@rnmapbox/maps 10.0.0-beta.46 → 10.0.0-beta.48

package/docs/docs.json

@@ -2733,14 +2733,14 @@
       },
       {
         "name": "queryRenderedFeaturesInRect",
-        "docblock": "Returns an array of rendered map features that intersect with the given rectangle,\nrestricted to the given style layers and filtered by the given predicate.\n\n@example\nthis._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])\n\n@param  {Array<Number>} bbox - A rectangle expressed in the map view’s coordinate system.\n@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.\n@param  {Array=} layerIDs -  A array of layer id's to filter the features by\n@return {FeatureCollection}",
+        "docblock": "Returns an array of rendered map features that intersect with the given rectangle,\nrestricted to the given style layers and filtered by the given predicate. In v10,\npassing an empty array will query the entire visible bounds of the map.\n\n@example\nthis._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])\n\n@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.\n@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.\n@param  {Array=} layerIDs -  A array of layer id's to filter the features by\n@return {FeatureCollection}",
         "modifiers": [
           "async"
         ],
         "params": [
           {
             "name": "bbox",
-            "description": "A rectangle expressed in the map view’s coordinate system.",
+            "description": "A rectangle expressed in the map view’s coordinate system. For v10, this can be an empty array to query the visible map area.",
             "type": {
               "name": "Array"
             },
@@ -2769,7 +2769,7 @@
             "name": "FeatureCollection"
           }
         },
-        "description": "Returns an array of rendered map features that intersect with the given rectangle,\nrestricted to the given style layers and filtered by the given predicate.",
+        "description": "Returns an array of rendered map features that intersect with the given rectangle,\nrestricted to the given style layers and filtered by the given predicate. In v10,\npassing an empty array will query the entire visible bounds of the map.",
         "examples": [
           "\nthis._map.queryRenderedFeaturesInRect([30, 40, 20, 10], ['==', 'type', 'Point'], ['id1', 'id2'])\n\n"
         ]
@@ -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]?
@@ -137,16 +138,34 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCameraFromTrackingMode()
     }
   }
-  @objc var maxZoomLevel: NSNumber?
-  @objc var minZoomLevel: NSNumber?
+  @objc var maxZoomLevel: NSNumber? {
+    didSet { _updateMaxBounds() }
+  }
+  @objc var minZoomLevel: NSNumber? {
+    didSet { _updateMaxBounds() }
+  }
   @objc var onUserTrackingModeChange: RCTBubblingEventBlock? = nil
   @objc var stop: [String: Any]? {
     didSet {
       _updateCamera()
     }
   }
+
+  @objc var maxBounds: String? {
+    didSet {
+      if let maxBounds = maxBounds {
+        logged("RCTMGLCamera.maxBounds") {
+          maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
+        }
+      } else {
+        maxBoundsFeature = nil
+      }
+      _updateMaxBounds()
+    }
+  }
+  var maxBoundsFeature : FeatureCollection? = nil
   
