@rnmapbox/maps 10.0.0-beta.41 → 10.0.0-beta.42

package/.eslintrc.js

@@ -78,8 +78,9 @@ module.exports = {
     'no-unused-expressions': ['error', { allowTaggedTemplates: true }],
     'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
     'react-native/no-inline-styles': 0,
+    '@typescript-eslint/no-explicit-any': ['error', { ignoreRestArgs: true }],
   },
-  ignorePatterns: ['**/rnmapbox.web.symlink'],
+  ignorePatterns: ['**/rnmapbox.web.symlink', 'plugin/build/'],
   overrides: [
     {
       // Match TypeScript Files

package/.github/workflows/ios-actions.yml

@@ -64,7 +64,7 @@ jobs:
           brew install xcbeautify
 
       - name: Build for detox
-        run: yarn detox build --configuration ios.debug | xcbeautify -qq
+        run: set -o pipefail && NSUnbufferedIO=YES  yarn detox build --configuration ios.debug 2>&1 | xcbeautify -qq
 
       - name: Test with detox
         run: |

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

@@ -20,6 +20,7 @@ import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
 import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLAndroidTextureMapViewManager;
+import com.mapbox.rctmgl.components.styles.atmosphere.RCTMGLAtmosphereManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLBackgroundLayerManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLCircleLayerManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillExtrusionLayerManager;
@@ -107,6 +108,7 @@ public class RCTMGLPackage implements ReactPackage {
         managers.add(new RCTMGLRasterLayerManager());
         managers.add(new RCTMGLSkyLayerManager());
         managers.add(new RCTMGLTerrainManager());
+        managers.add(new RCTMGLAtmosphereManager());
         managers.add(new RCTMGLBackgroundLayerManager());
 
         managers.add(new RCTMGLLightManager());

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

@@ -159,7 +159,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             override fun onStyleLoaded(style: Style) {
                 savedStyle = style
                 setUpImage(style)
-                addQueuedFeatures()
+                addQueuedFeaturesToMap()
                 setupLocalization(style)
             }
         })
@@ -305,26 +305,28 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mCameraChangeTracker.setReason(CameraChangeTracker.EMPTY)
     }
 
