@rnmapbox/maps 10.1.12 → 10.1.14

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/annotation/RNMBXPointAnnotationCoordinator.kt

@@ -29,6 +29,45 @@ class RNMBXPointAnnotationCoordinator(val mapView: MapView) {
             onAnnotationClick(pointAnnotation)
             false
         })
+        manager.addDragListener(object : OnPointAnnotationDragListener {
+            override fun onAnnotationDragStarted(_annotation: Annotation<*>) {
+                annotationDragged = true;
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDragStart() }
+            }
+
+            override fun onAnnotationDrag(_annotation: Annotation<*>) {
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDrag() }
+            }
+
+            override fun onAnnotationDragFinished(_annotation: Annotation<*>) {
+                annotationDragged = false;
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDragEnd() }
+            }
+        })
     }
 
     fun getAndClearAnnotationClicked(): Boolean {
@@ -70,46 +109,6 @@ class RNMBXPointAnnotationCoordinator(val mapView: MapView) {
             newSelected = null
         }
 
-        manager.addDragListener(object : OnPointAnnotationDragListener {
-            override fun onAnnotationDragStarted(_annotation: Annotation<*>) {
-                annotationDragged = true;
-                var reactAnnotation: RNMBXPointAnnotation? = null
-                for (key in annotations.keys) {
-                    val annotation = annotations[key]
-                    val curMarkerID = annotation?.mapboxID
-                    if (_annotation.id == curMarkerID) {
-                        reactAnnotation = annotation
-                    }
-                }
-                reactAnnotation?.let { it.onDragStart() }
-            }
-
-            override fun onAnnotationDrag(_annotation: Annotation<*>) {
-                var reactAnnotation: RNMBXPointAnnotation? = null
-                for (key in annotations.keys) {
-                    val annotation = annotations[key]
-                    val curMarkerID = annotation?.mapboxID
-                    if (_annotation.id == curMarkerID) {
-                        reactAnnotation = annotation
-                    }
-                }
-                reactAnnotation?.let { it.onDrag() }
-            }
-
-            override fun onAnnotationDragFinished(_annotation: Annotation<*>) {
-                annotationDragged = false;
-                var reactAnnotation: RNMBXPointAnnotation? = null
-                for (key in annotations.keys) {
-                    val annotation = annotations[key]
-                    val curMarkerID = annotation?.mapboxID
-                    if (_annotation.id == curMarkerID) {
-                        reactAnnotation = annotation
-                    }
-                }
-                reactAnnotation?.let { it.onDragEnd() }
-            }
-        })
-
         oldSelected?.let { deselectAnnotation(it) }
         newSelected?.let { selectAnnotation(it) }
 

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
     }
