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

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

@@ -5,6 +5,27 @@ import com.facebook.react.views.view.ReactViewGroup
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
 abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
-    abstract fun addToMap(mapView: RCTMGLMapView)
-    abstract fun removeFromMap(mapView: RCTMGLMapView)
+    protected var mMapView: RCTMGLMapView? = null;
+    private var mWithMapViewCallbacks: Array<((RCTMGLMapView) -> Unit)>? = null;
+
+    open fun addToMap(mapView: RCTMGLMapView) {
+        mMapView = mapView;
+        mWithMapViewCallbacks?.forEach { it(mapView) }
+        mWithMapViewCallbacks = null;
+    }
+
+    open fun removeFromMap(mapView: RCTMGLMapView) {
+        mMapView = null;
+    }
+
+    internal fun withMapView(callback: (mapView: RCTMGLMapView) -> Unit) {
+        val mapView = mMapView;
+        if (mapView == null) {
+            val callbacks = mWithMapViewCallbacks ?: arrayOf();
+            callbacks.plus(callback)
+            mWithMapViewCallbacks = callbacks
+        } else {
+            callback(mapView)
+        }
+    }
 }

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

@@ -23,8 +23,6 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
     View.OnLayoutChangeListener
 {
     // region Instance variables
-
-    private var mMapView: RCTMGLMapView? = null
     private var mView: View? = null
     private var didAddToMap = false
 
@@ -72,14 +70,15 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
 
     // endregion
 
-    // region RCTMGLMapComponent methods
+    // region AbstractMapFeature methods
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         add()
     }
 
     override fun removeFromMap(mapView: RCTMGLMapView) {
+        super.removeFromMap(mapView)
         remove(mapView)
     }
 

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

@@ -28,7 +28,6 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
     var marker: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
-    private var mMapView: RCTMGLMapView? = null
     private val mHasChildren = false
     private var mCoordinate: Point? = null
     var iD: String? = null
@@ -74,7 +73,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         makeMarker()
         if (mChildView != null) {
@@ -103,6 +102,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         if (calloutView != null) {
             map.offscreenAnnotationViewContainer?.removeView(calloutView)
         }
+        super.removeFromMap(mapView)
     }
 
     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/RCTMGLCamera.kt

@@ -45,11 +45,12 @@ import com.mapbox.rctmgl.modules.RCTMGLLogging
 import com.mapbox.rctmgl.utils.LatLng
 import com.mapbox.rctmgl.utils.Logger
 
+
+
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
     AbstractMapFeature(
         mContext
     ) {
-    private var mMapView: RCTMGLMapView? = null
     private var hasSentFirstRegion = false
     private var mDefaultStop: CameraStop? = null
     private var mCameraStop: CameraStop? = null
@@ -117,7 +118,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         setInitialCamera()
         updateMaxMinZoomLevel()
         updateMaxBounds()
@@ -128,7 +129,9 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {}
+    override fun removeFromMap(mapView: RCTMGLMapView) {
+        super.removeFromMap(mapView)
+    }
     fun setStop(stop: CameraStop) {
         mCameraStop = stop
         mCameraStop!!.setCallback(mCameraCallback)
@@ -161,14 +164,20 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         updateMaxBounds()
     }
 
+
     private fun updateMaxBounds() {
-        /*
-        MapboxMap map = getMapboxMap();
-        if (map != null && mMaxBounds != null) {
-            map.setLatLngBoundsForCameraTarget(mMaxBounds);
-        }
+        withMapView { mapView ->
+            val map = mapView.getMapboxMap()
+            val maxBounds = mMaxBounds
+            if (maxBounds != null) {
+                map.setBounds(CameraBoundsOptions.Builder().bounds(
+                    maxBounds.toBounds()
+                ).build())
+            } else {
+                map.setBounds(CameraBoundsOptions.Builder().build())
+            }
 
-         */
+        }
     }
 
     private fun updateMaxMinZoomLevel() {
@@ -319,7 +328,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
             });
              */
         } else {
-            mLocationComponentManager!!.setCameraMode(CameraMode.NONE)
+            mLocationComponentManager!!.setCameraMode(com.mapbox.rctmgl.components.location.CameraMode.NONE)
         }
     }
 

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

@@ -1,24 +1,14 @@
 package com.mapbox.rctmgl.components.camera
 
