@rnmapbox/maps 10.1.0-beta.13 → 10.1.0-beta.15

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -63,7 +63,7 @@ import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeReason
 import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeTracker
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLayer
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLight
-import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
 import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrain
 import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.rnmapbox.rnmbx.events.IEvent
@@ -86,6 +86,19 @@ import com.rnmapbox.rnmbx.v11compat.feature.*
 import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
 import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
 
+fun <T> MutableList<T>.removeIf21(predicate: (T) -> Boolean): Boolean {
+    var removed = false
+    val iterator = this.iterator()
+    while (iterator.hasNext()) {
+        val element = iterator.next()
+        if (predicate(element)) {
+            iterator.remove()
+            removed = true
+        }
+    }
+    return removed
+}
+
 data class OrnamentSettings(
     var enabled : Boolean? = false,
     var margins: ReadableMap? =null,
@@ -166,7 +179,7 @@ class RNMBXLifeCycle {
         } else {
             attachedToWindowWaiters.add(callback)
             return com.rnmapbox.rnmbx.components.mapview.Cancelable {
-                attachedToWindowWaiters.removeIf { it === callback }
+                attachedToWindowWaiters.removeIf21 { it === callback }
             }
         }
     }
@@ -190,7 +203,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
      */
     public var offscreenAnnotationViewContainer: ViewGroup? = null
 
-    private val mSources: MutableMap<String, RCTSource<*>>
+    private val mSources: MutableMap<String, RNMBXSource<*>>
     private val mImages: MutableList<RNMBXImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
     private var mActiveMarkerID: AnnotationID = INVALID_ANNOTATION_ID
@@ -204,9 +217,11 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
     private val mPointAnnotations: MutableMap<String, RNMBXPointAnnotation>
     private val mCameraChangeTracker = CameraChangeTracker()
-    private val mMap: MapboxMap?
+    private lateinit var mMap: MapboxMap
 
-    private val mMapView: MapView
+    private lateinit var mMapView: MapView
+    val isInitialized: Boolean
+        get() = this::mMapView.isInitialized
 
     var savedStyle: Style? = null
         private set
@@ -309,13 +324,13 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         savedStyle = style
         styleLoaded = true
         setUpImage(style)
-        addFeaturesToMap()
+        addFeaturesToMap(true)
         applyLocalizeLabels()
         style.setProjection(Projection(mProjection))
     }
 