@@ -97,12 +95,10 @@ class CameraStop {
     fun toCameraUpdate(mapView: RNMBXMapView): CameraUpdateItem {
         val map = mapView.getMapboxMap()
         val currentCamera = map.cameraState
+
         val builder = CameraOptions.Builder()
         builder.center(currentCamera.center)
         builder.bearing(currentCamera.bearing)
-
-        val currentPadding = currentCamera.padding
-
         builder.padding(currentCamera.padding)
         builder.zoom(currentCamera.zoom)
         if (mBearing != null) {
@@ -111,7 +107,11 @@ class CameraStop {
         if (mTilt != null) {
             builder.pitch(mTilt)
         }
+        if (mZoom != null) {
+            builder.zoom(mZoom)
+        }
 
+        val currentPadding = currentCamera.padding
         val paddingLeft: Int = mPaddingLeft ?: currentPadding.left.toInt()
         val paddingTop: Int = mPaddingTop ?: currentPadding.top.toInt()
         val paddingRight: Int = mPaddingRight ?: currentPadding.right.toInt()
@@ -119,10 +119,10 @@ class CameraStop {
         val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
         val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
         val cameraPaddingEdgeInsets = convert(cameraPaddingClipped)
+        builder.padding(cameraPaddingEdgeInsets)
 
         if (mLatLng != null) {
             builder.center(mLatLng!!.point)
-            builder.padding(cameraPaddingEdgeInsets)
         } else if (mBounds != null) {
             val tilt = if (mTilt != null) mTilt!! else currentCamera.pitch
             val bearing = if (mBearing != null) mBearing!! else currentCamera.bearing
@@ -133,17 +133,14 @@ class CameraStop {
                 bearing,
                 tilt
             )
-
             builder.center(boundsCamera.center)
             builder.anchor(boundsCamera.anchor)
             builder.zoom(boundsCamera.zoom)
+            builder.bearing(boundsCamera.bearing)
+            builder.pitch(boundsCamera.pitch)
             builder.padding(boundsCamera.padding)
         }
 
-        if (mZoom != null) {
-            builder.zoom(mZoom)
-        }
-
         return CameraUpdateItem(map, builder.build(), mDuration, mCallback, mMode)
     }
 
@@ -156,10 +153,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"))
             }
@@ -201,6 +194,7 @@ class CameraStop {
                 when (readableMap.getInt("mode")) {
                     CameraMode.FLIGHT -> stop.setMode(CameraMode.FLIGHT)
                     CameraMode.LINEAR -> stop.setMode(CameraMode.LINEAR)
+                    CameraMode.MOVE -> stop.setMode(CameraMode.MOVE)
                     CameraMode.NONE -> stop.setMode(CameraMode.NONE)
                     else -> stop.setMode(CameraMode.EASE)
                 }

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

@@ -83,7 +83,7 @@ class CameraUpdateItem(
         val animationOptions = MapAnimationOptions.Builder();
 
         // animateCamera / easeCamera only allows positive duration
-        if (duration == 0 || mCameraMode == CameraMode.NONE) {
+        if (duration == 0 || mCameraMode == CameraMode.MOVE || mCameraMode == CameraMode.NONE) {
             map.flyToV11(mCameraUpdate, animationOptions.apply {
                 duration(0)
             },
@@ -109,7 +109,6 @@ class CameraUpdateItem(
                 callback
             )
         }
-        null
     }
 
     override fun cancel(mayInterruptIfRunning: Boolean): Boolean {

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 == null)) {
-            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
     }
@@ -174,15 +179,12 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
     private fun updateMaxBounds() {
         withMapView { mapView ->
             val map = mapView.getMapboxMap()
-            val maxBounds = mMaxBounds
             val builder = CameraBoundsOptions.Builder()
-
-            if (maxBounds != null) {
-                builder.bounds(maxBounds.toBounds())
-            }
-            mMinZoomLevel?.let { builder.minZoom(it) }
-            mMaxZoomLevel?.let { builder.maxZoom(it) }
+            builder.bounds(mMaxBounds?.toBounds())
+            builder.minZoom(mMinZoomLevel ?: 0.0) // Passing null does not reset this value.
+            builder.maxZoom(mMaxZoomLevel ?: 25.0) // Passing null does not reset this value.
             map.setBounds(builder.build())
+            mCameraStop?.let { updateCamera(it) }
         }
     }
 

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

@@ -9,11 +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> {
@@ -58,12 +59,12 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
 
     @ReactProp(name = "minZoomLevel")
     override fun setMinZoomLevel(camera: RNMBXCamera, value: Dynamic) {
-        camera.setMinZoomLevel(value.asDouble())
+        camera.setMinZoomLevel(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "maxZoomLevel")
     override fun setMaxZoomLevel(camera: RNMBXCamera, value: Dynamic) {
-        camera.setMaxZoomLevel(value.asDouble())
+        camera.setMaxZoomLevel(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followUserLocation")

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/camera/constants/CameraMode.java

@@ -7,12 +7,13 @@ import java.lang.annotation.RetentionPolicy;
 
 public class CameraMode {
 
-    @IntDef({ FLIGHT, EASE, LINEAR, NONE })
+    @IntDef({ FLIGHT, EASE, LINEAR, MOVE, NONE })
     @Retention(RetentionPolicy.SOURCE)
     public @interface Mode {}
 
     public static final int FLIGHT = 1;
     public static final int EASE = 2;
     public static final int LINEAR = 3;
-    public static final int NONE = 4;
+    public static final int MOVE = 4;
+    public static final int NONE = 5;
 }