@rnmapbox/maps 10.0.0-beta.77 → 10.0.0-beta.79

package/android/rctmgl/build.gradle

@@ -1,4 +1,5 @@
 def defaultMapboxMapsImpl = "maplibre"
+def defaultMapboxMapsVersion = "10.11.2"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -8,6 +9,10 @@ def safeExtGet(prop, fallback) {
 if (rootProject.ext.has('expoRNMapboxMapsImpl')) {
     rootProject.ext.set('RNMapboxMapsImpl', rootProject.ext.get('expoRNMapboxMapsImpl'))
 }
+if (rootProject.ext.has('expoRNMapboxMapsVersion')) {
+    rootProject.ext.set('RNMapboxMapsVersion', rootProject.ext.get('expoRNMapboxMapsVersion'))
+}
+
 
 buildscript {
   repositories {
@@ -28,6 +33,7 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 
 android {
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
+        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/maplibre']
@@ -35,6 +41,7 @@ android {
         }
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
+        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/mapbox']
@@ -130,7 +137,7 @@ dependencies {
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation 'com.mapbox.maps:android:10.11.1'
+            implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.10.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
         }

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

@@ -4,6 +4,13 @@ import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
+enum class RemovalReason {
+    VIEW_REMOVAL,
+    STYLE_CHANGE,
+    ON_DESTROY,
+    REORDER
+}
+
 abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
     protected var mMapView: RCTMGLMapView? = null;
     private var mWithMapViewCallbacks: Array<((RCTMGLMapView) -> Unit)>? = null;
@@ -14,8 +21,10 @@ abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
         mWithMapViewCallbacks = null;
     }
 
-    open fun removeFromMap(mapView: RCTMGLMapView) {
+    // return false if you don not want to remove this feature based on reason
+    open fun removeFromMap(mapView: RCTMGLMapView,reason: RemovalReason) : Boolean {
         mMapView = null;
+        return true;
     }
 
     internal fun withMapView(callback: (mapView: RCTMGLMapView) -> Unit) {

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

@@ -12,6 +12,7 @@ import com.mapbox.maps.ViewAnnotationAnchor
 import com.mapbox.maps.ViewAnnotationOptions
 import com.mapbox.maps.viewannotation.viewAnnotationOptions
 import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.utils.Logger
 import java.util.Vector
@@ -77,9 +78,10 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
         add()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {
-        super.removeFromMap(mapView)
+    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+        super.removeFromMap(mapView, reason)
         remove(mapView)
+        return true
     }
 
     // endregion

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

@@ -19,6 +19,7 @@ import android.view.View
 import com.mapbox.geojson.Point
 import com.mapbox.maps.ScreenCoordinate
 import com.mapbox.maps.Style
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.events.PointAnnotationDragEvent
 import com.mapbox.rctmgl.utils.BitmapUtils
 import com.mapbox.rctmgl.utils.LatLng
@@ -90,8 +91,8 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {
-        val map = (if (mMapView != null) mMapView else mapView) ?: return
+    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+        val map = (if (mMapView != null) mMapView else mapView) ?: return true
         if (marker != null) {
             map.pointAnnotationManager?.delete(marker!!)
         }
@@ -101,7 +102,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         if (calloutView != null) {
             map.offscreenAnnotationViewContainer?.removeView(calloutView)
         }
-        super.removeFromMap(mapView)
+        return super.removeFromMap(mapView, reason)
     }
 
     override fun onLayoutChange(v: View, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int,

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

@@ -55,9 +55,7 @@ class CameraUpdateQueue {
 
     fun execute(map: RCTMGLMapView?) {
         if (mQueue.isEmpty()) {
-            if (mCompleteListener != null) {
-                mCompleteListener!!.onCompleteAll()
-            }
+            mCompleteListener?.let { it.onCompleteAll() }
             return
         }
         val stop = mQueue.poll() ?: return

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

@@ -25,6 +25,7 @@ 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.viewport
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import com.mapbox.rctmgl.components.location.*
 import com.mapbox.rctmgl.events.MapUserTrackingModeEvent
@@ -39,7 +40,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     private var hasSentFirstRegion = false
     private var mDefaultStop: CameraStop? = null
     private var mCameraStop: CameraStop? = null
-    private val mCameraUpdateQueue: CameraUpdateQueue
+    private val mCameraUpdateQueue = CameraUpdateQueue()
 
     /*
     // private LocationComponent mLocationComponent;
@@ -66,17 +67,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     private var mMaxBounds: LatLngBounds? = null
 
 
-    private val mLocationBearingChangedListener = OnIndicatorBearingChangedListener { v ->
-        if (mFollowUserLocation) {
-            mMapView!!.getMapboxMap().setCamera(CameraOptions.Builder().bearing(v).build())
-        }
-    }
-    private val mLocationPositionChangeListener = OnIndicatorPositionChangedListener { point ->
-        if (mFollowUserLocation) {
-            mMapView!!.getMapboxMap().setCamera(CameraOptions.Builder().center(point).build())
-            mMapView!!.gestures.focalPoint = mMapView!!.getMapboxMap().pixelForCoordinate(point)
-        }
-    }
     private val mCameraCallback: Animator.AnimatorListener = object : Animator.AnimatorListener {
         override fun onAnimationStart(animator: Animator) {}
         override fun onAnimationEnd(animator: Animator) {
@@ -88,7 +78,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
 
         override fun onAnimationCancel(animator: Animator) {
             if (!hasSentFirstRegion) {
-                mMapView!!.sendRegionChangeEvent(false)
+                mMapView?.sendRegionChangeEvent(false)
                 hasSentFirstRegion = true
             }
         }
@@ -105,14 +95,18 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         _updateViewportState()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {
-        super.removeFromMap(mapView)
+    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason) : Boolean {
+        if (reason == RemovalReason.STYLE_CHANGE) {
+            return false
+        } else {
+            return super.removeFromMap(mapView, reason);
+        }
     }
     fun setStop(stop: CameraStop) {
         mCameraStop = stop
-        mCameraStop!!.setCallback(mCameraCallback)
+        stop.setCallback(mCameraCallback)
         if (mMapView != null) {
-            mCameraStop?.let { updateCamera(it) }
+            stop.let { updateCamera(it) }
         }
     }
 
@@ -181,11 +175,13 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     }
 
     private fun setInitialCamera() {
-        val map = mMapView!!.getMapboxMap()
-        if (mDefaultStop != null) {
-            mDefaultStop!!.setDuration(0)
-            mDefaultStop!!.setMode(CameraMode.NONE)
-            val item = mDefaultStop!!.toCameraUpdate(mMapView!!)
+        mDefaultStop?.let {
+            val mapView = mMapView!!
+            val map = mapView.getMapboxMap()
+
+            it.setDuration(0)
+            it.setMode(CameraMode.NONE)
+            val item = it.toCameraUpdate(mapView)
             item.run()
         }
     }
@@ -221,7 +217,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     }
 
     init {
-        mCameraUpdateQueue = CameraUpdateQueue()
         mLocationManager = getInstance(mContext)
     }
 

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

@@ -15,6 +15,7 @@ import com.mapbox.maps.ImageStretches
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.rctmgl.R
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.images.RCTMGLImages
 import com.mapbox.rctmgl.events.ImageMissingEvent
@@ -92,13 +93,13 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         mSendMissingImageEvents = value
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {
+    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
         removeImages(mapView)
         mMap = null
         mNativeImages = mutableMapOf()
         mImages = HashMap()
         mCurrentImages = HashSet()
-        super.removeFromMap(mapView)
+        return super.removeFromMap(mapView, reason)
     }
 
     private fun removeImages(mapView: RCTMGLMapView) {

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

@@ -10,6 +10,7 @@ import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
 enum class RenderMode {
@@ -31,11 +32,11 @@ class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context),
         applyChanges()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {
+    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
         mEnabled = false
         mMapView?.locationComponentManager?.showNativeUserLocation(false)
         mMap?.getStyle(this)
-        super.removeFromMap(mapView)
+        return super.removeFromMap(mapView, reason)
     }
 
     @SuppressLint("MissingPermission")

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

@@ -21,6 +21,7 @@ import com.mapbox.geojson.Feature
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
 import com.mapbox.maps.*
+import com.mapbox.maps.extension.localization.localizeLabels
 import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
@@ -46,6 +47,7 @@ import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
 import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerView
 import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager
 import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation
@@ -64,10 +66,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
+import com.mapbox.rctmgl.utils.*
 import com.mapbox.rctmgl.utils.extensions.toReadableArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -142,6 +141,10 @@ class RCTMGLLifeCycle {
     }
 }
 
+data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var addedToMap: Boolean = false) {
+
+}
+
 open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager /*, MapboxMapOptions options*/) : MapView(mContext), OnMapClickListener, OnMapLongClickListener {
     /**
      * `PointAnnotations` are rendered to a canvas, but the React Native `Image` component is
@@ -156,19 +159,23 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private var mPointAnnotationManager: PointAnnotationManager? = null
     private var mActiveMarkerID: Long = -1
     private var mProjection: ProjectionName = ProjectionName.MERCATOR
+    private var mLocaleString: String? = null
+    private var mLocaleLayerIds: List<String>? = null
     private var mStyleURL: String? = null
     val isDestroyed = false
     private var mCamera: RCTMGLCamera? = null
-    private val mFeatures: MutableList<AbstractMapFeature> = ArrayList()
+    private val mFeatures = mutableListOf<FeatureEntry>()
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
     private val mPointAnnotations: MutableMap<String, RCTMGLPointAnnotation>
     private val mCameraChangeTracker = CameraChangeTracker()
     private val mMap: MapboxMap?
 
-    // v10todo, style gets null if we add anyhing
     var savedStyle: Style? = null
         private set
-    private val mHandledMapChangedEvents: HashSet<String>? = null
+
+    private var styleLoaded = false
+
+    private var mHandledMapChangedEvents: HashSet<String>? = null
     private var mAnnotationClicked = false
     private var mAnnotationDragged = false
     private var mLocationComponentManager: LocationComponentManager? = null
@@ -238,23 +245,31 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             return mPointAnnotationManager
         }
 
+    private fun styleLoaded(style: Style) {
+        savedStyle = style
+        styleLoaded = true
+        setUpImage(style)
+        addFeaturesToMap()
+        applyLocalizeLabels()
+        style.setProjection(Projection(mProjection))
+    }
+
     private fun onMapReady(map: MapboxMap) {
         map.getStyle(object : Style.OnStyleLoaded {
             override fun onStyleLoaded(style: Style) {
-                savedStyle = style
-                setUpImage(style)
-                addQueuedFeaturesToMap()
-                setupLocalization(style)
+                styleLoaded(style)
             }
         })
         val _this = this
 
         map.addOnCameraChangeListener(OnCameraChangeListener { cameraChangedEventData ->
             handleMapChangedEvent(EventTypes.REGION_IS_CHANGING)
+            handleMapChangedEvent(EventTypes.CAMERA_CHANGED)
         })
 
         map.addOnMapIdleListener(OnMapIdleListener { mapIdleEventData ->
             sendRegionDidChangeEvent()
+            handleMapChangedEvent(EventTypes.MAP_IDLE);
         })
 
         val gesturesPlugin: GesturesPlugin = this.gestures
@@ -325,7 +340,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mMap.getStyle(onStyleLoaded)
     }
 
-    // region features
+    // region Features
     fun addFeature(childView: View?, childPosition: Int) {
         var feature: AbstractMapFeature? = null
         if (childView is RCTSource<*>) {
@@ -354,23 +369,26 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             feature = childView as AbstractMapFeature?
         } else if (childView is ViewGroup) {
             val children = childView
+            Logger.w(LOG_TAG, "Adding non map components as a child of a map is deprecated!")
             for (i in 0 until children.childCount) {
-                addFeature(children.getChildAt(i), childPosition)
+                addView(children.getChildAt(i), childPosition)
             }
         }
-        if (feature != null) {
-            if (mQueuedFeatures == null) {
-                feature.addToMap(this)
-                mFeatures.add(childPosition, feature)
-            } else {
-                mQueuedFeatures?.add(childPosition, feature)
-            }
+
+        val addToMap = styleLoaded
+
+
+        var entry = FeatureEntry(feature, childView, false)
+        if (addToMap) {
+            feature?.addToMap(this)
+            entry.addedToMap = true
         }
+        mFeatures.add(childPosition, entry);
     }
 
-    fun removeFeature(childPosition: Int) {
-        val feature = features()[childPosition]
-                ?: return
+    fun removeFeatureAt(childPosition: Int) {
+        val entry = mFeatures[childPosition]
+        val feature = entry.feature
         if (feature is RCTSource<*>) {
             mSources.remove(feature.iD)
         } else if (feature is RCTMGLPointAnnotation) {
@@ -382,67 +400,54 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         } else if (feature is RCTMGLImages) {
             mImages.remove(feature)
         }
-        feature.removeFromMap(this)
-        features().remove(feature)
-    }
-
-    private fun features(): MutableList<AbstractMapFeature> {
-        return if (mQueuedFeatures != null && mQueuedFeatures!!.size > 0) (
-            mQueuedFeatures!!
-        )
-         else {
-            mFeatures
+        if (entry.addedToMap) {
+            if (feature?.removeFromMap(this, RemovalReason.VIEW_REMOVAL) == true) {
+                entry.addedToMap = false
+            }
         }
+        mFeatures.removeAt(childPosition)
     }
 
     val featureCount: Int
-        get() = features().size
+        get() = mFeatures.size
 
-    fun getFeatureAt(i: Int): AbstractMapFeature {
-        return features()[i]
+    fun getFeatureAt(i: Int): View? {
+        return mFeatures[i].view
     }
 
-    fun removeAllFeatures() {
+    fun removeAllFeatureFromMap(reason: RemovalReason) {
         mFeatures.forEach {
-            it.removeFromMap(this)
-        }
-        mFeatures.clear()
-        val queuedFeatures = mQueuedFeatures
-        if (queuedFeatures != null) {
-            queuedFeatures.clear()
+            if (it.feature?.removeFromMap(this, reason) == true) {
+                it.addedToMap = false
+            }
         }
     }
     // endregion
 
     fun sendRegionChangeEvent(isAnimated: Boolean) {
-        val event: IEvent = MapChangeEvent(this, EventTypes.REGION_DID_CHANGE,
+        val didChangeEvent = MapChangeEvent(this, EventTypes.REGION_DID_CHANGE,
                 makeRegionPayload(isAnimated))
-        mManager.handleEvent(event)
+        mManager.handleEvent(didChangeEvent)
         mCameraChangeTracker.setReason(CameraChangeReason.NONE)
     }
 
-    private fun removeAllFeaturesFromMap() {
-        mFeatures.forEach { it -> it.removeFromMap(this) }
-    }
-
-    private fun addQueuedFeaturesToMap() {
-        mQueuedFeatures?.let { queuedFeatures ->
-            queuedFeatures.forEach {
-                it.addToMap(this)
-                mFeatures.add(it)
+    private fun removeAllFeaturesFromMap(reason: RemovalReason) {
+        mFeatures.forEach { it ->
+            if (it.feature?.removeFromMap(this, reason) == true) {
+                it.addedToMap = false
             }
-            queuedFeatures.clear()
         }
-        mQueuedFeatures = null;
     }
 
-    private fun addAllFeaturesToMap() {
-        mQueuedFeatures?.also {
-            this.addQueuedFeaturesToMap()
-        } ?: run {
-            mFeatures.forEach { it.addToMap(this) }
+    private fun addFeaturesToMap() {
+        mFeatures.forEach {
+            if (!it.addedToMap) {
+                it.feature?.addToMap(this)
+                it.addedToMap = true
+            }
         }
     }
+
     
     private val allTouchableSources: List<RCTSource<*>>
         private get() {
@@ -507,23 +512,37 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         }
     }
 
+    fun applyLocalizeLabels() {
+        val localeStr = mLocaleString
+        if (localeStr != null) {
+            val locale = if (localeStr == "current") Locale.getDefault() else Locale(localeStr)
+            savedStyle?.localizeLabels(locale, mLocaleLayerIds)
+        }
+    }
+    fun setReactLocalizeLabels(localeStr: String?, layerIds: List<String>?) {
+        if (localeStr != null) {
+            mLocaleString = localeStr
+            mLocaleLayerIds = layerIds
+        }
+        applyLocalizeLabels()
+    }
+
     fun setReactStyleURL(styleURL: String) {
         mStyleURL = styleURL
         if (mMap != null) {
-            removeAllFeaturesFromMap()
+            removeAllFeatureFromMap(RemovalReason.STYLE_CHANGE)
             if (isJSONValid(mStyleURL)) {
+                styleLoaded = false
                 mMap.loadStyleJson(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
-                        style.setProjection(Projection(mProjection))
-                        addAllFeaturesToMap()
+                        styleLoaded(style)
                     }
                 })
             } else {
+                styleLoaded = false
                 mMap.loadStyleUri(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
-                        savedStyle = style
-                        style.setProjection(Projection(mProjection))
-                        addAllFeaturesToMap()
+                        styleLoaded(style)
                     }
                 },
                         object : OnMapLoadErrorListener {
@@ -699,6 +718,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         waiters.add(callback)
     }
 
+    // region Events
+
     fun sendRegionDidChangeEvent() {
         handleMapChangedEvent(EventTypes.REGION_DID_CHANGE)
         mCameraChangeTracker.setReason(CameraChangeReason.NONE)
@@ -706,16 +727,52 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 
     private fun handleMapChangedEvent(eventType: String) {
         if (!canHandleEvent(eventType)) return
+
         val event: IEvent
         event = when (eventType) {
             EventTypes.REGION_WILL_CHANGE, EventTypes.REGION_DID_CHANGE, EventTypes.REGION_IS_CHANGING -> MapChangeEvent(this, eventType, makeRegionPayload(null))
+            EventTypes.CAMERA_CHANGED, EventTypes.MAP_IDLE -> MapChangeEvent(this, eventType, makeCameraPayload())
             else -> MapChangeEvent(this, eventType)
         }
         mManager.handleEvent(event)
     }
 
+    fun setHandledMapChangedEvents(events: Array<String>) {
+        mHandledMapChangedEvents = HashSet<String>(events.asList())
+    }
+
     private fun canHandleEvent(event: String): Boolean {
-        return mHandledMapChangedEvents == null || mHandledMapChangedEvents.contains(event)
+        val changedEvents = mHandledMapChangedEvents
+        return changedEvents == null || changedEvents.contains(event)
+    }
+
+    private fun makeCameraPayload(): WritableMap {
+        val position = mMap?.cameraState ?: return WritableNativeMap()
+        val properties = WritableNativeMap()
+        properties.putDouble("zoom", position.zoom)
+        properties.putDouble("heading", position.bearing)
+        properties.putDouble("pitch", position.pitch)
+        properties.putArray("center", position.center.toReadableArray())
+        try {
+            val bounds = mMap.coordinateBoundsForCamera(position.toCameraOptions())
+
+            val boundsMap = WritableNativeMap()
+            boundsMap.putArray("ne", bounds.northeast.toReadableArray())
+            boundsMap.putArray("sw", bounds.southwest.toReadableArray())
+            
+            properties.putMap("bounds", boundsMap)
+        } catch (ex: Exception) {
+            Logger.e(LOG_TAG, "An error occurred while attempting to make the region", ex)
+        }
+        val gestures = WritableNativeMap()
+        gestures.putBoolean("isGestureActive", mCameraChangeTracker.isUserInteraction)
+        // gestures.putBoolean("isAnimatingFromGesture", if (null == isAnimated) mCameraChangeTracker.isAnimated else isAnimated)
+
+        val state: WritableMap = WritableNativeMap()
+        state.putMap("properties", properties)
+        state.putMap("gestures", gestures)
+
+        return state
     }
 
     private fun makeRegionPayload(isAnimated: Boolean?): WritableMap {
@@ -737,18 +794,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return GeoJSONUtils.toPointFeature(latLng, properties)
     }
 
-    private fun setupLocalization(style: Style) {
-        /*
-        mLocalizationPlugin = new LocalizationPlugin(RCTMGLMapView.this, mMap, style);
-        if (mLocalizeLabels) {
-            try {
-                mLocalizationPlugin.matchMapLanguageWithDeviceDefault();
-            } catch (Exception e) {
-                final String localeString = Locale.getDefault().toString();
-                Logger.w(LOG_TAG, String.format("Could not find matching locale for %s", localeString));
-            }
-        }*/
-    }
+    // endregion
 
     /**
      * Adds the marker image to the map for use as a SymbolLayer icon
@@ -1245,7 +1291,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     override fun onDestroy() {
-        removeAllFeatures()
+        removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
         viewAnnotationManager.removeAllViewAnnotations()
         mLocationComponentManager?.onDestroy();
 
@@ -1254,7 +1300,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun onDropViewInstance() {
-        removeAllFeatures()
+        removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
         viewAnnotationManager.removeAllViewAnnotations()
         lifecycle.onDestroy()
     }
@@ -1264,6 +1310,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         super.onAttachedToWindow()
     }
 
+
     // endregion
 }