@rnmapbox/maps 10.1.27 → 10.1.29-rc.0

package/README.md

@@ -252,4 +252,4 @@ Help drive this repo forward - be a sponsor. Add a comment [here](https://github
 ---
 ## Developer Group
 
-Have a question or need some help? Join our [Gitter developer group](https://gitter.im/rnmapbox/Lobby)!
+Have a question or need some help? Use [Github discussions](https://github.com/rnmapbox/maps/discussions) or the [react-native channel](https://discord.com/channels/1004826913229000704/1092426983696248893) in the mapbox discord.

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

@@ -99,9 +99,11 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
     override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mapView.callIfAttachedToWindow {
-            setInitialCamera()
-            updateMaxBounds()
-            mCameraStop?.let { updateCamera(it) }
+            withMapView { mapView ->
+                setInitialCamera(mapView)
+                updateMaxBounds(mapView)
+                mCameraStop?.let { updateCamera(it, mapView) }
+            }
         }
         _observeViewportState(mapView.mapView)
         _updateViewportState()
@@ -117,8 +119,8 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
     fun setStop(stop: CameraStop) {
         mCameraStop = stop
         stop.setCallback(mCameraCallback)
-        if (mMapView != null) {
-            stop.let { updateCamera(it) }
+        withMapView { mapView ->
+            stop.let { updateCamera(it, mapView) }
         }
     }
 
@@ -172,25 +174,24 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
 
     fun setMaxBounds(bounds: LatLngBounds?) {
         mMaxBounds = bounds
-        updateMaxBounds()
+        withMapView { mapView ->
+            updateMaxBounds(mapView)
+        }
     }
 
 
-    private fun updateMaxBounds() {
-        withMapView { mapView ->
-            val map = mapView.getMapboxMap()
-            val builder = CameraBoundsOptions.Builder()
-            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) }
-        }
+    private fun updateMaxBounds(mapView: RNMBXMapView) {
+        val map = mapView.getMapboxMap()
+        val builder = CameraBoundsOptions.Builder()
+        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, mapView) }
     }
 
-    private fun setInitialCamera() {
+    private fun setInitialCamera(mapView: RNMBXMapView) {
         mDefaultStop?.let {
-            val mapView = mMapView!!
             val map = mapView.getMapboxMap()
 
             it.setDuration(0)
@@ -200,9 +201,9 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         }
     }
 
-    private fun updateCamera(cameraStop: CameraStop) {
+    private fun updateCamera(cameraStop: CameraStop, mapView: RNMBXMapView) {
         mCameraUpdateQueue.offer(cameraStop)
-        mCameraUpdateQueue.execute(mMapView)
+        mCameraUpdateQueue.execute(mapView)
     }
 
     private fun updateUserLocation(isAnimated: Boolean) {
@@ -243,12 +244,12 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
 
     fun setMinZoomLevel(zoomLevel: Double?) {
         mMinZoomLevel = zoomLevel
-        updateMaxBounds()
+        withMapView { updateMaxBounds(it) }
     }
 
     fun setMaxZoomLevel(zoomLevel: Double?) {
         mMaxZoomLevel = zoomLevel
-        updateMaxBounds()
+        withMapView { updateMaxBounds(it) }
     }
 
     fun setZoomLevel(zoomLevel: Double) {

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

@@ -152,14 +152,6 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    public fun setHandledMapChangedEvents(
-        viewRef: Double?,
-        events: ReadableArray,
-        promise: Promise
-    ) {
-        setHandledMapChangedEvents(viewRef?.toInt(), events, promise)
-    }
-
     override fun clearData(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.clearData(createCommandResponse(promise))

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

@@ -309,7 +309,9 @@ abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : Abstrac
             val layer = mLayer
             if (layer != null) {
                 it.removeStyleLayer(layer.layerId)
-                mLayer = null // see https://github.com/rnmapbox/maps/pull/3392
+                if (reason != RemovalReason.REORDER) {
+                    mLayer = null // see https://github.com/rnmapbox/maps/pull/3392
+                }
             } else {
                 Logger.e("RNMBXLayer","mLayer is null on removal layer from map")
             }

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

@@ -44,8 +44,8 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
     override fun getClusterLeaves(
         viewRef: ViewRefTag?,
         featureJSON: String,
-        number: Int,
-        offset: Int,
+        number: Double,
+        offset: Double,
         promise: Promise
     ) {
         withShapeSourceOnUIThread(viewRef, promise) {

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

@@ -16,7 +16,7 @@ data class ViewTagWaiter<V>(
 
 const val LOG_TAG = "ViewTagResolver"
 
-typealias ViewRefTag = Int
+typealias ViewRefTag = Double
 // 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 Integer viewRef, boolean writeToDisk, Promise promise);
+  public abstract void takeSnap(@Nullable Double viewRef, boolean writeToDisk, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryTerrainElevation(@Nullable Integer viewRef, ReadableArray coordinates, Promise promise);
+  public abstract void queryTerrainElevation(@Nullable Double viewRef, ReadableArray coordinates, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setSourceVisibility(@Nullable Integer viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
+  public abstract void setSourceVisibility(@Nullable Double viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCenter(@Nullable Integer viewRef, Promise promise);
+  public abstract void getCenter(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCoordinateFromView(@Nullable Integer viewRef, ReadableArray atPoint, Promise promise);
+  public abstract void getCoordinateFromView(@Nullable Double viewRef, ReadableArray atPoint, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getPointInView(@Nullable Integer viewRef, ReadableArray atCoordinate, Promise promise);
+  public abstract void getPointInView(@Nullable Double viewRef, ReadableArray atCoordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getZoom(@Nullable Integer viewRef, Promise promise);
+  public abstract void getZoom(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getVisibleBounds(@Nullable Integer viewRef, Promise promise);
+  public abstract void getVisibleBounds(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesAtPoint(@Nullable Integer viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesAtPoint(@Nullable Double viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesInRect(@Nullable Integer viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesInRect(@Nullable Double viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setHandledMapChangedEvents(@Nullable Integer viewRef, ReadableArray events, Promise promise);
+  public abstract void setHandledMapChangedEvents(@Nullable Double viewRef, ReadableArray events, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void clearData(@Nullable Integer viewRef, Promise promise);
+  public abstract void clearData(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void querySourceFeatures(@Nullable Integer viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
+  public abstract void querySourceFeatures(@Nullable Double 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 Integer viewRef, ReadableMap stop, Promise promise);
+  public abstract void updateCameraStop(@Nullable Double 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(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void create(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setLineString(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void setLineString(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setStartOffset(int tag, double offset, double duration, Promise promise);
+  public abstract void setStartOffset(double tag, double offset, double duration, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setEndOffset(int tag, double offset, double duration, Promise promise);
+  public abstract void setEndOffset(double 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 Integer viewRef, Promise promise);
+  public abstract void refresh(@Nullable Double 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(int tag, ReadableArray coordinate, Promise promise);
+  public abstract void create(double tag, ReadableArray coordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void moveTo(int tag, ReadableArray coordinate, double duration, Promise promise);
+  public abstract void moveTo(double 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 Integer viewRef, Promise promise);
+  public abstract void refresh(@Nullable Double 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 Integer viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterExpansionZoom(@Nullable Double viewRef, String featureJSON, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterLeaves(@Nullable Integer viewRef, String featureJSON, int number, int offset, Promise promise);
+  public abstract void getClusterLeaves(@Nullable Double viewRef, String featureJSON, double number, double offset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterChildren(@Nullable Integer viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterChildren(@Nullable Double 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(int tag, String key, String domain, ReadableMap value, Promise promise);
+  public abstract void setOption(double 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 Integer viewRef, Promise promise);
+  public abstract void getState(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void transitionTo(@Nullable Integer viewRef, ReadableMap state, ReadableMap transition, Promise promise);
+  public abstract void transitionTo(@Nullable Double viewRef, ReadableMap state, ReadableMap transition, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void idle(@Nullable Integer viewRef, Promise promise);
+  public abstract void idle(@Nullable Double viewRef, Promise promise);
 }

package/ios/RNMBX/Extensions/Array+asExpressions.swift

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 internal extension Array where Element == Any {
-  func asExpression() throws -> Expression? {
+  func asExpression() throws -> MapboxMaps.Expression? {
     let filter = self
     if filter.count > 0 {
       let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)

package/ios/RNMBX/RNMBXFabricPropConvert.h

@@ -2,7 +2,7 @@
 
 /**
  *
- * 1. Requirest the following prelude
+ * 1. Requires the following prelude
  * const auto &oldViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*oldProps);
  * const auto &newViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
  *
@@ -12,6 +12,7 @@
 NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSString* propertyName);
 BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propertyName);
 NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName);
+NSNumber* RNMBXPropConvert_Optional_NSNumber(const folly::dynamic &dyn, NSString* propertyName);
 id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSString* propertyName);
 BOOL RNMBXPropConvert_BOOL(const folly::dynamic &dyn, NSString* propertyName);
 NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn, NSString* propertyName);
@@ -21,16 +22,23 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.name = RNMBXPropConvert_Optional_BOOL_NSNumber(newViewProps.name, @#name); \
   }
 
-#define RNMBX_OPTIONAL_PROP_BOOL(name) \
+#define RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, viewName) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
-    _view.name = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
+    _view.viewName = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_BOOL(name) RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, name)
+
 #define RNMBX_OPTIONAL_PROP_NSString(name) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
     _view.name = RNMBXPropConvert_Optional_NSString(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_NSNumber(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_NSNumber(newViewProps.name, @#name); \
+  }
+
 #define RNMBX_OPTIONAL_PROP_ExpressionDouble(name) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
     _view.name = RNMBXPropConvert_Optional_ExpressionDouble(newViewProps.name, @#name); \

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -55,7 +55,7 @@ BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propert
 }
 
 NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName) {
-    switch (dyn.type()) {
+  switch (dyn.type()) {
     case folly::dynamic::STRING:
       return [NSString stringWithCString:dyn.getString().c_str() encoding:NSUTF8StringEncoding];
     case folly::dynamic::NULLT:
@@ -71,6 +71,26 @@ NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString
   }
 }
 
+NSNumber* RNMBXPropConvert_Optional_NSNumber(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+    case folly::dynamic::INT64:
+      return @(dyn.getInt());
+    case folly::dynamic::DOUBLE:
+      return @(dyn.getDouble());
+    case folly::dynamic::NULLT:
+      return nil;
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a number or nil but was: %s",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return nil;
+  }
+}
+
+
 
 id RNMBXPropConvert_ID(const folly::dynamic &dyn)
 {