-import com.mapbox.rctmgl.components.camera.CameraStop.Companion.fromReadableMap
-import com.mapbox.maps.MapboxMap
-import com.mapbox.maps.CameraOptions
-import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
-import android.view.animation.LinearInterpolator
-import android.view.animation.AccelerateDecelerateInterpolator
-import com.mapbox.rctmgl.components.camera.CameraStop
-import com.mapbox.rctmgl.components.camera.CameraUpdateQueue.OnCompleteAllListener
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
 import com.facebook.react.bridge.ReactApplicationContext
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.components.camera.RCTMGLCamera
-import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.bridge.ReadableMap
-import java.lang.AssertionError
-import java.util.HashMap
+import com.mapbox.geojson.FeatureCollection
+import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.mapbox.rctmgl.components.camera.CameraStop.Companion.fromReadableMap
+import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
+
 
 //import com.mapbox.rctmgl.utils.GeoJSONUtils;
 class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
@@ -53,15 +43,6 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
         }
     }
 
-    /*v10todo
-    @ReactProp(name="maxBounds")
-    public void setMaxBounds(RCTMGLCamera camera, String value) {
-        if (value != null) {
-            FeatureCollection collection = FeatureCollection.fromJson(value);
-            camera.setMaxBounds(GeoJSONUtils.toLatLngBounds(collection));
-        }
-    }
-*/
     @ReactProp(name = "userTrackingMode")
     fun setUserTrackingMode(camera: RCTMGLCamera, userTrackingMode: Int) {
         camera.setUserTrackingMode(userTrackingMode)
@@ -108,6 +89,16 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
         camera.setFollowZoomLevel(value)
     }
 
+    @ReactProp(name = "maxBounds")
+    fun setMaxBounds(camera: RCTMGLCamera, value: String?) {
+        if (value != null) {
+            val collection = FeatureCollection.fromJson(value)
+            camera.setMaxBounds(toLatLngBounds(collection))
+        } else {
+            camera.setMaxBounds(null)
+        }
+    }
+
     companion object {
         const val REACT_CLASS = "RCTMGLCamera"
     }

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

@@ -82,6 +82,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         mNativeImages = HashMap()
         mImages = HashMap()
         mCurrentImages = HashSet()
+        super.removeFromMap(mapView)
     }
 
     private fun removeImages(mapView: RCTMGLMapView) {
@@ -151,6 +152,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         // Wait for style before adding the source to the map
         // only then we can pre-load required images / placeholders into the style
         // before we add the ShapeSource to the map

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

@@ -17,13 +17,12 @@ import com.mapbox.mapboxsdk.maps.Style;
  */   class RCTMGLNativeUserLocation(context: Context?) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
     private var mEnabled = true
     private var mMap: MapboxMap? = null
-    private var mMapView: RCTMGLMapView? = null
 
     @RenderMode.Mode
     private var mRenderMode = RenderMode.COMPASS
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mEnabled = true
-        mMapView = mapView
         mapView.getMapboxMap()
         mapView.getMapAsync(this)
         setRenderMode(mRenderMode)
@@ -32,6 +31,7 @@ import com.mapbox.mapboxsdk.maps.Style;
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mEnabled = false
         mMap?.getStyle(this)
+        super.removeFromMap(mapView)
     }
 
     @SuppressLint("MissingPermission")

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

@@ -33,11 +33,14 @@ import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager
 import com.mapbox.maps.plugin.annotation.generated.createPointAnnotationManager
 import com.mapbox.maps.plugin.attribution.attribution
 import com.mapbox.maps.plugin.attribution.generated.AttributionSettings
+import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.maps.plugin.compass.compass
+import com.mapbox.maps.plugin.compass.generated.CompassSettings
 import com.mapbox.maps.plugin.delegates.listeners.*
 import com.mapbox.maps.plugin.gestures.*
 import com.mapbox.maps.plugin.logo.generated.LogoSettings
 import com.mapbox.maps.plugin.logo.logo
+import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
@@ -65,6 +68,12 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
+data class OrnamentSettings(
+    var enabled : Boolean? = false,
+    var margins: ReadableMap? =null,
+    var position: Int = -1
+)
+
 
 interface RCTMGLMapViewLifecycleOwner : LifecycleOwner {
     fun handleLifecycleEvent(event: Lifecycle.Event)
@@ -608,7 +617,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         properties.putBoolean("isUserInteraction", mCameraChangeTracker.isUserInteraction)
         try {
             val bounds = mMap.coordinateBoundsForCamera(position.toCameraOptions())
-            properties.putArray("visibleBounds", GeoJSONUtils.fromCoordinateBounds(bounds))
+            properties.putArray("visibleBounds", bounds.toReadableArray())
         } catch (ex: Exception) {
             Logger.e(LOG_TAG, "An error occurred while attempting to make the region", ex)
         }
@@ -760,7 +769,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         val bounds = mMap!!.coordinateBoundsForCamera(mMap!!.cameraState.toCameraOptions())
 
         sendResponse(callbackID, {
-            it.putArray("visibleBounds", GeoJSONUtils.fromCoordinateBounds(bounds))
+            it.putArray("visibleBounds", bounds.toReadableArray())
         })
     }
 
