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

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,13 +41,15 @@ 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)
-        nativeImageUpdater?.let {
-            it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
-            mBitmap = null;
+        bitmap?.let { bitmap ->
+            nativeImageUpdater?.let {
+                it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
+                mBitmap = null;
+            }
         }
     }
 
@@ -59,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
@@ -67,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,26 +14,28 @@ 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.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)
     bitmap.copyPixelsToBuffer(byteBuffer)
     return this.addStyleImage(
         imageId,
         (1.0/((160.0/bitmap.density)) * scale).toFloat() ,
-        Image(bitmap.width, bitmap.height, byteBuffer.array()),
+        Image(bitmap.width, bitmap.height, byteBuffer.array().toImageData()),
         sdf,
         stretchX,
         stretchY,
@@ -60,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
@@ -101,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) {
@@ -112,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()) {
@@ -174,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 {

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.images
+package com.rnmapbox.rnmbx.components.images
 
 import android.graphics.drawable.BitmapDrawable
 import android.view.View
@@ -8,24 +8,24 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.utils.ImageEntry
-import com.mapbox.rctmgl.utils.Logger
-import com.mapbox.rctmgl.utils.ResourceUtils
-import com.mapbox.rctmgl.utils.extensions.forEach
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.utils.ImageEntry
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ResourceUtils
+import com.rnmapbox.rnmbx.utils.extensions.forEach
 import java.util.*
 
-class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLImages?>(
+class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXImages?>(
         mContext
     ) {
     override fun getName(): String {
-        return "RCTMGLImages"
+        return "RNMBXImages"
     }
 
-    public override fun createViewInstance(context: ThemedReactContext): RCTMGLImages {
-        return RCTMGLImages(context, this)
+    public override fun createViewInstance(context: ThemedReactContext): RNMBXImages {
+        return RNMBXImages(context, this)
     }
 
     fun imageInfo(name: String, map: ReadableMap): ImageInfo {
@@ -48,7 +48,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
         }
         if (map.hasKey("scale")) {
             if (map.getType("scale") != ReadableType.Number) {
-                Logger.e("RCTMGLImages", "scale should be a number found: $scale in $map")
+                Logger.e("RNMBXImages", "scale should be a number found: $scale in $map")
             }
             scale = map.getDouble("scale")
         }
@@ -56,7 +56,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "images")
-    fun setImages(images: RCTMGLImages, map: ReadableMap) {
+    fun setImages(images: RNMBXImages, map: ReadableMap) {
         val imagesList = mutableListOf<Map.Entry<String, ImageEntry>>()
         map.forEach { imageName, imageInfo ->
             when (imageInfo) {
@@ -65,7 +65,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                     if (uri != null) {
                         imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(uri,  imageInfo(imageName, imageInfo))))
                     } else {
-                        Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, no uri/url found!")
+                        Logger.e("RNMBXImagesManager", "Unexpected value for key: $imageName in images property, no uri/url found!")
                     }
                 }
                 is String -> {
@@ -73,7 +73,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                     imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(name, ImageInfo(name=imageName))))
                 }
                 else -> {
-                    Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, only string/object is supported")
+                    Logger.e("RNMBXImagesManager", "Unexpected value for key: $imageName in images property, only string/object is supported")
                 }
             }
         }
@@ -81,7 +81,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "hasOnImageMissing")
-    fun setHasOnImageMissing(images: RCTMGLImages, value: Boolean?) {
+    fun setHasOnImageMissing(images: RNMBXImages, value: Boolean?) {
         images.setHasOnImageMissing(value!!)
     }
 
@@ -94,7 +94,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 if (drawable != null) {
                     return NativeImage(ImageInfo(name=resourceName), drawable)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
+                    Logger.e("RNMBXImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }
@@ -106,19 +106,19 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 if (drawable != null && resourceName != null) {
                     return NativeImage(imageInfo(resourceName, map), drawable)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
+                    Logger.e("RNMBXImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }
             else -> {
-                Logger.e("RCTMGLImages", "nativeImages element should be a string or a object, but was: $dynamic")
+                Logger.e("RNMBXImages", "nativeImages element should be a string or a object, but was: $dynamic")
                 return null
             }
         }
     }
 
     @ReactProp(name = "nativeImages")
-    fun setNativeImages(images: RCTMGLImages, arr: ReadableArray) {
+    fun setNativeImages(images: RNMBXImages, arr: ReadableArray) {
         val nativeImages = mutableListOf<NativeImage>();
         for (i in 0 until arr.size()) {
             val nativeImage = toNativeImage(arr.getDynamic(i))
@@ -135,16 +135,16 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
             .build()
     }
 
-    // region RCTMGLImage children
+    // region RNMBXImage children
 
-    override fun addView(parent: RCTMGLImages?, childView: View?, childPosition: Int) {
+    override fun addView(parent: RNMBXImages?, childView: View?, childPosition: Int) {
         if (parent == null || childView == null) {
-            Logger.e("RCTMGLImages", "addView: parent or childView is null")
+            Logger.e("RNMBXImages", "addView: parent or childView is null")
             return
         }
 
-        if (childView !is RCTMGLImage) {
-            Logger.e("RCTMGLImages", "child view should be RCTMGLImage")
+        if (childView !is RNMBXImage) {
+            Logger.e("RNMBXImages", "child view should be RNMBXImage")
             return
         }
 
@@ -152,18 +152,18 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
         childView.nativeImageUpdater = parent
     }
 
-    override fun removeView(parent: RCTMGLImages?, view: View?) {
+    override fun removeView(parent: RNMBXImages?, view: View?) {
         if (parent == null || view == null) {
-            Logger.e("RCTMGLImages", "removeView: parent or view is null")
+            Logger.e("RNMBXImages", "removeView: parent or view is null")
             return
         }
 
         parent.mImageViews.remove(view)
     }
 
-    override fun removeAllViews(parent: RCTMGLImages?) {
+    override fun removeAllViews(parent: RNMBXImages?) {
         if (parent == null) {
-            Logger.e("RCTMGLImages", "removeAllViews parent is null")
+            Logger.e("RNMBXImages", "removeAllViews parent is null")
             return
         }
 
@@ -173,22 +173,22 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     // endregion
 
     companion object {
-        const val REACT_CLASS = "RCTMGLImages"
+        const val REACT_CLASS = "RNMBXImages"
 
         fun convertStretch(stretch: Dynamic) : List<ImageStretches>? {
             if (stretch.type != ReadableType.Array) {
-                Logger.e("RCTMGLImages", "stretch should be an array, got $stretch")
+                Logger.e("RNMBXImages", "stretch should be an array, got $stretch")
                 return null
             }
             val array = stretch.asArray()
             var result = mutableListOf<ImageStretches>();
             for (i in 0 until array.size()) {
                 if (array.getType(i) != ReadableType.Array) {
-                    Logger.e("RTMGLImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
+                    Logger.e("RNMBXImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
                 } else {
                     val pair = array.getArray(i)
                     if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
-                        Logger.e("RCTMGLImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                        Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
                     }
                     result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
                 }
@@ -198,18 +198,18 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
 
         fun convertContent(content: Dynamic) : ImageContent? {
             if (content.type != ReadableType.Array) {
-                Logger.e("RCTMGLImages", "content should be an array, got $content")
+                Logger.e("RNMBXImages", "content should be an array, got $content")
                 return null
             }
             val array = content.asArray()
             if (array.size() != 4) {
-                Logger.e("RCTMGLImages", "content should be an array of 4 numbers, got $content")
+                Logger.e("RNMBXImages", "content should be an array of 4 numbers, got $content")
                 return null
             }
             val result = arrayOf(0.0, 0.0, 0.0, 0.0, 0.0)
             for (i in 0 until array.size()) {
                 if (array.getType(i) != ReadableType.Number) {
-                    Logger.e("RTMGLImages", "each element of content should be an number but was : ${array}")
+                    Logger.e("RNMBXImages", "each element of content should be an number but was : ${array}")
                     return null
                 } else {
                     result[i] = array.getDouble(i)

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

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