@maplibre/maplibre-react-native 11.3.1 → 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/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.1",
+  "version": "11.3.2",
   "publishConfig": {
     "access": "public",
     "provenance": true