@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerView.kt → java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation
+package com.rnmapbox.rnmbx.components.annotation
 
 import android.content.Context
 import android.os.Handler
@@ -11,15 +11,15 @@ import com.mapbox.geojson.Point
 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 com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.utils.Logger
 import java.util.Vector
 
 private data class Vec2(val dx: Double, val dy: Double)
 
-class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerViewManager):
+class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewManager):
     AbstractMapFeature(context),
     View.OnLayoutChangeListener
 {
@@ -73,12 +73,12 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
 
     // region AbstractMapFeature methods
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         add()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         super.removeFromMap(mapView, reason)
         remove(mapView)
         return true
@@ -140,7 +140,7 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
         )
     }
 
-    private fun remove(mapView: RCTMGLMapView) {
+    private fun remove(mapView: RNMBXMapView) {
         this.removeOnLayoutChangeListener(this)
 
         mView?.let { view ->
@@ -150,7 +150,7 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
             }
             val removed = mapView.viewAnnotationManager?.removeViewAnnotation(view)
             if (removed == false) {
-                Logger.w("RCTMGLMarkerView", "Unable to remove view")
+                Logger.w("RNMBXMarkerView", "Unable to remove view")
             }
             didAddToMap = false
         }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.kt → java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt}

@@ -1,10 +1,10 @@
-package com.mapbox.rctmgl.components.annotation
+package com.rnmapbox.rnmbx.components.annotation
 
 import android.view.View
 import android.widget.FrameLayout
-import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
 import com.facebook.react.bridge.ReactApplicationContext
-import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
@@ -12,36 +12,36 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.mapbox.maps.ScreenCoordinate
 import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 
