@rnmapbox/maps 10.0.0-rc.6 → 10.0.0-rc.8

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

@@ -38,7 +38,7 @@ abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: Rea
         mRateLimitedEvents[eventCacheKey] = System.currentTimeMillis()
         mEventDispatcher!!.dispatchEvent(
             AbstractEvent(
-                event.id,
+                event.iD,
                 event.key,
                 event.canCoalesce(),
                 event.toJSON()

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

@@ -24,6 +24,9 @@ import com.mapbox.maps.plugin.viewport.ViewportStatusObserver
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateOptions
 import com.mapbox.maps.plugin.viewport.data.ViewportStatusChangeReason
+import com.mapbox.maps.plugin.viewport.state.FollowPuckViewportState
+import com.mapbox.maps.plugin.viewport.state.OverviewViewportState
+import com.mapbox.maps.plugin.viewport.state.ViewportState
 import com.mapbox.maps.plugin.viewport.viewport
 import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
@@ -31,6 +34,7 @@ import com.mapbox.rctmgl.components.location.*
 import com.mapbox.rctmgl.events.MapUserTrackingModeEvent
 import com.mapbox.rctmgl.location.*
 import com.mapbox.rctmgl.utils.Logger
+import com.mapbox.rctmgl.utils.writableMapOf
 
 
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
@@ -91,7 +95,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         setInitialCamera()
         updateMaxBounds()
         mCameraStop?.let { updateCamera(it) }
-        _observeViewportState(mapView)
+        _observeViewportState(mapView.mapView)
         _updateViewportState()
     }
 
@@ -281,27 +285,105 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         }
     }
 
+    fun toFollowUserLocation(toStatus: ViewportStatus): Boolean {
+        when (toStatus) {
+            ViewportStatus.Idle -> return false
+            is ViewportStatus.State -> return true
+            is ViewportStatus.Transition -> return true
+        }
+    }
+
+    fun toFollowUserMode(state: ViewportState): String? {
+        if (state is FollowPuckViewportState) {
+            when (state.options.bearing) {
+                is FollowPuckViewportStateBearing.SyncWithLocationPuck ->
+                    return "normal"
+                is FollowPuckViewportStateBearing.Constant ->
+                    return "constant"
+                else -> {
+                    Logger.w(LOG_TAG, "Unexpected bearing: ${state.options.bearing}")
+                    return "normal"
+                }
+            }
+        } else if (state is OverviewViewportState) {
+            return "overview"
+        } else {
+            return "custom"
+        }
+    }
+
+    fun toFollowUserMode(status: ViewportStatus): String? {
+        when (status) {
+            ViewportStatus.Idle -> return null
+            is ViewportStatus.State ->
+                return toFollowUserMode(status)
+            is ViewportStatus.Transition ->
+                return toFollowUserMode(status.toState)
+        }
+    }
+
+    fun toReadableMap(status: ViewportStatus): ReadableMap {
+        when (status) {
+            ViewportStatus.Idle -> return writableMapOf("state" to "idle")
+            is ViewportStatus.State ->
+                return writableMapOf(
+                    "state" to status.toString()
+                )
+            is ViewportStatus.Transition ->
+                return writableMapOf(
+                    "transition" to status.toString()
+                )
+        }
+    }
+
     fun _observeViewportState(mapView: MapView) {
         mapView.viewport.addStatusObserver(object: ViewportStatusObserver {
             override fun onViewportStatusChanged(
-                from: ViewportStatus,
-                to: ViewportStatus,
+                fromStatus: ViewportStatus,
+                toStatus: ViewportStatus,
                 reason: ViewportStatusChangeReason
             ) {
-                if (to == ViewportStatus.Idle) {
-                    mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.NONE))
-                } else if (to is ViewportStatus.Transition) {
+                if (reason == ViewportStatusChangeReason.USER_INTERACTION) {
+                    val followUserLocation = toFollowUserLocation(toStatus)
+
 
-                } else if (to is ViewportStatus.State){
-                    //mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.FOLLOW))
+
+                    mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.NONE,
+                    writableMapOf(
+                        "followUserMode" to toFollowUserMode(toStatus),
+                        "followUserLocation" to followUserLocation,
+                        "fromViewportState" to toReadableMap(fromStatus),
+                        "toViewportState" to toReadableMap(toStatus),
+                        "reason" to toString(reason),
+                    )
+                    ))
                 }
             }
         })
     }
 
