@rnmapbox/maps 10.0.0-beta.45 → 10.0.0-beta.47

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/atmosphere/RCTMGLAtmosphere.kt

@@ -32,6 +32,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     // endregion RCTLayer
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val atmosphere = makeAtmosphere()
         mAtmosphere = atmosphere
@@ -42,6 +43,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
+        super.removeFromMap(mapView)
     }
 
     fun makeAtmosphere(): Atmosphere {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTLayer.kt

@@ -42,7 +42,6 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
     protected var mMap: MapboxMap? = null
     @JvmField
     protected var mLayer: T? = null
-    protected var mMapView: RCTMGLMapView? = null
     protected var mHadFilter = false
 
     fun setSourceID(sourceID: String?) {
@@ -230,8 +229,8 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
-        mMapView = mapView
         if (style == null) return
         val existingLayer = getLayerAs(style, iD)
         if (existingLayer != null) {
@@ -251,6 +250,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         if (style != null) {
             style!!.removeStyleLayer(mLayer!!.layerId)
         }
+        super.removeFromMap(mapView)
     }
 
     // v10TOOD: adding anything seems to make getStyle null

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSource.kt

@@ -77,6 +77,10 @@ class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourc
 
     fun setClusterMaxZoom(clusterMaxZoom: Long) {
         mClusterMaxZoom = clusterMaxZoom
+        if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
+            val result = mMap!!.getStyle()!!
+                .setStyleSourceProperty(iD!!, "clusterMaxZoom", Value.valueOf(clusterMaxZoom))
+        }
     }
 
     fun setClusterProperties(clusterProperties: HashMap<String, Any>) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTSource.kt

@@ -24,8 +24,6 @@ import java.util.ArrayList
 import java.util.HashMap
 
 abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
-    @JvmField
-    protected var mMapView: RCTMGLMapView? = null
     @JvmField
     protected var mMap: MapboxMap? = null
     var iD: String? = null
@@ -107,7 +105,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
         }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         mMap?.getStyle(object : Style.OnStyleLoaded {
             override fun onStyleLoaded(style: Style) {
@@ -149,6 +147,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
                 Logger.w(LOG_TAG, String.format("RCTSource.removeFromMap: %s - %s", mSource, ex.message), ex)
             }
         }
+        super.removeFromMap(mapView)
     }
 
     fun addLayer(childView: View?, childPosition: Int) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/terrain/RCTMGLTerrain.kt

@@ -36,6 +36,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val terrain = makeTerrain()
         mTerrain = terrain
@@ -46,6 +47,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
+        super.removeFromMap(mapView)
     }
 
     fun makeTerrain(): Terrain {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/CustomHttpHeaders.kt

@@ -0,0 +1,38 @@
+package com.mapbox.rctmgl.modules
+
+import com.mapbox.common.*
+
+object CustomHttpHeaders : HttpServiceInterceptorInterface {
+    init {}
+
+    val map = mutableMapOf<String, String>()
+
+    fun addCustomHeader(headerName: String, headerValue: String) {
+        HttpServiceFactory.getInstance().setInterceptor(
+            this
+        )
+    }
+
+    fun removeCustomHeader(headerName: String) {
+        map.remove(headerName)
+    }
+
+    override fun onRequest(request: HttpRequest): HttpRequest {
+        for (entry in map.entries.iterator()) {
+            request.headers[entry.key] = entry.value
+        }
+        return request
+    }
+
+    override fun onDownload(download: DownloadOptions): DownloadOptions {
+        for (entry in map.entries.iterator()) {
+            download.request.headers[entry.key] = entry.value
+        }
+        return download
+    }
+
+    override fun onResponse(response: HttpResponse): HttpResponse {
+        return response
+    }
+}
+

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLModule.kt

@@ -12,6 +12,7 @@ import com.mapbox.rctmgl.modules.RCTMGLOfflineModule
 import com.mapbox.rctmgl.modules.RCTMGLLocationModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.common.MapBuilder
+import com.mapbox.common.*
 import com.mapbox.maps.Style
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import java.util.HashMap
@@ -124,6 +125,16 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
         // NO-OP
     }
 