-  // Update methods.
+  // MARK: Update methods
 
   func _updateCameraFromJavascript() {
     guard !followUserLocation else {
@@ -185,6 +204,43 @@ 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() {
+    withMapView { map in
+      var options = CameraBoundsOptions()
+      
+      if let maxBounds = self.maxBoundsFeature {
+        logged("RCTMGLCamera._updateMaxBounds._toCoordinateBounds") {
+          options.bounds = try self._toCoordinateBounds(maxBounds)
+        }
+      }
+      if let minZoomLevel = self.minZoomLevel {
+        options.minZoom = minZoomLevel.CGFloat
+      }
+      if let maxZoomLevel = self.maxZoomLevel {
+        options.maxZoom = maxZoomLevel.CGFloat
+      }
+
+      logged("RCTMGLCamera._updateMaxBounds") {
+        try map.mapboxMap.setCameraBounds(with: options)
+      }
+    }
+  }
 
   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

@@ -188,15 +188,15 @@ open class RCTMGLMapView : MapView {
     let glPosition = MapboxGLPosition(rawValue: position)
     switch glPosition {
     case .topLeft:
-      return .topLeft
+      return .topLeading
     case .bottomRight:
-      return .bottomRight
+      return .bottomTrailing
     case .topRight:
-      return .topRight
+      return .topTrailing
     case .bottomLeft:
-      return .bottomLeft
+      return .bottomLeading
     case .none:
-      return .topLeft
+      return .topLeading
     }
   }
   
@@ -231,7 +231,7 @@ open class RCTMGLMapView : MapView {
   }
 
   @objc func setReactRotateEnabled(_ value: Bool) {
-    self.mapView.gestures.options.pinchRotateEnabled = value
+    self.mapView.gestures.options.rotateEnabled = value
   }
 
   @objc func setReactPitchEnabled(_ value: Bool) {
@@ -251,20 +251,20 @@ open class RCTMGLMapView : MapView {
     }
   }
 
-  private func getOrnamentOptionsFromPosition(_ position: [String: Int]!) -> (position: OrnamentPosition, margins: CGPoint)? {
+  private func getOrnamentOptionsFromPosition(_ position: [String: Int]) -> (position: OrnamentPosition, margins: CGPoint)? {
     let left = position["left"]
     let right = position["right"]
     let top = position["top"]
     let bottom = position["bottom"]
     
     if let left = left, let top = top {
-      return (OrnamentPosition.topLeft, CGPoint(x: left, y: top))
+      return (OrnamentPosition.topLeading, CGPoint(x: left, y: top))
     } else if let right = right, let top = top {
-      return (OrnamentPosition.topRight, CGPoint(x: right, y: top))
+      return (OrnamentPosition.topTrailing, CGPoint(x: right, y: top))
     } else if let bottom = bottom, let right = right {
-      return (OrnamentPosition.bottomRight, CGPoint(x: right, y: bottom))
+      return (OrnamentPosition.bottomTrailing, CGPoint(x: right, y: bottom))
     } else if let bottom = bottom, let left = left {
-      return (OrnamentPosition.bottomLeft, CGPoint(x: left, y: bottom))
+      return (OrnamentPosition.bottomLeading, CGPoint(x: left, y: bottom))
     }
     
     return nil
@@ -520,7 +520,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
         let options = RenderedQueryOptions(
           layerIds: source.getLayerIDs(), filter: nil
         )
-        self.mapboxMap.queryRenderedFeatures(in: hitboxRect, options: options) {
+        self.mapboxMap.queryRenderedFeatures(with: hitboxRect, options: options) {
           result in
           
           var newHits = hits
@@ -772,12 +772,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
           }
         }
       }
-      /*
-      
-         let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation>,
-         let rctmglPointAnnotation = rctmglPointAnnotation.object {
-        rctmglPointAnnotation.didTap()
-      }*/
     }
   }
   
@@ -874,12 +868,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
           }
         }
       }
-      /*
-      
-         let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation>,
-         let rctmglPointAnnotation = rctmglPointAnnotation.object {
-        rctmglPointAnnotation.didTap()
-      }*/
     }
   }
   