+    fun toString(reason: ViewportStatusChangeReason): String {
+        when (reason) {
+            ViewportStatusChangeReason.IDLE_REQUESTED ->
+                return "idleRequested"
+            ViewportStatusChangeReason.TRANSITION_FAILED ->
+                return "transitionFailed"
+            ViewportStatusChangeReason.TRANSITION_STARTED ->
+                return "transitionStarted"
+            ViewportStatusChangeReason.TRANSITION_SUCCEEDED ->
+                return "transitionSucceeded"
+            ViewportStatusChangeReason.USER_INTERACTION ->
+                return "userInteraction"
+            else -> {
+                Logger.w(LOG_TAG, "toString; unkown reason: ${reason}")
+                return "unkown: $reason"
+            }
+        }
+    }
+
     fun _updateViewportState() {
         mMapView?.let {
-            val map = it
+            val map = it.mapView
             val viewport = map.viewport;
 
             if (mLocationComponentManager == null) {
@@ -418,5 +500,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         const val USER_LOCATION_CAMERA_MOVE_DURATION = 1000
         const val minimumZoomLevelForUserTracking = 10.5
         const val defaultZoomLevelForUserTracking = 14.0
+        const val LOG_TAG = "RCTMGLCamera"
     }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/location/LocationComponentManager.kt

@@ -64,6 +64,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     }
 
     private fun applyStateChanges(map: RCTMGLMapView, oldState: State, newState: State, fullUpdate: Boolean) {
+        val mapView = map.mapView
         if (map.getLifecycleState() != Lifecycle.State.STARTED) {
             // In case lifecycle was already stopped, so we're part of shutdown, do not call updateSettings as it'll just restart
             // the loationComponent that will not be stopped. See https://github.com/mapbox/mapbox-maps-android/issues/2017
@@ -72,7 +73,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
             }
             return
         }
-        map.location.updateSettings {
+        mapView.location.updateSettings {
             enabled = newState.enabled
 
             if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
@@ -140,7 +141,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     }
 
     private fun useMapLocationProvider(mapView: RCTMGLMapView) {
-        val provider = mapView.location.getLocationProvider()
+        val provider = mapView.mapView.location.getLocationProvider()
         if (provider != null) {
             mLocationManager.provider = provider
         }

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

@@ -7,6 +7,7 @@ import android.graphics.RectF
 import android.util.Log
 import android.view.Gravity
 import android.view.View
+import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.lifecycle.Lifecycle
@@ -45,6 +46,7 @@ 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.plugin.scalebar.scalebar
+import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.rctmgl.components.RemovalReason
@@ -145,7 +147,7 @@ data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var a
 
 }
 
-open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager /*, MapboxMapOptions options*/) : MapView(mContext), OnMapClickListener, OnMapLongClickListener {
+open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager /*, MapboxMapOptions options*/) : FrameLayout(mContext), OnMapClickListener, OnMapLongClickListener, OnLayoutChangeListener {
     /**
      * `PointAnnotations` are rendered to a canvas, but the React Native `Image` component is
      * implemented on top of Fresco (https://frescolib.org), which does not load images for
@@ -170,6 +172,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private val mCameraChangeTracker = CameraChangeTracker()
     private val mMap: MapboxMap?
 
+    private val mMapView: MapView
+
     var savedStyle: Style? = null
         private set
 
@@ -183,17 +187,24 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         private set
 
     val mapView: MapView
-        get() = this
+        get() = this.mMapView
+
+    val viewAnnotationManager: ViewAnnotationManager
+        get() = mapView.viewAnnotationManager
+
+    fun getMapboxMap(): MapboxMap {
+        return mapView.getMapboxMap()
+    }
 
     val pointAnnotationManager: PointAnnotationManager?
         get() {
             if (mPointAnnotationManager == null) {
                 val _this = this
-                val gesturesPlugin: GesturesPlugin = this.gestures
+                val gesturesPlugin: GesturesPlugin = mapView.gestures
                 gesturesPlugin.removeOnMapClickListener(_this)
                 gesturesPlugin.removeOnMapLongClickListener(_this)
 
-                mPointAnnotationManager = annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
+                mPointAnnotationManager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
                 mPointAnnotationManager?.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
                         onMarkerClick(pointAnnotation)
                         false
@@ -272,7 +283,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             handleMapChangedEvent(EventTypes.MAP_IDLE);
         })
 
-        val gesturesPlugin: GesturesPlugin = this.gestures
+        val gesturesPlugin: GesturesPlugin = mapView.gestures
         gesturesPlugin.addOnMapLongClickListener(_this)
         gesturesPlugin.addOnMapClickListener(_this)
 
@@ -581,7 +592,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                     ScreenCoordinate(screenPoint.x + halfWidth,
                             screenPoint.y + halfHeight)
             )
-            getMapboxMap().queryRenderedFeatures(RenderedQueryGeometry(screenBox),
+            mapView.getMapboxMap().queryRenderedFeatures(RenderedQueryGeometry(screenBox),
                     RenderedQueryOptions(
                             source.layerIDs,
                             null
@@ -814,7 +825,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         }
 
     fun getMapAsync(mapReady: OnMapReadyCallback) {
-        mapReady.onMapReady(getMapboxMap())
+        mapReady.onMapReady(mapView.getMapboxMap())
     }
 
     //fun setTintColor(color: Int) {
@@ -938,7 +949,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun takeSnap(callbackID: String?, writeToDisk: Boolean) {
-        this.snapshot { snapshot ->
+        mapView.snapshot { snapshot ->
             if (snapshot == null) {
                 Logger.e("takeSnap", "snapshot failed")
 
@@ -1030,7 +1041,13 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         offscreenAnnotationViewContainer?.setLayoutParams(p)
         addView(offscreenAnnotationViewContainer)
 
-        mMap = getMapboxMap()
+        mMapView = MapView(mContext)
+
+        val matchParent = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        mMapView.setLayoutParams(matchParent)
+        addView(mMapView)
+
+        mMap = mapView.getMapboxMap()
         mSources = HashMap()
         mImages = ArrayList()
         mPointAnnotations = HashMap()
@@ -1050,7 +1067,9 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         })
 
-        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, this.viewAnnotationManager)
+        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, mapView.viewAnnotationManager)
+
+        this.addOnLayoutChangeListener(this)
     }
 
     // region Ornaments
@@ -1135,7 +1154,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateCompass() {
-        compass.updateSettings {
+        mapView.compass.updateSettings {
             fadeWhenFacingNorth = mCompassFadeWhenNorth
             updateOrnament("compass", mCompassSettings, this.toGenericOrnamentSettings())
         }
@@ -1180,8 +1199,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mapView.forceLayout();
 
         mapView.measure(
-            MeasureSpec.makeMeasureSpec(mapView.measuredWidth, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(mapView.measuredHeight, MeasureSpec.EXACTLY)
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
         );
         mapView.layout(mapView.left, mapView.top, mapView.right, mapView.bottom)
     }
@@ -1236,7 +1255,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateAttribution() {
-        attribution.updateSettings {
+        mapView.attribution.updateSettings {
             updateOrnament("attribution", mAttributionSettings, this.toGenericOrnamentSettings())
         }
         workaroundToRelayoutChildOfMapView()
@@ -1271,7 +1290,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateLogo() {
-        logo.updateSettings {
+        mapView.logo.updateSettings {
             updateOrnament("logo", mLogoSettings, this.toGenericOrnamentSettings())
         }
         workaroundToRelayoutChildOfMapView()
@@ -1290,18 +1309,21 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         super.onDetachedFromWindow();
     }
 
+    /* FMTODO
     override fun onDestroy() {
+        this.removeOnLayoutChangeListener(this)
         removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
-        viewAnnotationManager.removeAllViewAnnotations()
+        mapView.viewAnnotationManager.removeAllViewAnnotations()
         mLocationComponentManager?.onDestroy();
 
         lifecycle.onDestroy()
         super.onDestroy()
     }
+     */
 
     fun onDropViewInstance() {
         removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
-        viewAnnotationManager.removeAllViewAnnotations()
+        mapView.viewAnnotationManager.removeAllViewAnnotations()
         lifecycle.onDestroy()
     }
 
@@ -1310,6 +1332,26 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         super.onAttachedToWindow()
     }
 
+    override fun onLayoutChange(
+        v: View?,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int,
+        oldLeft: Int,
+        oldTop: Int,
+        oldRight: Int,
+        oldBottom: Int
+    ) {
+        mapView.post {
+            mapView.measure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            )
+            mapView.layout(mapView.left, mapView.top, mapView.right, mapView.bottom)
+        }
+    }
+
 
     // endregion
 }

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

