@rnmapbox/maps 10.3.0-beta.0 → 10.3.0-rc.0

package/README.md

@@ -56,11 +56,8 @@ _A community-supported, open-source React Native library for building maps with
 
 ---
 
-### Supported Implementations 
-At the moment we support Mapbox (v10) and Mapbox (v11) beta.
-We default to Mapbox (v10).
-
-_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using v11 beta_
+### Supported Implementations
+We support Mapbox Maps SDK v11. See [iOS](ios/install.md) & [Android](android/install.md) setup guides.
 
 
 
@@ -74,7 +71,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using
 
 - [node](https://nodejs.org)
 - [npm](https://www.npmjs.com/)
-- [React Native](https://facebook.github.io/react-native/) (0.70+, older versions from 0.64+ might or might not work)
+- [React Native](https://facebook.github.io/react-native/) (0.79+)
 
 
 ## Installation

package/android/install.md

@@ -2,8 +2,7 @@
 
 ## Supported mapbox libraries
 
-We're only supporting mapbox 10.16* and 11.*. The default is 10.16*.
-Next release will be 11.* only so we recommend updatign to 11.*
+We support Mapbox Maps SDK v11.
 
 ### Adding mapbox maven repo
 
@@ -27,39 +26,14 @@ allprojects {
 
 ### Using non default mapbox version
 
-*Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
+*Warning*: If you set a custom version, make sure you revisit any time you update @rnmapbox/maps. Setting it to an earlier version than what we expect will likely result in a build error.
 
 Set `RNMapboxMapsVersion` in `android/build.gradle > buildscript > ext` section
 
-
-```groovy
-buildscript {
-    ext {
-        RNMapboxMapsVersion = '11.4.1'
-    }
-}
-```
-
-you can also customize all the libraries, should it be neccesary
-
-```groovy
-buildscript {
-    ext {
-        // ...
-        RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation 'com.mapbox.maps:android:10.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
-        }
-    }
-}
-```
-
-### Using v11
-
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsVersion = '11.4.1'
+        RNMapboxMapsVersion = '11.16.2'
     }
 }
 ```

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

@@ -36,7 +36,7 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     private val mTitle: String? = null
     private val mSnippet: String? = null
     private var mAnchor: Array<Float>? = null
-    private val mIsSelected = false
+    private var mIsSelected = false
     private var mDraggable = false
     private var mChildView: View? = null
     private var mChildBitmap: Bitmap? = null
@@ -187,7 +187,19 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         }
     }
 
+    fun setReactSelected(selected: Boolean) {
+        if (selected && !mIsSelected) {
+            pointAnnotations?.let {
+                it.deselectSelectedAnnotation()
+                it.selectAnnotation(this)
+            }
+        } else if (!selected && mIsSelected) {
+            pointAnnotations?.deselectAnnotation(this)
+        }
+    }
+
     fun doSelect(shouldSendEvent: Boolean) {
+        mIsSelected = true
         if (calloutView != null) {
             makeCallout()
         }
@@ -197,6 +209,7 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     }
 
     fun doDeselect() {
+        mIsSelected = false
         mManager.handleEvent(makeEvent(false))
         mCalloutSymbol?.let { mCalloutSymbol ->
             pointAnnotations?.delete(mCalloutSymbol)

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

@@ -78,6 +78,17 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
         annotation.setAnchor(mapValue.getDouble("x").toFloat(), mapValue.getDouble("y").toFloat())
     }
 
+    override fun setSelected(
+        annotation: RNMBXPointAnnotation,
+        value: Dynamic
+    ) {
+        if (value.isNull) {
+            Logger.e("RNMBXPointAnnotationManager", "selected value is null")
+            return
+        }
+        annotation.setReactSelected(value.asBoolean())
+    }
+
     @ReactProp(name = "draggable")
     override fun setDraggable(annotation: RNMBXPointAnnotation, draggable: Dynamic) {
         annotation.setDraggable(draggable.asBoolean())

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

@@ -175,6 +175,14 @@ object RNMBXStyleFactory {
                 setLineGradient(layer, styleValue)
               "lineTrimOffset" ->
                 setLineTrimOffset(layer, styleValue)
+              "lineBorderWidth" ->
+                setLineBorderWidth(layer, styleValue)
+                "lineBorderWidthTransition" ->
+                setLineBorderWidthTransition(layer, styleValue)
+              "lineBorderColor" ->
+                setLineBorderColor(layer, styleValue)
+                "lineBorderColorTransition" ->
+                setLineBorderColorTransition(layer, styleValue)
               "lineZOffset" ->
                 setLineZOffset(layer, styleValue)
               "lineElevationReference" ->
@@ -795,6 +803,8 @@ object RNMBXStyleFactory {
           val styleValue = style.getStyleValueForKey(styleKey)
 
           when (styleKey) {
+              "modelAllowDensityReduction" ->
+                setModelAllowDensityReduction(layer, styleValue)
               "visibility" ->
                 setVisibility(layer, styleValue)
               "modelId" ->
@@ -847,6 +857,8 @@ object RNMBXStyleFactory {
                 setModelHeightBasedEmissiveStrengthMultiplierTransition(layer, styleValue)
               "modelCutoffFadeRange" ->
                 setModelCutoffFadeRange(layer, styleValue)
+              "modelElevationReference" ->
+                setModelElevationReference(layer, styleValue)
           }
         } catch (e: MapboxStyleException) {
           Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -1619,6 +1631,58 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setLineBorderWidth(layer: LineLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.lineBorderWidth(expression)
+        } else {
+          Logger.e("RNMBXLine", "Expression for lineBorderWidth is null")
+        }
+      } else {
+          val value = styleValue.getDouble(VALUE_KEY)
+          if (value != null) {
+            layer.lineBorderWidth(value)
+          } else {
+            Logger.e("RNMBXLine", "value for lineBorderWidth is null")
+          }
+      }
+    }
+
+
+    fun setLineBorderWidthTransition(layer: LineLayer, styleValue: RNMBXStyleValue) {
+      val transition = styleValue.transition
+      if (transition != null) {
+        layer.lineBorderWidthTransition(transition);
+      }
+    }
+
+    fun setLineBorderColor(layer: LineLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.lineBorderColor(expression)
+        } else {
+          Logger.e("RNMBXLine", "Expression for lineBorderColor is null")
+        }
+      } else {
+          val value = styleValue.getInt(VALUE_KEY)
+          if (value != null) {
+            layer.lineBorderColor(value)
+          } else {
+            Logger.e("RNMBXLine", "value for lineBorderColor is null")
+          }
+      }
+    }
+
+
+    fun setLineBorderColorTransition(layer: LineLayer, styleValue: RNMBXStyleValue) {
+      val transition = styleValue.transition
+      if (transition != null) {
+        layer.lineBorderColorTransition(transition);
+      }
+    }
+
     fun setLineZOffset(layer: LineLayer, styleValue: RNMBXStyleValue ) {
       if (styleValue.isExpression()) {
         val expression = styleValue.getExpression()
@@ -4673,6 +4737,24 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setModelAllowDensityReduction(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.modelAllowDensityReduction(expression)
+        } else {
+          Logger.e("RNMBXModel", "Expression for modelAllowDensityReduction is null")
+        }
+      } else {
+          val value = styleValue.getBoolean(VALUE_KEY)
+          if (value != null) {
+            layer.modelAllowDensityReduction(value)
+          } else {
+            Logger.e("RNMBXModel", "value for modelAllowDensityReduction is null")
+          }
+      }
+    }
+
     fun setVisibility(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }
@@ -5022,6 +5104,19 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setModelElevationReference(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.modelElevationReference(expression)
+        } else {
+          Logger.e("RNMBXModel", "Expression for modelElevationReference is null")
+        }
+      } else {
+          layer.modelElevationReference(ModelElevationReference.valueOf(styleValue.getEnumName()))
+      }
+    }
+
     fun setVisibility(layer: BackgroundLayer, styleValue: RNMBXStyleValue ) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapSteadyEvent.kt

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.WritableMap
 /**
  * Direct event for CameraGestureObserver -> onMapSteady
  * JS registrationName: onMapSteady
- * Native event name (key): topOnMapSteady
+ * Native event name (key): onMapSteady
  */
 class MapSteadyEvent(
     view: View?,
@@ -16,7 +16,7 @@ class MapSteadyEvent(
     private val lastGestureType: String?
 ) : AbstractEvent(view, "mapSteady") {
     override val key: String
-        get() = "topOnMapSteady"
+        get() = "onMapSteady"
 
     override val payload: WritableMap
         get() = Arguments.createMap().apply {
@@ -34,6 +34,12 @@ class MapSteadyEvent(
             putDouble("timestamp", System.currentTimeMillis().toDouble())
         }
 
+    override fun toJSON(): WritableMap {
+        val map = Arguments.createMap()
+        map.merge(payload)
+        return map
+    }
+
     override fun canCoalesce(): Boolean {
         // Do not coalesce - each steady/timeout event is significant
         return false

package/android/src/main/java/com/rnmapbox/rnmbx/events/RNMBXCameraGestureObserver.kt

@@ -37,7 +37,6 @@ class RNMBXCameraGestureObserver(
     private var lastTransitionEndedAtMs: Double? = null
     private var quietRunnable: Runnable? = null
     private var timeoutRunnable: Runnable? = null
-    private var emittedForCurrentActivity: Boolean = false
 
     private val quietMs: Double get() = quietPeriodMs ?: 200.0
     private val maxMs: Double? get() = maxIntervalMs
@@ -84,9 +83,9 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun scheduleQuietCheck() {
+        cancelQuietTimer()
         val delay = quietMs
         if (delay <= 0) {
-            cancelQuietTimer()
             maybeEmitSteady()
             return
         }
@@ -99,8 +98,10 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun scheduleTimeout() {
+        if (timeoutRunnable != null) return
         val delay = maxMs ?: return
         val runnable = Runnable {
+            timeoutRunnable = null
             emitTimeout()
         }
         timeoutRunnable = scheduleTimer(delay, runnable)
@@ -108,7 +109,6 @@ class RNMBXCameraGestureObserver(
 
     private fun markActivity(gestureType: String? = null) {
         if (gestureType != null) lastGestureType = gestureType
-        emittedForCurrentActivity = false
         scheduleQuietCheck()
         scheduleTimeout()
     }
@@ -122,7 +122,6 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun emitSteady(idleDurationMs: Double) {
-        if (emittedForCurrentActivity) return
         cancelQuietTimer()
         cancelTimeoutTimer()
         val gesture = lastGestureType
@@ -131,7 +130,6 @@ class RNMBXCameraGestureObserver(
             MapSteadyEvent.make(this, "steady", idleDurationMs, gesture)
         )
         lastGestureType = null
-        emittedForCurrentActivity = true
     }
 
     private fun emitTimeout() {

package/android/src/main/java/com/rnmapbox/rnmbx/events/RNMBXCameraGestureObserverManager.kt

@@ -65,7 +65,7 @@ class RNMBXCameraGestureObserverManager(private val mContext: ReactApplicationCo
 
     // Map the native event name to the JS registration name for direct events
     override fun customEvents(): Map<String, String> = mapOf(
-        "topOnMapSteady" to "onMapSteady"
+        "onMapSteady" to "onMapSteady"
     )
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXSnapshotModule.kt

@@ -8,10 +8,13 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.mapbox.geojson.Feature
+import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
 import com.mapbox.maps.CameraOptions
+import com.mapbox.maps.EdgeInsets
 import com.mapbox.maps.MapSnapshotOptions
 import com.mapbox.maps.Size
+import com.mapbox.maps.SnapshotOverlayOptions
 import com.mapbox.maps.Snapshotter
 import com.rnmapbox.rnmbx.modules.RNMBXModule.Companion.getAccessToken
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
@@ -43,30 +46,38 @@ class RNMBXSnapshotModule(private val mContext: ReactApplicationContext) :
         // FileSource.getInstance(mContext).activate();
         mContext.runOnUiQueueThread {
             val snapshotterID = UUID.randomUUID().toString()
-            val snapshotter = Snapshotter(mContext, getOptions(jsOptions))
+            val showLogo = if (jsOptions.hasKey("withLogo")) jsOptions.getBoolean("withLogo") else true
+            val overlayOptions = SnapshotOverlayOptions(showLogo = showLogo)
+            val snapshotter = Snapshotter(mContext, getOptions(jsOptions), overlayOptions)
             snapshotter.setStyleUri(jsOptions.getString("styleURL")!!)
-            snapshotter.setCamera(getCameraOptions(jsOptions))
+            try {
+                snapshotter.setCamera(getCameraOptions(jsOptions, snapshotter))
+            } catch (e: IllegalArgumentException) {
+                promise.reject(REACT_CLASS, e.message, e)
+                return@runOnUiQueueThread
+            }
             mSnapshotterMap[snapshotterID] = snapshotter
-            snapshotter.startV11 { image,error ->
+
+            snapshotter.start(null) { image, error ->
                 try {
                     if (image == null) {
                         Log.w(REACT_CLASS, "Snapshot failed: $error")
                         promise.reject(REACT_CLASS, "Snapshot failed: $error")
                         mSnapshotterMap.remove(snapshotterID)
                     } else {
-                        val image = image.toMapboxImage()
+                        val mapboxImage = image.toMapboxImage()
                         var result: String? = null
                         result = if (jsOptions.getBoolean("writeToDisk")) {
-                            BitmapUtils.createImgTempFile(mContext, image)
+                            BitmapUtils.createImgTempFile(mContext, mapboxImage)
                         } else {
-                            BitmapUtils.createImgBase64(image)
+                            BitmapUtils.createImgBase64(mapboxImage)
                         }
                         if (result == null) {
                             promise.reject(
                                 REACT_CLASS,
                                 "Could not generate snapshot, please check Android logs for more info."
                             )
-                            return@startV11
+                            return@start
                         }
                         promise.resolve(result)
                         mSnapshotterMap.remove(snapshotterID)
@@ -79,17 +90,44 @@ class RNMBXSnapshotModule(private val mContext: ReactApplicationContext) :
         }
     }
 
-    private fun getCameraOptions(jsOptions: ReadableMap): CameraOptions {
-        val centerPoint =
-            Feature.fromJson(jsOptions.getString("centerCoordinate")!!)
-        val point = centerPoint.geometry() as Point?
-        val cameraOptionsBuilder = CameraOptions.Builder()
-        return cameraOptionsBuilder
-            .center(point)
-            .pitch(jsOptions.getDouble("pitch"))
-            .bearing(jsOptions.getDouble("heading"))
-            .zoom(jsOptions.getDouble("zoomLevel"))
-            .build()
+    private fun getCameraOptions(jsOptions: ReadableMap, snapshotter: Snapshotter): CameraOptions {
+        val pitch = jsOptions.getDouble("pitch")
+        val heading = jsOptions.getDouble("heading")
+        val zoomLevel = jsOptions.getDouble("zoomLevel")
+
+        // Check if centerCoordinate is provided
+        if (jsOptions.hasKey("centerCoordinate") && !jsOptions.isNull("centerCoordinate")) {
+            val centerPoint = Feature.fromJson(jsOptions.getString("centerCoordinate")!!)
+            val point = centerPoint.geometry() as Point?
+            return CameraOptions.Builder()
+                .center(point)
+                .pitch(pitch)
+                .bearing(heading)
+                .zoom(zoomLevel)
+                .build()
+        }
+
+        // Check if bounds is provided
+        if (jsOptions.hasKey("bounds") && !jsOptions.isNull("bounds")) {
+            val boundsJson = jsOptions.getString("bounds")!!
+            val featureCollection = FeatureCollection.fromJson(boundsJson)
+            val coords = featureCollection.features()?.mapNotNull { feature ->
+                feature.geometry() as? Point
+            } ?: emptyList()
+
+            if (coords.isEmpty()) {
+                throw IllegalArgumentException("bounds contains no valid coordinates")
+            }
+
+            return snapshotter.cameraForCoordinates(
+                coords,
+                EdgeInsets(0.0, 0.0, 0.0, 0.0),
+                heading,
+                pitch
+            )
+        }
+
+        throw IllegalArgumentException("neither centerCoordinate nor bounds provided")
     }
 
     private fun getOptions(jsOptions: ReadableMap): MapSnapshotOptions {

package/ios/RNMBX/README.md

@@ -1 +1 @@
-iOS v10 code
+iOS native code

package/ios/RNMBX/RNMBXBackgroundLayer.swift

@@ -30,7 +30,7 @@ public class RNMBXBackgroundLayer: RNMBXLayer {
         styler.backgroundLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXBackgroundLayer.addStyles") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXCalloutComponentView.mm

@@ -45,6 +45,16 @@ using namespace facebook::react;
   return concreteComponentDescriptorProvider<RNMBXCalloutComponentDescriptor>();
 }
 
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    [_view insertSubview:childComponentView atIndex:index];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    [childComponentView removeFromSuperview];
+}
+
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
   const auto &newProps = static_cast<const RNMBXCalloutProps &>(*props);

package/ios/RNMBX/RNMBXCamera.swift

@@ -595,14 +595,14 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
     return super.removeFromMap(map, mapView: mapView, reason: reason)
   }
 
-  @objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  @objc public func moveBy(x: Double, y: Double, animationMode: Double, animationDuration: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     withMapView { mapView in
       let contentFrame = mapView.bounds.inset(by: mapView.safeAreaInsets)
       let centerPoint = CGPoint(x: contentFrame.midX, y: contentFrame.midY)
       let endCameraPoint = CGPoint(x: centerPoint.x + x, y: centerPoint.y + y)
       let cameraOptions = mapView.mapboxMap.dragCameraOptions(from: centerPoint, to: endCameraPoint)
       
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
 
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -611,7 +611,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 
@@ -622,18 +622,18 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
   @objc public func scaleBy(
     x: Double,
     y: Double,
-    scaleFactor: NSNumber,
-    animationMode: NSNumber?,
-    animationDuration: NSNumber?,
+    scaleFactor: Double,
+    animationMode: Double,
+    animationDuration: Double,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
     withMapView { mapView in
       let currentZoom = mapView.cameraState.zoom
-      let newZoom = currentZoom + log2(scaleFactor.doubleValue)
+      let newZoom = currentZoom + log2(scaleFactor)
       let anchor = CGPoint(x: x, y: y)
       let cameraOptions = CameraOptions(anchor: anchor, zoom: newZoom)
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
         
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -642,7 +642,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 

package/ios/RNMBX/RNMBXCameraModule.mm

@@ -53,8 +53,8 @@ RCT_EXPORT_METHOD(updateCameraStop:(nonnull NSNumber *)viewRef
 RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
                   x:(double)x
                   y:(double)y
-                  animationMode:(nonnull NSNumber *)animationMode
-                  animationDuration:(nonnull NSNumber *)animationDuration
+                  animationMode:(double)animationMode
+                  animationDuration:(double)animationDuration
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
         [self withCamera:viewRef block:^(RNMBXCamera *camera) {
@@ -65,9 +65,9 @@ RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
  RCT_EXPORT_METHOD(scaleBy:(nonnull NSNumber *)viewRef
                    x:(double)x
                    y:(double)y
-                   animationMode:(nonnull NSNumber *)animationMode
-                   animationDuration:(nonnull NSNumber *)animationDuration
-                   scaleFactor:(nonnull NSNumber *)scaleFactor
+                   animationMode:(double)animationMode
+                   animationDuration:(double)animationDuration
+                   scaleFactor:(double)scaleFactor
                    resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject) {
          [self withCamera:viewRef block:^(RNMBXCamera *camera) {

package/ios/RNMBX/RNMBXCircleLayer.swift

@@ -80,7 +80,7 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXCircleLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXFillExtrusionLayer.swift

@@ -78,7 +78,7 @@ public class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXFillExtrusionLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXFillLayer.swift

@@ -80,7 +80,7 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
         styler.fillLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXFillLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXHeatmapLayer.swift

@@ -34,7 +34,7 @@ public class RNMBXHeatmapLayer: RNMBXVectorLayer {
         styler.heatmapLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXHeatmapLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXHillshadeLayer.swift

@@ -73,7 +73,7 @@ public class RNMBXHillshadeLayer: RNMBXLayer {
         styler.hillshadeLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater:{ (updater) in logged("RNMBXHillshadeLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXLayer.swift

@@ -19,10 +19,10 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     didSet { self.optionsChanged() }
   }
 
-  var oldReatStyle: Dictionary<String, Any>? = nil
+  var oldReactStyle: Dictionary<String, Any>? = nil
   @objc public var reactStyle : Dictionary<String, Any>? = nil {
     willSet {
-      oldReatStyle = reactStyle
+      oldReactStyle = reactStyle
     }
     didSet {
       DispatchQueue.main.async {