-    private fun setupEvents() {
-       mMap?.addOnRenderFrameFinishedListener(
+    private fun setupEvents(map: MapboxMap) {
+       map.addOnRenderFrameFinishedListener(
            object: OnRenderFrameFinishedListener {
                override fun onRenderFrameFinished(eventData: RenderFrameFinishedEventData) {
                    handleMapChangedEvent(EventTypes.DID_FINISH_RENDERING_FRAME_FULLY)
@@ -444,7 +459,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     // region Features
     fun addFeature(childView: View?, childPosition: Int) {
         var feature: AbstractMapFeature? = null
-        if (childView is RCTSource<*>) {
+        if (childView is RNMBXSource<*>) {
             val source = childView
             mSources[source.iD.toString()] = source
             feature = childView as AbstractMapFeature?
@@ -472,10 +487,10 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             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) {
-                addView(children.getChildAt(i), childPosition)
-            }
+            Logger.w(LOG_TAG, "Adding non map components:${children.javaClass.name} as a child of a map is deprecated!")
+            //for (i in 0 until children.childCount) {
+            //    addView(children.getChildAt(i), childPosition)
+            //}
         }
 
         val addToMap = styleLoaded || (feature?.requiresStyleLoad == false)
@@ -491,7 +506,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     fun removeFeatureAt(childPosition: Int) {
         val entry = mFeatures[childPosition]
         val feature = entry.feature
-        if (feature is RCTSource<*>) {
+        if (feature is RNMBXSource<*>) {
             mSources.remove(feature.iD)
         } else if (feature is RNMBXPointAnnotation) {
             val annotation = feature
@@ -553,9 +568,9 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
 
-    private val allTouchableSources: List<RCTSource<*>>
+    private val allTouchableSources: List<RNMBXSource<*>>
         private get() {
-            val sources: MutableList<RCTSource<*>> = ArrayList()
+            val sources: MutableList<RNMBXSource<*>> = ArrayList()
             for (key in mSources.keys) {
                 val source = mSources[key]
                 if (source != null && source.hasPressListener()) {
@@ -565,14 +580,14 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             return sources
         }
 
-    private fun getTouchableSourceWithHighestZIndex(sources: List<RCTSource<*>>?): RCTSource<*>? {
+    private fun getTouchableSourceWithHighestZIndex(sources: List<RNMBXSource<*>>?): RNMBXSource<*>? {
         if (sources == null || sources.size == 0) {
             return null
         }
         if (sources.size == 1) {
             return sources[0]
         }
-        val layerToSourceMap: MutableMap<String, RCTSource<*>> = HashMap()
+        val layerToSourceMap: MutableMap<String, RNMBXSource<*>> = HashMap()
         for (source in sources) {
             val layerIDs: Array<out String>? = source.layerIDs.toTypedArray()
             if (layerIDs != null) {
@@ -606,13 +621,60 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         return true
     }
 
+    // region properties
+    var surfaceView: Boolean? = null
+
+    enum class Property(val _apply: (RNMBXMapView) -> Unit) : PropertyUpdaterWithName<RNMBXMapView> {
+        PROJECTION(RNMBXMapView::applyProjection),
+        LOCALIZE_LABELS(RNMBXMapView::applyLocalizeLabels),
+        STYLE_URL(RNMBXMapView::applyStyleURL),
+        ATTRIBUTION(RNMBXMapView::applyAttribution),
+        LOGO(RNMBXMapView::applyLogo),
+        SCALEBAR(RNMBXMapView::applyScaleBar),
+        COMPASS(RNMBXMapView::applyCompass),;
+
+        override fun apply(mapView: RNMBXMapView) {
+           _apply(mapView)
+        }
+    }
+
+    val changes = PropertyChanges<RNMBXMapView>();
+
+    var withMapWaiters = mutableListOf<(map: MapView)->Unit>();
+    fun withMap(callback: (map: MapboxMap) -> Unit) {
+        if (! this::mMap.isInitialized) {
+            withMapWaiters.add { it -> callback(it.getMapboxMap()) }
+        } else {
+            callback(mMap)
+        }
+    }
+    fun withMapView(callback: (map: MapView) -> Unit) {
+        if (! this::mMapView.isInitialized) {
+            withMapWaiters.add(callback)
+        } else {
+            callback(mMapView)
+        }
+    }
+    fun applyAllChanges() {
+        if (! this::mMapView.isInitialized) {
+            createMapView()
+            withMapWaiters.forEach { it(mMapView) }
+            withMapWaiters.clear()
+        }
+        changes.apply(this)
+    }
+
+
     fun setReactProjection(projection: ProjectionName) {
         if (projection != null) {
             mProjection = projection
         }
+        changes.add(Property.PROJECTION)
+    }
 
+    fun applyProjection() {
         if (mMap != null) {
-            mMap.getStyle()?.setProjection(Projection(projection))
+            mMap.getStyle()?.setProjection(Projection(mProjection))
         }
     }
 
@@ -629,14 +691,18 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             mLocaleString = localeStr
             mLocaleLayerIds = layerIds
         }
-        applyLocalizeLabels()
+        changes.add(Property.LOCALIZE_LABELS)
     }
 
     fun setReactStyleURL(styleURL: String) {
         mStyleURL = styleURL
-        if (mMap != null) {
+        changes.add(Property.STYLE_URL)
+    }
+    fun applyStyleURL() {
+        val styleURL = mStyleURL
+        if (mMap != null && styleURL != null) {
             removeAllFeatureFromMap(RemovalReason.STYLE_CHANGE)
-            if (isJSONValid(mStyleURL)) {
+            if (isJSONValid(styleURL)) {
                 styleLoaded = false
                 mMap.loadStyleJson(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
@@ -650,25 +716,26 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
                         styleLoaded(style)
                     }
                 },
-                        object : OnMapLoadErrorListener {
-                            override fun onMapLoadError(mapLoadingErrorEventData: MapLoadingErrorEventData) {
-                                Logger.w("MapLoadError", mapLoadingErrorEventData.message)
-                            }
+                    object : OnMapLoadErrorListener {
+                        override fun onMapLoadError(mapLoadingErrorEventData: MapLoadingErrorEventData) {
+                            Logger.w("MapLoadError", mapLoadingErrorEventData.message)
                         }
+                    }
                 )
                 addFeaturesToMap(false)
             }
         }
     }
+    //endregion
 
     interface HandleTap {
-        fun run(hitTouchableSources: List<RCTSource<*>?>?, hits: Map<String?, List<Feature?>?>)
+        fun run(hitTouchableSources: List<RNMBXSource<*>?>?, hits: Map<String?, List<Feature?>?>)
     }
 
     fun handleTapInSources(
-            sources: LinkedList<RCTSource<*>>, screenPoint: ScreenCoordinate,
+            sources: LinkedList<RNMBXSource<*>>, screenPoint: ScreenCoordinate,
             hits: HashMap<String?, List<Feature?>?>,
-            hitTouchableSources: ArrayList<RCTSource<*>?>,
+            hitTouchableSources: ArrayList<RNMBXSource<*>?>,
             handleTap: HandleTap
     ) {
         if (sources.isEmpty()) {
@@ -723,11 +790,11 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         val hits = HashMap<String?, List<Feature?>?>()
         if (screenPoint != null) {
             handleTapInSources(LinkedList(touchableSources), screenPoint, hits, ArrayList(), object : HandleTap {
-                override fun run(hitTouchableSources: List<RCTSource<*>?>?, hits: Map<String?, List<Feature?>?>) {
+                override fun run(hitTouchableSources: List<RNMBXSource<*>?>?, hits: Map<String?, List<Feature?>?>) {
                     if (hits.size > 0) {
-                        val source = getTouchableSourceWithHighestZIndex(hitTouchableSources as List<RCTSource<*>>?)
+                        val source = getTouchableSourceWithHighestZIndex(hitTouchableSources as List<RNMBXSource<*>>?)
                         if (source != null && source.hasPressListener() && source.iD != null && source.iD in hits) {
-                            source.onPress(RCTSource.OnPressEvent(
+                            source.onPress(RNMBXSource.OnPressEvent(
                                     hits[source.iD] as List<Feature>,
                                     GeoJSONUtils.toLatLng(point),
                                     PointF(screenPoint.x.toFloat(), screenPoint.y.toFloat())
@@ -934,7 +1001,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     //    }
     //}
 
-    // region Callbacks
+    // region Methods
 
     fun getCenter(response: CommandResponse) {
         var center = mMap!!.cameraState!!.center
@@ -1141,51 +1208,61 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             }
         }
     }
-
     // endregion
 
     companion object {
         const val LOG_TAG = "RNMBXMapView"
     }
 
-    init {
-        offscreenAnnotationViewContainer = FrameLayout(getContext())
-        val p = FrameLayout.LayoutParams(0, 0)
-        p.setMargins(-10000, -10000, -10000, -10000)
-        offscreenAnnotationViewContainer?.setLayoutParams(p)
-        addView(offscreenAnnotationViewContainer)
-
-        mMapView = if (options != null) MapView(mContext, options) else MapView(mContext)
+    fun createMapView() : MapView {
+        var options: MapInitOptions? = null
+        if (surfaceView == false) {
+            options = MapInitOptions(context= mContext, textureView= true)
+        }
+        val mapView = if (options != null) MapView(mContext, options) else MapView(mContext)
+        mMapView = mapView
 
         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()
+        mapView.setLayoutParams(matchParent)
+        addView(mapView)
+        this.addOnLayoutChangeListener(this)
 
-        onMapReady(mMap)
+        val map = mapView.getMapboxMap()
+        mMap = map
 
         val _this = this
-        mMap.addOnMapLoadedListener(OnMapLoadedListener { (begin, end) -> _this.handleMapChangedEvent(EventTypes.DID_FINISH_LOADING_MAP) })
-        mMap.addOnStyleLoadedListener(OnStyleLoadedListener { (begin, end) -> _this.handleMapChangedEvent(EventTypes.DID_FINISH_LOADING_STYLE) })
-        mMap.addOnStyleImageMissingListener(OnStyleImageMissingListener { (begin, end, id) ->
+
+        onMapReady(map)
+
+        map.addOnMapLoadedListener(OnMapLoadedListener { (begin, end) -> _this.handleMapChangedEvent(EventTypes.DID_FINISH_LOADING_MAP) })
+        map.addOnStyleLoadedListener(OnStyleLoadedListener { (begin, end) -> _this.handleMapChangedEvent(EventTypes.DID_FINISH_LOADING_STYLE) })
+        map.addOnStyleImageMissingListener(OnStyleImageMissingListener { (begin, end, id) ->
             for (images in mImages) {
-                if (images.addMissingImageToStyle(id, mMap)) {
+                if (images.addMissingImageToStyle(id, map)) {
                     return@OnStyleImageMissingListener
                 }
             }
             for (images in mImages) {
-                images.sendImageMissingEvent(id, mMap)
+                images.sendImageMissingEvent(id, map)
             }
         })
 
         RNMBXMarkerViewManager.markerViewContainerSizeFixer(this, mapView.viewAnnotationManager)
 
-        this.addOnLayoutChangeListener(this)
-        this.setupEvents()
+        this.setupEvents(map)
+        return mapView
+    }
+
+    init {
+        offscreenAnnotationViewContainer = FrameLayout(getContext())
+        val p = FrameLayout.LayoutParams(0, 0)
+        p.setMargins(-10000, -10000, -10000, -10000)
+        offscreenAnnotationViewContainer?.setLayoutParams(p)
+        addView(offscreenAnnotationViewContainer)
+
+        mSources = HashMap()
+        mImages = ArrayList()
+        mPointAnnotations = HashMap()
     }
 
     // region Ornaments
@@ -1246,30 +1323,30 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     fun setReactCompassEnabled(compassEnabled: Boolean) {
         mCompassSettings.enabled = compassEnabled
-        updateCompass()
+        changes.add(Property.COMPASS)
     }
 
     fun setReactCompassFadeWhenNorth(compassFadeWhenNorth: Boolean) {
         mCompassFadeWhenNorth = compassFadeWhenNorth
-        updateCompass()
+        changes.add(Property.COMPASS)
     }
 
     fun setReactCompassViewMargins(compassViewMargins: ReadableMap) {
         mCompassSettings.margins = compassViewMargins
-        updateCompass()
+        changes.add(Property.COMPASS)
     }
 
     fun setReactCompassViewPosition(compassViewPosition: Int) {
         mCompassSettings.position = compassViewPosition
-        updateCompass()
+        changes.add(Property.COMPASS)
     }
 
     fun setReactCompassPosition(compassPosition: ReadableMap) {
         mCompassSettings.setPosAndMargins(compassPosition)
-        updateCompass()
+        changes.add(Property.COMPASS)
     }
 
-    private fun updateCompass() {
+    private fun applyCompass() {
         mapView.compass.updateSettings {
             fadeWhenFacingNorth = mCompassFadeWhenNorth
             updateOrnament("compass", mCompassSettings, this.toGenericOrnamentSettings())
@@ -1281,25 +1358,25 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     fun setReactScaleBarEnabled(scaleBarEnabled: Boolean) {
         mScaleBarSettings.enabled = scaleBarEnabled
-        updateScaleBar()
+        changes.add(Property.SCALEBAR)
     }
 
     fun setReactScaleBarViewMargins(scaleBarMargins: ReadableMap) {
         mScaleBarSettings.margins = scaleBarMargins
-        updateScaleBar()
+        changes.add(Property.SCALEBAR)
     }
 
     fun setReactScaleBarViewPosition(scaleBarPosition: Int) {
         mScaleBarSettings.position = scaleBarPosition
-        updateScaleBar()
+        changes.add(Property.SCALEBAR)
     }
 
     fun setReactScaleBarPosition(scaleBarPosition: ReadableMap) {
         mScaleBarSettings.setPosAndMargins(scaleBarPosition)
-        updateScaleBar()
+        changes.add(Property.SCALEBAR)
     }
 
-    private fun updateScaleBar() {
+    private fun applyScaleBar() {
         mapView.scalebar.updateSettings {
             updateOrnament("scaleBar", mScaleBarSettings, this.toGenericOrnamentSettings())
         }
@@ -1352,25 +1429,25 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     fun setReactAttributionEnabled(attributionEnabled: Boolean?) {
         mAttributionSettings.enabled = attributionEnabled
-        updateAttribution()
+        changes.add(Property.ATTRIBUTION)
     }
 
     fun setReactAttributionViewMargins(margins: ReadableMap) {
         mAttributionSettings.margins = margins
-        updateAttribution()
+        changes.add(Property.ATTRIBUTION)
     }
 
     fun setReactAttributionViewPosition(position: Int) {
         mAttributionSettings.position = position
-        updateAttribution()
+        changes.add(Property.ATTRIBUTION)
     }
 
     fun setReactAttributionPosition(position: ReadableMap?) {
         mAttributionSettings.setPosAndMargins(position)
-        updateAttribution()
+        changes.add(Property.ATTRIBUTION)
     }
 
-    private fun updateAttribution() {
+    private fun applyAttribution() {
         mapView.attribution.updateSettings {
             updateOrnament("attribution", mAttributionSettings, this.toGenericOrnamentSettings())
         }
@@ -1387,25 +1464,25 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     fun setReactLogoEnabled(enabled: Boolean?) {
         mLogoSettings.enabled = enabled
-        updateLogo()
+        changes.add(Property.LOGO)
     }
 
     fun setReactLogoMargins(margins: ReadableMap) {
         mLogoSettings.margins = margins
-        updateLogo()
+        changes.add(Property.LOGO)
     }
 
     fun setReactLogoViewPosition(position: Int) {
         mLogoSettings.position = position
-        updateLogo()
+        changes.add(Property.LOGO)
     }
 
     fun setReactLogoPosition(position: ReadableMap?) {
         mLogoSettings.setPosAndMargins(position)
-        updateLogo()
+        changes.add(Property.LOGO)
     }
 
-    private fun updateLogo() {
+    private fun applyLogo() {
         mapView.logo.updateSettings {
             updateOrnament("logo", mLogoSettings, this.toGenericOrnamentSettings())
         }

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt

@@ -49,7 +49,7 @@ interface CommandResponse {
     fun error(message: String)
 }
 
-open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver<RNMBXMapView>) :
+open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXMapView>(context), RNMBXMapViewManagerInterface<RNMBXMapView> {
     private val mViews: MutableMap<Int, RNMBXMapView>
 
@@ -77,7 +77,9 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     override fun onAfterUpdateTransaction(mapView: RNMBXMapView) {
         super.onAfterUpdateTransaction(mapView)
-        if (mapView.getMapboxMap() == null) {
+        val first = !mapView.isInitialized
+        mapView.applyAllChanges()
+        if (first) {
             mViews[mapView.id] = mapView
             mapView.init()
         }
@@ -141,53 +143,63 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.setReactLocalizeLabels(locale, layerIds)
     }
 
+    @ReactProp(name = "surfaceView")
+    override fun setSurfaceView(mapView: RNMBXMapView, value: Dynamic) {
+        if (mapView.isInitialized) {
+            Logger.d(LOG_TAG, "setSurafaceView cannot be changed")
+        } else {
+            mapView.surfaceView = value.asBoolean()
+        }
+    }
+
     @ReactProp(name = "gestureSettings")
     override fun setGestureSettings(mapView: RNMBXMapView, settings: Dynamic) {
-        mapView.getMapboxMap().gesturesPlugin {
-            val map = settings.asMap()
-            this.updateSettings {
-                map.getAndLogIfNotBoolean("doubleTapToZoomInEnabled", LOG_TAG)?.let {
-                    this.doubleTapToZoomInEnabled = it
-                }
-                map.getAndLogIfNotBoolean("doubleTouchToZoomOutEnabled", LOG_TAG)?.let {
-                    this.doubleTouchToZoomOutEnabled = it
-                }
-                map.getAndLogIfNotBoolean("pinchPanEnabled", LOG_TAG)?.let {
-                    this.pinchScrollEnabled = it
-                }
-                map.getAndLogIfNotBoolean("pinchZoomEnabled", LOG_TAG)?.let {
-                    this.pinchToZoomEnabled = it
-                }
-                map.getAndLogIfNotBoolean("pinchZoomDecelerationEnabled", LOG_TAG)?.let {
-                    this.pinchToZoomDecelerationEnabled = it
-                }
-                map.getAndLogIfNotBoolean("pitchEnabled", LOG_TAG)?.let {
-                    this.pitchEnabled = it
-                }
-                map.getAndLogIfNotBoolean("quickZoomEnabled", LOG_TAG)?.let {
-                    this.quickZoomEnabled = it
-                }
-                map.getAndLogIfNotBoolean("rotateEnabled", LOG_TAG)?.let {
-                    this.rotateEnabled = it
-                }
-                map.getAndLogIfNotBoolean("rotateDecelerationEnabled", LOG_TAG)?.let {
-                    this.rotateDecelerationEnabled = it
-                }
-                map.getAndLogIfNotBoolean("panEnabled", LOG_TAG)?.let {
-                    this.scrollEnabled = it
-                }
-                map.getAndLogIfNotDouble("panDecelerationFactor", LOG_TAG)?.let {
-                    this.scrollDecelerationEnabled = it > 0.0
-                }
-                map.getAndLogIfNotBoolean("simultaneousRotateAndPinchToZoomEnabled", LOG_TAG)?.let {
-                    this.simultaneousRotateAndPinchToZoomEnabled = it
-                }
-                map.getAndLogIfNotDouble("zoomAnimationAmount", LOG_TAG)?.let {
-                    this.zoomAnimationAmount = it.toFloat()
-                }
-            }
+        mapView.withMap {
+           it.gesturesPlugin {
+               val map = settings.asMap()
+               this.updateSettings {
+                   map.getAndLogIfNotBoolean("doubleTapToZoomInEnabled", LOG_TAG)?.let {
+                       this.doubleTapToZoomInEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("doubleTouchToZoomOutEnabled", LOG_TAG)?.let {
+                       this.doubleTouchToZoomOutEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("pinchPanEnabled", LOG_TAG)?.let {
+                       this.pinchScrollEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("pinchZoomEnabled", LOG_TAG)?.let {
+                       this.pinchToZoomEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("pinchZoomDecelerationEnabled", LOG_TAG)?.let {
+                       this.pinchToZoomDecelerationEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("pitchEnabled", LOG_TAG)?.let {
+                       this.pitchEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("quickZoomEnabled", LOG_TAG)?.let {
+                       this.quickZoomEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("rotateEnabled", LOG_TAG)?.let {
+                       this.rotateEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("rotateDecelerationEnabled", LOG_TAG)?.let {
+                       this.rotateDecelerationEnabled = it
+                   }
+                   map.getAndLogIfNotBoolean("panEnabled", LOG_TAG)?.let {
+                       this.scrollEnabled = it
+                   }
+                   map.getAndLogIfNotDouble("panDecelerationFactor", LOG_TAG)?.let {
+                       this.scrollDecelerationEnabled = it > 0.0
+                   }
+                   map.getAndLogIfNotBoolean("simultaneousRotateAndPinchToZoomEnabled", LOG_TAG)?.let {
+                       this.simultaneousRotateAndPinchToZoomEnabled = it
+                   }
+                   map.getAndLogIfNotDouble("zoomAnimationAmount", LOG_TAG)?.let {
+                       this.zoomAnimationAmount = it.toFloat()
+                   }
+               }
+           }
         }
-
     }
 
     @ReactProp(name = "styleURL")
@@ -202,28 +214,32 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "zoomEnabled")
     override fun setZoomEnabled(map: RNMBXMapView, zoomEnabled: Dynamic) {
-        val mapView = map.mapView
-        mapView.gestures.pinchToZoomEnabled = zoomEnabled.asBoolean()
-        mapView.gestures.doubleTouchToZoomOutEnabled = zoomEnabled.asBoolean()
-        mapView.gestures.doubleTapToZoomInEnabled = zoomEnabled.asBoolean()
+        map.withMapView {
+            it.gestures.pinchToZoomEnabled = zoomEnabled.asBoolean()
+            it.gestures.doubleTouchToZoomOutEnabled = zoomEnabled.asBoolean()
+            it.gestures.doubleTapToZoomInEnabled = zoomEnabled.asBoolean()
+        }
     }
 
     @ReactProp(name = "scrollEnabled")
     override fun setScrollEnabled(map: RNMBXMapView, scrollEnabled: Dynamic) {
-        val mapView = map.mapView
-        mapView.gestures.scrollEnabled = scrollEnabled.asBoolean()
+        map.withMapView {
+            it.gestures.scrollEnabled = scrollEnabled.asBoolean()
+        }
     }
 
     @ReactProp(name = "pitchEnabled")
     override fun setPitchEnabled(map: RNMBXMapView, pitchEnabled: Dynamic) {
-        val mapView = map.mapView
-        mapView.gestures.pitchEnabled = pitchEnabled.asBoolean()
+        map.withMapView {
+            it.gestures.pitchEnabled = pitchEnabled.asBoolean()
+        }
     }
 
     @ReactProp(name = "rotateEnabled")
     override fun setRotateEnabled(map: RNMBXMapView, rotateEnabled: Dynamic) {
-        val mapView = map.mapView
-        mapView.gestures.rotateEnabled = rotateEnabled.asBoolean()
+        map.withMapView {
+           it.gestures.rotateEnabled = rotateEnabled.asBoolean()
+        }
     }
 
     @ReactProp(name = "attributionEnabled")