@@ -117,24 +117,28 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     @ReactProp(name = "zoomEnabled")
-    fun setZoomEnabled(mapView: RCTMGLMapView, zoomEnabled: Boolean) {
+    fun setZoomEnabled(map: RCTMGLMapView, zoomEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.pinchToZoomEnabled = zoomEnabled
         mapView.gestures.doubleTouchToZoomOutEnabled = zoomEnabled
         mapView.gestures.doubleTapToZoomInEnabled = zoomEnabled
     }
 
     @ReactProp(name = "scrollEnabled")
-    fun setScrollEnabled(mapView: RCTMGLMapView, scrollEnabled: Boolean) {
+    fun setScrollEnabled(map: RCTMGLMapView, scrollEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.scrollEnabled = scrollEnabled
     }
 
     @ReactProp(name = "pitchEnabled")
-    fun setPitchEnabled(mapView: RCTMGLMapView, pitchEnabled: Boolean) {
+    fun setPitchEnabled(map: RCTMGLMapView, pitchEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.pitchEnabled = pitchEnabled
     }
 
     @ReactProp(name = "rotateEnabled")
-    fun setRotateEnabled(mapView: RCTMGLMapView, rotateEnabled: Boolean) {
+    fun setRotateEnabled(map: RCTMGLMapView, rotateEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.rotateEnabled = rotateEnabled
     }
 

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/AbstractEvent.kt

@@ -0,0 +1,49 @@
+package com.mapbox.rctmgl.events
+
+import android.view.View
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+
+abstract class AbstractEvent(view: View?, private val mEventType: String) : IEvent {
+    private var mTagID = 0
+    private val mTimestamp: Long
+
+    constructor(eventType: String) : this(null, eventType) {}
+
+    init {
+        if (view != null) {
+            mTagID = view.id
+        }
+        mTimestamp = System.currentTimeMillis()
+    }
+
+    override val iD
+        get() = mTagID
+
+    override val type
+        get() = mEventType
+
+    override fun equals(event: IEvent): Boolean {
+        return key == event.key && mEventType == event.type
+    }
+
+    override val payload
+        get() = Arguments.createMap()
+
+    override val timestamp
+        get() = mTimestamp
+
+    override fun toJSON(): WritableMap {
+        val map = Arguments.createMap()
+        map.putString("type", type)
+        val payloadClone = Arguments.createMap()
+        payloadClone.merge(payload)
+        map.putMap("payload", payloadClone)
+        return map
+    }
+
+    override fun canCoalesce(): Boolean {
+        // default behavior of com.facebook.react.uimanager.events.Event
+        return true
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/IEvent.kt

@@ -0,0 +1,17 @@
+package com.mapbox.rctmgl.events
+
+import com.facebook.react.bridge.WritableMap
+
+/**
+ * Created by nickitaliano on 8/23/17.
+ */
+interface IEvent {
+    val iD: Int
+    val key: String?
+    val type: String?
+    val timestamp: Long
+    fun equals(event: IEvent): Boolean
+    fun canCoalesce(): Boolean
+    val payload: WritableMap
+    fun toJSON(): WritableMap
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/LocationEvent.kt

@@ -3,10 +3,8 @@ package com.mapbox.rctmgl.events
 import android.location.Location
 import com.facebook.react.bridge.Arguments
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.events.IEvent
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.mapbox.rctmgl.events.constants.EventTypes
-import com.mapbox.rctmgl.events.LocationEvent
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import java.util.*
@@ -20,21 +18,17 @@ class LocationEvent(private val location: Location, private val mapView: RCTMGLM
 
     constructor(location: Location) : this(location, null) {}
 
-    override fun getID(): Int {
-        return mapView?.id ?: -1
-    }
+    override val iD
+        get() =  mapView?.id ?: -1
 
-    override fun getKey(): String {
-        return EventKeys.USER_LOCATION_UPDATE
-    }
+    override val key
+        get() = EventKeys.USER_LOCATION_UPDATE
 
-    override fun getType(): String {
-        return EventTypes.USER_LOCATION_UPDATED
-    }
+    override val type
+        get() = EventTypes.USER_LOCATION_UPDATED
 
-    override fun getTimestamp(): Long {
-        return System.currentTimeMillis()
-    }
+    override val timestamp
+        get() =  System.currentTimeMillis()
 
     override fun equals(event: IEvent): Boolean {
         val other = event as LocationEvent
@@ -45,14 +39,15 @@ class LocationEvent(private val location: Location, private val mapView: RCTMGLM
         return uUID == event.uUID
     }
 
-    override fun getPayload(): WritableMap {
+    override val payload: WritableMap
+    get() {
         val positionProperties: WritableMap = WritableNativeMap()
         val coords: WritableMap = WritableNativeMap()
         coords.putDouble("longitude", location.longitude)
         coords.putDouble("latitude", location.latitude)
         coords.putDouble("altitude", location.altitude)
         coords.putDouble("accuracy", location.accuracy.toDouble())
-        // A better solution will be to pull the heading from the compass engine, 
+        // A better solution will be to pull the heading from the compass engine,
         // unfortunately the api is not publicly available in the mapbox sdk
         coords.putDouble("heading", location.bearing.toDouble())
         coords.putDouble("course", location.bearing.toDouble())

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/MapUserTrackingModeEvent.kt

@@ -7,15 +7,15 @@ import com.mapbox.rctmgl.components.location.UserTrackingMode
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.mapbox.rctmgl.events.constants.EventTypes
 
-class MapUserTrackingModeEvent(view: View?, val userTrackingMode: Int) : AbstractEvent(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE) {
-    override fun getKey(): String {
-        return EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
-    }
+class MapUserTrackingModeEvent(view: View?, val userTrackingMode: Int, val basePayload: WritableMap? = null) : AbstractEvent(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE) {
+    override val key
+        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
 
-    override fun getPayload(): WritableMap {
-        val payload = Arguments.createMap()
-        payload.putBoolean("followUserLocation", userTrackingMode != UserTrackingMode.NONE)
-        payload.putString("followUserMode", UserTrackingMode.toString(userTrackingMode))
-        return payload
-    }
+    override val payload : WritableMap
+        get() = {
+            val payload = basePayload?.copy() ?: Arguments.createMap()
+            payload.putBoolean("followUserLocation", userTrackingMode != UserTrackingMode.NONE)
+            payload.putString("followUserMode", UserTrackingMode.toString(userTrackingMode))
+            payload
+        }.invoke()
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/constants/EventTypes.kt

@@ -0,0 +1,44 @@
+package com.mapbox.rctmgl.events.constants
+
+object EventTypes {
+    // map event types
+    const val MAP_CLICK = "press"
+    const val MAP_LONG_CLICK = "longpress"
+    const val MAP_USER_TRACKING_MODE_CHANGE = "usertrackingmodechange"
+    const val REGION_WILL_CHANGE = "regionwillchange"
+    const val REGION_IS_CHANGING = "regionischanging" // deprecated
+    const val CAMERA_CHANGED = "camerachanged"
+    const val REGION_DID_CHANGE = "regiondidchange"
+    const val MAP_IDLE = "mapidle"
+    const val USER_LOCATION_UPDATED = "userlocationdupdated"
+    const val WILL_START_LOADING_MAP = "willstartloadingmap"
+    const val DID_FINISH_LOADING_MAP = "didfinishloadingmap"
+    const val DID_FAIL_LOADING_MAP = "didfailloadingmap"
+    const val WILL_START_RENDERING_FRAME = "willstartrenderingframe"
+    const val DID_FINISH_RENDERING_FRAME = "didfinishrenderingframe"
+    const val DID_FINISH_RENDERING_FRAME_FULLY = "didfinishrenderingframefully"
+    const val WILL_START_RENDERING_MAP = "willstartrenderingmap"
+    const val DID_FINISH_RENDERING_MAP = "didfinishrenderingmap"
+    const val DID_FINISH_RENDERING_MAP_FULLY = "didfinishrenderingmapfully"
+    const val DID_FINISH_LOADING_STYLE = "didfinishloadingstyle"
+
+    // point annotation event types
+    const val ANNOTATION_SELECTED = "annotationselected"
+    const val ANNOTATION_DESELECTED = "annotationdeselected"
+    const val ANNOTATION_DRAG_START = "annotationdragstart"
+    const val ANNOTATION_DRAG = "annotationdrag"
+    const val ANNOTATION_DRAG_END = "annotationdragend"
+
+    // offline event types
+    const val OFFLINE_ERROR = "offlineerror"
+    const val OFFLINE_TILE_LIMIT = "offlinetilelimit"
+    const val OFFLINE_STATUS = "offlinestatus"
+
+    // shape source event types
+    const val SHAPE_SOURCE_LAYER_CLICK = "shapesourcelayerpress"
+    const val VECTOR_SOURCE_LAYER_CLICK = "vectorsourcelayerpress"
+    const val RASTER_SOURCE_LAYER_CLICK = "rastersourcelayerpress"
+
+    // image missing event type
+    const val IMAGES_MISSING = "imagesmissing"
+}

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

@@ -12,6 +12,9 @@ import com.mapbox.rctmgl.events.EventEmitter
 import com.mapbox.rctmgl.location.LocationManager.Companion.getInstance
 import java.lang.Exception
 
+data class LocationEventThrottle(var waitBetweenEvents: Double? = null, var lastSentTimestamp: Long? = null) {
+}
+
 @ReactModule(name = RCTMGLLocationModule.REACT_CLASS)
 class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -19,6 +22,7 @@ class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
     private var mMinDisplacement = 0f
     private val locationManager: LocationManager? = getInstance(reactContext)
     private var mLastLocation: Location? = null
+    private var locationEventThrottle: LocationEventThrottle = LocationEventThrottle()
 
     private val lifecycleEventListener: LifecycleEventListener = object : LifecycleEventListener {
         override fun onHostResume() {
@@ -52,7 +56,7 @@ class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
                 }
             }
             mLastLocation = location
-            if (changed && (location != null)) {
+            if (changed && (location != null) && shouldSendLocationEvent()) {
                 val locationEvent = LocationEvent(location)
                 val emitter = EventEmitter.getModuleEmitter(reactApplicationContext)
                 emitter?.emit(LOCATION_UPDATE, locationEvent.payload)
@@ -145,6 +149,37 @@ class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
         mLastLocation = null
     }
 
+    // region Location event throttle
+    @ReactMethod
+    fun setLocationEventThrottle(throttleValue: Double) {
+        if (throttleValue > 0) {
+            locationEventThrottle.waitBetweenEvents = throttleValue;
+        } else {
+            locationEventThrottle.waitBetweenEvents = null
+        }
+    }
+
+    fun shouldSendLocationEvent(): Boolean {
+        val waitBetweenEvents = locationEventThrottle.waitBetweenEvents
+        if (waitBetweenEvents == null) {
+            return true
+        }
+
+        val currentTimestamp = System.nanoTime()
+        val lastSentTimestamp = locationEventThrottle.lastSentTimestamp
+        if (lastSentTimestamp == null) {
+            return true
+        }
+
+        if ((currentTimestamp - lastSentTimestamp) > 1000.0*waitBetweenEvents) {
+            return true
+        }
+
+        return false
+    }
+    // endregion
+
+
     companion object {
         const val REACT_CLASS = "RCTMGLLocationModule"
         const val LOCATION_UPDATE = "MapboxUserLocationUpdate"

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -571,7 +571,7 @@ extension RCTMGLCamera : ViewportStatusObserver {
     if reason == .idleRequested {
       return "idleRequested"
     } else if reason == .transitionFailed {
-      return "transitionFailied"
+      return "transitionFailed"
     } else if reason == .transitionStarted {
       return "transitionStarted"
     } else if reason == .transitionSucceeded {

package/ios/RCTMGL-v10/RCTMGLLocationModule.m

@@ -12,9 +12,9 @@ RCT_EXTERN_METHOD(getLastKnownLocation)
 RCT_EXTERN_METHOD(setMinDisplacement:(CLLocationDistance)minDisplacement)
 RCT_EXTERN_METHOD(setRequestsAlwaysUse:(BOOL)requestsAlwaysUse)
 
-RCT_EXTERN_METHOD(setLocationEventThrottle:(NSNumber *)throttleValue)
+RCT_EXTERN_METHOD(setLocationEventThrottle:(nonnull NSNumber *)throttleValue)
 
-RCT_EXTERN_METHOD(simulateHeading:(nonnull NSNumber)changesPerSecond increment:(nonnull NSNumber))
+RCT_EXTERN_METHOD(simulateHeading:(nonnull NSNumber*)changesPerSecond increment:(nonnull NSNumber*))
 
 
 @end

package/ios/install.md

@@ -39,6 +39,13 @@ cd ios
 pod install
 ```
 
+If you want to show the user's current location on the map with the [UserLocation](../docs/UserLocation.md) component, you'll need to add the following property to your `Info.plist` (see [Mapbox iOS docs](https://docs.mapbox.com/ios/maps/guides/user-location/#request-temporary-access-to-full-accuracy-location) for more info):
+
+```
+<key>NSLocationWhenInUseUsageDescription</key>
+<string>Show current location on map.</string>
+```
+
 You are good to go!
 
 Read on if you want to edit your Mapbox version or flavor.

package/lib/commonjs/components/Terrain.js

@@ -16,7 +16,7 @@ const Terrain = /*#__PURE__*/(0, _react.memo)(props => {
     style = {}
   } = props;
   if (props.exaggeration) {
-    console.warn(`Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
+    console.warn(`Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
     style = {
       exaggeration: props.exaggeration,
       ...style

package/lib/module/components/Terrain.js

@@ -7,7 +7,7 @@ export const Terrain = /*#__PURE__*/memo(props => {
     style = {}
   } = props;
   if (props.exaggeration) {
-    console.warn(`Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
+    console.warn(`Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
     style = {
       exaggeration: props.exaggeration,
       ...style

package/package.json

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

package/plugin/install.md

@@ -50,6 +50,23 @@ For `mapbox` or `mapbox-gl` you'll need to provide `RNMapboxMapsDownloadToken` a
 }
 ```
 
+If you want to show the user's current location on the map with the [UserLocation](../docs/UserLocation.md) component, you can use the [expo-location](https://docs.expo.dev/versions/latest/sdk/location/) plugin to configure the required `NSLocationWhenInUseUsageDescription` property. Install the plugin with `npx expo install expo-location` and add its config plugin to the plugins array of your `app.{json,config.js,config.ts}`:
+
+```json
+{
+  "expo": {
+    "plugins": [
+      [
+        "expo-location",
+        {
+          "locationWhenInUsePermission": "Show current location on map."
+        }
+      ]
+    ]
+  }
+}
+```
+
 Next, rebuild your app as described in the ["Adding custom native code"](https://docs.expo.io/workflow/customizing/) guide.
 
 ### Advanced Configuration

package/src/components/Terrain.tsx

@@ -33,7 +33,7 @@ export const Terrain = memo((props: Props) => {
 
   if (props.exaggeration) {
     console.warn(
-      `Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
+      `Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
     );
     style = { exaggeration: props.exaggeration, ...style };
   }

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

@@ -1,62 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-abstract public class AbstractEvent implements IEvent {
-    private int mTagID;
-    private String mEventType;
-    private long mTimestamp;
-
-    public AbstractEvent(String eventType) {
-        this(null, eventType);
-    }
-
-    public AbstractEvent(View view, String eventType) {
-        mEventType = eventType;
-
-        if (view != null) {
-            mTagID = view.getId();
-        }
-
-        mTimestamp = System.currentTimeMillis();
-    }
-
-    public int getID() {
-        return mTagID;
-    }
-
-    public String getType() {
-        return mEventType;
-    }
-
-    public boolean equals(IEvent event) {
-        return getKey().equals(event.getKey()) && mEventType.equals(event.getType());
-    }
-
-    public WritableMap getPayload() {
-        return Arguments.createMap();
-    }
-
-    public long getTimestamp() {
-        return mTimestamp;
-    }
-
-    public WritableMap toJSON() {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", getType());
-
-        WritableMap payloadClone = Arguments.createMap();
-        payloadClone.merge(getPayload());
-        map.putMap("payload", payloadClone);
-        return map;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        // default behavior of com.facebook.react.uimanager.events.Event
-        return true;
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-public interface IEvent {
-    int getID();
-    String getKey();
-    String getType();
-    long getTimestamp();
-    boolean equals(IEvent event);
-    boolean canCoalesce();
-    WritableMap getPayload();
-    WritableMap toJSON();
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/constants/EventTypes.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.events.constants;
-
-public class EventTypes {
-    // map event types
-    public static final String MAP_CLICK = "press";
-    public static final String MAP_LONG_CLICK = "longpress";
-    public static final String MAP_USER_TRACKING_MODE_CHANGE = "usertrackingmodechange";
-
-    public static final String REGION_WILL_CHANGE = "regionwillchange";
-    public static final String REGION_IS_CHANGING = "regionischanging"; // deprecated
-    public static final String CAMERA_CHANGED = "camerachanged";
-    public static final String REGION_DID_CHANGE  = "regiondidchange";
-    public static final String MAP_IDLE = "mapidle";
-    public static final String USER_LOCATION_UPDATED = "userlocationdupdated";
-
-
-
-    public static final String WILL_START_LOADING_MAP = "willstartloadingmap";
-    public static final String DID_FINISH_LOADING_MAP = "didfinishloadingmap";
-    public static final String DID_FAIL_LOADING_MAP = "didfailloadingmap";
-
-    public static final String WILL_START_RENDERING_FRAME = "willstartrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME = "didfinishrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME_FULLY = "didfinishrenderingframefully";
-
-    public static final String WILL_START_RENDERING_MAP = "willstartrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP = "didfinishrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP_FULLY = "didfinishrenderingmapfully";
-
-    public static final String DID_FINISH_LOADING_STYLE = "didfinishloadingstyle";
-
-    // point annotation event types
-    public static final String ANNOTATION_SELECTED = "annotationselected";
-    public static final String ANNOTATION_DESELECTED = "annotationdeselected";
-    public static final String ANNOTATION_DRAG_START = "annotationdragstart";
-    public static final String ANNOTATION_DRAG = "annotationdrag";
-    public static final String ANNOTATION_DRAG_END = "annotationdragend";
-
-    // offline event types
-    public static final String OFFLINE_ERROR = "offlineerror";
-    public static final String OFFLINE_TILE_LIMIT = "offlinetilelimit";
-    public static final String OFFLINE_STATUS = "offlinestatus";
-
-    // shape source event types
-    public static final String SHAPE_SOURCE_LAYER_CLICK = "shapesourcelayerpress";
-    public static final String VECTOR_SOURCE_LAYER_CLICK = "vectorsourcelayerpress";
-    public static final String RASTER_SOURCE_LAYER_CLICK = "rastersourcelayerpress";
-
-    // image missing event type
-    public static final String IMAGES_MISSING = "imagesmissing";
-}