@rnmapbox/maps 10.1.0-beta.4 → 10.1.0-beta.6

package/CHANGELOG.md

@@ -10,12 +10,12 @@ PR Title ([#123](link to my pr))
 #### Breaking changes:
 
 The setup was changed - see install instructions for more details. In a nuthsell:
-* On both android/ios to select mapbox implementation use `RNMapboxMapsImpl`/`$RNMapboxMapsImpl` variable which can be one of (`maplibre`,`mapbox`(aka v10),`mapbox-gl`)
-* Default implementation is `maplibre` as it requires not further setup. *WARNING* using mapbox styles from `maplibre` has different pricing than mapbox native sdk-s.
-* On Podfile `$RNMBGL.(pre|post)_install` was changed `$RNMapboxMaps.(pre|post)_install`
-* Package name was changed from `@react-native-mapbox-gl/maps` to `@rnmapbox/maps`. If you just testing with the v10 version you can use something like [babel-plugin-transform-rename-import](https://www.npmjs.com/package/babel-plugin-transform-rename-import) to keep using the old imports for a while.
-* `MapboxGL.setAccessToken` now requires `MapboxGL.setWellKnownTileServer` on maplibre.
 
+- On both android/ios to select mapbox implementation use `RNMapboxMapsImpl`/`$RNMapboxMapsImpl` variable which can be one of (`maplibre`,`mapbox`(aka v10),`mapbox-gl`)
+- Default implementation is `maplibre` as it requires not further setup. _WARNING_ using mapbox styles from `maplibre` has different pricing than mapbox native sdk-s.
+- On Podfile `$RNMBGL.(pre|post)_install` was changed `$RNMapboxMaps.(pre|post)_install`
+- Package name was changed from `@react-native-mapbox-gl/maps` to `@rnmapbox/maps`. If you just testing with the v10 version you can use something like [babel-plugin-transform-rename-import](https://www.npmjs.com/package/babel-plugin-transform-rename-import) to keep using the old imports for a while.
+- `MapboxGL.setAccessToken` now requires `MapboxGL.setWellKnownTileServer` on maplibre.
 
 #### Changes:
 
@@ -97,7 +97,7 @@ Add Expo config plugin ([#1388](https://github.com/rnmapbox/maps/pull/1388))
 Android: Bump `okhttp` to `4.9.0` ([#1390](https://github.com/rnmapbox/maps/pull/1390))
 Support dynamically changing local JSON in styleURL ([#1399](https://github.com/rnmapbox/maps/pull/1399))
 Add missing types to `SymbolLayerStyle` & `ImagesProps` ([#1360](https://github.com/rnmapbox/maps/pull/1360))
-Fix error while updating coordinates of RCTMGLImageSource ([#1310](https://github.com/rnmapbox/maps/pull/1310))
+Fix error while updating coordinates of RNMBXImageSource ([#1310](https://github.com/rnmapbox/maps/pull/1310))
 
 ## 8.2.0-beta2
 

package/android/build.gradle

@@ -56,7 +56,7 @@ android {
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
         sourceSets {
             main {
-                java.srcDirs = ['src/main/java-v10']
+                java.srcDirs = ['src/main/java']
                 if (safeExtGet("RNMapboxMapsUseV11", false)) {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v11'
                 } else {

package/android/install.md

@@ -35,6 +35,20 @@ allprojects {
 }
 ```
 
+### Setting Mapbox implementation
+
+Note 10.1 or later only supports mapbox 10 and 11 implementations. So you no longer need to set this variable:
+
+Set `RNMapboxMapsImpl` in `android/build.gradle > buildscript > ext` section
+
+```groovy
+buildscript {
+    ext {
+        RNMapboxMapsImpl = 'mapbox'
+    }
+}
+```
+
 ### Using non default mapbox version
 
 *Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mapbox.rctmgl">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rnmapbox.rnmbx">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -0,0 +1,168 @@
+package com.rnmapbox.rnmbx
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.JavaScriptModule
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
+import com.rnmapbox.rnmbx.components.images.RNMBXImageManager
+import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
+import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocationManager
+import com.rnmapbox.rnmbx.components.mapview.NativeMapViewModule
+import com.rnmapbox.rnmbx.components.mapview.RNMBXAndroidTextureMapViewManager
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapViewManager
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleImportManager
+import com.rnmapbox.rnmbx.components.styles.atmosphere.RNMBXAtmosphereManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXBackgroundLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXCircleLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
+import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXVectorSourceManager
+import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager
+import com.rnmapbox.rnmbx.modules.RNMBXLocationModule
+import com.rnmapbox.rnmbx.modules.RNMBXLogging
+import com.rnmapbox.rnmbx.modules.RNMBXModule
+import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
+import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
+
+class RNMBXPackage : TurboReactPackage() {
+    override fun getModule(
+        s: String,
+        reactApplicationContext: ReactApplicationContext
+    ): NativeModule? {
+        when (s) {
+            RNMBXModule.REACT_CLASS -> return RNMBXModule(reactApplicationContext)
+            RNMBXLocationModule.REACT_CLASS -> return RNMBXLocationModule(reactApplicationContext)
+            RNMBXOfflineModule.REACT_CLASS -> return RNMBXOfflineModule(reactApplicationContext)
+            RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
+            RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
+            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext)
+        }
+        return null
+    }
+
+    @Deprecated("")
+    fun createJSModules(): List<Class<out JavaScriptModule?>> {
+        return emptyList()
+    }
+
+    override fun createViewManagers(reactApplicationContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        val managers: MutableList<ViewManager<*, *>> = ArrayList()
+
+        // components
+        managers.add(RNMBXCameraManager(reactApplicationContext))
+        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext))
+        managers.add(RNMBXMapViewManager(reactApplicationContext))
+        managers.add(RNMBXStyleImportManager(reactApplicationContext))
+
+        // annotations
+        managers.add(RNMBXMarkerViewManager(reactApplicationContext))
+        managers.add(RNMBXPointAnnotationManager(reactApplicationContext))
+        managers.add(RNMBXCalloutManager())
+        managers.add(RNMBXNativeUserLocationManager())
+
+        // sources
+        managers.add(RNMBXVectorSourceManager(reactApplicationContext))
+        managers.add(RNMBXShapeSourceManager(reactApplicationContext))
+        managers.add(RNMBXRasterDemSourceManager(reactApplicationContext))
+        managers.add(RNMBXRasterSourceManager(reactApplicationContext))
+        managers.add(RNMBXImageSourceManager())
+
+        // images
+        managers.add(RNMBXImagesManager(reactApplicationContext))
+        managers.add(RNMBXImageManager(reactApplicationContext))
+
+        // layers
+        managers.add(RNMBXFillLayerManager())
+        managers.add(RNMBXFillExtrusionLayerManager())
+        managers.add(RNMBXHeatmapLayerManager())
+        managers.add(RNMBXLineLayerManager())
+        managers.add(RNMBXCircleLayerManager())
+        managers.add(RNMBXSymbolLayerManager())
+        managers.add(RNMBXRasterLayerManager())
+        managers.add(RNMBXSkyLayerManager())
+        managers.add(RNMBXTerrainManager())
+        managers.add(RNMBXAtmosphereManager())
+        managers.add(RNMBXBackgroundLayerManager())
+        managers.add(RNMBXLightManager())
+        return managers
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            moduleInfos[RNMBXModule.REACT_CLASS] = ReactModuleInfo(
+                RNMBXModule.REACT_CLASS,
+                RNMBXModule.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
+            moduleInfos[RNMBXLocationModule.REACT_CLASS] = ReactModuleInfo(
+                RNMBXLocationModule.REACT_CLASS,
+                RNMBXLocationModule.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
+            moduleInfos[RNMBXOfflineModule.REACT_CLASS] = ReactModuleInfo(
+                RNMBXOfflineModule.REACT_CLASS,
+                RNMBXOfflineModule.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
+            moduleInfos[RNMBXSnapshotModule.REACT_CLASS] = ReactModuleInfo(
+                RNMBXSnapshotModule.REACT_CLASS,
+                RNMBXSnapshotModule.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
+            moduleInfos[RNMBXLogging.REACT_CLASS] = ReactModuleInfo(
+                RNMBXLogging.REACT_CLASS,
+                RNMBXLogging.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
+            moduleInfos[NativeMapViewModule.NAME] = ReactModuleInfo(
+                NativeMapViewModule.NAME,
+                NativeMapViewModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
+            moduleInfos
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components;
+package com.rnmapbox.rnmbx.components;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components
+package com.rnmapbox.rnmbx.components
 
 import android.app.Activity
 import android.view.ViewGroup
@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.mapbox.rctmgl.events.IEvent
+import com.rnmapbox.rnmbx.events.IEvent
 
 /**
  * Created by nickitaliano on 8/23/17.

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

@@ -1,8 +1,8 @@
-package com.mapbox.rctmgl.components
+package com.rnmapbox.rnmbx.components
 
 import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 
 enum class RemovalReason {
     VIEW_REMOVAL,
@@ -12,22 +12,22 @@ enum class RemovalReason {
 }
 
 abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
-    protected var mMapView: RCTMGLMapView? = null;
-    private var mWithMapViewCallbacks: Array<((RCTMGLMapView) -> Unit)>? = null;
+    protected var mMapView: RNMBXMapView? = null;
+    private var mWithMapViewCallbacks: Array<((RNMBXMapView) -> Unit)>? = null;
 
-    open fun addToMap(mapView: RCTMGLMapView) {
+    open fun addToMap(mapView: RNMBXMapView) {
         mMapView = mapView;
         mWithMapViewCallbacks?.forEach { it(mapView) }
         mWithMapViewCallbacks = null;
     }
 
     // return false if you don not want to remove this feature based on reason
-    open fun removeFromMap(mapView: RCTMGLMapView,reason: RemovalReason) : Boolean {
+    open fun removeFromMap(mapView: RNMBXMapView,reason: RemovalReason) : Boolean {
         mMapView = null;
         return true;
     }
 
-    internal fun withMapView(callback: (mapView: RCTMGLMapView) -> Unit) {
+    internal fun withMapView(callback: (mapView: RNMBXMapView) -> Unit) {
         val mapView = mMapView;
         if (mapView == null) {
             val callbacks = mWithMapViewCallbacks ?: arrayOf();

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXCallout.kt

@@ -0,0 +1,6 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+
+class RNMBXCallout(context: Context?) : ReactViewGroup(context)

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXCalloutManager.java

@@ -0,0 +1,18 @@
+package com.rnmapbox.rnmbx.components.annotation;
+
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+
+public class RNMBXCalloutManager extends ViewGroupManager<RNMBXCallout> {
+    public static final String REACT_CLASS = "RNMBXCallout";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected RNMBXCallout createViewInstance(ThemedReactContext reactContext) {
+        return new RNMBXCallout(reactContext);
+    }
+}

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,33 +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.*
 
-import com.mapbox.rctmgl.v11compat.annotation.*;
+import com.rnmapbox.rnmbx.v11compat.annotation.*;
 
-class RCTMGLPointAnnotation(private val mContext: Context, private val mManager: RCTMGLPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
+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
@@ -48,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
@@ -74,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()
@@ -93,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!!)
@@ -121,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 {

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]