+    @ReactMethod
+    fun addCustomHeader(headerName: String, headerValue: String) {
+        CustomHttpHeaders.addCustomHeader(headerName, headerValue)
+    }
+
+    @ReactMethod
+    fun removeCustomHeader(headerName: String) {
+        CustomHttpHeaders.removeCustomHeader(headerName)
+    }
+
     companion object {
         const val REACT_CLASS = "RCTMGLModule"
         private val customHeaderInterceptorAdded = false
@@ -132,4 +143,4 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
             return getDefault((reactContext)!!, null).resourceOptions.accessToken
         }
     }
-}
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/LatLngBounds.kt

@@ -0,0 +1,35 @@
+package com.mapbox.rctmgl.utils
+
+import com.mapbox.geojson.Point
+import com.mapbox.maps.CoordinateBounds
+import com.mapbox.rctmgl.utils.LatLngBounds
+
+class LatLngBounds internal constructor(
+    var latNorth: Double,
+    var lonEast: Double,
+    var latSouth: Double,
+    var lonWest: Double
+) {
+    val southWest: LatLng
+        get() = LatLng(latSouth, lonWest)
+    val northEast: LatLng
+        get() = LatLng(latNorth, lonEast)
+
+    fun toLatLngs(): Array<LatLng> {
+        return arrayOf(northEast, southWest)
+    }
+
+    fun toBounds(): CoordinateBounds {
+        return CoordinateBounds(
+            Point.fromLngLat(lonWest, latSouth),
+            Point.fromLngLat(lonEast, latNorth),
+            false
+        )
+    }
+
+    companion object {
+        fun from(bbox: Double, bbox1: Double, bbox2: Double, bbox3: Double): LatLngBounds {
+            return LatLngBounds(bbox, bbox1, bbox2, bbox3)
+        }
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/CoordinateBounds.kt

@@ -0,0 +1,23 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
+import com.mapbox.maps.CoordinateBounds
+import com.mapbox.rctmgl.utils.GeoJSONUtils
+import com.mapbox.rctmgl.utils.LatLng
+
+fun CoordinateBounds.toReadableArray() : ReadableArray {
+    val array = Arguments.createArray()
+    val ne = northeast
+    val sw = southwest
+    val latLngs = arrayOf(
+        LatLng(ne.latitude(), ne.longitude()),
+        LatLng(ne.latitude(), sw.longitude()),
+        LatLng(sw.latitude(), sw.longitude()),
+        LatLng(sw.latitude(), ne.longitude())
+    )
+    for (latLng in latLngs) {
+        array.pushArray(GeoJSONUtils.fromLatLng(latLng))
+    }
+    return array
+}

package/docs/docs.json

@@ -3939,10 +3939,10 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "string"
+                "name": "number"
               }
             ],
-            "raw": "Promise<string>"
+            "raw": "Promise<number>"
           }
         },
         "description": "Returns the zoom needed to expand the cluster.",

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -108,7 +108,8 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
 
-  // Properties set on RCTMGLCamera in React Native.
+  // MARK: React properties
+  
   @objc var animationDuration: NSNumber?
   @objc var animationMode: NSString?
   @objc var defaultStop: [String: Any]?
@@ -145,8 +146,19 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCamera()
     }
   }
+
+  @objc var maxBounds: String? {
+    didSet {
+      if let maxBounds = maxBounds {
+        logged("RCTMGLCamera.maxBounds") {
+          let maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
+          try _updateMaxBounds(maxBoundsFeature)
+        }
+      }
+    }
+  }
   
