@maplibre/maplibre-react-native 11.3.0 → 11.3.2

package/MapLibreReactNative.podspec

@@ -1,4 +1,5 @@
 require "json"
+require "securerandom"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
@@ -15,19 +16,31 @@ $MLRN_SPM_SPEC ||= {
 
 $MLRN = Object.new
 
+# Prevent UUID collisions https://github.com/maplibre/maplibre-react-native/issues/1499
+def $MLRN._mlrn_unique_uuid(project)
+  loop do
+    candidate = SecureRandom.hex(12).upcase
+    return candidate unless project.objects_by_uuid.key?(candidate)
+  end
+end
+
 def $MLRN._add_spm_to_target(project, target, url, requirement, product_name)
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
   pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
   if !pkg
-    pkg = project.new(pkg_class)
+    pkg_uuid = self._mlrn_unique_uuid(project)
+    pkg = pkg_class.new(project, pkg_uuid)
+    project.objects_by_uuid[pkg_uuid] = pkg
     pkg.repositoryURL = url
     project.root_object.package_references << pkg
   end
   pkg.requirement = requirement
   ref = target.package_product_dependencies.find { |r| r.class == ref_class && r.package == pkg && r.product_name == product_name }
   if !ref
-    ref = project.new(ref_class)
+    ref_uuid = self._mlrn_unique_uuid(project)
+    ref = ref_class.new(project, ref_uuid)
+    project.objects_by_uuid[ref_uuid] = ref
     ref.package = pkg
     ref.product_name = product_name
     target.package_product_dependencies << ref

package/android/src/main/java/org/maplibre/reactnative/components/sources/MLRNSource.kt

@@ -136,20 +136,26 @@ abstract class MLRNSource<T : Source?>(
     }
 
     fun removeLayer(childPosition: Int) {
+        val queuedLayers = mQueuedLayers
         val layer: MLRNLayer? =
-            if (mQueuedLayers != null && mQueuedLayers!!.isNotEmpty()) {
-                mQueuedLayers!![childPosition]
+            if (!queuedLayers.isNullOrEmpty()) {
+                queuedLayers.getOrNull(childPosition)
             } else {
-                mLayers[childPosition]
+                mLayers.getOrNull(childPosition)
             }
+
+        if (layer == null) return
+
         removeLayerFromMap(layer, childPosition)
     }
 
     fun getLayerAt(childPosition: Int): MLRNLayer? {
-        if (mQueuedLayers != null && mQueuedLayers!!.isNotEmpty()) {
-            return mQueuedLayers!![childPosition]
+        val queuedLayers = mQueuedLayers
+        if (!queuedLayers.isNullOrEmpty()) {
+            return queuedLayers.getOrNull(childPosition)
         }
-        return mLayers[childPosition]
+
+        return mLayers.getOrNull(childPosition)
     }
 
     protected fun addLayerToMap(

package/ios/components/map-view/MLRNMapView.m

@@ -273,18 +273,16 @@ static double const M2PI = M_PI * 2;
   NSMutableArray<MLRNSource *> *hitTouchableSources = [[NSMutableArray alloc] init];
   for (MLRNSource *touchableSource in touchableSources) {
     NSDictionary<NSString *, NSNumber *> *hitbox = touchableSource.hitbox;
-    float halfWidth = [hitbox[@"width"] floatValue] / 2.f;
-    float halfHeight = [hitbox[@"height"] floatValue] / 2.f;
-
-    CGFloat top = screenPoint.y - halfHeight;
-    CGFloat left = screenPoint.x - halfWidth;
+    float top = [hitbox[@"top"] floatValue];
+    float right = [hitbox[@"right"] floatValue];
+    float bottom = [hitbox[@"bottom"] floatValue];
+    float left = [hitbox[@"left"] floatValue];
     CGRect hitboxRect =
-        CGRectMake(left, top, [hitbox[@"width"] floatValue], [hitbox[@"height"] floatValue]);
+        CGRectMake(screenPoint.x - left, screenPoint.y - top, left + right, top + bottom);
 
     NSArray<id<MLNFeature>> *features =
         [self visibleFeaturesInRect:hitboxRect
-            inStyleLayersWithIdentifiers:[NSSet setWithArray:[touchableSource getLayerIDs]]
-                               predicate:nil];
+            inStyleLayersWithIdentifiers:[NSSet setWithArray:[touchableSource getLayerIDs]]];
 
     if (features.count > 0) {
       hits[touchableSource.id] = features;

package/ios/components/sources/MLRNSource.m

@@ -5,13 +5,11 @@
 
 @implementation MLRNSource
 
-double const DEFAULT_HITBOX_AREA = 44.0;
-
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     _layers = [[NSMutableArray alloc] init];
     _reactSubviews = [[NSMutableArray alloc] init];
-    _hitbox = @{@"width" : @(DEFAULT_HITBOX_AREA), @"height" : @(DEFAULT_HITBOX_AREA)};
+    _hitbox = @{@"top" : @22.0f, @"right" : @22.0f, @"bottom" : @22.0f, @"left" : @22.0f};
   }
   return self;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "11.3.0",
+  "version": "11.3.2",
   "publishConfig": {
     "access": "public",
     "provenance": true