@rnmapbox/maps 10.1.20 → 10.1.22

package/android/build.gradle

@@ -13,6 +13,15 @@ def isNewArchitectureEnabled() {
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+
+def getKotlinVersion() {
+    return rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.21'
+}
+
+def getCoroutinesVersion(kotlinVersion) {
+    return kotlinVersion >= '1.9' ? '1.8.0' : '1.6.4'
+}
+
 // expo plugin
 if (rootProject.ext.has('expoRNMapboxMapsImpl')) {
     rootProject.ext.set('RNMapboxMapsImpl', rootProject.ext.get('expoRNMapboxMapsImpl'))
@@ -21,6 +30,7 @@ if (rootProject.ext.has('expoRNMapboxMapsVersion')) {
     rootProject.ext.set('RNMapboxMapsVersion', rootProject.ext.get('expoRNMapboxMapsVersion'))
 }
 
+project.ext.set("kotlinVersion", getKotlinVersion())
 
 buildscript {
   repositories {
@@ -28,8 +38,9 @@ buildscript {
     mavenCentral()
   }
 
+  def kotlinVersion = this.kotlinVersion
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.21'}"
+      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
   }
 }
 
@@ -142,9 +153,8 @@ dependencies {
     // React Native
     implementation "com.facebook.react:react-native:+"
 
-    // kotlin coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${safeExtGet('kotlinxCoroutinesCoreVersion', '1.8.0')}"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${safeExtGet('kotlinxCoroutinesAndroidVersion', '1.8.0')}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${safeExtGet('kotlinxCoroutinesCoreVersion', getCoroutinesVersion(getKotlinVersion()))}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${safeExtGet('kotlinxCoroutinesAndroidVersion', getCoroutinesVersion(getKotlinVersion()))}"
 
     // Mapbox SDK
     customizableDependencies('RNMapboxMapsLibs') {

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotationModule.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.module.annotations.ReactModule
 import com.rnmapbox.rnmbx.NativeRNMBXPointAnnotationModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 @ReactModule(name = RNMBXPointAnnotationModule.NAME)
@@ -15,7 +16,7 @@ class RNMBXPointAnnotationModule(reactContext: ReactApplicationContext?, private
         const val NAME = "RNMBXPointAnnotationModule"
     }
 
-    private fun withPointAnnotationOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXPointAnnotation) -> Unit) {
+    private fun withPointAnnotationOnUIThread(viewRef: ViewRefTag?, reject: Promise, fn: (RNMBXPointAnnotation) -> Unit) {
         if (viewRef == null) {
             reject.reject(Exception("viewRef is null for RNMBXPointAnnotation"))
         } else {
@@ -24,7 +25,7 @@ class RNMBXPointAnnotationModule(reactContext: ReactApplicationContext?, private
     }
 
     @ReactMethod
-    override fun refresh(viewRef: Double?, promise: Promise) {
+    override fun refresh(viewRef: ViewRefTag?, promise: Promise) {
         withPointAnnotationOnUIThread(viewRef, promise) {
             it.refresh()
             promise.resolve(null)

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCameraModule.kt

@@ -9,12 +9,13 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.rnmapbox.rnmbx.NativeRNMBXCameraModuleSpec
 import com.rnmapbox.rnmbx.components.mapview.CommandResponse
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 
 class RNMBXCameraModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeRNMBXCameraModuleSpec(context) {
     private fun withViewportOnUIThread(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         reject: Promise,
         fn: (RNMBXCamera) -> Unit
     ) {
@@ -42,7 +43,7 @@ class RNMBXCameraModule(context: ReactApplicationContext, val viewTagResolver: V
       const val NAME = "RNMBXCameraModule"
     }
 
-    override fun updateCameraStop(viewRef: Double?, stop: ReadableMap, promise: Promise) {
+    override fun updateCameraStop(viewRef: ViewRefTag?, stop: ReadableMap, promise: Promise) {
         withViewportOnUIThread(viewRef, promise) {
             it.updateCameraStop(stop)
             promise.resolve(null)

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXViewportModule.kt

@@ -8,11 +8,12 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.rnmapbox.rnmbx.NativeRNMBXViewportModuleSpec
 import com.rnmapbox.rnmbx.components.mapview.CommandResponse
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXViewportModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeRNMBXViewportModuleSpec(context) {
     private fun withViewportOnUIThread(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         reject: Promise,
         fn: (RNMBXViewport) -> Unit
     ) {
@@ -36,14 +37,14 @@ class RNMBXViewportModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun getState(viewRef: Double?, promise: Promise) {
+    override fun getState(viewRef: ViewRefTag?, promise: Promise) {
         withViewportOnUIThread(viewRef, promise) {
             promise.resolve(it.getState())
         }
     }
 
     override fun transitionTo(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         state: ReadableMap,
         transition: ReadableMap?,
         promise: Promise
@@ -53,7 +54,7 @@ class RNMBXViewportModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun idle(viewRef: Double?, promise: Promise) {
+    override fun idle(viewRef: ViewRefTag?, promise: Promise) {
         withViewportOnUIThread(viewRef, promise) {
             it.idle()
             promise.resolve(true)

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImageModule.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.module.annotations.ReactModule
 import com.rnmapbox.rnmbx.NativeRNMBXImageModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 @ReactModule(name = RNMBXImageModule.NAME)
@@ -15,7 +16,7 @@ class RNMBXImageModule(reactContext: ReactApplicationContext?, private val viewT
         const val NAME = "RNMBXImageModule"
     }
 
-    private fun withImageOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXImage) -> Unit) {
+    private fun withImageOnUIThread(viewRef: ViewRefTag?, reject: Promise, fn: (RNMBXImage) -> Unit) {
         if (viewRef == null) {
             reject.reject(Exception("viewRef is null for RNMBXImage"))
         } else {
@@ -24,7 +25,7 @@ class RNMBXImageModule(reactContext: ReactApplicationContext?, private val viewT
     }
 
     @ReactMethod
-    override fun refresh(viewRef: Double?, promise: Promise) {
+    override fun refresh(viewRef: ViewRefTag?, promise: Promise) {
         withImageOnUIThread(viewRef, promise) {
             it.refresh()
             promise.resolve(null)

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt

@@ -8,13 +8,14 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.rnmapbox.rnmbx.NativeMapViewModuleSpec
 import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
 
 class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeMapViewModuleSpec(context) {
     private fun withMapViewOnUIThread(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         reject: Promise,
         fn: (RNMBXMapView) -> Unit
     ) {
@@ -38,14 +39,14 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun takeSnap(viewRef: Double?, writeToDisk: Boolean, promise: Promise) {
+    override fun takeSnap(viewRef: ViewRefTag?, writeToDisk: Boolean, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.takeSnap(writeToDisk, createCommandResponse(promise))
         }
     }
 
     override fun queryTerrainElevation(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         coordinates: ReadableArray,
         promise: Promise
     ) {
@@ -55,7 +56,7 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
     }
 
     override fun setSourceVisibility(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         visible: Boolean,
         sourceId: String,
         sourceLayerId: String?,
@@ -68,14 +69,14 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun getCenter(viewRef: Double?, promise: Promise) {
+    override fun getCenter(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.getCenter(createCommandResponse(promise))
         }
     }
 
     override fun getCoordinateFromView(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         atPoint: ReadableArray,
         promise: Promise
     ) {
@@ -84,26 +85,26 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun getPointInView(viewRef: Double?, atCoordinate: ReadableArray, promise: Promise) {
+    override fun getPointInView(viewRef: ViewRefTag?, atCoordinate: ReadableArray, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.getPointInView(atCoordinate.toCoordinate(), createCommandResponse(promise))
         }
     }
 
-    override fun getZoom(viewRef: Double?, promise: Promise) {
+    override fun getZoom(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.getZoom(createCommandResponse(promise))
         }
     }
 
-    override fun getVisibleBounds(viewRef: Double?, promise: Promise) {
+    override fun getVisibleBounds(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.getVisibleBounds(createCommandResponse(promise))
         }
     }
 
     override fun queryRenderedFeaturesAtPoint(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         atPoint: ReadableArray,
         withFilter: ReadableArray,
         withLayerIDs: ReadableArray,
@@ -122,7 +123,7 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
     }
 
     override fun queryRenderedFeaturesInRect(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         withBBox: ReadableArray,
         withFilter: ReadableArray,
         withLayerIDs: ReadableArray?,
@@ -141,7 +142,7 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
     }
 
     override fun setHandledMapChangedEvents(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         events: ReadableArray,
         promise: Promise
     ) {
@@ -151,14 +152,14 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    override fun clearData(viewRef: Double?, promise: Promise) {
+    override fun clearData(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.clearData(createCommandResponse(promise))
         }
     }
 
     override fun querySourceFeatures(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         sourceId: String,
         withFilter: ReadableArray,
         withSourceLayerIDs: ReadableArray,

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.uimanager.common.UIManagerType
 import com.rnmapbox.rnmbx.BuildConfig
 import com.rnmapbox.rnmbx.NativeRNMBXShapeSourceModuleSpec
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 @ReactModule(name = RNMBXShapeSourceModule.NAME)
@@ -16,7 +17,7 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
     NativeRNMBXShapeSourceModuleSpec(reactContext) {
 
 
-    private fun withShapeSourceOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXShapeSource) -> Unit) {
+    private fun withShapeSourceOnUIThread(viewRef: ViewRefTag?, reject: Promise, fn: (RNMBXShapeSource) -> Unit) {
         if (viewRef == null) {
             reject.reject(Exception("viewRef is null for RNMBXShapeSource"))
         } else {
@@ -30,7 +31,7 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
 
     @ReactMethod
     override fun getClusterExpansionZoom(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         featureJSON: String,
         promise: Promise
     ) {
@@ -41,10 +42,10 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
 
     @ReactMethod
     override fun getClusterLeaves(
-        viewRef: Double?,
+        viewRef: ViewRefTag?,
         featureJSON: String,
-        number: Double,
-        offset: Double,
+        number: Int,
+        offset: Int,
         promise: Promise
     ) {
         withShapeSourceOnUIThread(viewRef, promise) {
@@ -53,7 +54,7 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
     }
 
     @ReactMethod
-    override fun getClusterChildren(viewRef: Double?, featureJSON: String, promise: Promise) {
+    override fun getClusterChildren(viewRef: ViewRefTag?, featureJSON: String, promise: Promise) {
         withShapeSourceOnUIThread(viewRef, promise) {
             it.getClusterChildren(featureJSON, promise)
         }

package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt

@@ -11,6 +11,7 @@ import com.mapbox.turf.TurfConstants.UNIT_METERS
 import com.mapbox.turf.TurfMeasurement
 import com.mapbox.turf.TurfMisc
 import com.rnmapbox.rnmbx.NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 
 class ChangeLineOffsetsShapeAnimator(tag: Tag, _lineString: LineString, startOffset: Double, endOffset: Double): ShapeAnimatorCommon(tag) {
     private var lineString = _lineString
@@ -153,7 +154,7 @@ class RNMBXChangeLineOffsetsShapeAnimatorModule(
     }
 
     override fun create(
-        tag: Double,
+        tag: ViewRefTag,
         coordinates: ReadableArray,
         startOffset: Double,
         endOffset: Double,
@@ -172,11 +173,11 @@ class RNMBXChangeLineOffsetsShapeAnimatorModule(
         promise?.resolve(tag.toInt())
     }
 
-    private fun getAnimator(tag: Double): ChangeLineOffsetsShapeAnimator {
+    private fun getAnimator(tag: ViewRefTag): ChangeLineOffsetsShapeAnimator {
         return shapeAnimatorManager.get(tag.toLong()) as ChangeLineOffsetsShapeAnimator
     }
 
-    override fun setLineString(tag: Double, coordinates: ReadableArray?, startOffset: Double, endOffset: Double, promise: Promise?) {
+    override fun setLineString(tag: ViewRefTag, coordinates: ReadableArray?, startOffset: Double, endOffset: Double, promise: Promise?) {
         val animator = getAnimator(tag)
 
         if (coordinates == null) {
@@ -191,13 +192,13 @@ class RNMBXChangeLineOffsetsShapeAnimatorModule(
         promise?.resolve(true)
     }
 
-    override fun setStartOffset(tag: Double, offset: Double, duration: Double, promise: Promise?) {
+    override fun setStartOffset(tag: ViewRefTag, offset: Double, duration: Double, promise: Promise?) {
         val animator = getAnimator(tag)
         animator.setStartOffset(offset, duration / 1000)
         promise?.resolve(true)
     }
 
-    override fun setEndOffset(tag: Double, offset: Double, duration: Double, promise: Promise?) {
+    override fun setEndOffset(tag: ViewRefTag, offset: Double, duration: Double, promise: Promise?) {
         val animator = getAnimator(tag)
         animator.setEndOffset(offset, duration / 1000)
         promise?.resolve(true)

package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXMovePointShapeAnimatorModule.kt

@@ -11,6 +11,7 @@ import com.mapbox.geojson.Point
 import com.mapbox.turf.TurfConstants.UNIT_METERS
 import com.mapbox.turf.TurfMeasurement
 import com.rnmapbox.rnmbx.NativeRNMBXMovePointShapeAnimatorModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewRefTag
 
 class MovePointShapeAnimator(tag: Tag, coordinate: Point) : ShapeAnimatorCommon(tag) {
     private var point = AnimatableElement<Point>(
@@ -77,7 +78,7 @@ class RNMBXMovePointShapeAnimatorModule(
     }
 
     @ReactMethod
-    override fun create(tag: Double, startCoordinate: ReadableArray, promise: Promise) {
+    override fun create(tag: ViewRefTag, startCoordinate: ReadableArray, promise: Promise) {
         shapeAnimatorManager.add(
             MovePointShapeAnimator(
                 tag.toLong(),
@@ -92,7 +93,7 @@ class RNMBXMovePointShapeAnimatorModule(
 
     @ReactMethod
     override fun moveTo(
-        tag: Double,
+        tag: ViewRefTag,
         coordinate: ReadableArray?,
         duration: Double,
         promise: Promise?

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -16,6 +16,7 @@ data class ViewTagWaiter<V>(
 
 const val LOG_TAG = "ViewTagResolver"
 
+typealias ViewRefTag = Int
 // see https://github.com/rnmapbox/maps/pull/3074
 open class ViewTagResolver(val context: ReactApplicationContext) {
     private val createdViews: HashSet<Int> = hashSetOf<Int>()

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeMapViewModuleSpec.java

@@ -37,53 +37,53 @@ public abstract class NativeMapViewModuleSpec extends ReactContextBaseJavaModule
 
   @ReactMethod
   @DoNotStrip
-  public abstract void takeSnap(@Nullable Double viewRef, boolean writeToDisk, Promise promise);
+  public abstract void takeSnap(@Nullable Integer viewRef, boolean writeToDisk, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryTerrainElevation(@Nullable Double viewRef, ReadableArray coordinates, Promise promise);
+  public abstract void queryTerrainElevation(@Nullable Integer viewRef, ReadableArray coordinates, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setSourceVisibility(@Nullable Double viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
+  public abstract void setSourceVisibility(@Nullable Integer viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCenter(@Nullable Double viewRef, Promise promise);
+  public abstract void getCenter(@Nullable Integer viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCoordinateFromView(@Nullable Double viewRef, ReadableArray atPoint, Promise promise);
+  public abstract void getCoordinateFromView(@Nullable Integer viewRef, ReadableArray atPoint, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getPointInView(@Nullable Double viewRef, ReadableArray atCoordinate, Promise promise);
+  public abstract void getPointInView(@Nullable Integer viewRef, ReadableArray atCoordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getZoom(@Nullable Double viewRef, Promise promise);
+  public abstract void getZoom(@Nullable Integer viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getVisibleBounds(@Nullable Double viewRef, Promise promise);
+  public abstract void getVisibleBounds(@Nullable Integer viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesAtPoint(@Nullable Double viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesAtPoint(@Nullable Integer viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesInRect(@Nullable Double viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesInRect(@Nullable Integer viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setHandledMapChangedEvents(@Nullable Double viewRef, ReadableArray events, Promise promise);
+  public abstract void setHandledMapChangedEvents(@Nullable Integer viewRef, ReadableArray events, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void clearData(@Nullable Double viewRef, Promise promise);
+  public abstract void clearData(@Nullable Integer viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void querySourceFeatures(@Nullable Double viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
+  public abstract void querySourceFeatures(@Nullable Integer viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXCameraModuleSpec.java

@@ -37,5 +37,5 @@ public abstract class NativeRNMBXCameraModuleSpec extends ReactContextBaseJavaMo
 
   @ReactMethod
   @DoNotStrip
-  public abstract void updateCameraStop(@Nullable Double viewRef, ReadableMap stop, Promise promise);
+  public abstract void updateCameraStop(@Nullable Integer viewRef, ReadableMap stop, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec.java

@@ -36,17 +36,17 @@ public abstract class NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec extend
 
   @ReactMethod
   @DoNotStrip
-  public abstract void create(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void create(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setLineString(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void setLineString(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setStartOffset(double tag, double offset, double duration, Promise promise);
+  public abstract void setStartOffset(int tag, double offset, double duration, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setEndOffset(double tag, double offset, double duration, Promise promise);
+  public abstract void setEndOffset(int tag, double offset, double duration, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXImageModuleSpec.java

@@ -36,5 +36,5 @@ public abstract class NativeRNMBXImageModuleSpec extends ReactContextBaseJavaMod
 
   @ReactMethod
   @DoNotStrip
-  public abstract void refresh(@Nullable Double viewRef, Promise promise);
+  public abstract void refresh(@Nullable Integer viewRef, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXMovePointShapeAnimatorModuleSpec.java

@@ -36,9 +36,9 @@ public abstract class NativeRNMBXMovePointShapeAnimatorModuleSpec extends ReactC
 
   @ReactMethod
   @DoNotStrip
-  public abstract void create(double tag, ReadableArray coordinate, Promise promise);
+  public abstract void create(int tag, ReadableArray coordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void moveTo(double tag, ReadableArray coordinate, double duration, Promise promise);
+  public abstract void moveTo(int tag, ReadableArray coordinate, double duration, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXPointAnnotationModuleSpec.java

@@ -36,5 +36,5 @@ public abstract class NativeRNMBXPointAnnotationModuleSpec extends ReactContextB
 
   @ReactMethod
   @DoNotStrip
-  public abstract void refresh(@Nullable Double viewRef, Promise promise);
+  public abstract void refresh(@Nullable Integer viewRef, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXShapeSourceModuleSpec.java

@@ -36,13 +36,13 @@ public abstract class NativeRNMBXShapeSourceModuleSpec extends ReactContextBaseJ
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterExpansionZoom(@Nullable Double viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterExpansionZoom(@Nullable Integer viewRef, String featureJSON, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterLeaves(@Nullable Double viewRef, String featureJSON, double number, double offset, Promise promise);
+  public abstract void getClusterLeaves(@Nullable Integer viewRef, String featureJSON, int number, int offset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterChildren(@Nullable Double viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterChildren(@Nullable Integer viewRef, String featureJSON, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXTileStoreModuleSpec.java

@@ -41,5 +41,5 @@ public abstract class NativeRNMBXTileStoreModuleSpec extends ReactContextBaseJav
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setOption(double tag, String key, String domain, ReadableMap value, Promise promise);
+  public abstract void setOption(int tag, String key, String domain, ReadableMap value, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXViewportModuleSpec.java

@@ -37,13 +37,13 @@ public abstract class NativeRNMBXViewportModuleSpec extends ReactContextBaseJava
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getState(@Nullable Double viewRef, Promise promise);
+  public abstract void getState(@Nullable Integer viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void transitionTo(@Nullable Double viewRef, ReadableMap state, ReadableMap transition, Promise promise);
+  public abstract void transitionTo(@Nullable Integer viewRef, ReadableMap state, ReadableMap transition, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void idle(@Nullable Double viewRef, Promise promise);
+  public abstract void idle(@Nullable Integer viewRef, Promise promise);
 }

package/ios/RNMBX/RNMBXFabricHelpers.h

@@ -67,7 +67,7 @@ static std::tuple<std::string, std::string> RNMBXStringifyEventData(NSDictionary
 }
 
 template <typename T>
-void RNMBXSetCommonLayerPropsWithoutSourceID(T newProps, RNMBXLayer *_view)
+void RNMBXSetCommonLayerPropsWithoutSourceID(const T& newProps, RNMBXLayer *_view)
 {
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
@@ -108,7 +108,7 @@ void RNMBXSetCommonLayerPropsWithoutSourceID(T newProps, RNMBXLayer *_view)
 }
 
 template <typename T>
-void RNMBXSetCommonLayerProps(T newProps, RNMBXLayer *_view)
+void RNMBXSetCommonLayerProps(const T& newProps, RNMBXLayer *_view)
 {
     RNMBXSetCommonLayerPropsWithoutSourceID(newProps, _view);
     id sourceLayerID = RNMBXConvertFollyDynamicToId(newProps.sourceLayerID);

package/ios/RNMBX/RNMBXMapView.swift

@@ -171,7 +171,7 @@ open class RNMBXMapView: UIView {
   }()
   
   var _mapView: MapView! = nil
-  func createMapView() {
+  func createMapView() -> MapView {
     if let mapViewImpl = mapViewImpl, let mapViewInstance = createAndAddMapViewImpl(mapViewImpl, self) {
       _mapView = mapViewInstance
     } else {
@@ -192,6 +192,7 @@ open class RNMBXMapView: UIView {
     _mapView.gestures.delegate = self
     setupEvents()
     afterMapViewAdded()
+    return _mapView
   }
 
   func createAndAddMapViewImpl(_ impl: String, _ view: RNMBXMapView) -> MapView? {
@@ -203,17 +204,20 @@ open class RNMBXMapView: UIView {
     }
   }
 
+  @available(*, deprecated, renamed: "withMapView", message: "mapView can be nil if the map initialization has not finished, use withMapView instead")
   public var mapView : MapView! {
     get { return _mapView }
   }
+  
+  @available(*, deprecated, renamed: "withMapboxMap", message: "mapboxMap can be nil if the map initialization has not finished, use withMapboxMap instead")
   var mapboxMap: MapboxMap! {
-    get { _mapView.mapboxMap }
+    get { _mapView?.mapboxMap }
   }
 
   @objc public func addToMap(_ subview: UIView) {
-    withMapView {
+    withMapView { mapView in
       if let mapComponent = subview as? RNMBXMapComponent {
-        let style = self.mapView.mapboxMap.style
+        let style = mapView.mapboxMap.style
         var addToMap = false
         if mapComponent.waitForStyleLoad() {
           if (self.styleLoaded) {
@@ -303,7 +307,7 @@ open class RNMBXMapView: UIView {
   
   // MARK: - React Native properties
   let changes : PropertyChanges<RNMBXMapView> = PropertyChanges()
-  var mapViewWaiters : [()->Void] = []
+  var mapViewWaiters : [(_: MapView)->Void] = []
   
   enum Property : String {
     case projection
@@ -363,14 +367,24 @@ open class RNMBXMapView: UIView {
     changes.add(name: property.rawValue, update: property.apply)
   }
   
-  func withMapView(callback: @escaping () -> Void) {
-    if _mapView != nil {
-      callback()
+  func withMapView(callback: @escaping (_: MapView) -> Void) {
+    if let mapView = _mapView {
+      callback(mapView)
     } else {
       mapViewWaiters.append(callback)
     }
   }
   
+  func withMapboxMap(callback: @escaping (_: MapboxMap) -> Void) {
+    if let mapboxMap = _mapView?.mapboxMap {
+      callback(mapboxMap)
+    } else {
+      mapViewWaiters.append { mapView in
+        callback(mapView.mapboxMap)
+      }
+    }
+  }
+  
   var projection: StyleProjection?
   
   @objc public func setReactProjection(_ value: String?) {
@@ -698,9 +712,9 @@ open class RNMBXMapView: UIView {
 
   @objc override public func didSetProps(_ props: [String]) {
     if (_mapView == nil) {
-      createMapView()
+      let view = createMapView()
       
-      mapViewWaiters.forEach { $0() }
+      mapViewWaiters.forEach { $0(view) }
       mapViewWaiters.removeAll()
     }
     changes.apply(self)

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -23,25 +23,6 @@ open class RNMBXMapViewManager: RCTViewManager {
     }
 }
 
-// MARK: helpers
-
-extension RNMBXMapViewManager {
-    static func withMapboxMap(
-        _ view: RNMBXMapView,
-        name: String,
-        rejecter: @escaping RCTPromiseRejectBlock,
-        fn: @escaping (_: MapboxMap) -> Void) -> Void
-    {
-        guard let mapboxMap = view.mapboxMap else {
-          RNMBXLogError("MapboxMap is not yet available");
-          rejecter(name, "Map not loaded yet", nil)
-          return;
-        }
-        
-        fn(mapboxMap)
-    }
-}
-
 // MARK: - react methods
 
 extension RNMBXMapViewManager {
@@ -76,12 +57,12 @@ extension RNMBXMapViewManager {
     }
     
     @objc public static func getCenter(_ view: RNMBXMapView, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        withMapboxMap(view, name: "getCenter", rejecter:rejecter) { map in
-            resolver(["center": [
-                map.cameraState.center.longitude,
-                map.cameraState.center.latitude
-            ]])
-        }
+      view.withMapboxMap { map in
+        resolver(["center": [
+            map.cameraState.center.longitude,
+            map.cameraState.center.latitude
+        ]])
+      }
     }
 
     @objc public static func getCoordinateFromView(
@@ -89,10 +70,10 @@ extension RNMBXMapViewManager {
         atPoint point: CGPoint,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
-            withMapboxMap(view, name: "getCoordinateFromView", rejecter:rejecter) { map in
-                let coordinates = map.coordinate(for: point)
-                resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]])
-            }
+          view.withMapboxMap { map in
+            let coordinates = map.coordinate(for: point)
+            resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]])
+          }
             
     }
 
@@ -101,12 +82,11 @@ extension RNMBXMapViewManager {
         atCoordinate coordinate: [NSNumber],
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
-            withMapboxMap(view, name: "getPointInView", rejecter:rejecter) { map in
-                let coordinate = CLLocationCoordinate2DMake(coordinate[1].doubleValue, coordinate[0].doubleValue)
-                let point = map.point(for: coordinate)
-                resolver(["pointInView": [(point.x), (point.y)]])
-            }
-            
+          view.withMapboxMap { map in
+              let coordinate = CLLocationCoordinate2DMake(coordinate[1].doubleValue, coordinate[0].doubleValue)
+              let point = map.point(for: coordinate)
+              resolver(["pointInView": [(point.x), (point.y)]])
+          }
       }
 
     @objc public static func setHandledMapChangedEvents(
@@ -124,10 +104,9 @@ extension RNMBXMapViewManager {
         _ view: RNMBXMapView,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
-            withMapboxMap(view, name: "getZoom", rejecter:rejecter) { map in
-                resolver(["zoom": map.cameraState.zoom])
-            }
-            
+          view.withMapboxMap { map in
+              resolver(["zoom": map.cameraState.zoom])
+          }
     }
 
     @objc public static func getVisibleBounds(
@@ -148,27 +127,26 @@ extension RNMBXMapViewManager {
         withLayerIDs layerIDs: [String]?,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-            withMapboxMap(view, name: "queryRenderedFeaturesAtPoint", rejecter:rejecter) { map in
-                let point = CGPoint(x: CGFloat(point[0].floatValue), y: CGFloat(point[1].floatValue))
-
-                logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) {
-                  let options = try RenderedQueryOptions(layerIds: (layerIDs ?? []).isEmpty ? nil : layerIDs, filter: filter?.asExpression())
-                  
-                  map.queryRenderedFeatures(with: point, options: options) { result in
-                    switch result {
-                    case .success(let features):
-                      resolver([
-                        "data": ["type": "FeatureCollection", "features": features.compactMap { queriedFeature in
-                          logged("queryRenderedFeaturesAtPoint.feature.toJSON") { try queriedFeature.feature.toJSON() }
-                        }]
-                      ])
-                    case .failure(let error):
-                      rejecter("queryRenderedFeaturesAtPoint","failed to query features", error)
-                    }
+          view.withMapboxMap { map in
+              let point = CGPoint(x: CGFloat(point[0].floatValue), y: CGFloat(point[1].floatValue))
+
+              logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) {
+                let options = try RenderedQueryOptions(layerIds: (layerIDs ?? []).isEmpty ? nil : layerIDs, filter: filter?.asExpression())
+                
+                map.queryRenderedFeatures(with: point, options: options) { result in
+                  switch result {
+                  case .success(let features):
+                    resolver([
+                      "data": ["type": "FeatureCollection", "features": features.compactMap { queriedFeature in
+                        logged("queryRenderedFeaturesAtPoint.feature.toJSON") { try queriedFeature.feature.toJSON() }
+                      }]
+                    ])
+                  case .failure(let error):
+                    rejecter("queryRenderedFeaturesAtPoint","failed to query features", error)
                   }
                 }
-            }
-        
+              }
+          }
       }
 
     @objc public static func queryRenderedFeaturesInRect(

package/ios/RNMBX/RNMBXMarkerViewComponentView.mm

@@ -104,6 +104,7 @@ using namespace facebook::react;
         layoutMetrics.contentInsets,
         layoutMetrics.borderWidth,
         layoutMetrics.displayType,
+        layoutMetrics.positionType, // RN074
         layoutMetrics.layoutDirection,
         layoutMetrics.wasLeftAndRightSwapped,
         layoutMetrics.pointScaleFactor,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.20",
+  "version": "10.1.22",
   "publishConfig": {
     "access": "public"
   },