-  // Update methods.
+  // MARK: Update methods
 
   func _updateCameraFromJavascript() {
     guard !followUserLocation else {
@@ -185,6 +197,29 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     map.viewport.idle()
     map.location.removeLocationConsumer(consumer: self)
   }
+  
+  func _toCoordinateBounds(_ bounds: FeatureCollection) throws -> CoordinateBounds  {
+    guard bounds.features.count == 2 else {
+      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+    }
+    let swFeature = bounds.features[0]
+    let neFeature = bounds.features[1]
+    
+    guard case let .point(sw) = swFeature.geometry,
+          case let .point(ne) = neFeature.geometry else {
+      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+    }
+
+    return CoordinateBounds(southwest: sw.coordinates, northeast: ne.coordinates)
+  }
+  
+  func _updateMaxBounds(_ bounds: FeatureCollection) throws {
+    withMapView { map in
+      logged("RCTMGLCamera._updateMaxBounds") {
+        try map.mapboxMap.setCameraBounds(with: CameraBoundsOptions(bounds: try self._toCoordinateBounds(bounds)))
+      }
+    }
+  }
 
   func _updateCameraFromTrackingMode() {
     withMapView { map in

package/ios/RCTMGL-v10/RCTMGLCameraManager.m

@@ -4,6 +4,7 @@
 
 @interface RCT_EXTERN_MODULE(RCTMGLCameraManager, RCTViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(maxBounds, NSString)
 RCT_EXPORT_VIEW_PROPERTY(animationDuration, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(animationMode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(defaultStop, NSDictionary)

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -4,6 +4,8 @@ import MapKit
 
 @objc(RCTMGLMapView)
 open class RCTMGLMapView : MapView {
+  var tapDelegate: IgnoreRCTMGLMakerViewGestureDelegate? = nil
+
   var compassEnabled: Bool = false
   var compassFadeWhenNorth: Bool = false
   var reactOnPress : RCTBubblingEventBlock?
@@ -420,12 +422,70 @@ extension RCTMGLMapView {
 
 // MARK: - gestures
 
+class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelegate {
+  var originalDelegate: UIGestureRecognizerDelegate?
+
+  init(originalDelegate: UIGestureRecognizerDelegate?) {
+    self.originalDelegate = originalDelegate
+  }
+  
+  func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizerShouldBegin?(gestureRecognizer) ?? true
+  }
+
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldRecognizeSimultaneouslyWith: otherGestureRecognizer) ?? false
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldRequireFailureOf: otherGestureRecognizer) ?? false
+  }
+
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldBeRequiredToFailBy: otherGestureRecognizer) ?? false
+  }
+
+  private func isMarkerViewSubview(_ view: UIView) -> Bool {
+    var current : UIView? = view
+    while let act = current {
+      if (act is RCTMGLMarkerView) {
+        return true
+      }
+      current = act.superview
+    }
+    return false
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+    if let view = touch.view, isMarkerViewSubview(view) {
+      return false
+    }
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: touch) ?? true
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive press: UIPress) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: press) ?? true
+  }
+
+  
+  @available(iOS 13.4, *)
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive event: UIEvent) -> Bool {
+        return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: event) ?? true
+  }
+}
+
 extension RCTMGLMapView {
+  
   @objc func setReactOnPress(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnPress = value
-    
-    self.mapView.gestures.singleTapGestureRecognizer.removeTarget( pointAnnotationManager.manager, action: nil)
-    self.mapView.gestures.singleTapGestureRecognizer.addTarget(self, action: #selector(doHandleTap(_:)))
+
+    let singleTapGestureRecognizer = self.mapView.gestures.singleTapGestureRecognizer
+
+    singleTapGestureRecognizer.removeTarget(pointAnnotationManager.manager, action: nil)
+    singleTapGestureRecognizer.addTarget(self, action: #selector(doHandleTap(_:)))
+
+    self.tapDelegate = IgnoreRCTMGLMakerViewGestureDelegate(originalDelegate: singleTapGestureRecognizer.delegate)
+    singleTapGestureRecognizer.delegate = tapDelegate
   }
 
   @objc func setReactOnLongPress(_ value: @escaping RCTBubblingEventBlock) {
@@ -673,6 +733,11 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
   private var draggedAnnotation: PointAnnotation?
   
   func annotationManager(_ manager: AnnotationManager, didDetectTappedAnnotations annotations: [Annotation]) {
+    // We handle taps ourselfs
+    //   onTap(annotations: annotations)
+  }
+
+  func onTap(annotations: [Annotation]) {
     guard annotations.count > 0 else {
       fatalError("didDetectTappedAnnotations: No annotations found")
     }
@@ -724,7 +789,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     }
     let options = RenderedQueryOptions(layerIds: [layerId], filter: nil)
     mapFeatureQueryable.queryRenderedFeatures(
-        at: tap.location(in: tap.view),
+      with: tap.location(in: tap.view),
         options: options) { [weak self] (result) in
 
         guard let self = self else { return }
@@ -746,10 +811,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
 
             // If `tappedAnnotations` is not empty, call delegate
             if !tappedAnnotations.isEmpty {
-              self.annotationManager(
-                self.manager,
-                didDetectTappedAnnotations: tappedAnnotations)
-              
+              self.onTap(annotations: tappedAnnotations)
             } else {
               noAnnotationFound(tap)
             }
@@ -757,7 +819,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
         case .failure(let error):
           noAnnotationFound(tap)
           Logger.log(level:.warn, message:"Failed to query map for annotations due to error: \(error)")
-          
         }
     }
   }

package/ios/RCTMGL-v10/RCTMGLShapeSource.swift

@@ -21,7 +21,19 @@ class RCTMGLShapeSource : RCTMGLSource {
   
   @objc var cluster : NSNumber?
   @objc var clusterRadius : NSNumber?
-  @objc var clusterMaxZoomLevel : NSNumber?
+  @objc var clusterMaxZoomLevel : NSNumber? {
+    didSet {
+      logged("RCTMGLShapeSource.clusterMaxZoomLevel") {
+        if let number = clusterMaxZoomLevel?.doubleValue {
+          doUpdate { (style) in
+            logged("RCTMGLShapeSource.doUpdate") {
+              try style.setSourceProperty(for: id, property: "clusterMaxZoom", value: number)
+            }
+          }
+        }
+      }
+    }
+  }
   @objc var clusterProperties : [String: [Any]]?;
   
   @objc var maxZoomLevel : NSNumber?
@@ -192,7 +204,7 @@ extension RCTMGLShapeSource
 extension RCTMGLShapeSource
 {
   func getClusterExpansionZoom(
-    _ clusterId: NSNumber,
+    _ featureJSON: String,
     completion: @escaping (Result<Int, Error>) -> Void)
   {
     guard let mapView = map?.mapView else {
@@ -200,29 +212,23 @@ extension RCTMGLShapeSource
       return
     }
 
-    let options = SourceQueryOptions(sourceLayerIds: nil, filter: Exp(.eq) {
-      Exp(.get) { "cluster_id" }
-      clusterId.uintValue
-    })
-    mapView.mapboxMap.querySourceFeatures(for: id, options: options) { result in
-      switch result {
-      case .success(let features):
-        let cluster = features[0]
-        mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster.feature, extension: "supercluster", extensionField: "expansion-zoom") { result in
-          switch result {
-          case .success(let features):
-            guard let value = features.value as? NSNumber else {
-              completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
-              return
-            }
-                
-            completion(.success(value.intValue))
-          case .failure(let error):
-            completion(.failure(error))
+    logged("RCTMGLShapeSource.getClusterExpansionZoom", rejecter: { (_,_,error) in
+      completion(.failure(error!))
+    }) {
+      let cluster : Feature = try parse(featureJSON);
+
+      mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster, extension: "supercluster", extensionField: "expansion-zoom") { result in
+        switch result {
+        case .success(let features):
+          guard let value = features.value as? NSNumber else {
+            completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
+            return
           }
+          
+          completion(.success(value.intValue))
+        case .failure(let error):
+          completion(.failure(error))
         }
-      case .failure(let error):
-        completion(.failure(error))
       }
     }
   }

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.m

@@ -25,9 +25,9 @@ RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock
 
 
 RCT_EXTERN_METHOD(getClusterExpansionZoom:(nonnull NSNumber*)reactTag
-                                clusterId:(nonnull NSNumber*)clusterId
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
+                                featureJSON:(nonnull NSString*)featureJSON
+                                resolver:(RCTPromiseResolveBlock)resolve
+                                rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getClusterLeaves:(nonnull NSNumber*)reactTag
                   featureJSON:(nonnull NSString*)featureJSON

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.swift

@@ -38,12 +38,12 @@ extension RCTMGLShapeSourceManager {
 extension RCTMGLShapeSourceManager {
   @objc func getClusterExpansionZoom(
     _ reactTag: NSNumber,
-    clusterId: NSNumber,
+    featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getClusterExpansionZoom", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterExpansionZoom(clusterId) { result in
+    self.withShapeSource(reactTag, name:"getCluster   ExpansionZoom", rejecter: rejecter) { shapeSource in
+      shapeSource.getClusterExpansionZoom(featureJSON) { result in
         switch result {
         case .success(let zoom):
           resolver([

package/javascript/components/MarkerView.tsx

@@ -119,8 +119,22 @@ class MarkerView extends React.PureComponent<Props> {
         anchor={anchor}
         allowOverlap={this.props.allowOverlap}
         isSelected={this.props.isSelected}
+        onTouchEnd={(e) => {
+          console.log('e => ');
+          e.stopPropagation();
+        }}
       >
-        <View style={{ flex: 0, alignSelf: 'flex-start' }}>
+        <View
+          style={{ flex: 0, alignSelf: 'flex-start' }}
+          onStartShouldSetResponder={(_event) => {
+            console.log('+> onStart');
+            return true;
+          }}
+          onTouchEnd={(e) => {
+            console.log('e => ');
+            e.stopPropagation();
+          }}
+        >
           {this.props.children}
         </View>
       </RCTMGLMarkerView>

package/javascript/components/ShapeSource.tsx

@@ -210,12 +210,12 @@ export class ShapeSource extends NativeBridgeComponent(
    */
   async getClusterExpansionZoom(
     feature: string | GeoJSON.Feature,
-  ): Promise<string> {
+  ): Promise<number> {
     if (typeof feature === 'number') {
       console.warn(
         'Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.',
       );
-      const res: { data: string } = await this._runNativeCommand(
+      const res: { data: number } = await this._runNativeCommand(
         'getClusterExpansionZoomById',
         this._nativeRef,
         [feature],
@@ -223,7 +223,7 @@ export class ShapeSource extends NativeBridgeComponent(
       return res.data;
     }
 
-    const res: { data: string } = await this._runNativeCommand(
+    const res: { data: number } = await this._runNativeCommand(
       'getClusterExpansionZoom',
       this._nativeRef,
       [JSON.stringify(feature)],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.45",
+  "version": "10.0.0-beta.47",
   "publishConfig": {
     "access": "public"
   },

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/LatLngBounds.java

@@ -1,42 +0,0 @@
-package com.mapbox.rctmgl.utils;
-
-import com.mapbox.geojson.Point;
-import com.mapbox.maps.CoordinateBounds;
-
-public class LatLngBounds {
-  public static LatLngBounds from(double bbox, double bbox1, double bbox2, double bbox3) {
-    return new LatLngBounds(bbox, bbox1, bbox2, bbox3);
-  }
-
-  LatLng getSouthWest() {
-    return new LatLng(latSouth, lonWest);
-  }
-
-  LatLng getNorthEast() {
-    return new LatLng(latNorth, lonEast);
-  }
-
-  LatLng[] toLatLngs() {
-    return new LatLng[] {getNorthEast(), getSouthWest()};
-  }
-  
-  double latNorth;
-  double lonEast;
-  double latSouth;
-  double lonWest;
-
-  LatLngBounds(double latNorth,double lonEast, double latSouth, double lonWest) {
-    this.latNorth = latNorth;
-    this.lonEast = lonEast;
-    this.latSouth = latSouth;
-    this.lonWest = lonWest;
-  }
-
-  public CoordinateBounds toBounds() {
-    return new CoordinateBounds(
-            Point.fromLngLat(lonWest, latSouth),
-            Point.fromLngLat(lonEast, latNorth),
-            false
-    );
-  }
-}