@@ -858,12 +867,12 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 
     // region Ornaments
 
-    fun toGravity(kind: String, viewPosition: Int): Int {
+    private fun toGravity(kind: String, viewPosition: Int): Int {
         return when (viewPosition) {
-            0 -> (Gravity.TOP or Gravity.START)
-            1 -> (Gravity.TOP or Gravity.END)
-            2 -> (Gravity.BOTTOM or Gravity.START)
-            3 -> (Gravity.BOTTOM or Gravity.END)
+            0 -> (Gravity.TOP or Gravity.LEFT)
+            1 -> (Gravity.BOTTOM or Gravity.LEFT)
+            2 -> (Gravity.TOP or Gravity.RIGHT)
+            3 -> (Gravity.BOTTOM or Gravity.RIGHT)
             else -> {
                 Logger.e(
                     "MapView",
@@ -874,13 +883,46 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         }
     }
 
-    var mCompassEnabled = false
+    private fun updateOrnament(kind: String, from: OrnamentSettings, to: GenericOrnamentSettings) {
+        from.enabled?.let { to.enabled = it }
+        if (from.position >= 0) {
+            to.position = toGravity(kind, from.position)
+        }
+
+        from.margins?.let {
+            val pixelDensity = resources.displayMetrics.density
+            val x: Int? = it.getDouble("x")?.let { (it * pixelDensity).toInt() }
+            val y: Int? = it.getDouble("y")?.let { (it * pixelDensity).toInt() }
+
+            val horizontalGravity = to.position and Gravity.HORIZONTAL_GRAVITY_MASK
+            val verticalGravity = to.position and Gravity.VERTICAL_GRAVITY_MASK
+
+            when (horizontalGravity) {
+                Gravity.LEFT -> { to.setHMargins(x?.toFloat(), 0f)  }
+                Gravity.RIGHT -> { to.setHMargins(0f, x?.toFloat())  }
+                Gravity.CENTER_HORIZONTAL ->{ to.setHMargins(x?.toFloat(), x?.toFloat())  }
+                else -> Logger.e(
+                    "MapView",
+                    "${kind}ViewMargins: unexpected absolute pos: $horizontalGravity"
+                )
+            }
+            when (verticalGravity) {
+                Gravity.TOP -> { to.setVMargins(y?.toFloat(), 0f)  }
+                Gravity.BOTTOM -> { to.setVMargins(0f, y?.toFloat())  }
+                Gravity.CENTER_VERTICAL -> { to.setVMargins(y?.toFloat(), y?.toFloat())  }
+                else -> Logger.e(
+                    "MapView",
+                    "${kind}ViewMargins: unexpected vertical pos: $verticalGravity"
+                )
+            }
+        }
+    }
+
+    var mCompassSettings = OrnamentSettings(enabled = false)
     var mCompassFadeWhenNorth = false
-    var mCompassViewMargins: ReadableMap? = null
-    var mCompassViewPosition: Int = -1
 
     fun setReactCompassEnabled(compassEnabled: Boolean) {
-        mCompassEnabled = compassEnabled
+        mCompassSettings.enabled = compassEnabled
         updateCompass()
     }
 
@@ -890,82 +932,55 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun setReactCompassViewMargins(compassViewMargins: ReadableMap) {
-        mCompassViewMargins = compassViewMargins
+        mCompassSettings.margins = compassViewMargins
         updateCompass()
     }
 
     fun setReactCompassViewPosition(compassViewPosition: Int) {
-        mCompassViewPosition = compassViewPosition
+        mCompassSettings.position = compassViewPosition
         updateCompass()
     }
 
-    fun setReactCompassMargins(compassMargins: ReadableMap) {
-        val bottom_mask = 1;
-        val right_mask = 2;
-
-        var margins = WritableNativeMap()
-        var position = 0;
-        if (compassMargins.hasKey("bottom")) {
-            margins.putInt("y", compassMargins.getInt("bottom"))
-            position = position or bottom_mask
-        } else {
-            if (compassMargins.hasKey("top")) {
-                margins.putInt("y", compassMargins.getInt("top"))
-            }
-        }
-
-        if (compassMargins.hasKey("left")) {
-            margins.putInt("x", compassMargins.getInt("left"))
-        } else {
-            if (compassMargins.hasKey("right")) {
-                margins.putInt("x", compassMargins.getInt("right"))
-            }
-        }
-        mCompassViewPosition = position
-        mCompassViewMargins = margins
+    fun setReactCompassPosition(compassPosition: ReadableMap) {
+        mCompassSettings.setPosAndMargins(compassPosition)
         updateCompass()
     }
 
     private fun updateCompass() {
         compass.updateSettings {
-            enabled = mCompassEnabled
             fadeWhenFacingNorth = mCompassFadeWhenNorth
-            if (mCompassViewPosition >= 0) {
-                position = toGravity("compass", mCompassViewPosition)
-            }
+            updateOrnament("compass", mCompassSettings, this.toGenericOrnamentSettings())
+        }
+    }
 
-            val compassViewMargins = mCompassViewMargins
-            if (compassViewMargins != null) {
-                val pixelDensity = resources.displayMetrics.density.toInt()
-                val x: Int = compassViewMargins.getInt("x") * pixelDensity
-                val y: Int = compassViewMargins.getInt("y") * pixelDensity
+    var mScaleBarSettings = OrnamentSettings(enabled = false)
 
-                val horizontalGravity = position and Gravity.HORIZONTAL_GRAVITY_MASK
-                val verticalGravity = position and Gravity.VERTICAL_GRAVITY_MASK
+    fun setReactScaleBarEnabled(scaleBarEnabled: Boolean) {
+        mScaleBarSettings.enabled = scaleBarEnabled
+        updateScaleBar()
+    }
+    
+    fun setReactScaleBarViewMargins(scaleBarMargins: ReadableMap) {
+        mScaleBarSettings.margins = scaleBarMargins
+        updateScaleBar()
+    }
 
-                when (horizontalGravity) {
-                    Gravity.LEFT -> {
-                        marginLeft = x.toFloat()
-                    }
-                    Gravity.RIGHT -> marginRight = x.toFloat()
-                    Gravity.CENTER_HORIZONTAL -> marginLeft = x.toFloat()
-                    else -> Logger.e(
-                        "MapView",
-                        "compassViewMargins: unexpected absolute pos: $horizontalGravity"
-                    )
-                }
-                when (verticalGravity) {
-                    Gravity.TOP -> marginTop = y.toFloat()
-                    Gravity.BOTTOM -> marginBottom = y.toFloat()
-                    Gravity.CENTER_VERTICAL -> marginTop = y.toFloat()
-                    else -> Logger.e(
-                        "MapView",
-                        "compassViewMargins: unexpected vertical pos: $verticalGravity"
-                    )
-                }
-            }
+    fun setReactScaleBarViewPosition(scaleBarPosition: Int) {
+        mScaleBarSettings.position = scaleBarPosition
+        updateScaleBar()
+    }
+
+    fun setReactScaleBarPosition(scaleBarPosition: ReadableMap) {
+        mScaleBarSettings.setPosAndMargins(scaleBarPosition)
+        updateScaleBar()
+    }
+
+    private fun updateScaleBar() {
+        scalebar.updateSettings {
+            updateOrnament("scaleBar", mScaleBarSettings, this.toGenericOrnamentSettings())
         }
     }
+
     // endregion
 
     private fun getGravityAndMargin (position:ReadableMap): Pair<Int, IntArray> {
@@ -1043,6 +1058,44 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private var mLogoGravity: Int? = null
     private var mLogoMargin: IntArray? = null
 
+    var mLogoSettings = OrnamentSettings(enabled = null)
+
+    fun setReactLogoEnabled(enabled: Boolean?) {
+        mLogoSettings.enabled = enabled
+        updateLogo()
+    }
+
+    fun setReactLogoMargins(margins: ReadableMap) {
+        mLogoSettings.margins = margins
+        updateLogo()
+    }
+
+    fun setReactLogoViewPosition(position: Int) {
+        mLogoSettings.position = position
+        updateLogo()
+    }
+
+    fun setReactLogoPosition(position: ReadableMap?) {
+        mLogoSettings.setPosAndMargins(position)
+        updateLogo()
+    }
+
+    private fun updateLogo() {
+        logo.updateSettings {
+            updateOrnament("logo", mLogoSettings, this.toGenericOrnamentSettings())
+        }
+
+        logo.updateSettings {
+            println(String.format("logo :: position - before 0x%08x", position))
+            //position = Gravity.BOTTOM or Gravity.RIGHT
+            println(String.format("eq bottom|right %b", position == (Gravity.BOTTOM or Gravity.RIGHT)))
+            if (position == Gravity.BOTTOM or Gravity.RIGHT) {
+                position = Gravity.BOTTOM or Gravity.RIGHT
+            }
+            println(String.format("logo :: position - after 0x%08x", position))
+        }
+    }
+/*
     fun setReactLogoEnabled(logoEnabled: Boolean?) {
         mLogoEnabled = logoEnabled ?: LogoSettings().enabled
         updateLogo()
@@ -1081,6 +1134,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         }
     }
+ */
     // endregion
 
     // region lifecycle
@@ -1128,3 +1182,97 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 
     // endregion
 }
+
+fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
+    if (posAndMargins == null) { return }
+
+    val bottom_mask = 1;
+    val right_mask = 2;
+
+    var margins = WritableNativeMap()
+    var position = 0;
+    if (posAndMargins
+            .hasKey("bottom")) {
+        margins.putInt("y", posAndMargins.getInt("bottom"))
+        position = position or bottom_mask
+    } else {
+        if (posAndMargins.hasKey("top")) {
+            margins.putInt("y", posAndMargins.getInt("top"))
+        }
+    }
+
+    if (posAndMargins.hasKey("left")) {
+        margins.putInt("x", posAndMargins.getInt("left"))
+    } else {
+        if (posAndMargins.hasKey("right")) {
+            position = position or right_mask
+            margins.putInt("x", posAndMargins.getInt("right"))
+        }
+    }
+    this.position = position
+    this.margins = margins
+}
+
+interface GenericOrnamentSettings {
+    fun setHMargins(left: Float?, right: Float?)
+    fun setVMargins(top: Float?, bottom: Float?)
+    var enabled: Boolean
+    var position: Int
+}
+
+fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
+    private val settings = this@toGenericOrnamentSettings
+    override fun setHMargins(left: Float?, right: Float?) {
+        left?.let { settings.marginLeft = it }
+        right?.let { settings.marginRight = it }
+    }
+    override fun setVMargins(top: Float?, bottom: Float?) {
+        top?.let { settings.marginTop = it }
+        bottom?.let { settings.marginBottom = it }
+    }
+    override var enabled: Boolean
+        get() = settings.enabled
+        set(value) { settings.enabled = value }
+    override var position: Int
+        get() = settings.position
+        set(value) { settings.position = value }
+}
+
+fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
+    private val settings = this@toGenericOrnamentSettings
+    override fun setHMargins(left: Float?, right: Float?) {
+        left?.let { settings.marginLeft = it }
+        right?.let { settings.marginRight = it }
+    }
+    override fun setVMargins(top: Float?, bottom: Float?) {
+        top?.let { settings.marginTop = it }
+        bottom?.let { settings.marginBottom = it }
+    }
+    override var enabled: Boolean
+        get() = settings.enabled
+        set(value) { settings.enabled = value }
+    override var position: Int
+        get() = settings.position
+        set(value) { settings.position = value }
+}
+
+fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
+    private val settings = this@toGenericOrnamentSettings
+    override fun setHMargins(left: Float?, right: Float?) {
+        left?.let { settings.marginLeft = it }
+        right?.let { settings.marginRight = it }
+    }
+    override fun setVMargins(top: Float?, bottom: Float?) {
+        top?.let { settings.marginTop = it }
+        bottom?.let { settings.marginBottom = it }
+    }
+    override var enabled: Boolean
+        get() = settings.enabled
+        set(value) { settings.enabled = value }
+    override var position: Int
+        get() = settings.position
+        set(value) {
+            println(String.format("logo :: position: 0x%08x", value))
+            settings.position = value
+        }
+}

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

