@rnmapbox/maps 10.1.11 → 10.1.13

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -13,6 +13,7 @@ import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationModule
 import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXCameraModule
 import com.rnmapbox.rnmbx.components.camera.RNMBXViewport
 import com.rnmapbox.rnmbx.components.camera.RNMBXViewportManager
 import com.rnmapbox.rnmbx.components.camera.RNMBXViewportModule
@@ -96,6 +97,7 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
             NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXCameraModule.NAME -> return RNMBXCameraModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
             RNMBXViewportModule.NAME -> return RNMBXViewportModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
             RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
             RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
@@ -114,8 +116,8 @@ class RNMBXPackage : TurboReactPackage() {
         val managers: MutableList<ViewManager<*, *>> = ArrayList()
 
         // components
-        managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXViewportManager(reactApplicationContext))
+        managers.add(RNMBXCameraManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXCameraManager")))
+        managers.add(RNMBXViewportManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXViewportManager")))
         managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
         managers.add(RNMBXModelsManager(reactApplicationContext))
@@ -245,6 +247,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXCameraModule.NAME] = ReactModuleInfo(
+                RNMBXCameraModule.NAME,
+                RNMBXCameraModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
             moduleInfos[RNMBXShapeSourceModule.NAME] = ReactModuleInfo(
                 RNMBXShapeSourceModule.NAME,
                 RNMBXShapeSourceModule.NAME,

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

@@ -31,8 +31,6 @@ class CameraStop {
     private var mDuration = 2000
     private var mCallback: Animator.AnimatorListener? = null
 
-    var ts: Int? = null
-
     fun setBearing(bearing: Double) {
         mBearing = bearing
     }
@@ -156,10 +154,6 @@ class CameraStop {
         ): CameraStop {
             val stop = CameraStop()
 
-            if (readableMap.hasKey("__updateTS")) {
-                stop.ts = readableMap.getInt("__updateTS")
-            }
-
             if (readableMap.hasKey("pitch")) {
                 stop.setTilt(readableMap.getDouble("pitch"))
             }

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

@@ -3,6 +3,7 @@ package com.rnmapbox.rnmbx.components.camera
 import android.animation.Animator
 import android.content.Context
 import android.location.Location
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.plugin.gestures.gestures
 import com.rnmapbox.rnmbx.location.LocationManager.Companion.getInstance
@@ -15,6 +16,7 @@ import com.mapbox.maps.plugin.locationcomponent.OnIndicatorBearingChangedListene
 import com.mapbox.maps.plugin.locationcomponent.OnIndicatorPositionChangedListener
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.maps.*
 import com.mapbox.maps.plugin.locationcomponent.location
 import com.mapbox.maps.plugin.viewport.ViewportStatus
@@ -113,15 +115,18 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         }
     }
     fun setStop(stop: CameraStop) {
-        if (stop.ts != mCameraStop?.ts) {
-            mCameraStop = stop
-            stop.setCallback(mCameraCallback)
-            if (mMapView != null) {
-                stop.let { updateCamera(it) }
-            }
+        mCameraStop = stop
+        stop.setCallback(mCameraCallback)
+        if (mMapView != null) {
+            stop.let { updateCamera(it) }
         }
     }
 
+    fun updateCameraStop(map: ReadableMap) {
+        val stop = CameraStop.fromReadableMap(mContext, map, null)
+        setStop(stop)
+    }
+
     fun setDefaultStop(stop: CameraStop?) {
         mDefaultStop = stop
     }
@@ -136,17 +141,17 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         _updateViewportState()
     }
 
-    fun setFollowZoomLevel(zoomLevel: Double) {
+    fun setFollowZoomLevel(zoomLevel: Double?) {
         mFollowZoomLevel = zoomLevel
         _updateViewportState();
     }
 
-    fun setFollowPitch(pitch: Double) {
+    fun setFollowPitch(pitch: Double?) {
         mFollowPitch = pitch
         _updateViewportState();
     }
 
-    fun setFollowHeading(heading: Double) {
+    fun setFollowHeading(heading: Double?) {
         mFollowHeading = heading
         _updateViewportState();
     }

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

@@ -9,9 +9,12 @@ import com.mapbox.geojson.FeatureCollection
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.components.camera.CameraStop.Companion.fromReadableMap
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.asBooleanOrNull
+import com.rnmapbox.rnmbx.utils.extensions.asDoubleOrNull
+import com.rnmapbox.rnmbx.utils.extensions.asStringOrNull
 
-class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
+class RNMBXCameraManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXCamera?>(
         mContext
     ), RNMBXCameraManagerInterface<RNMBXCamera> {
@@ -71,22 +74,22 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
 
     @ReactProp(name = "followUserMode")
     override fun setFollowUserMode(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowUserMode(value.asString())
+        camera.setFollowUserMode(value.asStringOrNull())
     }
 
     @ReactProp(name = "followZoomLevel")
     override fun setFollowZoomLevel(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowZoomLevel(value.asDouble())
+        camera.setFollowZoomLevel(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followPitch")
     override fun setFollowPitch(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowPitch(value.asDouble())
+        camera.setFollowPitch(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followHeading")
     override fun setFollowHeading(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowHeading(value.asDouble())
+        camera.setFollowHeading(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followPadding")

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

@@ -0,0 +1,51 @@
+package com.rnmapbox.rnmbx.components.camera
+
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+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.ViewTagResolver
+
+
+class RNMBXCameraModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeRNMBXCameraModuleSpec(context) {
+    private fun withViewportOnUIThread(
+        viewRef: Double?,
+        reject: Promise,
+        fn: (RNMBXCamera) -> Unit
+    ) {
+        if (viewRef == null) {
+            reject.reject(Exception("viewRef is null"))
+        } else {
+            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
+        }
+    }
+
+    private fun createCommandResponse(promise: Promise): CommandResponse = object : CommandResponse {
+        override fun success(builder: (WritableMap) -> Unit) {
+            val payload: WritableMap = WritableNativeMap()
+            builder(payload)
+
+            promise.resolve(payload)
+        }
+
+        override fun error(message: String) {
+            promise.reject(Exception(message))
+        }
+    }
+
+    companion object {
+      const val NAME = "RNMBXCameraModule"
+    }
+
+    override fun updateCameraStop(viewRef: Double?, stop: ReadableMap, promise: Promise) {
+        withViewportOnUIThread(viewRef, promise) {
+            it.updateCameraStop(stop)
+            promise.resolve(null)
+        }
+    }
+}

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

@@ -12,8 +12,9 @@ import com.facebook.react.viewmanagers.RNMBXViewportManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.events.constants.eventMapOf
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
-class RNMBXViewportManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXViewport?>(
+class RNMBXViewportManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXViewport?>(
         mContext
     ), RNMBXViewportManagerInterface<RNMBXViewport> {
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocation.kt

@@ -46,6 +46,7 @@ enum class RenderMode {
 class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
     private var mEnabled = true
     private var mMap: MapboxMap? = null
+    private var mMBXMapView: RNMBXMapView? = null
     private var mRenderMode : RenderMode = RenderMode.NORMAL;
     private var mContext : Context = context
 
@@ -63,7 +64,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         SHADOW
     }
 
-    private var imageNames = mutableMapOf<PuckImagePart, String>()
+    private var imageNames = mutableMapOf<PuckImagePart, String?>()
     private var subscriptions = mutableMapOf<PuckImagePart, Subscription>()
     private var images = mutableMapOf<PuckImagePart, ImageHolder>()
 
@@ -98,23 +99,10 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         }
 
     private fun imageNameUpdated(image: PuckImagePart, name: String?) {
-        if (name != null) {
-            imageNames[image] = name
-        } else {
-            imageNames.remove(image)
-        }
-        subscriptions[image]?.let {
-            it.cancel()
-        }
-        subscriptions.remove(image)
-
-        if (name == null) {
-            imageUpdated(image, null)
-            return
+        imageNames[image] = name
+        mMBXMapView?.let {
+            _fetchImages(it)
         }
-
-        imageManager?.let { subscribe(it, image, name) }
-
     }
 
     private fun imageUpdated(image: PuckImagePart, imageHolder: ImageHolder?) {
@@ -208,6 +196,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         mapView.getMapboxMap()
         mapView.getMapAsync(this)
         mMapView?.locationComponentManager?.showNativeUserLocation(true)
+        mMBXMapView = mapView
         _fetchImages(mapView)
         _apply()
     }
@@ -216,6 +205,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         mEnabled = false
         mMapView?.locationComponentManager?.showNativeUserLocation(false)
         mMap?.getStyle(this)
+        mMBXMapView = null
         return super.removeFromMap(mapView, reason)
     }
 
@@ -244,7 +234,6 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
             subscriptions.remove(image)
             Logger.e("RNMBXNativeUserLocation", "subscribe: there is alread a subscription for image: $image")
         }
-
         subscriptions[image] = imageManager.subscribe(name, Resolver { _, imageData  ->
             imageUpdated(image, imageData.toImageHolder())
         })
@@ -260,19 +249,27 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
     private fun _fetchImages(map: RNMBXMapView) {
         map.mapView?.getMapboxMap()?.getStyle()?.let { style ->
             imageNames.forEach { (part,name) ->
-                if (style.hasStyleImage(name)) {
-                    style.getStyleImage(name)?.let { image ->
-                        images[part] = image.toImageHolder()
+                if (name != null) {
+                    if (style.hasStyleImage(name)) {
+                        style.getStyleImage(name)?.let { image ->
+                            images[part] = image.toImageHolder()
+                        }
+                    } else {
+                        images.remove(part)
                     }
+                } else {
+                    images.remove(part)
                 }
             }
         }
-
         removeSubscriptions()
         val imageManager = map.imageManager
         this.imageManager = imageManager
+        _apply()
         imageNames.forEach { (part,name) ->
-            subscribe(imageManager, part, name)
+            if (name != null) {
+                subscribe(imageManager, part, name)
+            }
         }
     }
     // endregion

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ExpressionParser.java

@@ -6,12 +6,14 @@ import com.facebook.react.bridge.ReadableMap;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.mapbox.maps.extension.style.expressions.generated.Expression;
+import com.rnmapbox.rnmbx.utils.Logger;
 
 import java.util.Locale;
 
 import javax.annotation.Nullable;
 
 public class ExpressionParser {
+  static final String LOG_TAG = "RNMBXMapView";
   static final String TYPE_STRING = "string";
   static final String TYPE_ARRAY = "array";
   static final String TYPE_NUMBER = "number";
@@ -22,10 +24,14 @@ public class ExpressionParser {
     if (rawExpressions == null || rawExpressions.size() == 0) {
       return null;
     }
-
-    JsonArray array = ConvertUtils.toJsonArray(rawExpressions);
-    String jsonString = new Gson().toJson(array);
-    return Expression.fromRaw(jsonString);
+    try {
+      JsonArray array = ConvertUtils.toJsonArray(rawExpressions);
+      String jsonString = new Gson().toJson(array);
+      return Expression.fromRaw(jsonString);
+    } catch (Exception e) {
+      Logger.e(LOG_TAG, "An error occurred while attempting to parse the expression", e);
+      return null;
+    }
   }
 
   public static @Nullable Expression fromTyped(ReadableMap rawExpressions) {

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

@@ -91,7 +91,7 @@ object Logger {
         }
     }
 
-    fun e(tag: String, msg: String, tr: Throwable) {
+    @JvmStatic fun e(tag: String, msg: String, tr: Throwable) {
         if (logLevel <= Log.ERROR) {
             logger.e(tag, msg, tr)
         }

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

@@ -62,4 +62,20 @@ fun Dynamic.asBooleanOrNull(): Boolean? {
     } else {
         asBoolean()
     }
+}
+
+fun Dynamic.asDoubleOrNull(): Double? {
+    return if (isNull) {
+        null
+    } else {
+        asDouble()
+    }
+}
+
+fun Dynamic.asStringOrNull(): String? {
+    return if (isNull) {
+        null
+    } else {
+        asString()
+    }
 }

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

@@ -0,0 +1,41 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.rnmapbox.rnmbx;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public abstract class NativeRNMBXCameraModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNMBXCameraModule";
+
+  public NativeRNMBXCameraModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void updateCameraStop(@Nullable Double viewRef, ReadableMap stops, Promise promise);
+}

package/ios/RNMBX/RNMBXCamera.swift

@@ -40,15 +40,16 @@ struct CameraUpdateItem {
       if let center = camera.center {
         try center.validate()
       }
+
       switch mode {
-        case .flight:
+      case .flight:
         map.mapView.camera.fly(to: camera, duration: duration)
-        case .ease:
+      case .ease:
         map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
-        case .linear:
+      case .linear:
         map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
-        default:
-          map.mapboxMap.setCamera(to: camera)
+      default:
+        map.mapboxMap.setCamera(to: camera)
       }
     }
   }
@@ -236,6 +237,10 @@ open class RNMBXCamera : RNMBXMapComponentBase {
     map.viewport.idle()
   }
   
+  @objc public func updateCameraStop(_ stop: [String: Any]) {
+    self.stop = stop
+  }
+  
   func _toCoordinateBounds(_ bounds: FeatureCollection) throws -> CoordinateBounds  {
     guard bounds.features.count == 2 else {
       throw RNMBXError.paramError("Expected two Points in FeatureColletion")
@@ -259,14 +264,12 @@ open class RNMBXCamera : RNMBXMapComponentBase {
         logged("RNMBXCamera._updateMaxBounds._toCoordinateBounds") {
           options.bounds = try self._toCoordinateBounds(maxBounds)
         }
+      } else {
+        options.bounds = nil
       }
-      if let minZoomLevel = self.minZoomLevel {
-        options.minZoom = minZoomLevel.CGFloat
-      }
-      if let maxZoomLevel = self.maxZoomLevel {
-        options.maxZoom = maxZoomLevel.CGFloat
-      }
-
+      options.minZoom = self.minZoomLevel?.CGFloat
+      options.maxZoom = self.maxZoomLevel?.CGFloat
+      
       logged("RNMBXCamera._updateMaxBounds") {
         try map.mapboxMap.setCameraBounds(with: options)
       }
@@ -371,11 +374,12 @@ open class RNMBXCamera : RNMBXMapComponentBase {
     if (stop.isEmpty) {
       return nil
     }
+    
     var zoom: CGFloat?
     if let z = stop["zoom"] as? Double {
       zoom = CGFloat(z)
     }
-    
+
     var pitch: CGFloat?
     if let p = stop["pitch"] as? Double {
       pitch = CGFloat(p)
@@ -386,20 +390,22 @@ open class RNMBXCamera : RNMBXMapComponentBase {
       heading = CLLocationDirection(h)
     }
     
-    let padding = UIEdgeInsets(
+    var padding: UIEdgeInsets = UIEdgeInsets(
       top: stop["paddingTop"] as? Double ?? 0,
       left: stop["paddingLeft"] as? Double ?? 0,
       bottom: stop["paddingBottom"] as? Double ?? 0,
       right: stop["paddingRight"] as? Double ?? 0
     )
-
-    var center: LocationCoordinate2D?
-    if let feature: String = stop["centerCoordinate"] as? String {
-      
+    
+    var camera: CameraOptions?
+    
+    if let feature = stop["centerCoordinate"] as? String {
       let centerFeature : Turf.Feature? = logged("RNMBXCamera.toUpdateItem.decode.cc") { try
         JSONDecoder().decode(Turf.Feature.self, from: feature.data(using: .utf8)!)
       }
       
+      var center: LocationCoordinate2D?
+      
       switch centerFeature?.geometry {
       case .point(let centerPoint):
         center = centerPoint.coordinates
@@ -407,7 +413,16 @@ open class RNMBXCamera : RNMBXMapComponentBase {
         Logger.log(level: .error, message: "RNMBXCamera.toUpdateItem: Unexpected geometry: \(String(describing: centerFeature?.geometry))")
         return nil
       }
-    } else if let feature: String = stop["bounds"] as? String {
+      
+      camera = CameraOptions(
+        center: center,
+        padding: padding,
+        anchor: nil,
+        zoom: zoom,
+        bearing: heading,
+        pitch: pitch
+      )
+    } else if let feature = stop["bounds"] as? String {
       let collection : Turf.FeatureCollection? = logged("RNMBXCamera.toUpdateItem.decode.bound") { try
         JSONDecoder().decode(Turf.FeatureCollection.self, from: feature.data(using: .utf8)!) }
       let features = collection?.features
@@ -436,55 +451,35 @@ open class RNMBXCamera : RNMBXMapComponentBase {
         #else
         let bounds = CoordinateBounds(southwest: sw, northeast: ne)
         #endif
-        let camera = map.mapboxMap.camera(
+
+        camera = map.mapboxMap.camera(
           for: bounds,
           padding: padding,
-          bearing: heading ?? map.cameraState.bearing,
-          pitch: pitch ?? map.cameraState.pitch
+          bearing: heading ?? map.mapboxMap.cameraState.bearing,
+          pitch: pitch ?? map.mapboxMap.cameraState.pitch
         )
-
-        if let _center = camera.center, let _zoom = camera.zoom {
-          center = _center
-          zoom = _zoom
-        }
       }
     }
 
-    let duration: TimeInterval? = {
-      if let d = stop["duration"] as? Double {
-        return toSeconds(d)
-      }
+    guard let camera = camera else {
       return nil
-    }()
-    
-    let mode: CameraMode = {
-      if let m = stop["mode"] as? String, let m = CameraMode(rawValue: m) {
-        return m
-      }
-      return .flight
-    }()
-    
-    if let z1 = minZoomLevel, let z2 = CGFloat(exactly: z1), zoom ?? 100 < z2 {
-      zoom = z2
     }
 
-    if let z1 = maxZoomLevel, let z2 = CGFloat(exactly: z1), zoom ?? 0 > z2 {
-      zoom = z2
+    var duration: TimeInterval?
+    if let d = stop["duration"] as? Double {
+      duration = toSeconds(d)
+    }
+    
+    var mode: CameraMode = .flight
+    if let m = stop["mode"] as? String, let m = CameraMode(rawValue: m) {
+      mode = m
     }
 
-    let result = CameraUpdateItem(
-      camera: CameraOptions(
-        center: center,
-        padding: padding,
-        anchor: nil,
-        zoom: zoom,
-        bearing: heading,
-        pitch: pitch
-      ),
+    return CameraUpdateItem(
+      camera: camera,
       mode: mode,
       duration: duration
     )
-    return result
   }
   
   func _updateCamera() {

package/ios/RNMBX/RNMBXCameraModule.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "rnmapbox_maps_specs.h"
+#else
+#import <React/RCTBridge.h>
+#endif
+
+@interface RNMBXCameraModule : NSObject
+#ifdef RCT_NEW_ARCH_ENABLED
+<NativeRNMBXCameraModuleSpec>
+#else
+<RCTBridgeModule>
+#endif
+
+@end
+