@rnmapbox/maps 10.2.4 → 10.2.6

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

@@ -937,7 +937,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
     fun queryRenderedFeaturesInRect(rect: RectF?, filter: Expression?, layerIDs: List<String>?, response: CommandResponse) {
-        val size = mMap!!.getMapOptions().size
+        val size = mMap.getMapOptions().size
         val screenBox = if (rect == null) ScreenBox(ScreenCoordinate(0.0, 0.0), ScreenCoordinate(size?.width!!.toDouble(), size?.height!!.toDouble())) else ScreenBox(
                 ScreenCoordinate(rect.right.toDouble(), rect.bottom.toDouble() ),
                 ScreenCoordinate(rect.left.toDouble(), rect.top.toDouble()),
@@ -962,7 +962,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
     fun querySourceFeatures(sourceId: String, filter: Expression?, sourceLayerIDs: List<String>?, response: CommandResponse) {
-        mMap?.querySourceFeatures(
+        mMap.querySourceFeatures(
                 sourceId,
                 SourceQueryOptions(sourceLayerIDs, (filter ?: Value.nullValue()) as Value),
         ) { features ->
@@ -982,7 +982,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
     fun getVisibleBounds(response: CommandResponse) {
-        val bounds = mMap!!.coordinateBoundsForCamera(mMap!!.cameraState.toCameraOptions())
+        val bounds = mMap.coordinateBoundsForCamera(mMap.cameraState.toCameraOptions())
 
         response.success {
             it.putArray("visibleBounds", bounds.toReadableArray())
@@ -1009,7 +1009,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
     fun queryTerrainElevation(longitude: Double, latitude: Double, response: CommandResponse) {
-        val result = mMap?.getElevation(Point.fromLngLat(longitude, latitude))
+        val result = mMap.getElevation(Point.fromLngLat(longitude, latitude))
 
         if (result != null) {
             response.success {

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

@@ -32,7 +32,7 @@ class RNMBXStyle(private val mContext: Context, reactStyle: ReadableMap?, map: M
     fun getStyleValueForKey(styleKey: String): RNMBXStyleValue {
         val styleValueConfig = mReactStyle!!.getMap(styleKey)
         if (styleValueConfig != null) {
-            return RNMBXStyleValue(styleValueConfig)
+            return RNMBXStyleValue(styleKey, styleValueConfig)
         } else {
             Logger.e("RNMBXStyle", "Value for ${styleKey} not found")
             throw Exception("RNMBXStyle - Value for ${styleKey} not found")

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

@@ -28,7 +28,6 @@ import com.rnmapbox.rnmbx.utils.DownloadMapImageTask.OnAllImagesLoaded
 import com.rnmapbox.rnmbx.utils.Logger
 
 import com.rnmapbox.rnmbx.v11compat.light.*;
-import com.rnmapbox.rnmbx.v11compat.layers.*;
 import com.rnmapbox.rnmbx.v11compat.stylefactory.*;
 
 import java.util.List;

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

@@ -13,8 +13,9 @@ import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
 import java.util.ArrayList
 
-class RNMBXStyleValue(config: ReadableMap) {
+class RNMBXStyleValue(key: String?, config: ReadableMap) {
     val type: String?
+    val key: String?
     private var isExpression = false
     private var mExpression: Expression? = null
     private val mPayload: ReadableMap?
@@ -202,6 +203,7 @@ class RNMBXStyleValue(config: ReadableMap) {
     }
 
     init {
+        this.key = key
         type = config.getString("styletype")
         mPayload = config.getMap("stylevalue")
         isAddImage = false
@@ -231,7 +233,9 @@ class RNMBXStyleValue(config: ReadableMap) {
             val dynamic = mPayload!!.getDynamic("value")
             if (isExpression(dynamic)) {
                 isExpression = true
-                mExpression = ExpressionParser.fromTyped(mPayload)
+                Logger.logged("$key ExpressionParser.fromTyped") {
+                    mExpression = ExpressionParser.fromTyped(mPayload)
+                }
             }
         }
     }

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

@@ -0,0 +1,239 @@
+package com.rnmapbox.rnmbx.utils
+
+import android.graphics.PointF
+import android.graphics.RectF
+import android.util.Log
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.NoSuchKeyException
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import java.text.NumberFormat
+import java.text.ParseException
+
+object ConvertUtils {
+    const val LOG_TAG: String = "ConvertUtils"
+
+    fun toJsonObject(map: ReadableMap?): JsonObject? {
+        if (map == null) return null
+        val result = JsonObject()
+        val it = map.keySetIterator()
+
+        while (it.hasNextKey()) {
+            val key = it.nextKey()
+            when (map.getType(key)) {
+                ReadableType.Map -> result.add(key, toJsonObject(map.getMap(key)))
+                ReadableType.Array -> result.add(key, toJsonArray(map.getArray(key)))
+                ReadableType.Null -> result.add(key, null)
+                ReadableType.Number -> result.addProperty(key, map.getDouble(key))
+                ReadableType.String -> result.addProperty(key, map.getString(key))
+                ReadableType.Boolean -> result.addProperty(key, map.getBoolean(key))
+            }
+        }
+        return result
+    }
+
+    @JvmStatic
+    fun toJsonArray(array: ReadableArray?): JsonArray? {
+        if (array == null) return null
+        val result = JsonArray(array.size())
+        for (i in 0..<array.size()) {
+            when (array.getType(i)) {
+                ReadableType.Map -> result.add(toJsonObject(array.getMap(i)))
+                ReadableType.Array -> result.add(toJsonArray(array.getArray(i)))
+                ReadableType.Null -> result.add(null as JsonElement?)
+                ReadableType.Number -> result.add(array.getDouble(i))
+                ReadableType.String -> result.add(array.getString(i))
+                ReadableType.Boolean -> result.add(array.getBoolean(i))
+            }
+        }
+        return result
+    }
+
+    @JvmStatic
+    fun typedToJsonElement(map: ReadableMap?): JsonElement? {
+        if (map == null) return null
+
+        val type = map.getString("type")
+
+        if (type == ExpressionParser.TYPE_MAP) {
+            val result = JsonObject()
+
+            val keyValues = map.getArray("value")
+            for (i in 0..<keyValues!!.size()) {
+                val keyValue = keyValues.getArray(i)
+                val key = keyValue!!.getMap(0)!!.getString("value")
+
+                result.add(key, typedToJsonElement(keyValue.getMap(1)))
+            }
+            return result
+        } else if (type == ExpressionParser.TYPE_ARRAY) {
+            val arrayValue = map.getArray("value")
+            val result = JsonArray(arrayValue!!.size())
+            for (i in 0..<arrayValue.size()) {
+                result.add(typedToJsonElement(arrayValue.getMap(i)))
+            }
+            return result
+        } else if (type == ExpressionParser.TYPE_BOOL) {
+            return JsonPrimitive(map.getBoolean("value"))
+        } else if (type == ExpressionParser.TYPE_NUMBER) {
+            return JsonPrimitive(map.getDouble("value"))
+        } else if (type == ExpressionParser.TYPE_STRING) {
+            return JsonPrimitive(map.getString("value"))
+        } else {
+            throw RuntimeException(String.format("Unrecognized type {}", map.getString("type")))
+        }
+    }
+
+    fun toWritableArray(array: JsonArray): WritableArray {
+        val writableArray = Arguments.createArray()
+
+        for (i in 0..<array.size()) {
+            val element = array.get(i)
+
+            if (element.isJsonArray()) {
+                writableArray.pushArray(toWritableArray(element.getAsJsonArray()))
+            } else if (element.isJsonObject()) {
+                writableArray.pushMap(toWritableMap(element.getAsJsonObject()))
+            } else if (element.isJsonPrimitive()) {
+                val primitive = element.getAsJsonPrimitive()
+
+                if (primitive.isBoolean()) {
+                    writableArray.pushBoolean(primitive.getAsBoolean())
+                } else if (primitive.isNumber()) {
+                    writableArray.pushDouble(primitive.getAsDouble())
+                } else {
+                    writableArray.pushString(primitive.getAsString())
+                }
+            }
+        }
+
+        return writableArray
+    }
+
+    fun toWritableMap(inObject: JsonObject): WritableMap {
+        val map = Arguments.createMap()
+
+        for (entry in inObject.entrySet()) {
+            val propName = entry.key
+            val jsonElement = entry.value
+
+            if (jsonElement.isJsonPrimitive()) {
+                val primitive = jsonElement.getAsJsonPrimitive()
+
+                if (primitive.isBoolean()) {
+                    map.putBoolean(propName, primitive.getAsBoolean())
+                } else if (primitive.isNumber()) {
+                    map.putDouble(propName, primitive.getAsDouble())
+                } else {
+                    map.putString(propName, primitive.getAsString())
+                }
+            } else if (jsonElement.isJsonArray()) {
+                map.putArray(propName, toWritableArray(jsonElement.getAsJsonArray()))
+            } else if (jsonElement.isJsonObject()) {
+                map.putMap(propName, toWritableMap(jsonElement.getAsJsonObject()))
+            }
+        }
+
+        return map
+    }
+
+    fun getObjectFromString(str: String): Any? {
+        val numberFormat = NumberFormat.getNumberInstance()
+
+        try {
+            return numberFormat.parse(str)
+        } catch (e: ParseException) {
+            // ignore we're just figuring out what type this is
+        }
+
+        return str
+    }
+
+    fun toStringList(array: ReadableArray?): MutableList<String> {
+        val list: MutableList<String> = ArrayList<String>()
+
+        if (array == null) {
+            return list
+        }
+
+        for (i in 0..<array.size()) {
+            array.getString(i)?.let {
+                list.add(it)
+            }
+        }
+
+        return list
+    }
+
+    fun toPointF(array: ReadableArray?): PointF {
+        val pointF = PointF()
+
+        if (array == null) {
+            return pointF
+        }
+
+        pointF.set(array.getDouble(0).toFloat(), array.getDouble(1).toFloat())
+        return pointF
+    }
+
+    // returns null if array is null
+    fun toRectF(array: ReadableArray?): RectF? {
+        val rectF = RectF()
+
+        if (array == null || array.size() == 0) {
+            return null
+        }
+
+        rectF.set(
+            array.getDouble(3).toFloat(),
+            array.getDouble(0).toFloat(),
+            array.getDouble(1).toFloat(),
+            array.getDouble(2).toFloat()
+        )
+        return rectF
+    }
+
+    fun getDouble(key: String, map: ReadableMap, defaultValue: Double): Double {
+        var value = defaultValue
+
+        try {
+            value = map.getDouble(key)
+        } catch (e: NoSuchKeyException) {
+            // key not found use default value
+            Log.d(
+                LOG_TAG,
+                String.format("No key found for %s, using default value %f", key, defaultValue)
+            )
+        }
+
+        return value
+    }
+
+    fun getString(key: String, map: ReadableMap, defaultValue: String): String {
+        var value = defaultValue
+
+        try {
+            map.getString(key)?.let {
+                value = it
+            } ?: run {
+                Log.d(LOG_TAG, String.format("key %s is null, using default value %s", key, defaultValue))
+                // value is already defaultValue
+            }
+        } catch (e: NoSuchKeyException) {
+            // key not found use default value
+            Log.d(
+                LOG_TAG,
+                String.format("No key found for %s, using default value %s", key, defaultValue)
+            )
+        }
+
+        return value
+    }
+}

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

@@ -30,8 +30,11 @@ object GeoJSONUtils {
                 "GeoJSONUtils.fromFeature geometry was null for feature: ${feature.toJson()}"
             )
         }
-        val properties = ConvertUtils.toWritableMap(feature.properties())
-        map.putMap("properties", properties)
+
+        feature.properties()?.let {
+            val properties = ConvertUtils.toWritableMap(it)
+            map.putMap("properties", properties)
+        }
         return map
     }
 

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt

@@ -733,3 +733,32 @@ class BackgroundPitchAlignment {
     companion object
 }
 
+fun FillExtrusionLayer.fillExtrusionEdgeRadius(
+    expression: Expression
+) {
+    // V11 only
+}
+
+fun FillExtrusionLayer.fillExtrusionEdgeRadius(
+    value: Double
+) {
+    // V11 only
+}
+
+fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
+    expression: Expression
+) {
+    // V11 only
+}
+
+fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
+    value: Double
+) {
+    // V11 only
+}
+
+fun FillExtrusionLayer.fillExtrusionEmissiveStrengthTransition(
+    transition: StyleTransition
+) {
+    // V11 only
+}

package/android/src/test/kotlin/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValueTest.kt

@@ -27,7 +27,7 @@ class RNMBXStyleValueTest {
     fun `getEnumName returns correct enum name`() {
         Mockito.`when`(mockPayload.getString("value")).thenReturn("test-value")
 
-        val styleValue = RNMBXStyleValue(mockConfig)
+        val styleValue = RNMBXStyleValue('foo', mockConfig)
 
         assertEquals("TEST_VALUE", styleValue.getEnumName())
     }
@@ -36,7 +36,7 @@ class RNMBXStyleValueTest {
     fun `getEnumName handles Turkish locale correctly`() {
         Mockito.`when`(mockPayload.getString("value")).thenReturn("miter")
 
-        val styleValue = RNMBXStyleValue(mockConfig)
+        val styleValue = RNMBXStyleValue('foo', mockConfig)
 
         Locale.setDefault(Locale("tr", "TR"))
 

package/ios/RNMBX/RNMBXCustomLocationProvider.swift

@@ -36,7 +36,9 @@ public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
   
   @objc
   override public func didSetProps(_ props: [String]) {
-    changes.apply(self)
+    if customLocationProvider != nil {
+      changes.apply(self)
+    }
   }
   
   var customLocationProvider: CustomLocationProvider? = nil
@@ -49,6 +51,7 @@ public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
     self.map = map
     if let mapView = map.mapView {
       installCustomeLocationProviderIfNeeded(mapView: mapView)
+      changes.apply(self)
     }
   }
   

package/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm

@@ -12,6 +12,8 @@
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 #import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
 
+#import "RNMBXFabricPropConvert.h"
+
 using namespace facebook::react;
 
 @interface RNMBXCustomLocationProviderComponentView () <RCTRNMBXCustomLocationProviderViewProtocol>
@@ -30,7 +32,7 @@ using namespace facebook::react;
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXCircleLayerProps>();
+    static const auto defaultProps = std::make_shared<const RNMBXCustomLocationProviderProps>();
     _props = defaultProps;
       [self prepareView];
   }
@@ -49,12 +51,20 @@ using namespace facebook::react;
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<RNMBXCircleLayerComponentDescriptor>();
+  return concreteComponentDescriptorProvider<RNMBXCustomLocationProviderComponentDescriptor>();
 }
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
+  const auto &oldViewProps = static_cast<const RNMBXCustomLocationProviderProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXCustomLocationProviderProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NumberArray(coordinate)
+  RNMBX_OPTIONAL_PROP_NSNumber(heading)
+
   [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
 }
 
 - (void)prepareForRecycle

package/ios/RNMBX/RNMBXFabricPropConvert.h

@@ -13,6 +13,7 @@ NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSS
 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);
+NSArray<NSNumber*>* RNMBXPropConvert_Optional_NumberArray(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);
@@ -27,6 +28,11 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.viewName = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
   }
 
+#define RNMBX_REMAP_OPTIONAL_PROP_NSDictionary(name, viewName) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name)) { \
+    _view.viewName = RNMBXPropConvert_Optional_NSDictionary(newViewProps.name, @#name); \
+  }
+
 #define RNMBX_OPTIONAL_PROP_BOOL(name) RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, name)
 
 #define RNMBX_OPTIONAL_PROP_NSString(name) \
@@ -34,6 +40,11 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.name = RNMBXPropConvert_Optional_NSString(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_NumberArray(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_NumberArray(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); \
@@ -49,7 +60,4 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.name = RNMBXPropConvert_BOOL(newViewProps.name, @#name); \
   }
 
-#define RNMBX_OPTIONAL_PROP_NSDictionary(name) \
-  if ((!oldProps.get() || oldViewProps.name != newViewProps.name)) { \
-    _view.name = RNMBXPropConvert_Optional_NSDictionary(newViewProps.name, @#name); \
-  }
+#define RNMBX_OPTIONAL_PROP_NSDictionary(name) RNMBX_REMAP_OPTIONAL_PROP_NSDictionary(name, name)

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -153,4 +153,8 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
   return RNMBXPropConvert_ID(dyn);
 }
 
+NSArray<NSNumber*> * RNMBXPropConvert_Optional_NumberArray(const folly::dynamic &dyn, NSString* propertyName) {
+  return RNMBXPropConvert_ID(dyn);
+}
+
 #endif

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -190,6 +190,8 @@ using namespace facebook::react;
     RNMBX_REMAP_OPTIONAL_PROP_BOOL(rotateEnabled, reactRotateEnabled)
 
     RNMBX_REMAP_OPTIONAL_PROP_BOOL(pitchEnabled, reactPitchEnabled)
+  
+    RNMBX_REMAP_OPTIONAL_PROP_NSDictionary(gestureSettings, reactGestureSettings)
 
     id preferredFramesPerSecond = RNMBXConvertFollyDynamicToId(newViewProps.preferredFramesPerSecond);
     if (preferredFramesPerSecond != nil) {

package/ios/RNMBX/RNMBXPointAnnotationComponentView.mm

@@ -11,6 +11,8 @@
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 #import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
 
+#import "RNMBXFabricPropConvert.h"
+
 using namespace facebook::react;
 
 @interface RNMBXPointAnnotationComponentView () <RCTRNMBXPointAnnotationViewProtocol>
@@ -40,9 +42,9 @@ using namespace facebook::react;
 - (void)prepareView
 {
     _view = [[RNMBXPointAnnotation alloc] init];
-      
+
     self.contentView = _view;
-      
+
     // capture weak self reference to prevent retain cycle
     __weak __typeof__(self) weakSelf = self;
 
@@ -122,24 +124,14 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXPointAnnotationProps &>(*props);
-    id coordinate = RNMBXConvertFollyDynamicToId(newProps.coordinate);
-    if (coordinate != nil) {
-        _view.coordinate = coordinate;
-    }
-    id draggable = RNMBXConvertFollyDynamicToId(newProps.draggable);
-    if (draggable != nil) {
-        _view.draggable = draggable;
-    }
-    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
-    if (idx != nil) {
-        _view.id = idx;
-    }
-    id anchor = RNMBXConvertFollyDynamicToId(newProps.anchor);
-    if (anchor != nil) {
-        _view.anchor = anchor;
-    }
-    
+  const auto &oldViewProps = static_cast<const RNMBXPointAnnotationProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXPointAnnotationProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSString(coordinate)
+  RNMBX_OPTIONAL_PROP_BOOL(draggable)
+  RNMBX_OPTIONAL_PROP_NSString(id)
+  RNMBX_OPTIONAL_PROP_NSDictionary(anchor)
+
   [super updateProps:props oldProps:oldProps];
 }
 

package/lib/module/components/MapView.js

@@ -231,7 +231,7 @@ class MapView extends NativeBridgeComponent(React.PureComponent, NativeMapViewMo
    * @example
    * this._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])
    *
-   * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system. For v10, this can be an empty array to query the visible map area.
+   * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system, density independent pixels and not map coordinates. This can be an empty array to query the visible map area.
    * @param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.
    * @param  {Array=} layerIDs -  A array of layer id's to filter the features by
    * @return {FeatureCollection}

package/lib/typescript/src/components/MapView.d.ts

@@ -460,7 +460,7 @@ declare class MapView extends MapView_base {
      * @example
      * this._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])
      *
-     * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system. For v10, this can be an empty array to query the visible map area.
+     * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system, density independent pixels and not map coordinates. This can be an empty array to query the visible map area.
      * @param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.
      * @param  {Array=} layerIDs -  A array of layer id's to filter the features by
      * @return {FeatureCollection}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnmapbox/maps",
-  "version": "10.2.4",
+  "version": "10.2.6",
   "description": "Community-supported, open-source React Native library for building maps using Mapbox native maps SDK for iOS and Android",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.native.d.ts",

package/src/components/MapView.tsx

@@ -755,7 +755,7 @@ class MapView extends NativeBridgeComponent(
    * @example
    * this._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])
    *
-   * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system. For v10, this can be an empty array to query the visible map area.
+   * @param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system, density independent pixels and not map coordinates. This can be an empty array to query the visible map area.
    * @param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.
    * @param  {Array=} layerIDs -  A array of layer id's to filter the features by
    * @return {FeatureCollection}

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

@@ -1,253 +0,0 @@
-package com.rnmapbox.rnmbx.utils;
-
-import android.graphics.PointF;
-import android.graphics.RectF;
-import android.util.Log;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.NoSuchKeyException;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class ConvertUtils {
-    public static final String LOG_TAG = "ConvertUtils";
-
-    public static JsonObject toJsonObject(ReadableMap map) {
-        if (map == null) return null;
-        JsonObject result = new JsonObject();
-        ReadableMapKeySetIterator it = map.keySetIterator();
-
-        while (it.hasNextKey()) {
-            String key = it.nextKey();
-            switch (map.getType(key)) {
-                case Map:
-                    result.add(key, toJsonObject(map.getMap(key)));
-                    break;
-                case Array:
-                    result.add(key, toJsonArray(map.getArray(key)));
-                    break;
-                case Null:
-                    result.add(key, null);
-                    break;
-                case Number:
-                    result.addProperty(key, map.getDouble(key));
-                    break;
-                case String:
-                    result.addProperty(key, map.getString(key));
-                    break;
-                case Boolean:
-                    result.addProperty(key, map.getBoolean(key));
-                    break;
-            }
-        }
-        return result;
-    }
-
-    public static JsonArray toJsonArray(ReadableArray array) {
-        if (array == null) return null;
-        JsonArray result = new JsonArray(array.size());
-        for (int i = 0; i < array.size(); i++) {
-            switch (array.getType(i)) {
-                case Map:
-                    result.add(toJsonObject(array.getMap(i)));
-                    break;
-                case Array:
-                    result.add(toJsonArray(array.getArray(i)));
-                    break;
-                case Null:
-                    result.add((JsonElement)null);
-                    break;
-                case Number:
-                    result.add(array.getDouble(i));
-                    break;
-                case String:
-                    result.add(array.getString(i));
-                    break;
-                case Boolean:
-                    result.add(array.getBoolean(i));
-                    break;
-            }
-        }
-        return result;
-    }
-
-    public static JsonElement typedToJsonElement(ReadableMap map) {
-        if (map == null) return null;
-
-        String type = map.getString("type");
-
-        if (type.equals(ExpressionParser.TYPE_MAP)) {
-            JsonObject result = new JsonObject();
-
-            ReadableArray keyValues = map.getArray("value");
-            for (int i = 0; i < keyValues.size(); i++) {
-                ReadableArray keyValue = keyValues.getArray(i);
-                String key = keyValue.getMap(0).getString("value");
-
-                result.add(key, typedToJsonElement(keyValue.getMap(1)));
-            }
-            return result;
-        }
-        else if (type.equals(ExpressionParser.TYPE_ARRAY)) {
-            ReadableArray arrayValue = map.getArray("value");
-            JsonArray result = new JsonArray(arrayValue.size());
-            for (int i = 0; i < arrayValue.size(); i++) {
-                result.add(typedToJsonElement(arrayValue.getMap(i)));
-            }
-            return result;
-        }
-        else if (type.equals(ExpressionParser.TYPE_BOOL)) {
-            return new JsonPrimitive(map.getBoolean("value"));
-        }
-        else if (type.equals(ExpressionParser.TYPE_NUMBER)) {
-            return new JsonPrimitive(map.getDouble("value"));
-        }
-        else if (type.equals(ExpressionParser.TYPE_STRING)) {
-            return new JsonPrimitive(map.getString("value"));
-        }
-        else {
-            throw new RuntimeException(String.format("Unrecognized type {}", map.getString("type")));
-        }
-    }
-
-    public static WritableArray toWritableArray(JsonArray array) {
-        WritableArray writableArray = Arguments.createArray();
-
-        for (int i = 0; i < array.size(); i++) {
-            JsonElement element = array.get(i);
-
-            if (element.isJsonArray()) {
-                writableArray.pushArray(toWritableArray(element.getAsJsonArray()));
-            } else if (element.isJsonObject()) {
-                writableArray.pushMap(toWritableMap(element.getAsJsonObject()));
-            } else if (element.isJsonPrimitive()) {
-                JsonPrimitive primitive = element.getAsJsonPrimitive();
-
-                if (primitive.isBoolean()) {
-                    writableArray.pushBoolean(primitive.getAsBoolean());
-                } else if (primitive.isNumber()) {
-                    writableArray.pushDouble(primitive.getAsDouble());
-                } else {
-                    writableArray.pushString(primitive.getAsString());
-                }
-            }
-        }
-
-        return writableArray;
-    }
-
-    public static WritableMap toWritableMap(JsonObject object) {
-        WritableMap map = Arguments.createMap();
-
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-            String propName = entry.getKey();
-            JsonElement jsonElement = entry.getValue();
-
-            if (jsonElement.isJsonPrimitive()) {
-                JsonPrimitive primitive = jsonElement.getAsJsonPrimitive();
-
-                if (primitive.isBoolean()) {
-                    map.putBoolean(propName, primitive.getAsBoolean());
-                } else if (primitive.isNumber()) {
-                    map.putDouble(propName, primitive.getAsDouble());
-                } else {
-                    map.putString(propName, primitive.getAsString());
-                }
-            } else if (jsonElement.isJsonArray()) {
-                map.putArray(propName, toWritableArray(jsonElement.getAsJsonArray()));
-            } else if (jsonElement.isJsonObject()) {
-                map.putMap(propName, toWritableMap(jsonElement.getAsJsonObject()));
-            }
-        }
-
-        return map;
-    }
-
-    public static Object getObjectFromString(String str) {
-        NumberFormat numberFormat = NumberFormat.getNumberInstance();
-
-        try {
-            return numberFormat.parse(str);
-        } catch (ParseException e) {
-            // ignore we're just figuring out what type this is
-        }
-
-        return str;
-    }
-
-    public static List<String> toStringList(ReadableArray array) {
-        List<String> list = new ArrayList<>();
-
-        if (array == null) {
-            return list;
-        }
-
-        for (int i = 0; i < array.size(); i++) {
-            list.add(array.getString(i));
-        }
-
-        return list;
-    }
-
-    public static PointF toPointF(ReadableArray array) {
-        PointF pointF = new PointF();
-
-        if (array == null) {
-            return pointF;
-        }
-
-        pointF.set((float)array.getDouble(0), (float)array.getDouble(1));
-        return pointF;
-    }
-
-    public static RectF toRectF(ReadableArray array) {
-        RectF rectF = new RectF();
-
-        if (array == null || array.size() == 0) {
-            return rectF;
-        }
-
-        rectF.set((float)array.getDouble(3), (float)array.getDouble(0), (float)array.getDouble(1), (float)array.getDouble(2));
-        return rectF;
-    }
-
-    public static double getDouble(String key, ReadableMap map, double defaultValue) {
-        double value = defaultValue;
-
-        try {
-            value = map.getDouble(key);
-        } catch (NoSuchKeyException e) {
-            // key not found use default value
-            Log.d(LOG_TAG, String.format("No key found for %s, using default value %f", key, defaultValue));
-        }
-
-        return value;
-    }
-
-    public static String getString(String key, ReadableMap map, String defaultValue) {
-        String value = defaultValue;
-
-        try {
-            value = map.getString(key);
-        } catch (NoSuchKeyException e) {
-            // key not found use default value
-            Log.d(LOG_TAG, String.format("No key found for %s, using default value %s", key, defaultValue));
-        }
-
-        return value;
-    }
-}

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layers.kt

@@ -1,35 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.layers;
-
-import com.mapbox.maps.extension.style.expressions.generated.Expression
-import com.mapbox.maps.extension.style.layers.generated.FillExtrusionLayer
-import com.mapbox.maps.extension.style.types.StyleTransition
-
-fun FillExtrusionLayer.fillExtrusionEdgeRadius(
-    expression: Expression
-) {
-    // V11 only
-}
-
-fun FillExtrusionLayer.fillExtrusionEdgeRadius(
-    value: Double
-) {
-    // V11 only
-}
-
-fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
-    expression: Expression
-) {
-    // V11 only
-}
-
-fun FillExtrusionLayer.fillExtrusionEmissiveStrength(
-    value: Double
-) {
-    // V11 only
-}
-
-fun FillExtrusionLayer.fillExtrusionEmissiveStrengthTransition(
-    transition: StyleTransition
-) {
-    // V11 only
-}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Layers.kt

@@ -1 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.layers;