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

package/android/rctmgl/build.gradle

@@ -130,8 +130,8 @@ dependencies {
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation 'com.mapbox.maps:android:10.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.4.0'
+            implementation 'com.mapbox.maps:android:10.9.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.8.0'
         }
     }
 

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt

@@ -72,8 +72,8 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     private var mFollowZoomLevel : Double? = null
     private var mFollowHeading : Double? = null
     private var mZoomLevel = -1.0
-    private var mMinZoomLevel = -1.0
-    private var mMaxZoomLevel = -1.0
+    private var mMinZoomLevel : Double? = null
+    private var mMaxZoomLevel : Double? = null
     private var mMaxBounds: LatLngBounds? = null
     private var mFollowUserLocation = false
     private var mFollowUserMode: String? = null
@@ -120,7 +120,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     override fun addToMap(mapView: RCTMGLMapView) {
         super.addToMap(mapView)
         setInitialCamera()
-        updateMaxMinZoomLevel()
         updateMaxBounds()
         mCameraStop?.let { updateCamera(it) }
         if (mFollowUserLocation) {
@@ -169,30 +168,17 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         withMapView { mapView ->
             val map = mapView.getMapboxMap()
             val maxBounds = mMaxBounds
+            val builder = CameraBoundsOptions.Builder()
+
             if (maxBounds != null) {
-                map.setBounds(CameraBoundsOptions.Builder().bounds(
-                    maxBounds.toBounds()
-                ).build())
-            } else {
-                map.setBounds(CameraBoundsOptions.Builder().build())
+                builder.bounds(maxBounds.toBounds())
             }
-
+            mMinZoomLevel?.let { builder.minZoom(it) }
+            mMaxZoomLevel?.let { builder.maxZoom(it) }
+            map.setBounds(builder.build())
         }
     }
 
-    private fun updateMaxMinZoomLevel() {
-        /*
-        MapboxMap map = getMapboxMap();
-        if (map != null) {
-            if (mMinZoomLevel >= 0.0) {
-                map.setMinZoomPreference(mMinZoomLevel);
-            }
-            if (mMaxZoomLevel >= 0.0) {
-                map.setMaxZoomPreference(mMaxZoomLevel);
-            }
-        }*/
-    }
-
     private fun setInitialCamera() {
         val map = mMapView!!.getMapboxMap()
         if (mDefaultStop != null) {
@@ -332,14 +318,14 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         }
     }
 
-    fun setMinZoomLevel(zoomLevel: Double) {
+    fun setMinZoomLevel(zoomLevel: Double?) {
         mMinZoomLevel = zoomLevel
-        updateMaxMinZoomLevel()
+        updateMaxBounds()
     }
 
-    fun setMaxZoomLevel(zoomLevel: Double) {
+    fun setMaxZoomLevel(zoomLevel: Double?) {
         mMaxZoomLevel = zoomLevel
-        updateMaxMinZoomLevel()
+        updateMaxBounds()
     }
 
     fun setZoomLevel(zoomLevel: Double) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -23,17 +23,15 @@ import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
 import com.mapbox.maps.extension.style.layers.generated.*
 import com.mapbox.maps.extension.style.layers.getLayer
+import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
+import com.mapbox.maps.extension.style.projection.generated.Projection
+import com.mapbox.maps.extension.style.projection.generated.setProjection
 import com.mapbox.maps.plugin.annotation.Annotation
 import com.mapbox.maps.plugin.annotation.annotations
-import com.mapbox.maps.plugin.annotation.generated.OnPointAnnotationClickListener
-import com.mapbox.maps.plugin.annotation.generated.OnPointAnnotationDragListener
-import com.mapbox.maps.plugin.annotation.generated.PointAnnotation
-import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager
-import com.mapbox.maps.plugin.annotation.generated.createPointAnnotationManager
+import com.mapbox.maps.plugin.annotation.generated.*
 import com.mapbox.maps.plugin.attribution.attribution
 import com.mapbox.maps.plugin.attribution.generated.AttributionSettings
-import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.maps.plugin.compass.compass
 import com.mapbox.maps.plugin.compass.generated.CompassSettings
 import com.mapbox.maps.plugin.delegates.listeners.*
@@ -41,7 +39,7 @@ import com.mapbox.maps.plugin.gestures.*
 import com.mapbox.maps.plugin.logo.generated.LogoSettings
 import com.mapbox.maps.plugin.logo.logo
 import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
-import com.mapbox.maps.viewannotation.ViewAnnotationManager
+import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerView
@@ -60,6 +58,7 @@ import com.mapbox.rctmgl.events.IEvent
 import com.mapbox.rctmgl.events.MapChangeEvent
 import com.mapbox.rctmgl.events.MapClickEvent
 import com.mapbox.rctmgl.events.constants.EventTypes
+import com.mapbox.rctmgl.utils.BitmapUtils
 import com.mapbox.rctmgl.utils.GeoJSONUtils
 import com.mapbox.rctmgl.utils.LatLng
 import com.mapbox.rctmgl.utils.Logger
@@ -68,6 +67,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
+
 data class OrnamentSettings(
     var enabled : Boolean? = false,
     var margins: ReadableMap? =null,
@@ -92,6 +92,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private val mImages: MutableList<RCTMGLImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
     private var mActiveMarkerID: Long = -1
+    private var mProjection: ProjectionName = ProjectionName.MERCATOR
     private var mStyleURL: String? = null
     val isDestroyed = false
     private var mCamera: RCTMGLCamera? = null
@@ -397,12 +398,24 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return true
     }
 
+    fun setReactProjection(projection: ProjectionName) {
+        if (projection != null) {
+            mProjection = projection
+        }
+
+        if (mMap != null) {
+            mMap.getStyle()?.setProjection(Projection(projection))
+        }
+    }
+
     fun setReactStyleURL(styleURL: String) {
+        mStyleURL = styleURL
         if (mMap != null) {
             removeAllFeaturesFromMap()
             if (isJSONValid(mStyleURL)) {
                 mMap.loadStyleJson(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
+                        style.setProjection(Projection(mProjection))
                         addAllFeaturesToMap()
                     }
                 })
@@ -410,6 +423,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 mMap.loadStyleUri(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
                         savedStyle = style
+                        style.setProjection(Projection(mProjection))
                         addAllFeaturesToMap()
                     }
                 },
@@ -733,7 +747,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun queryRenderedFeaturesInRect(callbackID: String?, rect: RectF, filter: Expression?, layerIDs: List<String>?) {
-        val screenBox = ScreenBox(
+        val size = mMap!!.getMapOptions().size
+        val screenBox = if (rect.isEmpty()) 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()),
         )
@@ -773,6 +788,28 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         })
     }
 