@@ -136,6 +136,26 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         mapView!!.setReactLogoPosition(logoPosition);
     }
 
+    @ReactProp(name = "scaleBarEnabled")
+    fun setScaleBarEnabled(mapView: RCTMGLMapView?, scaleBarEnabled: Boolean) {
+        mapView!!.setReactScaleBarEnabled(scaleBarEnabled);
+    }
+
+    @ReactProp(name = "scaleBarViewMargins")
+    fun setScaleBarViewMargins(mapView: RCTMGLMapView?, scaleBarMargins: ReadableMap?) {
+        mapView!!.setReactScaleBarViewMargins(scaleBarMargins!!);
+    }
+
+    @ReactProp(name = "scaleBarViewPosition")
+    fun setScaleBarViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: Int) {
+        mapView!!.setReactScaleBarViewPosition(scaleBarPosition!!)
+    }
+
+    @ReactProp(name = "scaleBarPosition")
+    fun scaleBarViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: ReadableMap) {
+        mapView!!.setReactScaleBarPosition(scaleBarPosition)
+    }
+
     @ReactProp(name = "compassEnabled")
     fun setCompassEnabled(mapView: RCTMGLMapView?, compassEnabled: Boolean) {
         mapView!!.setReactCompassEnabled(compassEnabled);
@@ -157,8 +177,8 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
     }
 
     @ReactProp(name = "compassPosition")
