Fix camera method and address deprecations

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

@@ -2,17 +2,19 @@ package com.rnmapbox.rnmbx.components.camera
 
 import android.animation.Animator
 import android.content.Context
-import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
-import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLng
-import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
-import com.rnmapbox.rnmbx.utils.LatLngBounds
-import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
-import com.mapbox.maps.CameraOptions
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.geojson.FeatureCollection
+import com.mapbox.geojson.Point
+import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.EdgeInsets
+import com.mapbox.maps.ScreenCoordinate
 import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLng
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
 import com.rnmapbox.rnmbx.utils.LatLng
+import com.rnmapbox.rnmbx.utils.LatLngBounds
 
 class CameraStop {
     private var mBearing: Double? = null
@@ -124,14 +126,22 @@ class CameraStop {
         if (mLatLng != null) {
             builder.center(mLatLng!!.point)
         } else if (mBounds != null) {
+            val coordinates = listOf<Point>(
+                mBounds!!.toBounds().northeast,
+                mBounds!!.toBounds().southwest
+            )
             val tilt = if (mTilt != null) mTilt!! else currentCamera.pitch
             val bearing = if (mBearing != null) mBearing!! else currentCamera.bearing
 
-            val boundsCamera = map.cameraForCoordinateBounds(
-                mBounds!!.toBounds(),
+            val boundsCamera = map.cameraForCoordinates(
+                coordinates,
+                CameraOptions.Builder()
+                    .pitch(tilt)
+                    .bearing(bearing)
+                    .build(),
                 cameraPaddingEdgeInsets,
-                bearing,
-                tilt
+                null,
+                ScreenCoordinate(0.0, 0.0)
             )
             builder.center(boundsCamera.center)
             builder.anchor(boundsCamera.anchor)

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

@@ -76,10 +76,11 @@ class CameraUpdateItem(
             }
         }
         val map = mMap.get()
-        if (map == null) {
+        if (map == null || mCameraUpdate.center == null) {
             isCameraActionCancelled = true
             return
         }
+
         val animationOptions = MapAnimationOptions.Builder();
 
         // animateCamera / easeCamera only allows positive duration

ios/RNMBX/RNMBXCamera.swift

@@ -40,16 +40,18 @@ struct CameraUpdateItem {
       if let center = camera.center {
         try center.validate()
       }
-
-      switch mode {
-      case .flight:
-        map.mapView.camera.fly(to: camera, duration: duration)
-      case .ease:
-        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
-      case .linear:
-        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
-      default:
-        map.mapboxMap.setCamera(to: camera)
+
+      map.withMapView { mapView in
+        switch mode {
+        case .flight:
+          mapView.camera.fly(to: camera, duration: duration)
+        case .ease:
+          mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
+        case .linear:
+          mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
+        default:
+          mapView.mapboxMap.setCamera(to: camera)
+        }
       }
     }
   }
@@ -87,8 +89,10 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
   }
 
   func withMapView(_ callback: @escaping (_ mapView: MapView) -> Void) {
-    withRNMBXMapView { mapView in
-      callback(mapView.mapView)
+    withRNMBXMapView { map in
+      map.withMapView { mapView in
+        callback(mapView)
+      }
     }
   }
 
@@ -444,17 +448,33 @@ open class RNMBXCamera : RNMBXMapComponentBase {
 
       withMapView { map in
         #if RNMBX_11
-        let bounds = [sw, ne]
+        do {
+          let bounds: [CLLocationCoordinate2D] = [sw, ne]
+          camera = try map.mapboxMap.camera(
+            for: bounds,
+            camera: .init(cameraState: .init(
+              center: .init(),
+              padding: .zero,
+              zoom: zoom ?? 0,
+              bearing: heading ?? map.mapboxMap.cameraState.bearing,
+              pitch: pitch ?? map.mapboxMap.cameraState.pitch
+            )),
+            coordinatesPadding: padding,
+            maxZoom: nil,
+            offset: nil
+          )
+        } catch {
+          Logger.log(level: .error, message: "RNMBXCamera.toUpdateItem: Failed to build camera configuration: \(error)")
+        }
         #else
         let bounds = CoordinateBounds(southwest: sw, northeast: ne)
-        #endif
-
         camera = map.mapboxMap.camera(
           for: bounds,
           padding: padding,
           bearing: heading ?? map.mapboxMap.cameraState.bearing,
           pitch: pitch ?? map.mapboxMap.cameraState.pitch
         )
+        #endif
       }
     } else {
       camera = CameraOptions(
@@ -525,8 +545,8 @@ open class RNMBXCamera : RNMBXMapComponentBase {
       return false
     }
 
-    map.mapView.viewport.removeStatusObserver(self)
-    return super.removeFromMap(map, reason:reason)
+    map._mapView.viewport.removeStatusObserver(self)
+    return super.removeFromMap(map, reason: reason)
   }
 }
 
@@ -565,12 +585,12 @@ extension RNMBXCamera : ViewportStatusObserver {
         return "compass"
       case .course:
         return "course"
-      case .some(let bearing):
+      case .some(_):
         return "constant"
       case .none:
         return "normal"
       }
-    } else if let state = state as? OverviewViewportState {
+    } else if let _ = state as? OverviewViewportState {
       return "overview"
     } else {
       return "custom"