-class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLMarkerView?>(reactApplicationContext) {
+class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXMarkerView?>(reactApplicationContext) {
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @ReactProp(name = "coordinate")
-    fun setCoordinate(markerView: RCTMGLMarkerView, geoJSONStr: String?) {
+    fun setCoordinate(markerView: RNMBXMarkerView, geoJSONStr: String?) {
         markerView.setCoordinate(toPointGeometry(geoJSONStr))
     }
 
     @ReactProp(name = "anchor")
-    fun setAnchor(markerView: RCTMGLMarkerView, map: ReadableMap) {
+    fun setAnchor(markerView: RNMBXMarkerView, map: ReadableMap) {
         markerView.setAnchor(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
     }
 
     @ReactProp(name = "allowOverlap")
-    fun setAllowOverlap(markerView: RCTMGLMarkerView, allowOverlap: Boolean) {
+    fun setAllowOverlap(markerView: RNMBXMarkerView, allowOverlap: Boolean) {
         markerView.setAllowOverlap(allowOverlap)
     }
 
     @ReactProp(name = "isSelected")
-    fun setIsSelected(markerView: RCTMGLMarkerView, isSelected: Boolean) {
+    fun setIsSelected(markerView: RNMBXMarkerView, isSelected: Boolean) {
         markerView.setIsSelected(isSelected)
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLMarkerView {
-        return RCTMGLMarkerView(reactContext, this)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXMarkerView {
+        return RNMBXMarkerView(reactContext, this)
     }
 
     override fun customEvents(): Map<String, String>? {
@@ -50,9 +50,9 @@ class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLMarkerView"
+        const val REACT_CLASS = "RNMBXMarkerView"
 
-        fun markerViewContainerSizeFixer(mapView: RCTMGLMapView, viewAnnotationManager: ViewAnnotationManager) {
+        fun markerViewContainerSizeFixer(mapView: RNMBXMapView, viewAnnotationManager: ViewAnnotationManager) {
             // see https://github.com/rnmapbox/maps/issues/2376
             viewAnnotationManager.addOnViewAnnotationUpdatedListener(object :
                 OnViewAnnotationUpdatedListener {

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.kt → java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotation.kt}

@@ -1,31 +1,33 @@
-package com.mapbox.rctmgl.components.annotation
+package com.rnmapbox.rnmbx.components.annotation
 
 import android.content.Context
 import android.graphics.Bitmap
-import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.mapbox.maps.plugin.annotation.generated.PointAnnotation
 import com.mapbox.maps.MapboxMap
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.annotation.RCTMGLCallout
-import com.mapbox.rctmgl.utils.GeoJSONUtils
-import com.mapbox.rctmgl.events.constants.EventTypes
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils
+import com.rnmapbox.rnmbx.events.constants.EventTypes
 import com.mapbox.maps.plugin.annotation.generated.PointAnnotationOptions
 import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
 import com.mapbox.maps.extension.style.layers.properties.generated.IconAnchor
-import com.mapbox.rctmgl.events.PointAnnotationClickEvent
+import com.rnmapbox.rnmbx.events.PointAnnotationClickEvent
 import android.graphics.PointF
 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
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.events.PointAnnotationDragEvent
+import com.rnmapbox.rnmbx.utils.BitmapUtils
+import com.rnmapbox.rnmbx.utils.LatLng
 import java.util.*
 
-class RCTMGLPointAnnotation(private val mContext: Context, private val mManager: RCTMGLPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
+import com.rnmapbox.rnmbx.v11compat.annotation.*;
+
+class RNMBXPointAnnotation(private val mContext: Context, private val mManager: RNMBXPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
     var marker: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
@@ -46,7 +48,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
     private var mCalloutBitmap: Bitmap? = null
     private var mCalloutBitmapId: String? = null
     override fun addView(childView: View, childPosition: Int) {
-        if (childView is RCTMGLCallout) {
+        if (childView is RNMBXCallout) {
             calloutView = childView
         } else {
             mChildView = childView
@@ -72,7 +74,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         mMapView?.offscreenAnnotationViewContainer?.removeView(childView)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         makeMarker()
@@ -91,7 +93,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         val map = (if (mMapView != null) mMapView else mapView) ?: return true
         if (marker != null) {
             map.pointAnnotationManager?.delete(marker!!)
@@ -119,7 +121,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         val bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom)
         val bitmapId = Integer.toString(v.id)
         addBitmapToStyle(bitmap, bitmapId)
-        if (v is RCTMGLCallout) {
+        if (v is RNMBXCallout) {
             mCalloutBitmap = bitmap
             mCalloutBitmapId = bitmapId
         } else {
@@ -133,8 +135,8 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
 
     val latLng: LatLng?
         get() = mCoordinate?.let { GeoJSONUtils.toLatLng(it) }
-    val mapboxID: Long
-        get() = if (marker == null) -1 else marker!!.id
+    val mapboxID: AnnotationID
+        get() = if (marker == null) INVALID_ANNOTATION_ID else marker!!.id
 
     fun setCoordinate(point: Point) {
         mCoordinate = point

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotationManager.java → java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotationManager.java}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.rnmapbox.rnmbx.components.annotation;
 
 import androidx.annotation.Nullable;
 
@@ -8,16 +8,16 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
 
 import java.util.Map;
 
-public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPointAnnotation> {
-    public static final String REACT_CLASS = "RCTMGLPointAnnotation";
+public class RNMBXPointAnnotationManager extends AbstractEventEmitter<RNMBXPointAnnotation> {
+    public static final String REACT_CLASS = "RNMBXPointAnnotation";
 
-    public RCTMGLPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
+    public RNMBXPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
     }
 
@@ -49,32 +49,32 @@ public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPoi
     }
 
     @Override
-    protected RCTMGLPointAnnotation createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLPointAnnotation(reactContext, this);
+    protected RNMBXPointAnnotation createViewInstance(ThemedReactContext reactContext) {
+        return new RNMBXPointAnnotation(reactContext, this);
     }
 
     @ReactProp(name="id")
-    public void setId(RCTMGLPointAnnotation annotation, String id) {
+    public void setId(RNMBXPointAnnotation annotation, String id) {
         annotation.setID(id);
     }
 
     @ReactProp(name="coordinate")
-    public void setCoordinate(RCTMGLPointAnnotation annotation, String geoJSONStr) {
+    public void setCoordinate(RNMBXPointAnnotation annotation, String geoJSONStr) {
         annotation.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
     }
 
     @ReactProp(name="anchor")
-    public void setAnchor(RCTMGLPointAnnotation annotation, ReadableMap map) {
+    public void setAnchor(RNMBXPointAnnotation annotation, ReadableMap map) {
         annotation.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
     }
 
     @ReactProp(name="draggable")
-    public void setDraggable(RCTMGLPointAnnotation annotation, Boolean draggable) {
+    public void setDraggable(RNMBXPointAnnotation annotation, Boolean draggable) {
         annotation.setDraggable(draggable);
     }
 
     @Override
-    public void receiveCommand(RCTMGLPointAnnotation annotation, int commandID, @Nullable ReadableArray args) {
+    public void receiveCommand(RNMBXPointAnnotation annotation, int commandID, @Nullable ReadableArray args) {
         switch (commandID) {
             case METHOD_REFRESH:
                 annotation.refresh();

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/camera/CameraStop.kt

@@ -1,18 +1,18 @@
-package com.mapbox.rctmgl.components.camera
+package com.rnmapbox.rnmbx.components.camera
 
 import android.animation.Animator
 import android.content.Context
-import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
-import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLng
-import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
-import com.mapbox.rctmgl.utils.LatLngBounds
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLng
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
+import com.rnmapbox.rnmbx.utils.LatLngBounds
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.CameraOptions
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.EdgeInsets
-import com.mapbox.rctmgl.components.camera.constants.CameraMode
-import com.mapbox.rctmgl.utils.LatLng
+import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.utils.LatLng
 
 class CameraStop {
     private var mBearing: Double? = null
@@ -91,7 +91,7 @@ class CameraStop {
         )
     }
 
-    fun toCameraUpdate(mapView: RCTMGLMapView): CameraUpdateItem {
+    fun toCameraUpdate(mapView: RNMBXMapView): CameraUpdateItem {
         val map = mapView.getMapboxMap()
         val currentCamera = map.cameraState
         val builder = CameraOptions.Builder()
@@ -204,7 +204,7 @@ class CameraStop {
             return stop
         }
 
-        private fun clippedPadding(padding: IntArray, mapView: RCTMGLMapView): IntArray {
+        private fun clippedPadding(padding: IntArray, mapView: RNMBXMapView): IntArray {
             val mapHeight = mapView.height
             val mapWidth = mapView.width
             val left = padding[0]

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/camera/CameraUpdateItem.kt

@@ -1,27 +1,29 @@
-package com.mapbox.rctmgl.components.camera
+package com.rnmapbox.rnmbx.components.camera
 
 import android.animation.Animator
 import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
-import com.mapbox.rctmgl.components.camera.CameraStop
-import com.mapbox.rctmgl.components.camera.RCTMGLCamera
+import com.rnmapbox.rnmbx.components.camera.CameraStop
+import com.rnmapbox.rnmbx.components.camera.RNMBXCamera
 import com.mapbox.maps.CameraOptions
 import android.view.animation.LinearInterpolator
 import android.view.animation.AccelerateDecelerateInterpolator
-import com.mapbox.rctmgl.components.camera.CameraUpdateQueue.OnCompleteAllListener
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
+import com.rnmapbox.rnmbx.components.camera.CameraUpdateQueue.OnCompleteAllListener
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.camera.CameraUpdateItem
 import com.facebook.react.bridge.ReactApplicationContext
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.plugin.animation.MapAnimationOptions.Companion.mapAnimationOptions
 import com.mapbox.maps.plugin.animation.easeTo
 import com.mapbox.maps.plugin.animation.flyTo
-import com.mapbox.rctmgl.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.v11compat.mapboxmap.easeToV11
+import com.rnmapbox.rnmbx.v11compat.mapboxmap.flyToV11
 import java.lang.ref.WeakReference
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.RunnableFuture
@@ -78,16 +80,14 @@ class CameraUpdateItem(
             isCameraActionCancelled = true
             return
         }
-        val animationOptions = MapAnimationOptions.Builder().apply {
-            animatorListener(callback)
-        }
+        val animationOptions = MapAnimationOptions.Builder();
 
         // animateCamera / easeCamera only allows positive duration
         if (duration == 0 || mCameraMode == CameraMode.NONE) {
-            map.flyTo(mCameraUpdate, animationOptions.apply {
+            map.flyToV11(mCameraUpdate, animationOptions.apply {
                 duration(0)
-                animatorListener(callback)
-            }.build())
+            },
+            callback)
         }
 
         // On iOS a duration of -1 means default or dynamic duration (based on flight-path length)
@@ -96,16 +96,17 @@ class CameraUpdateItem(
             animationOptions.apply { duration(duration.toLong()) }
         }
         if (mCameraMode == CameraMode.FLIGHT) {
-            map.flyTo(mCameraUpdate, animationOptions.build())
+            map.flyToV11(mCameraUpdate, animationOptions, callback)
         } else if (mCameraMode == CameraMode.LINEAR) {
-            map.easeTo(
-                mCameraUpdate,
-                animationOptions.apply { interpolator(LinearInterpolator()) }.build()
+            map.easeToV11(
+                mCameraUpdate,animationOptions.apply { interpolator(LinearInterpolator()) },
+                callback
             )
         } else if (mCameraMode == CameraMode.EASE) {
-            map.easeTo(
+            map.easeToV11(
                 mCameraUpdate,
-                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) }.build()
+                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) },
+                callback
             )
         }
         null

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/camera/CameraUpdateQueue.kt

@@ -1,19 +1,19 @@
-package com.mapbox.rctmgl.components.camera
+package com.rnmapbox.rnmbx.components.camera
 
-import com.mapbox.rctmgl.components.camera.CameraStop.Companion.fromReadableMap
+import com.rnmapbox.rnmbx.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.rnmapbox.rnmbx.components.camera.CameraStop
+import com.rnmapbox.rnmbx.components.camera.CameraUpdateQueue.OnCompleteAllListener
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.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.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.camera.RNMBXCamera
+import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
@@ -53,7 +53,7 @@ class CameraUpdateQueue {
         mCompleteListener = listener
     }
 
-    fun execute(map: RCTMGLMapView?) {
+    fun execute(map: RNMBXMapView?) {
         if (mQueue.isEmpty()) {
             mCompleteListener?.let { it.onCompleteAll() }
             return

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt → java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt}

@@ -1,24 +1,22 @@
-package com.mapbox.rctmgl.components.camera
+package com.rnmapbox.rnmbx.components.camera
 
 import android.animation.Animator
 import android.content.Context
 import android.location.Location
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.plugin.gestures.gestures
-import com.mapbox.rctmgl.location.LocationManager.Companion.getInstance
+import com.rnmapbox.rnmbx.location.LocationManager.Companion.getInstance
 import com.mapbox.maps.plugin.animation.flyTo
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.location.LocationComponentManager
-import com.mapbox.rctmgl.utils.LatLngBounds
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.location.LocationComponentManager
+import com.rnmapbox.rnmbx.utils.LatLngBounds
 import com.mapbox.maps.plugin.locationcomponent.OnIndicatorBearingChangedListener
 import com.mapbox.maps.plugin.locationcomponent.OnIndicatorPositionChangedListener
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.mapbox.maps.*
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.locationcomponent.location
-import com.mapbox.maps.plugin.locationcomponent.location2
 import com.mapbox.maps.plugin.viewport.ViewportStatus
 import com.mapbox.maps.plugin.viewport.ViewportStatusObserver
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
@@ -28,16 +26,17 @@ import com.mapbox.maps.plugin.viewport.state.FollowPuckViewportState
 import com.mapbox.maps.plugin.viewport.state.OverviewViewportState
 import com.mapbox.maps.plugin.viewport.state.ViewportState
 import com.mapbox.maps.plugin.viewport.viewport
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.camera.constants.CameraMode
-import com.mapbox.rctmgl.components.location.*
-import com.mapbox.rctmgl.events.MapUserTrackingModeEvent
-import com.mapbox.rctmgl.location.*
-import com.mapbox.rctmgl.utils.Logger
-import com.mapbox.rctmgl.utils.writableMapOf
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.components.location.*
+import com.rnmapbox.rnmbx.events.MapUserTrackingModeEvent
+import com.rnmapbox.rnmbx.location.*
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.writableMapOf
 
+import com.rnmapbox.rnmbx.v11compat.location.*;
 
-class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
+class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCameraManager) :
     AbstractMapFeature(
         mContext
     ) {
@@ -90,7 +89,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         override fun onAnimationRepeat(animator: Animator) {}
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         setInitialCamera()
         updateMaxBounds()
@@ -99,7 +98,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         _updateViewportState()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason) : Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason) : Boolean {
         if (reason == RemovalReason.STYLE_CHANGE) {
             return false
         } else {
@@ -273,7 +272,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     fun setUserTrackingMode(userTrackingMode: Int) {
         val oldTrackingMode = mUserTrackingMode
         mUserTrackingMode = userTrackingMode
-        mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, userTrackingMode))
+        mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, userTrackingMode))
         when (mUserTrackingMode) {
             UserTrackingMode.NONE -> mUserTrackingState = UserTrackingState.POSSIBLE
             UserTrackingMode.FOLLOW, UserTrackingMode.FollowWithCourse, UserTrackingMode.FollowWithHeading -> if (oldTrackingMode == UserTrackingMode.NONE) {
@@ -348,7 +347,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
 
 
 
-                    mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.NONE,
+                    mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, UserTrackingMode.NONE,
                     writableMapOf(
                         "followUserMode" to toFollowUserMode(toStatus),
                         "followUserLocation" to followUserLocation,
@@ -430,7 +429,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
                     }
                 }
                 else -> {
-                    Logger.e("RCTMGLCamera", "unexpected follow mode: $mFollowUserMode")
+                    Logger.e("RNMBXCamera", "unexpected follow mode: $mFollowUserMode")
                 }
             }
 
@@ -500,6 +499,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         const val USER_LOCATION_CAMERA_MOVE_DURATION = 1000
         const val minimumZoomLevelForUserTracking = 10.5
         const val defaultZoomLevelForUserTracking = 14.0
-        const val LOG_TAG = "RCTMGLCamera"
+        const val LOG_TAG = "RNMBXCamera"
     }
 }