-    fun setCompassMargins(mapView: RCTMGLMapView?, compassMargins: ReadableMap) {
-        mapView!!.setReactCompassMargins(compassMargins)
+    fun setCompassPosition(mapView: RCTMGLMapView?, compassMargins: ReadableMap) {
+        mapView!!.setReactCompassPosition(compassMargins)
     }
 
     @ReactProp(name = "contentInset")

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

@@ -32,6 +32,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     // endregion RCTLayer
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val atmosphere = makeAtmosphere()
         mAtmosphere = atmosphere
@@ -42,6 +43,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
+        super.removeFromMap(mapView)
     }
 
     fun makeAtmosphere(): Atmosphere {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTLayer.kt

@@ -42,7 +42,6 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
     protected var mMap: MapboxMap? = null
     @JvmField
     protected var mLayer: T? = null
-    protected var mMapView: RCTMGLMapView? = null
     protected var mHadFilter = false
 
     fun setSourceID(sourceID: String?) {
@@ -230,8 +229,8 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
-        mMapView = mapView
         if (style == null) return
         val existingLayer = getLayerAs(style, iD)
         if (existingLayer != null) {
@@ -251,6 +250,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         if (style != null) {
             style!!.removeStyleLayer(mLayer!!.layerId)
         }
+        super.removeFromMap(mapView)
     }
 
     // v10TOOD: adding anything seems to make getStyle null

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSource.kt

@@ -77,6 +77,10 @@ class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourc
 
     fun setClusterMaxZoom(clusterMaxZoom: Long) {
         mClusterMaxZoom = clusterMaxZoom
+        if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
+            val result = mMap!!.getStyle()!!
+                .setStyleSourceProperty(iD!!, "clusterMaxZoom", Value.valueOf(clusterMaxZoom))
+        }
     }
 
     fun setClusterProperties(clusterProperties: HashMap<String, Any>) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTSource.kt

@@ -24,8 +24,6 @@ import java.util.ArrayList
 import java.util.HashMap
 
 abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
-    @JvmField
-    protected var mMapView: RCTMGLMapView? = null
     @JvmField
     protected var mMap: MapboxMap? = null
     var iD: String? = null
@@ -107,7 +105,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
         }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         mMap?.getStyle(object : Style.OnStyleLoaded {
             override fun onStyleLoaded(style: Style) {
@@ -149,6 +147,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
                 Logger.w(LOG_TAG, String.format("RCTSource.removeFromMap: %s - %s", mSource, ex.message), ex)
             }
         }
+        super.removeFromMap(mapView)
     }
 
     fun addLayer(childView: View?, childPosition: Int) {

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

@@ -36,6 +36,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val terrain = makeTerrain()
         mTerrain = terrain
@@ -46,6 +47,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
+        super.removeFromMap(mapView)
     }
 
     fun makeTerrain(): Terrain {

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

@@ -0,0 +1,35 @@
+package com.mapbox.rctmgl.utils
+
+import com.mapbox.geojson.Point
+import com.mapbox.maps.CoordinateBounds
+import com.mapbox.rctmgl.utils.LatLngBounds
+
+class LatLngBounds internal constructor(
+    var latNorth: Double,
+    var lonEast: Double,
+    var latSouth: Double,
+    var lonWest: Double
+) {
+    val southWest: LatLng
+        get() = LatLng(latSouth, lonWest)
+    val northEast: LatLng
+        get() = LatLng(latNorth, lonEast)
+
+    fun toLatLngs(): Array<LatLng> {
+        return arrayOf(northEast, southWest)
+    }
+
+    fun toBounds(): CoordinateBounds {
+        return CoordinateBounds(
+            Point.fromLngLat(lonWest, latSouth),
+            Point.fromLngLat(lonEast, latNorth),
+            false
+        )
+    }
+
+    companion object {
+        fun from(bbox: Double, bbox1: Double, bbox2: Double, bbox3: Double): LatLngBounds {
+            return LatLngBounds(bbox, bbox1, bbox2, bbox3)
+        }
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/CoordinateBounds.kt

@@ -0,0 +1,23 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
+import com.mapbox.maps.CoordinateBounds
+import com.mapbox.rctmgl.utils.GeoJSONUtils
+import com.mapbox.rctmgl.utils.LatLng
+
+fun CoordinateBounds.toReadableArray() : ReadableArray {
+    val array = Arguments.createArray()
+    val ne = northeast
+    val sw = southwest
+    val latLngs = arrayOf(
+        LatLng(ne.latitude(), ne.longitude()),
+        LatLng(ne.latitude(), sw.longitude()),
+        LatLng(sw.latitude(), sw.longitude()),
+        LatLng(sw.latitude(), ne.longitude())
+    )
+    for (latLng in latLngs) {
+        array.pushArray(GeoJSONUtils.fromLatLng(latLng))
+    }
+    return array
+}

package/docs/docs.json

@@ -3939,10 +3939,10 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "string"
+                "name": "number"
               }
             ],
-            "raw": "Promise<string>"
+            "raw": "Promise<number>"
           }
         },
         "description": "Returns the zoom needed to expand the cluster.",

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -108,7 +108,8 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
 