@@ -896,8 +884,8 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     }
       switch sender.state {
         case .began:
-          mapFeatureQueryable.queryRenderedFeatures(
-            at: sender.location(in: sender.view),
+        mapFeatureQueryable.queryRenderedFeatures(
+          with: sender.location(in: sender.view),
             options: options) { [weak self] (result) in
               
               guard let self = self else { return }

package/ios/RCTMGL-v10/RCTMGLMapViewManager.swift

@@ -190,7 +190,7 @@ extension RCTMGLMapViewManager {
         logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) {
           let options = try RenderedQueryOptions(layerIds: layerIDs, filter: filter?.asExpression())
           
-          mapboxMap.queryRenderedFeatures(at: point, options: options) { result in
+          mapboxMap.queryRenderedFeatures(with: point, options: options) { result in
             switch result {
             case .success(let features):
               resolver([
@@ -214,17 +214,15 @@ extension RCTMGLMapViewManager {
     withLayerIDs layerIDs: [String]?,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      withMapboxMap(reactTag, name:"queryRenderedFeaturesInRect", rejecter: rejecter) { mapboxMap in
-        let left = CGFloat(bbox[0].floatValue)
-        let bottom = CGFloat(bbox[1].floatValue)
-        let right = CGFloat(bbox[2].floatValue)
-        let top = CGFloat(bbox[3].floatValue)
-        let rect = CGRect(x: [left,right].min()!, y: [bottom,top].min()!, width: fabs(right-left), height: fabs(top-bottom))
-        
+      withMapView(reactTag, name:"queryRenderedFeaturesInRect", rejecter: rejecter) { mapView in
+        let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue)
+        let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue)
+        let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue)
+        let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue)
+        let rect = bbox.isEmpty ? CGRect(x: 0.0, y: 0.0, width: mapView.bounds.size.width, height: mapView.bounds.size.height) : CGRect(x: [left,right].min()!, y: [top,bottom].min()!, width: abs(right-left), height: abs(bottom-top))
         logged("queryRenderedFeaturesInRect.option", rejecter: rejecter) {
           let options = try RenderedQueryOptions(layerIds: layerIDs, filter: filter?.asExpression())
-          
-          mapboxMap.queryRenderedFeatures(in: rect, options: options) { result in
+          mapView.mapboxMap.queryRenderedFeatures(with: rect, options: options) { result in
             switch result {
             case .success(let features):
               resolver([
@@ -233,7 +231,7 @@ extension RCTMGLMapViewManager {
                 }]
               ])
             case .failure(let error):
-              rejecter("queryRenderedFeaturesAtPoint","failed to query features", error)
+              rejecter("queryRenderedFeaturesInRect","failed to query features", 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/MapView.js

@@ -495,33 +495,38 @@ class MapView extends NativeBridgeComponent(
 
   /**
    * Returns an array of rendered map features that intersect with the given rectangle,
-   * restricted to the given style layers and filtered by the given predicate.
+   * restricted to the given style layers and filtered by the given predicate. In v10,
+   * passing an empty array will query the entire visible bounds of the map.
    *
    * @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.
+   * @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=} 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}
    */
   async queryRenderedFeaturesInRect(bbox, filter = [], layerIDs = []) {
-    if (!bbox || bbox.length !== 4) {
-      throw new Error(
-        'Must pass in a valid bounding box[top, right, bottom, left]',
+    if (
+      bbox != null &&
+      (bbox.length === 4 || (MapboxGL.MapboxV10 && bbox.length === 0))
+    ) {
+      const res = await this._runNativeCommand(
+        'queryRenderedFeaturesInRect',
+        this._nativeRef,
+        [bbox, getFilter(filter), layerIDs],
       );
-    }
-    const res = await this._runNativeCommand(
-      'queryRenderedFeaturesInRect',
-      this._nativeRef,
-      [bbox, getFilter(filter), layerIDs],
-    );
 
-    if (isAndroid()) {
-      return JSON.parse(res.data);
-    }
+      if (isAndroid()) {
+        return JSON.parse(res.data);
+      }
 
-    return res.data;
+      return res.data;
+    } else {
+      throw new Error(
+        'Must pass in a valid bounding box: [top, right, bottom, left]. An empty array [] is also acceptable in v10.',
+      );
+    }
   }
 
   /**

package/javascript/components/MarkerView.tsx

@@ -119,8 +119,19 @@ class MarkerView extends React.PureComponent<Props> {
         anchor={anchor}
         allowOverlap={this.props.allowOverlap}
         isSelected={this.props.isSelected}
+        onTouchEnd={(e) => {
+          e.stopPropagation();
+        }}
       >
-        <View style={{ flex: 0, alignSelf: 'flex-start' }}>
+        <View
+          style={{ flex: 0, alignSelf: 'flex-start' }}
+          onStartShouldSetResponder={(_event) => {
+            return true;
+          }}
+          onTouchEnd={(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/javascript/components/SymbolLayer.tsx

@@ -87,7 +87,7 @@ export class SymbolLayer extends AbstractLayer<Props, NativeTypeProps> {
     }
 
     React.Children.forEach(this.props.children, (child) => {
-      if (child?.type === View) {
+      if (child !== undefined && 'type' in child && child.type === View) {
         isSnapshot = true;
       }
     });

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.46",
+  "version": "10.0.0-beta.48",
   "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
-    );
-  }
-}