+    fun takeSnap(callbackID: String?, writeToDisk: Boolean) {
+        this.snapshot { snapshot ->
+            if (snapshot == null) {
+                Logger.e("takeSnap", "snapshot failed")
+
+                sendResponse(callbackID, {
+                    it.putNull("data")
+                    it.putString("error", "no snapshot")
+                })
+            } else {
+                val uri: String = if (writeToDisk) BitmapUtils.createTempFile(
+                    mContext,
+                    snapshot
+                ) else BitmapUtils.createBase64(snapshot)
+
+                sendResponse(callbackID, {
+                    it.putString("uri", uri)
+                })
+            }
+        }
+    }
+
     fun queryTerrainElevation(callbackID: String?, longitude: Double, latitude: Double) {
         val result = mMap?.getElevation(Point.fromLngLat(longitude, latitude))
 
@@ -870,8 +907,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private fun toGravity(kind: String, viewPosition: Int): Int {
         return when (viewPosition) {
             0 -> (Gravity.TOP or Gravity.LEFT)
-            1 -> (Gravity.BOTTOM or Gravity.LEFT)
-            2 -> (Gravity.TOP or Gravity.RIGHT)
+            1 -> (Gravity.TOP or Gravity.RIGHT)
+            2 -> (Gravity.BOTTOM or Gravity.LEFT)
             3 -> (Gravity.BOTTOM or Gravity.RIGHT)
             else -> {
                 Logger.e(
@@ -959,7 +996,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mScaleBarSettings.enabled = scaleBarEnabled
         updateScaleBar()
     }
-    
+
     fun setReactScaleBarViewMargins(scaleBarMargins: ReadableMap) {
         mScaleBarSettings.margins = scaleBarMargins
         updateScaleBar()

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt

@@ -11,6 +11,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.common.MapBuilder
+import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.plugin.compass.compass
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.logo.logo
@@ -78,7 +79,12 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         return mViews[reactTag]
     }
 
-    //region React Props
+    // region React Props
+    @ReactProp(name = "projection")
+    fun setProjection(mapView: RCTMGLMapView, projection: String?) {
+        mapView.setReactProjection( if (projection == "globe") ProjectionName.GLOBE else ProjectionName.MERCATOR )
+    }
+
     @ReactProp(name = "styleURL")
     fun setStyleURL(mapView: RCTMGLMapView, styleURL: String?) {
         mapView.setReactStyleURL(styleURL!!)
@@ -273,6 +279,9 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
             METHOD_VISIBLE_BOUNDS -> {
                 mapView.getVisibleBounds(args!!.getString(0));
             }
+            METHOD_TAKE_SNAP -> {
+                mapView.takeSnap(args!!.getString(0), args!!.getBoolean(1))
+            }
         }
         /*
         switch (commandID) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/RCTMGLStyleFactory.java

@@ -594,18 +594,6 @@ public class RCTMGLStyleFactory {
             case "fillExtrusionVerticalGradient":
               RCTMGLStyleFactory.setFillExtrusionVerticalGradient(layer, styleValue);
               break;
-            case "fillExtrusionAmbientOcclusionIntensity":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionIntensity(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionIntensityTransition":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionIntensityTransition(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionRadius":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionRadius(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionRadiusTransition":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionRadiusTransition(layer, styleValue);
-              break;
         }
       }
     }
@@ -2129,38 +2117,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-    public static void setFillExtrusionAmbientOcclusionIntensity(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      if (styleValue.isExpression()) {
-        layer.fillExtrusionAmbientOcclusionIntensity(styleValue.getExpression());
-      } else {
-          layer.fillExtrusionAmbientOcclusionIntensity(styleValue.getFloat(VALUE_KEY));
-      }
-    }
-
-
-    public static void setFillExtrusionAmbientOcclusionIntensityTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillExtrusionAmbientOcclusionIntensityTransition(transition);
-      }
-    }
-
-    public static void setFillExtrusionAmbientOcclusionRadius(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      if (styleValue.isExpression()) {
-        layer.fillExtrusionAmbientOcclusionRadius(styleValue.getExpression());
-      } else {
-          layer.fillExtrusionAmbientOcclusionRadius(styleValue.getFloat(VALUE_KEY));
-      }
-    }
-
-
-    public static void setFillExtrusionAmbientOcclusionRadiusTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillExtrusionAmbientOcclusionRadiusTransition(transition);
-      }
-    }
-
     public static void setVisibility(RasterLayer layer, RCTMGLStyleValue styleValue) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }

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

@@ -217,7 +217,7 @@ public class ConvertUtils {
     public static RectF toRectF(ReadableArray array) {
         RectF rectF = new RectF();
 
-        if (array == null) {
+        if (array == null || array.size() == 0) {
             return rectF;
         }
 

package/docs/FillExtrusionLayer.md

@@ -28,8 +28,6 @@ FillExtrusionLayer is a style layer that renders one or more 3D extruded polygon
 * <a href="#fillextrusionheight">fillExtrusionHeight</a><br/>
 * <a href="#fillextrusionbase">fillExtrusionBase</a><br/>
 * <a href="#fillextrusionverticalgradient">fillExtrusionVerticalGradient</a><br/>
-* <a href="#fillextrusionambientocclusionintensity">fillExtrusionAmbientOcclusionIntensity</a><br/>
-* <a href="#fillextrusionambientocclusionradius">fillExtrusionAmbientOcclusionRadius</a><br/>
 
 ___
 
@@ -346,88 +344,3 @@ Whether to apply a vertical gradient to the sides of a fillExtrusion layer. If t
 
 Parameters: `zoom`
 
-___
-
-### fillExtrusionAmbientOcclusionIntensity
-Name: `fillExtrusionAmbientOcclusionIntensity`
-
-### Description
-Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
-
-### Type
-`number`
-### Default Value
-`0`
-
-### Minimum
-`0`
-
-
-### Maximum
-`1`
-
-### Expression
-
-Parameters: `zoom`
-___
-
-### Name
-
-`fillExtrusionAmbientOcclusionIntensityTransition`
-
-### Description
-
-The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
-
-### Type
-
-`{ duration, delay }`
-
-### Units
-`milliseconds`
-
-### Default Value
-`{duration: 300, delay: 0}`
-
-
-___
-
-### fillExtrusionAmbientOcclusionRadius
-Name: `fillExtrusionAmbientOcclusionRadius`
-
-### Description
-The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.
-
-### Type
-`number`
-### Default Value
-`3`
-
-### Minimum
-`0`
-
-
-### Expression
-
-Parameters: `zoom`
-___
-
-### Name
-
-`fillExtrusionAmbientOcclusionRadiusTransition`
-
-### Description
-
-The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
-
-### Type
-
-`{ duration, delay }`
-
-### Units
-`milliseconds`
-
-### Default Value
-`{duration: 300, delay: 0}`
-
-

package/docs/MapView.md

@@ -6,6 +6,7 @@ MapView backed by Mapbox Native GL
 | Prop | Type | Default | Required | Description |
 | ---- | :-- | :----- | :------ | :---------- |
 | contentInset | `union` | `none` | `false` | The distance from the edges of the map view’s frame to the edges of the map view’s logical viewport. |
+| projection | `enum` | `'mercator'` | `false` | The projection used when rendering the map |
 | style | `any` | `none` | `false` | Style for wrapping React Native View |
 | styleURL | `string` | `none` | `false` | Style URL for map - notice, if non is set it _will_ default to `MapboxGL.StyleURL.Street` |
 | styleJSON | `string` | `none` | `false` | StyleJSON for map - according to TileJSON specs: https://github.com/mapbox/tilejson-spec |
@@ -118,12 +119,12 @@ this._map.queryRenderedFeaturesAtPoint([30, 40], ['==', 'type', 'Point'], ['id1'
 
 ### queryRenderedFeaturesInRect(bbox[, filter][, layerIDs])
 
-Returns an array of rendered map features that intersect with the given rectangle,<br/>restricted to the given style layers and filtered by the given predicate.
+Returns an array of rendered map features that intersect with the given rectangle,<br/>restricted to the given style layers and filtered by the given predicate. In v10,<br/>passing an empty array will query the entire visible bounds of the map.
 
 #### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `bbox` | `Array` | `Yes` | A rectangle expressed in the map view’s coordinate system. |
+| `bbox` | `Array` | `Yes` | A rectangle expressed in the map view’s coordinate system. For v10, this can be an empty array to query the visible map area. |
 | `filter` | `Array` | `No` | 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. |
 | `layerIDs` | `Array` | `No` |  A array of layer id's to filter the features by |
 

package/docs/docs.json

@@ -1425,43 +1425,6 @@
           ]
         },
         "transition": false
-      },
-      {
-        "name": "fillExtrusionAmbientOcclusionIntensity",
-        "type": "number",
-        "values": [],
-        "minimum": 0,
-        "maximum": 1,
-        "default": 0,
-        "description": "Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.",
-        "requires": [],
-        "disabledBy": [],
-        "allowedFunctionTypes": [],
-        "expression": {
-          "interpolated": true,
-          "parameters": [
-            "zoom"
-          ]
-        },
-        "transition": true
-      },
-      {
-        "name": "fillExtrusionAmbientOcclusionRadius",
-        "type": "number",
-        "values": [],
-        "minimum": 0,
-        "default": 3,
-        "description": "The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.",
-        "requires": [],
-        "disabledBy": [],
-        "allowedFunctionTypes": [],
-        "expression": {
-          "interpolated": true,
-          "parameters": [
-            "zoom"
-          ]
-        },
-        "transition": true
       }
     ]
   },
@@ -2733,14 +2696,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 +2732,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"
         ]
@@ -2928,6 +2891,13 @@
         "default": "none",
         "description": "The distance from the edges of the map view’s frame to the edges of the map view’s logical viewport."
       },
+      {
+        "name": "projection",
+        "required": false,
+        "type": "enum",
+        "default": "'mercator'",
+        "description": "The projection used when rendering the map"
+      },
       {
         "name": "style",
         "required": false,

package/index.d.ts

@@ -526,6 +526,7 @@ export interface MapViewProps extends ViewProps {
   userTrackingMode?: MapboxGL.UserTrackingModes;
   userLocationVerticalAlignment?: number;
   contentInset?: Array<number>;
+  projection?: 'mercator' | 'globe';
   style?: StyleProp<ViewStyle>;
   styleURL?: string;
   styleJSON?: string;

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -138,8 +138,12 @@ 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 {
@@ -151,12 +155,15 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     didSet {
       if let maxBounds = maxBounds {
         logged("RCTMGLCamera.maxBounds") {
-          let maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
-          try _updateMaxBounds(maxBoundsFeature)
+          maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
         }
+      } else {
+        maxBoundsFeature = nil
       }
+      _updateMaxBounds()
     }
   }
+  var maxBoundsFeature : FeatureCollection? = nil
   
   // MARK: Update methods
 
@@ -213,10 +220,24 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     return CoordinateBounds(southwest: sw.coordinates, northeast: ne.coordinates)
   }
   
-  func _updateMaxBounds(_ bounds: FeatureCollection) throws {
+  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: CameraBoundsOptions(bounds: try self._toCoordinateBounds(bounds)))
+        try map.mapboxMap.setCameraBounds(with: options)
       }
     }
   }

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -135,6 +135,14 @@ open class RCTMGLMapView : MapView {
 
   
   // MARK: - React Native properties
+
+  @objc func setReactProjection(_ value: String?) {
+    if let value = value {
+      var projection = StyleProjection(name: value == "globe" ? .globe : .mercator)
+      try! self.mapboxMap.style.setProjection(projection)
+    }
+  }
+  
   
   @objc func setReactAttributionEnabled(_ value: Bool) {
     mapView.ornaments.options.attributionButton.visibility = value ? .visible : .hidden
@@ -188,15 +196,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 +239,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 +259,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 +528,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 +780,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
           }
         }
       }
-      /*
-      
-         let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation>,
-         let rctmglPointAnnotation = rctmglPointAnnotation.object {
-        rctmglPointAnnotation.didTap()
-      }*/
     }
   }
   
@@ -874,12 +876,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
           }
         }
       }