-  // Properties set on RCTMGLCamera in React Native.
+  // MARK: React properties
+  
   @objc var animationDuration: NSNumber?
   @objc var animationMode: NSString?
   @objc var defaultStop: [String: Any]?
@@ -145,8 +146,19 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCamera()
     }
   }
+
+  @objc var maxBounds: String? {
+    didSet {
+      if let maxBounds = maxBounds {
+        logged("RCTMGLCamera.maxBounds") {
+          let maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
+          try _updateMaxBounds(maxBoundsFeature)
+        }
+      }
+    }
+  }
   
-  // Update methods.
+  // MARK: Update methods
 
   func _updateCameraFromJavascript() {
     guard !followUserLocation else {
@@ -185,6 +197,29 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     map.viewport.idle()
     map.location.removeLocationConsumer(consumer: self)
   }
+  
+  func _toCoordinateBounds(_ bounds: FeatureCollection) throws -> CoordinateBounds  {
+    guard bounds.features.count == 2 else {
+      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+    }
+    let swFeature = bounds.features[0]
+    let neFeature = bounds.features[1]
+    
+    guard case let .point(sw) = swFeature.geometry,
+          case let .point(ne) = neFeature.geometry else {
+      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+    }
+
+    return CoordinateBounds(southwest: sw.coordinates, northeast: ne.coordinates)
+  }
+  
+  func _updateMaxBounds(_ bounds: FeatureCollection) throws {
+    withMapView { map in
+      logged("RCTMGLCamera._updateMaxBounds") {
+        try map.mapboxMap.setCameraBounds(with: CameraBoundsOptions(bounds: try self._toCoordinateBounds(bounds)))
+      }
+    }
+  }
 
   func _updateCameraFromTrackingMode() {
     withMapView { map in

package/ios/RCTMGL-v10/RCTMGLCameraManager.m

@@ -4,6 +4,7 @@
 
 @interface RCT_EXTERN_MODULE(RCTMGLCameraManager, RCTViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(maxBounds, NSString)
 RCT_EXPORT_VIEW_PROPERTY(animationDuration, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(animationMode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(defaultStop, NSDictionary)

package/ios/RCTMGL-v10/RCTMGLShapeSource.swift

@@ -21,7 +21,19 @@ class RCTMGLShapeSource : RCTMGLSource {
   
   @objc var cluster : NSNumber?
   @objc var clusterRadius : NSNumber?
-  @objc var clusterMaxZoomLevel : NSNumber?
+  @objc var clusterMaxZoomLevel : NSNumber? {
+    didSet {
+      logged("RCTMGLShapeSource.clusterMaxZoomLevel") {
+        if let number = clusterMaxZoomLevel?.doubleValue {
+          doUpdate { (style) in
+            logged("RCTMGLShapeSource.doUpdate") {
+              try style.setSourceProperty(for: id, property: "clusterMaxZoom", value: number)
+            }
+          }
+        }
+      }
+    }
+  }
   @objc var clusterProperties : [String: [Any]]?;
   
   @objc var maxZoomLevel : NSNumber?
@@ -192,7 +204,7 @@ extension RCTMGLShapeSource
 extension RCTMGLShapeSource
 {
   func getClusterExpansionZoom(
-    _ clusterId: NSNumber,
+    _ featureJSON: String,
     completion: @escaping (Result<Int, Error>) -> Void)
   {
     guard let mapView = map?.mapView else {
@@ -200,29 +212,23 @@ extension RCTMGLShapeSource
       return
     }
 
-    let options = SourceQueryOptions(sourceLayerIds: nil, filter: Exp(.eq) {
-      Exp(.get) { "cluster_id" }
-      clusterId.uintValue
-    })
-    mapView.mapboxMap.querySourceFeatures(for: id, options: options) { result in
-      switch result {
-      case .success(let features):
-        let cluster = features[0]
-        mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster.feature, extension: "supercluster", extensionField: "expansion-zoom") { result in
-          switch result {
-          case .success(let features):
-            guard let value = features.value as? NSNumber else {
-              completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
-              return
-            }
-                
-            completion(.success(value.intValue))
-          case .failure(let error):
-            completion(.failure(error))
+    logged("RCTMGLShapeSource.getClusterExpansionZoom", rejecter: { (_,_,error) in
+      completion(.failure(error!))
+    }) {
+      let cluster : Feature = try parse(featureJSON);
+
+      mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster, extension: "supercluster", extensionField: "expansion-zoom") { result in
+        switch result {
+        case .success(let features):
+          guard let value = features.value as? NSNumber else {
+            completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
+            return
           }
+          
+          completion(.success(value.intValue))
+        case .failure(let error):
+          completion(.failure(error))
         }
-      case .failure(let error):
-        completion(.failure(error))
       }
     }
   }

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.m

@@ -25,9 +25,9 @@ RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock
 
 
 RCT_EXTERN_METHOD(getClusterExpansionZoom:(nonnull NSNumber*)reactTag
-                                clusterId:(nonnull NSNumber*)clusterId
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
+                                featureJSON:(nonnull NSString*)featureJSON
+                                resolver:(RCTPromiseResolveBlock)resolve
+                                rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getClusterLeaves:(nonnull NSNumber*)reactTag
                   featureJSON:(nonnull NSString*)featureJSON

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.swift

@@ -38,12 +38,12 @@ extension RCTMGLShapeSourceManager {
 extension RCTMGLShapeSourceManager {
   @objc func getClusterExpansionZoom(
     _ reactTag: NSNumber,
-    clusterId: NSNumber,
+    featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getClusterExpansionZoom", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterExpansionZoom(clusterId) { result in
+    self.withShapeSource(reactTag, name:"getCluster   ExpansionZoom", rejecter: rejecter) { shapeSource in
+      shapeSource.getClusterExpansionZoom(featureJSON) { result in
         switch result {
         case .success(let zoom):
           resolver([

package/javascript/components/MarkerView.tsx

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

package/javascript/components/ShapeSource.tsx

@@ -210,12 +210,12 @@ export class ShapeSource extends NativeBridgeComponent(
    */
   async getClusterExpansionZoom(
     feature: string | GeoJSON.Feature,
-  ): Promise<string> {
+  ): Promise<number> {
     if (typeof feature === 'number') {
       console.warn(
         'Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.',
       );
-      const res: { data: string } = await this._runNativeCommand(
+      const res: { data: number } = await this._runNativeCommand(
         'getClusterExpansionZoomById',
         this._nativeRef,
         [feature],
@@ -223,7 +223,7 @@ export class ShapeSource extends NativeBridgeComponent(
       return res.data;
     }
 
-    const res: { data: string } = await this._runNativeCommand(
+    const res: { data: number } = await this._runNativeCommand(
       'getClusterExpansionZoom',
       this._nativeRef,
       [JSON.stringify(feature)],

package/package.json

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

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

@@ -1,42 +0,0 @@
-package com.mapbox.rctmgl.utils;
-
-import com.mapbox.geojson.Point;
-import com.mapbox.maps.CoordinateBounds;
-
-public class LatLngBounds {
-  public static LatLngBounds from(double bbox, double bbox1, double bbox2, double bbox3) {
-    return new LatLngBounds(bbox, bbox1, bbox2, bbox3);
-  }
-
-  LatLng getSouthWest() {
-    return new LatLng(latSouth, lonWest);
-  }
-
-  LatLng getNorthEast() {
-    return new LatLng(latNorth, lonEast);
-  }
-
-  LatLng[] toLatLngs() {
-    return new LatLng[] {getNorthEast(), getSouthWest()};
-  }
-  
-  double latNorth;
-  double lonEast;
-  double latSouth;
-  double lonWest;
-
-  LatLngBounds(double latNorth,double lonEast, double latSouth, double lonWest) {
-    this.latNorth = latNorth;
-    this.lonEast = lonEast;
-    this.latSouth = latSouth;
-    this.lonWest = lonWest;
-  }
-
-  public CoordinateBounds toBounds() {
-    return new CoordinateBounds(
-            Point.fromLngLat(lonWest, latSouth),
-            Point.fromLngLat(lonEast, latNorth),
-            false
-    );
-  }
-}