-    private fun removeAllSourcesFromMap() {
-        if (mSources.size == 0) {
-            return
-        }
-        for (key in mSources.keys) {
-            val source = mSources[key]
-            source?.removeFromMap(this)
-        }
+    private fun removeAllFeaturesFromMap() {
+        mFeatures.forEach { it -> it.removeFromMap(this) }
     }
 
-    private fun addAllSourcesToMap() {
-        if (mSources.size == 0) {
-            return
-        }
-        for (key in mSources.keys) {
-            val source = mSources[key]
-            source?.addToMap(this)
+    private fun addQueuedFeaturesToMap() {
+        mQueuedFeatures?.let { queuedFeatures ->
+            queuedFeatures.forEach {
+                it.addToMap(this)
+                mFeatures.add(it)
+            }
+            queuedFeatures.clear()
         }
     }
 
+    private fun addAllFeaturesToMap() {
+        mQueuedFeatures?.also {
+            this.addQueuedFeaturesToMap()
+        } ?: run {
+            mFeatures.forEach { it.addToMap(this) }
+        }
+    }
+    
     private val allTouchableSources: List<RCTSource<*>>
         private get() {
             val sources: MutableList<RCTSource<*>> = ArrayList()
@@ -380,19 +382,18 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 
     fun setReactStyleURL(styleURL: String) {
         if (mMap != null) {
-            removeAllSourcesFromMap()
+            removeAllFeaturesFromMap()
             if (isJSONValid(mStyleURL)) {
                 mMap.loadStyleJson(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
-                        addAllSourcesToMap()
+                        addAllFeaturesToMap()
                     }
                 })
             } else {
                 mMap.loadStyleUri(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
                         savedStyle = style
-                        addAllSourcesToMap()
-                        addQueuedFeatures()
+                        addAllFeaturesToMap()
                     }
                 },
                         object : OnMapLoadErrorListener {
@@ -606,17 +607,6 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return GeoJSONUtils.toPointFeature(latLng, properties)
     }
 
-    fun addQueuedFeatures() {
-        if (mQueuedFeatures != null && mQueuedFeatures!!.size > 0) {
-            for (i in mQueuedFeatures!!.indices) {
-                val feature = mQueuedFeatures!![i]
-                feature.addToMap(this)
-                mFeatures.add(feature)
-            }
-            mQueuedFeatures = null
-        }
-    }
-
     private fun setupLocalization(style: Style) {
         /*
         mLocalizationPlugin = new LocalizationPlugin(RCTMGLMapView.this, mMap, style);

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

@@ -17,6 +17,7 @@ import com.mapbox.maps.extension.style.layers.generated.SymbolLayer;
 import com.mapbox.maps.extension.style.layers.generated.HeatmapLayer;
 import com.mapbox.maps.extension.style.layers.generated.HillshadeLayer;
 import com.mapbox.maps.extension.style.atmosphere.generated.Atmosphere;
+import com.mapbox.maps.extension.style.terrain.generated.Terrain;
 // import com.mapbox.maps.extension.style.layers.properties.generated.Visibility;
 import com.mapbox.maps.extension.style.layers.properties.generated.*;
 import com.mapbox.maps.extension.style.types.StyleTransition;
@@ -886,6 +887,23 @@ public class RCTMGLStyleFactory {
         }
       }
     }
+    public static void setTerrainLayerStyle(final Terrain layer, RCTMGLStyle style) {
+      List<String> styleKeys = style.getAllStyleKeys();
+
+      if (styleKeys.size() == 0) {
+        return;
+      }
+
+      for (String styleKey : styleKeys) {
+        final RCTMGLStyleValue styleValue = style.getStyleValueForKey(styleKey);
+
+        switch (styleKey) {
+            case "exaggeration":
+              RCTMGLStyleFactory.setExaggeration(layer, styleValue);
+              break;
+        }
+      }
+    }
 
     public static void setFillSortKey(FillLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
@@ -2635,4 +2653,12 @@ public class RCTMGLStyleFactory {
       }
     }
 
+    public static void setExaggeration(Terrain layer, RCTMGLStyleValue styleValue) {
+      if (styleValue.isExpression()) {
+        layer.exaggeration(styleValue.getExpression());
+      } else {
+          layer.exaggeration(styleValue.getFloat(VALUE_KEY));
+      }
+    }
+
 }

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

@@ -0,0 +1,59 @@
+package com.mapbox.rctmgl.components.styles.atmosphere
+
+import android.content.Context
+import com.facebook.react.bridge.ReadableMap
+import com.mapbox.maps.MapboxMap
+import com.mapbox.maps.extension.style.atmosphere.generated.Atmosphere
+import com.mapbox.maps.extension.style.terrain.generated.Terrain
+import com.mapbox.maps.extension.style.terrain.generated.removeTerrain
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.mapbox.rctmgl.components.styles.RCTMGLStyle
+import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
+import com.mapbox.rctmgl.utils.Logger
+
+class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
+    override var iD: String? = null
+    protected var mAtmosphere: Atmosphere? = null
+
+    // beginregion RCTLayer
+    @JvmField
+    protected var mMap: MapboxMap? = null
+
+    @JvmField
+    protected var mReactStyle: ReadableMap? = null
+
+    fun setReactStyle(reactStyle: ReadableMap?) {
+        mReactStyle = reactStyle
+        if (mAtmosphere != null) {
+            addStyles()
+        }
+    }
+    // endregion RCTLayer
+
+    override fun addToMap(mapView: RCTMGLMapView) {
+        mMap = mapView.getMapboxMap()
+        val atmosphere = makeAtmosphere()
+        mAtmosphere = atmosphere
+        addStyles()
+        mapView.savedStyle?.let { atmosphere.bindTo(it) }
+    }
+
+    override fun removeFromMap(mapView: RCTMGLMapView) {
+        mapView.savedStyle?.let { it.removeTerrain() }
+        mMap = null
+    }
+
+    fun makeAtmosphere(): Atmosphere {
+        return Atmosphere()
+    }
+
+    fun addStyles() {
+        RCTMGLStyleFactory.setAtmosphereLayerStyle(
+            mAtmosphere, RCTMGLStyle(
+                context, mReactStyle!!,
+                mMap!!
+            )
+        )
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.mapbox.rctmgl.components.styles.atmosphere
+
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+
+class RCTMGLAtmosphereManager : ViewGroupManager<RCTMGLAtmosphere>() {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLAtmosphere {
+        return RCTMGLAtmosphere(reactContext)
+    }
+
+    @ReactProp(name = "id")
+    fun setId(layer: RCTMGLAtmosphere, id: String?) {
+        layer.iD = id
+    }
+
+    @ReactProp(name = "reactStyle")
+    fun setReactStyle(atmosphere: RCTMGLAtmosphere, reactStyle: ReadableMap?) {
+        atmosphere.setReactStyle(reactStyle)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RCTMGLAtmosphere"
+    }
+}

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

@@ -1,58 +1,63 @@
 package com.mapbox.rctmgl.components.styles.terrain
 
 import android.content.Context
-import com.facebook.react.bridge.Dynamic
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
+import com.facebook.react.bridge.ReadableMap
+import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.extension.style.terrain.generated.Terrain
+import com.mapbox.maps.extension.style.terrain.generated.removeTerrain
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.facebook.react.bridge.ReadableType
-import com.mapbox.rctmgl.utils.ExpressionParser
+import com.mapbox.rctmgl.components.styles.RCTMGLStyle
+import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
 import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     override var iD: String? = null
     protected var mSourceID: String? = null
-    protected var mExaggeration: Dynamic? = null
     protected var mTerrain: Terrain? = null
 
+    // beginregion RCTLayer
+    @JvmField
+    protected var mMap: MapboxMap? = null
+
+    @JvmField
+    protected var mReactStyle: ReadableMap? = null
+
+    fun setReactStyle(reactStyle: ReadableMap?) {
+        mReactStyle = reactStyle
+        if (mTerrain != null) {
+            addStyles()
+        }
+    }
+    // endregion RCTLayer
+
     fun setSourceID(sourceID: String?) {
         mSourceID = sourceID
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        mMap = mapView.getMapboxMap()
         val terrain = makeTerrain()
-        addStyles(terrain)
         mTerrain = terrain
-        mapView.savedStyle?.let { mTerrain!!.bindTo(it) }
+        addStyles()
+        mapView.savedStyle?.let { terrain.bindTo(it) }
     }
 
     override fun removeFromMap(mapView: RCTMGLMapView) {
-        val emptyTerrain = Terrain("no-such-source-empty")
-        mapView.savedStyle?.let { emptyTerrain.bindTo(it) }
+        mapView.savedStyle?.let { it.removeTerrain() }
+        mMap = null
     }
 
     fun makeTerrain(): Terrain {
         return Terrain(mSourceID!!)
     }
 
-    fun setExaggeration(exaggeration: Dynamic?) {
-        mExaggeration = exaggeration
-    }
-
-    fun addStyles(terrain: Terrain) {
-        when (mExaggeration!!.type) {
-            ReadableType.Number -> terrain.exaggeration(mExaggeration!!.asDouble())
-            ReadableType.Array -> terrain.exaggeration(
-                    ExpressionParser.from(mExaggeration!!.asArray())!!
-            )
-            else -> Logger.e(
-                    "RCTMGLTerrain",
-                    "Unexpected type passed to exaggeration:$mExaggeration"
+    fun addStyles() {
+        RCTMGLStyleFactory.setTerrainLayerStyle(
+            mTerrain, RCTMGLStyle(
+                context, mReactStyle!!,
+                mMap!!
             )
-        }
-    }
-
-    fun setSourceLayerID(sourceLayerID: String?) {
-        Logger.e("RCTMGLSkyLayer", "Source layer should not be set for source layer id")
+        )
     }
 }

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

@@ -1,14 +1,8 @@
 package com.mapbox.rctmgl.components.styles.terrain
 
-import com.facebook.react.bridge.Dynamic
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
-import com.mapbox.maps.extension.style.terrain.generated.Terrain
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.facebook.react.bridge.ReadableType
-import com.facebook.react.uimanager.ViewGroupManager
-import com.mapbox.rctmgl.components.styles.terrain.RCTMGLTerrain
-import com.mapbox.rctmgl.components.styles.terrain.RCTMGLTerrainManager
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 
 class RCTMGLTerrainManager : ViewGroupManager<RCTMGLTerrain>() {
@@ -30,9 +24,9 @@ class RCTMGLTerrainManager : ViewGroupManager<RCTMGLTerrain>() {
         layer.setSourceID(sourceID)
     }
 
-    @ReactProp(name = "exaggeration")
-    fun setExaggeration(layer: RCTMGLTerrain, exaggeration: Dynamic?) {
-        layer.setExaggeration(exaggeration)
+    @ReactProp(name = "reactStyle")
+    fun setReactStyle(terrain: RCTMGLTerrain, reactStyle: ReadableMap?) {
+        terrain.setReactStyle(reactStyle)
     }
 
     companion object {

package/docs/Annotations.md

@@ -5,11 +5,12 @@ Comparsion of various annotations available in React native mapbox:
 | *Feature*              | *SymbolLayer*      | *PointAnnotation*                                                                                                                     |*MarkerView*             |*CircleLayer*        |
 |------------------------|--------------------|---------------------------------------------------------------------------------------------------------------------------------------|-------------------------|---------------------|
 | Can use images         | ✓            |                                                                                                                                       |                         |                     |
-| RN Views as children   | iOS: static        | iOS: interactive <br/> Android: static                                                                                                |interactive              |                     |
-| Interactions           | click              | iOS: full <br/> Android: click & drag & callout                                                                                       | supports full interactivity in the sense that inside MarkerViews one can place any RN View, which can be interacted with. Not to be misunderstood with drag n drop interactivity.                     | click          |
-| Control Z-index        | &check;            | iOS: always on top, Android: n/a                                                                                                      |always on top            | &check;             |
+| RN Views as children   | iOS: static        | static in v10, *was interactive on iOS before v10*                                                                                               |interactive              |                     |
+| Interactions           | click              | click & drag & callout                                                                                       | supports full interactivity in the sense that inside MarkerViews one can place any RN View, which can be interacted with. Not to be misunderstood with drag n drop interactivity.                     | click          |
+| Control Z-index        | &check;            | n/a                                                                                                      |always on top            | &check;             |
 | Clustering             | &check;            |                                                                                                                                       |                         | &check;             |
 | Style with expressions | &check;            |                                                                                                                                       |                         | &check;             |
+| v10 implementation     | [SymbolLayer](https://docs.mapbox.com/ios/maps/api/10.8.1/Structs/SymbolLayer.html)     | [PointAnnotation](https://docs.mapbox.com/ios/maps/api/10.8.1/Classes/PointAnnotationManager.html)                                        |[ViewAnnotations](https://docs.mapbox.com/ios/maps/api/10.8.1/Classes/ViewAnnotationManager.html)      |[CircleLayer](https://docs.mapbox.com/ios/maps/api/10.8.1/Structs/CircleLayer.html)       |
 | iOS implementation     | [MGLStyleSymbolLayer](https://docs.mapbox.com/ios/api/maps/5.8.0/Classes/MGLSymbolStyleLayer.html)     | [MGLAnnotationView](https://docs.mapbox.com/ios/api/maps/5.8.0/Classes/MGLAnnotationView.html)                                        |[MGLAnnotationView](https://docs.mapbox.com/ios/api/maps/5.8.0/Classes/MGLAnnotationView.html)       |[MGLCircleStyleLayer](https://docs.mapbox.com/ios/api/maps/5.8.0/Classes/MGLCircleStyleLayer.html)       |
 | Android implementation | [SymbolLayer](https://docs.mapbox.com/android/api/map-sdk/9.0.0/com/mapbox/mapboxsdk/style/layers/SymbolLayer.html)| [annotation.Symbol](https://docs.mapbox.com/android/api/plugins/annotation/0.8.0/com/mapbox/mapboxsdk/plugins/annotation/Symbol.html) |[annotation.Marker](https://docs.mapbox.com/android/api/plugins/markerview/0.4.0/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.html) |[CircleLayer](https://docs.mapbox.com/android/api/map-sdk/9.0.0/com/mapbox/mapboxsdk/style/layers/CircleLayer.html)|
 

package/docs/Camera.md

@@ -60,7 +60,7 @@ return (
 |   animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
 | allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
 | triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
-| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
+| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |
 
 ## methods
 ### setCamera()

package/docs/MapView.md

@@ -33,8 +33,8 @@ MapView backed by Mapbox Native GL
 | onRegionWillChange | `func` | `none` | `false` | <v10 only<br/><br/>This event is triggered whenever the currently displayed map region is about to change. |
 | onRegionIsChanging | `func` | `none` | `false` | This event is triggered whenever the currently displayed map region is changing. |
 | onRegionDidChange | `func` | `none` | `false` | This event is triggered whenever the currently displayed map region finished changing. |
-| onCameraChanged | `func` | `none` | `false` | iOS, v10 only, experimental.<br/><br/>Called when the currently displayed map area changes.<br/>Replaces onRegionIsChanging, so can't set both |
-| onMapIdle | `func` | `none` | `false` | iOS, v10 only, experimental<br/><br/>Called when the currently displayed map area stops changing.<br/>Replaces onRegionDidChange, so can't set both |
+| onCameraChanged | `func` | `none` | `false` | iOS, v10 only, deprecated will be removed in next version - please use onRegionIsChanging. |
+| onMapIdle | `func` | `none` | `false` | iOS, v10 only, deprecated will be removed in next version - please use onRegionDidChange |
 | onWillStartLoadingMap | `func` | `none` | `false` | This event is triggered when the map is about to start loading a new map style. |
 | onDidFinishLoadingMap | `func` | `none` | `false` | This is triggered when the map has successfully loaded a new map style. |
 | onDidFailLoadingMap | `func` | `none` | `false` | This event is triggered when the map has failed to load a new map style. |

package/docs/Terrain.md

@@ -1,22 +1,77 @@
-<!-- This file was autogenerated from Terrain.js do not modify -->
+<!-- This file was autogenerated from Terrain.tsx do not modify -->
 # <MapboxGL.Terrain />
-A global modifier that elevates layers and markers based on a DEM data source.
+
 
 ## props
 | Prop | Type | Default | Required | Description |
 | ---- | :-- | :----- | :------ | :---------- |
-| sourceID | `string` | `MapboxGL.StyleSource.DefaultSourceID` | `false` | Name of a source of raster_dem type to be used for terrain elevation. |
-| exaggeration | `union` | `none` | `false` | Optional number between 0 and 1000 inclusive. Defaults to 1. Supports interpolateexpressions. Transitionable.<br/>Exaggerates the elevation of the terrain by multiplying the data from the DEM with this value. |
+| sourceID | `string` | `none` | `true` | Name of a source of raster_dem type to be used for terrain elevation. |
+| exaggeration | `Value` | `none` | `false` | Deprecated, use exaggeration in style instead |
+| style | `TerrainLayerStyleProps` | `none` | `true` | Customizable style attributes |
+
+
+## styles
+
+* <a href="#source">source</a><br/>
+* <a href="#exaggeration">exaggeration</a><br/>
+
+___
+
+### source
+Name: `source`
+
+### Description
+Name of a source of `raster_dem` type to be used for terrain elevation.
+
+### Type
+`string`
+
+
+
+___
+
+### exaggeration
+Name: `exaggeration`
+
+### Description
+Exaggerates the elevation of the terrain by multiplying the data from the DEM with this value.
+
+### Type
+`number`
+### Default Value
+`1`
+
+### Minimum
+`0`
+
+
+### Maximum
+`1000`
+
+### Requires
+`source`
+
+### Expression
+
+Parameters: `zoom`
+___
+
+### Name
+
+`exaggerationTransition`
 
-## methods
-### baseProps()
+### Description
 
+The transition affecting any changes to this layer’s exaggeration property.
 
+### Type
 
-#### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
+`{ duration, delay }`
 
+### Units
+`milliseconds`
 
+### Default Value
+`{duration: 300, delay: 0}`
 
 

package/docs/docs.json

@@ -696,9 +696,12 @@
       {
         "name": "onUserTrackingModeChange",
         "required": false,
-        "type": "UserTrackingModeChangeCallback",
+        "type": {
+          "name": "func",
+          "funcSignature": "(event:MapboxGLEvent) => void"
+        },
         "default": "none",
-        "description": "Executes when user tracking mode changes."
+        "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
       }
     ],
     "fileNameWithExt": "Camera.tsx",
@@ -3055,34 +3058,14 @@
         "required": false,
         "type": "func",
         "default": "none",
-        "description": "iOS, v10 only, experimental.\n\nCalled when the currently displayed map area changes.\nReplaces onRegionIsChanging, so can't set both",
-        "params": [
-          {
-            "name": "region",
-            "description": "A payload containing the map center, bounds, and other properties.",
-            "type": {
-              "name": "MapState"
-            },
-            "optional": false
-          }
-        ]
+        "description": "iOS, v10 only, deprecated will be removed in next version - please use onRegionIsChanging."
       },
       {
         "name": "onMapIdle",
         "required": false,
         "type": "func",
         "default": "none",
-        "description": "iOS, v10 only, experimental\n\nCalled when the currently displayed map area stops changing.\nReplaces onRegionDidChange, so can't set both",
-        "params": [
-          {
-            "name": "region",
-            "description": "A payload containing the map center, bounds, and other properties.",
-            "type": {
-              "name": "MapState"
-            },
-            "optional": false
-          }
-        ]
+        "description": "iOS, v10 only, deprecated will be removed in next version - please use onRegionDidChange"
       },
       {
         "name": "onWillStartLoadingMap",
@@ -5795,40 +5778,66 @@
     ]
   },
   "Terrain": {
-    "description": "A global modifier that elevates layers and markers based on a DEM data source.",
+    "description": "",
     "displayName": "Terrain",
-    "methods": [
-      {
-        "name": "baseProps",
-        "docblock": null,
-        "modifiers": [
-          "get"
-        ],
-        "params": [],
-        "returns": null
-      }
-    ],
+    "methods": [],
     "props": [
       {
         "name": "sourceID",
-        "required": false,
+        "required": true,
         "type": "string",
-        "default": "MapboxGL.StyleSource.DefaultSourceID",
+        "default": "none",
         "description": "Name of a source of raster_dem type to be used for terrain elevation."
       },
       {
         "name": "exaggeration",
         "required": false,
-        "type": "union",
+        "type": "Value",
+        "default": "none",
+        "description": "Deprecated, use exaggeration in style instead"
+      },
+      {
+        "name": "style",
+        "required": true,
+        "type": "TerrainLayerStyleProps",
         "default": "none",
-        "description": "Optional number between 0 and 1000 inclusive. Defaults to 1. Supports interpolateexpressions. Transitionable.\nExaggerates the elevation of the terrain by multiplying the data from the DEM with this value."
+        "description": "Customizable style attributes"
       }
     ],
-    "composes": [
-      "../utils"
-    ],
-    "fileNameWithExt": "Terrain.js",
-    "name": "Terrain"
+    "fileNameWithExt": "Terrain.tsx",
+    "name": "Terrain",
+    "styles": [
+      {
+        "name": "source",
+        "type": "string",
+        "values": [],
+        "description": "Name of a source of `raster_dem` type to be used for terrain elevation.",
+        "requires": [],
+        "disabledBy": [],
+        "allowedFunctionTypes": []
+      },
+      {
+        "name": "exaggeration",
+        "type": "number",
+        "values": [],
+        "minimum": 0,
+        "maximum": 1000,
+        "default": 1,
+        "description": "Exaggerates the elevation of the terrain by multiplying the data from the DEM with this value.",
+        "requires": [
+          "source"
+        ],
+        "disabledBy": [],
+        "allowedFunctionTypes": [],
+        "expression": {
+          "interpolated": true,
+          "parameters": [
+            "zoom"
+          ]
+        },
+        "transition": true
+      }
+    ]
   },
   "UserLocation": {
     "description": "",