-      /*
-      
-         let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation>,
-         let rctmglPointAnnotation = rctmglPointAnnotation.object {
-        rctmglPointAnnotation.didTap()
-      }*/
     }
   }
   
@@ -896,8 +892,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.m

@@ -21,6 +21,7 @@ RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
 
+RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
 
 RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
 RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock)

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/RCTMGLStyle.swift

@@ -516,14 +516,6 @@ func fillExtrusionLayer(layer: inout FillExtrusionLayer, reactStyle:Dictionary<S
       self.setFillExtrusionBaseTransition(&layer, styleValue:styleValue);
     } else if (prop == "fillExtrusionVerticalGradient") {
       self.setFillExtrusionVerticalGradient(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionIntensity") {
-      self.setFillExtrusionAmbientOcclusionIntensity(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionIntensityTransition") {
-      self.setFillExtrusionAmbientOcclusionIntensityTransition(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionRadius") {
-      self.setFillExtrusionAmbientOcclusionRadius(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionRadiusTransition") {
-      self.setFillExtrusionAmbientOcclusionRadiusTransition(&layer, styleValue:styleValue);
     } else {
       Logger.log(level:.error, message: "Unexpected property \(prop) for layer: fill-extrusion")
     }
@@ -2027,34 +2019,6 @@ func setFillExtrusionVerticalGradient(_ layer: inout FillExtrusionLayer, styleVa
       
 }
 
-func setFillExtrusionAmbientOcclusionIntensity(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-      
-        
-          layer.fillExtrusionAmbientOcclusionIntensity = styleValue.mglStyleValueNumber();
-        
-      
-}
-
-func setFillExtrusionAmbientOcclusionIntensityTransition(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-    layer.fillExtrusionAmbientOcclusionIntensityTransition = styleValue.getTransition();
-}
-
-func setFillExtrusionAmbientOcclusionRadius(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-      
-        
-          layer.fillExtrusionAmbientOcclusionRadius = styleValue.mglStyleValueNumber();
-        
-      
-}
-
-func setFillExtrusionAmbientOcclusionRadiusTransition(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-    layer.fillExtrusionAmbientOcclusionRadiusTransition = styleValue.getTransition();
-}
-
 
 
 func setRasterStyleLayerVisibility(_ layer: inout RasterLayer, styleValue: RCTMGLStyleValue)

package/javascript/components/MapView.js

@@ -57,6 +57,11 @@ class MapView extends NativeBridgeComponent(
       PropTypes.number,
     ]),
 
+    /**
+     * The projection used when rendering the map
+     */
+    projection: PropTypes.oneOf(['mercator', 'globe']),
+
     /**
      * Style for wrapping React Native View
      */
@@ -294,6 +299,7 @@ class MapView extends NativeBridgeComponent(
   };
 
   static defaultProps = {
+    projection: 'mercator',
     localizeLabels: false,
     scrollEnabled: true,
     pitchEnabled: true,
@@ -391,21 +397,27 @@ class MapView extends NativeBridgeComponent(
         );
         if (props.onRegionDidChange) {
           console.warn(
-            'rnmapbox/maps: only one of  MapView.onRegionDidChange or onMapIdle is supported',
+            'rnmapbox/maps: only one of MapView.onRegionDidChange or onMapIdle is supported',
           );
         }
       }
       if (addIfHasHandler('CameraChanged')) {
         console.warn(
-          'onCameraChanged is deprecated and will be removed in next beta - please use onRegionWillChange',
+          'onCameraChanged is deprecated and will be removed in next beta - please use onRegionIsChanging',
         );
-        if (props.onRegionWillChange) {
+        if (props.onRegionIsChanging) {
           console.warn(
-            'rnmapbox/maps: only one of MapView.onRegionWillChange or onCameraChanged is supported',
+            'rnmapbox/maps: only one of MapView.onRegionIsChanging or onCameraChanged is supported',
           );
         }
       }
 
+      if (props.onRegionWillChange) {
+        console.warn(
+          'onRegionWillChange is deprecated and will be removed in v10 - please use onRegionIsChanging',
+        );
+      }
+
       this._runNativeCommand('setHandledMapChangedEvents', this._nativeRef, [
         events,
       ]);
@@ -495,33 +507,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

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

package/javascript/components/SymbolLayer.tsx

@@ -82,11 +82,11 @@ export class SymbolLayer extends AbstractLayer<Props, NativeTypeProps> {
   _shouldSnapshot() {
     let isSnapshot = false;
 
-    if (React.Children.count(this.props.children) <= 0) {
+    if (React.Children.count(this.baseProps.children) <= 0) {
       return isSnapshot;
     }
 
-    React.Children.forEach(this.props.children, (child) => {
+    React.Children.forEach(this.baseProps.children, (child) => {
       if (child?.type === View) {
         isSnapshot = true;
       }

package/javascript/utils/MapboxStyles.ts

@@ -1258,24 +1258,6 @@ export interface FillExtrusionLayerStyleProps {
    * Whether to apply a vertical gradient to the sides of a fillExtrusion layer. If true, sides will be shaded slightly darker farther down.
    */
   fillExtrusionVerticalGradient?: Value<boolean, ['zoom']>;
-  /**
-   * Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionIntensity?: Value<number, ['zoom']>;
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
-   */
-  fillExtrusionAmbientOcclusionIntensityTransition?: Transition;
-  /**
-   * The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionRadius?: Value<number, ['zoom']>;
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
-   */
-  fillExtrusionAmbientOcclusionRadiusTransition?: Transition;
 }
 export interface RasterLayerStyleProps {
   /**

package/javascript/utils/styleMap.ts

@@ -1196,38 +1196,6 @@ export const FillExtrusionLayerStyleProp = PropTypes.shape({
     PropTypes.bool,
     PropTypes.array,
   ]),
-
-  /**
-   * Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionIntensity: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.array,
-  ]),
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
-   */
-  fillExtrusionAmbientOcclusionIntensityTransition: PropTypes.shape({
-    duration: PropTypes.number,
-    delay: PropTypes.number,
-  }),
-
-  /**
-   * The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionRadius: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.array,
-  ]),
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
-   */
-  fillExtrusionAmbientOcclusionRadiusTransition: PropTypes.shape({
-    duration: PropTypes.number,
-    delay: PropTypes.number,
-  }),
 });
 
 export const RasterLayerStyleProp = PropTypes.shape({
@@ -1847,10 +1815,6 @@ const styleMap = {
   fillExtrusionBase: StyleTypes.Constant,
   fillExtrusionBaseTransition: StyleTypes.Transition,
   fillExtrusionVerticalGradient: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionIntensity: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionIntensityTransition: StyleTypes.Transition,
-  fillExtrusionAmbientOcclusionRadius: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionRadiusTransition: StyleTypes.Transition,
 
   rasterOpacity: StyleTypes.Constant,
   rasterOpacityTransition: StyleTypes.Transition,

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.47",
+  "version": "10.0.0-beta.49",
   "publishConfig": {
     "access": "public"
   },

package/plugin/install.md

@@ -32,8 +32,6 @@ After installing this package, add the [config plugin](https://docs.expo.io/guid
 }
 ```
 
-Next, rebuild your app as described in the ["Adding custom native code"](https://docs.expo.io/workflow/customizing/) guide.
-
 For `mapbox` or `mapbox-gl` you'll need to provide `RNMapboxMapsDownloadToken` as well.
 
 ```json
@@ -52,6 +50,8 @@ For `mapbox` or `mapbox-gl` you'll need to provide `RNMapboxMapsDownloadToken` a
 }
 ```
 
+Next, rebuild your app as described in the ["Adding custom native code"](https://docs.expo.io/workflow/customizing/) guide.
+
 ## Manual Setup
 
 For bare workflow projects, you can follow the manual setup guides:

package/rnmapbox-maps.podspec

@@ -20,7 +20,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ## Warning: these lines are scanned by autogenerate.js
-rnMapboxMapsDefaultMapboxVersion = '~> 10.8.1'
+rnMapboxMapsDefaultMapboxVersion = '~> 10.9.0'
 rnMapboxMapsDefaultMapboxGLVersion = '~> 5.9.0'
 rnMapboxMapsDefaultMapLibreVersion = 'exactVersion 5.12.1'
 

package/scripts/autogenerate.js

@@ -348,6 +348,9 @@ function isTranslate(attrName) {
 
 function isAttrSupported(attr, only) {
   const support = getAttributeSupport(attr['sdk-support']);
+  if (attr.private === true) {
+    return false;
+  }
   if (only != null) {
     return support.basic[only].android && support.basic[only].ios;
   }

package/style-spec/v8.json

@@ -196,7 +196,7 @@
     },
     "promoteId": {
       "type": "promoteId",
-      "doc": "A property to use as a feature id (for feature state). Either a property name, or an object of the form `{<sourceLayer>: <propertyName>}`. If specified as a string for a vector tile source, the same property is used across all its source layers."
+      "doc": "A property to use as a feature id (for feature state). Either a property name, or an object of the form `{<sourceLayer>: <propertyName>}`. If specified as a string for a vector tile source, the same property is used across all its source layers. If specified as an object only specified source layers will have id overriden, others will fallback to original feature id"
     },
     "volatile": {
       "type": "boolean",
@@ -877,6 +877,22 @@
         }
       },
       "property-type": "constant"
+    },
+    "fill-extrusion-edge-radius": {
+      "type": "number",
+      "private": true,
+      "default": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "doc": "Radius of a fill extrusion edge in meters. If not zero, rounds extrusion edges for a smoother appearance.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "v2.10.0",
+          "android": "10.7.0",
+          "ios": "10.7.0"
+        }
+      },
+      "property-type": "constant"
     }
   },
   "layout_line": {
@@ -1890,7 +1906,9 @@
           "macos": "0.1.0"
         },
         "data-driven styling": {
-          "js": "2.3.0"
+          "js": "2.3.0",
+          "android": "10.0.0",
+          "ios": "10.0.0"
         }
       },
       "expression": {
@@ -2798,7 +2816,9 @@
         "group": "Lookup",
         "sdk-support": {
           "basic functionality": {
-            "js": "1.10.0"
+            "js": "1.10.0",
+            "android": "10.0.0",
+            "ios": "10.0.0"
           }
         }
       },
@@ -2807,7 +2827,9 @@
         "group": "Lookup",
         "sdk-support": {
           "basic functionality": {
-            "js": "1.10.0"
+            "js": "1.10.0",
+            "android": "10.0.0",
+            "ios": "10.0.0"
           }
         }
       },
@@ -3194,12 +3216,14 @@
         "group": "Feature data",
         "sdk-support": {
           "basic functionality": {
-            "js": "0.46.0"
+            "js": "0.46.0",
+            "android": "10.0.0",
+            "ios": "10.0.0"
           }
         }
       },
       "geometry-type": {
-        "doc": "Returns the feature's geometry type: `Point`, `MultiPoint`, `LineString`, `MultiLineString`, `Polygon`, `MultiPolygon`. `Multi*` feature types are only returned in GeoJSON sources. When working with vector tile sources, use the singular forms.",
+        "doc": "Returns the feature's geometry type: `Point`, `LineString` or `Polygon`. `Multi*` feature types return the singular forms.",
         "group": "Feature data",
         "sdk-support": {
           "basic functionality": {
@@ -3239,7 +3263,9 @@
         "group": "Camera",
         "sdk-support": {
           "basic functionality": {
-            "js": "2.6.0"
+            "js": "2.6.0",
+            "android": "10.9.0",
+            "ios": "10.9.0"
           }
         }
       },
@@ -3248,7 +3274,9 @@
         "group": "Camera",
         "sdk-support": {
           "basic functionality": {
-            "js": "2.6.0"
+            "js": "2.6.0",
+            "android": "10.9.0",
+            "ios": "10.9.0"
           }
         }
       },
@@ -3736,7 +3764,9 @@
         "sdk-support": {
           "basic functionality": {
             "js": "0.45.0",
-            "android": "6.6.0"
+            "android": "6.6.0",
+            "ios": "4.1.0",
+            "macos": "0.8.0"
           }
         }
       },
@@ -4659,6 +4689,7 @@
     "fill-extrusion-ambient-occlusion-intensity": {
       "property-type": "data-constant",
       "type": "number",
+      "private": true,
       "default": 0.0,
       "minimum": 0,
       "maximum": 1,
@@ -4669,10 +4700,10 @@
         ]
       },
       "transition": true,
-      "doc": "Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a low-cost best-effort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.",
+      "doc": "Controls the intensity of shading near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.",
       "sdk-support": {
         "basic functionality": {
-          "js": "2.8.3",
+          "js": "2.10.0",
           "android": "10.7.0",
           "ios": "10.7.0"
         }
@@ -4681,6 +4712,7 @@
     "fill-extrusion-ambient-occlusion-radius": {
       "property-type": "data-constant",
       "type": "number",
+      "private": true,
       "default": 3.0,
       "minimum": 0,
       "expression": {
@@ -4690,10 +4722,13 @@
         ]
       },
       "transition": true,
-      "doc": "The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a low-cost best-effort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.",
+      "doc": "Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings.",
+      "requires": [
+        "fill-extrusion-edge-radius"
+      ],
       "sdk-support": {
         "basic functionality": {
-          "js": "2.8.3",
+          "js": "2.10.0",
           "android": "10.7.0",
           "ios": "10.7.0"
         }