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

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

@@ -1,29 +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.mapbox.rctmgl.v11compat.mapboxmap.easeToV11
-import com.mapbox.rctmgl.v11compat.mapboxmap.flyToV11
+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

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,16 +1,16 @@
-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
@@ -26,17 +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.mapbox.rctmgl.v11compat.location.*;
+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
     ) {
@@ -89,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()
@@ -98,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 {
@@ -272,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) {
@@ -347,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,
@@ -429,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")
                 }
             }
 
@@ -499,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"
     }
 }

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

@@ -1,16 +1,16 @@
-package com.mapbox.rctmgl.components.camera
+package com.rnmapbox.rnmbx.components.camera
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 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.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.camera.CameraStop.Companion.fromReadableMap
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
 
 
-class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLCamera?>(
+class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXCamera?>(
         mContext
     ) {
     override fun customEvents(): Map<String, String>? {
@@ -21,12 +21,12 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLCamera {
-        return RCTMGLCamera(reactContext, this)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXCamera {
+        return RNMBXCamera(reactContext, this)
     }
 
     @ReactProp(name = "stop")
-    fun setStop(camera: RCTMGLCamera, map: ReadableMap?) {
+    fun setStop(camera: RNMBXCamera, map: ReadableMap?) {
         if (map != null) {
             val stop = fromReadableMap(mContext, map, null)
             camera.setStop(stop)
@@ -34,7 +34,7 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "defaultStop")
-    fun setDefaultStop(camera: RCTMGLCamera, map: ReadableMap?) {
+    fun setDefaultStop(camera: RNMBXCamera, map: ReadableMap?) {
         if (map != null) {
             val stop = fromReadableMap(mContext, map, null)
             camera.setDefaultStop(stop)
@@ -42,58 +42,58 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "userTrackingMode")
-    fun setUserTrackingMode(camera: RCTMGLCamera, userTrackingMode: Int) {
+    fun setUserTrackingMode(camera: RNMBXCamera, userTrackingMode: Int) {
         camera.setUserTrackingMode(userTrackingMode)
         throw AssertionError("Unused code")
     }
 
     @ReactProp(name = "zoomLevel")
-    fun setZoomLevel(camera: RCTMGLCamera, zoomLevel: Double) {
+    fun setZoomLevel(camera: RNMBXCamera, zoomLevel: Double) {
         camera.setZoomLevel(zoomLevel)
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(camera: RCTMGLCamera, value: Double) {
+    fun setMinZoomLevel(camera: RNMBXCamera, value: Double) {
         camera.setMinZoomLevel(value)
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(camera: RCTMGLCamera, value: Double) {
+    fun setMaxZoomLevel(camera: RNMBXCamera, value: Double) {
         camera.setMaxZoomLevel(value)
     }
 
     @ReactProp(name = "followUserLocation")
-    fun setFollowUserLocation(camera: RCTMGLCamera, value: Boolean) {
+    fun setFollowUserLocation(camera: RNMBXCamera, value: Boolean) {
         camera.setFollowUserLocation(value)
     }
 
     @ReactProp(name = "followUserMode")
-    fun setFollowUserMode(camera: RCTMGLCamera, value: String?) {
+    fun setFollowUserMode(camera: RNMBXCamera, value: String?) {
         camera.setFollowUserMode(value)
     }
 
     @ReactProp(name = "followZoomLevel")
-    fun setFollowZoomLevel(camera: RCTMGLCamera, value: Double) {
+    fun setFollowZoomLevel(camera: RNMBXCamera, value: Double) {
         camera.setFollowZoomLevel(value)
     }
 
     @ReactProp(name = "followPitch")
-    fun setFollowPitch(camera: RCTMGLCamera, value: Double) {
+    fun setFollowPitch(camera: RNMBXCamera, value: Double) {
         camera.setFollowPitch(value)
     }
 
     @ReactProp(name = "followHeading")
-    fun setFollowHeading(camera: RCTMGLCamera, value: Double) {
+    fun setFollowHeading(camera: RNMBXCamera, value: Double) {
         camera.setFollowHeading(value)
     }
 
     @ReactProp(name = "followPadding")
-    fun setFollowPadding(camera: RCTMGLCamera, value: ReadableMap) {
+    fun setFollowPadding(camera: RNMBXCamera, value: ReadableMap) {
         camera.setFollowPadding(value)
     }
 
     @ReactProp(name = "maxBounds")
-    fun setMaxBounds(camera: RCTMGLCamera, value: String?) {
+    fun setMaxBounds(camera: RNMBXCamera, value: String?) {
         if (value != null) {
             val collection = FeatureCollection.fromJson(value)
             camera.setMaxBounds(toLatLngBounds(collection))
@@ -103,6 +103,6 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLCamera"
+        const val REACT_CLASS = "RNMBXCamera"
     }
 }

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.camera.constants;
+package com.rnmapbox.rnmbx.components.camera.constants;
 
 import androidx.annotation.IntDef;
 

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.images
+package com.rnmapbox.rnmbx.components.images
 
 import android.graphics.Bitmap
 import android.view.View
@@ -7,12 +7,12 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.views.view.ReactViewGroup
 import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
-import com.mapbox.rctmgl.components.annotation.RCTMGLCallout
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.utils.BitmapUtils
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.utils.BitmapUtils
+import com.rnmapbox.rnmbx.utils.Logger
 
-class RCTMGLImage(private val mContext: ReactApplicationContext, private val mManager: RCTMGLImageManager): ReactViewGroup(mContext), View.OnLayoutChangeListener {
+class RNMBXImage(private val mContext: ReactApplicationContext, private val mManager: RNMBXImageManager): ReactViewGroup(mContext), View.OnLayoutChangeListener {
     var name: String? = null
     var sdf: Boolean = false
     var scale: Double = 1.0
@@ -22,7 +22,7 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
 
     var mChildView: View? = null;
 
-    var mMapView: RCTMGLMapView? = null;
+    var mMapView: RNMBXMapView? = null;
 
     var nativeImageUpdater: NativeImageUpdater? = null;
 
@@ -41,7 +41,7 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
     private fun refreshBitmap(v: View, left: Int = v.left, top: Int = v.top, right: Int = v.right, bottom: Int = v.bottom) {
         val name = this.name
         if (name == null) {
-            Logger.e("RCTMGLImage", "Image component has no name")
+            Logger.e("RNMBXImage", "Image component has no name")
             return
         }
         val bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom)
@@ -61,7 +61,7 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
 
     override fun addView(childView: View, childPosition: Int) {
         if (childPosition != 0) {
-            Logger.e("RCTMGLImage", "expected a single subview got childView:$childView position:$childPosition")
+            Logger.e("RNMBXImage", "expected a single subview got childView:$childView position:$childPosition")
         }
         mMapView?.offscreenAnnotationViewContainer?.addView(childView)
         mChildView = childView
@@ -69,7 +69,7 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
     }
 
     // region add/remove to Map
-    fun addToMap(mapView: RCTMGLMapView) {
+    fun addToMap(mapView: RNMBXMapView) {
         mMapView = mapView
     }
     // endregion

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImageManager.kt

@@ -0,0 +1,67 @@
+package com.rnmapbox.rnmbx.components.images
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.DynamicFromArray
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+
+class RNMBXImageManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXImage>(
+mContext
+) {
+    override fun getName(): String {
+        return "RNMBXImage"
+    }
+
+    override fun createViewInstance(p0: ThemedReactContext): RNMBXImage {
+        return RNMBXImage(mContext, this)
+    }
+
+    override fun customEvents(): MutableMap<String, String>? {
+        return mutableMapOf();
+    }
+
+    // region React properties
+    @ReactProp(name="name")
+    fun setName(image: RNMBXImage, value: String) {
+        image.name = value
+    }
+
+    @ReactProp(name="sdf")
+    fun setSdf(image: RNMBXImage, value: Boolean) {
+        image.sdf = value
+    }
+
+    @ReactProp(name="stretchX")
+    fun setStretchX(image: RNMBXImage, value: Dynamic) {
+        image.stretchX = RNMBXImagesManager.convertStretch(value) ?: listOf()
+    }
+
+    @ReactProp(name="stretchY")
+    fun setStretchY(image: RNMBXImage, value: Dynamic) {
+        image.stretchY = RNMBXImagesManager.convertStretch(value) ?: listOf()
+    }
+
+    @ReactProp(name="content")
+    fun setContent(image: RNMBXImage, value: Dynamic) {
+        image.content = RNMBXImagesManager.convertContent(value)
+    }
+
+    @ReactProp(name="scale")
+    fun setScale(image: RNMBXImage, value: Double) {
+        image.scale = value
+    }
+    // endregion
+
+    // region React methods
+    override fun receiveCommand(root: RNMBXImage, commandId: String?, args: ReadableArray?) {
+        if (commandId == "refresh") {
+            root.refresh()
+        }
+    }
+    // endregion
+}

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

@@ -1,10 +1,10 @@
-package com.mapbox.rctmgl.components.images
+package com.rnmapbox.rnmbx.components.images
 
 import android.content.Context
 import android.graphics.Bitmap
-import com.mapbox.rctmgl.components.images.RCTMGLImagesManager
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.utils.ImageEntry
+import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.graphics.drawable.BitmapDrawable
 import androidx.core.content.res.ResourcesCompat
 import com.mapbox.bindgen.Expected
@@ -14,20 +14,20 @@ import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.images.RCTMGLImages
-import com.mapbox.rctmgl.events.ImageMissingEvent
-import com.mapbox.rctmgl.utils.BitmapUtils
-import com.mapbox.rctmgl.utils.DownloadMapImageTask
+import com.rnmapbox.rnmbx.R
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.images.RNMBXImages
+import com.rnmapbox.rnmbx.events.ImageMissingEvent
+import com.rnmapbox.rnmbx.utils.BitmapUtils
+import com.rnmapbox.rnmbx.utils.DownloadMapImageTask
 import java.nio.ByteBuffer
 import java.util.AbstractMap
 import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
 
-import com.mapbox.rctmgl.v11compat.image.*;
+import com.rnmapbox.rnmbx.v11compat.image.*;
 
 fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0) : Expected<String, None> {
     val byteBuffer = ByteBuffer.allocate(bitmap.byteCount)
@@ -62,9 +62,9 @@ interface NativeImageUpdater {
     fun updateImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0)
 }
 
-class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager) : AbstractMapFeature(context), NativeImageUpdater {
+class RNMBXImages(context: Context, private val mManager: RNMBXImagesManager) : AbstractMapFeature(context), NativeImageUpdater {
     var mCurrentImages: MutableSet<String?>
-    var mImageViews = mutableListOf<RCTMGLImage>();
+    var mImageViews = mutableListOf<RNMBXImage>();
     private var mImages: MutableMap<String, ImageEntry>?
     private var mNativeImages = mutableMapOf<String, NativeImage>()
     private var mSendMissingImageEvents = false
@@ -103,7 +103,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         mSendMissingImageEvents = value
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         removeImages(mapView)
         mMap = null
         if (reason == RemovalReason.ON_DESTROY) {
@@ -114,7 +114,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         return super.removeFromMap(mapView, reason)
     }
 
-    private fun removeImages(mapView: RCTMGLMapView) {
+    private fun removeImages(mapView: RNMBXMapView) {
         mapView.getStyle(object : Style.OnStyleLoaded {
             override fun onStyleLoaded(style: Style) {
                 if (hasImages()) {
@@ -176,7 +176,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         return style != null && imageId?.let { style.getStyleImage(it) } != null
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
 
         mImageViews.forEach {