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

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleImport.kt

@@ -0,0 +1,37 @@
+package com.rnmapbox.rnmbx.components.styles
+
+import android.content.Context
+import android.view.ViewGroup
+import com.mapbox.bindgen.Value
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+
+import com.rnmapbox.rnmbx.v11compat.style.*
+
+class RNMBXStyleImport(context: Context) : AbstractMapFeature(context) {
+    var id: String? = null;
+
+    var config: HashMap<String, Value> = hashMapOf()
+        set(value: HashMap<String, Value>) {
+            field = value
+            if (mMapView != null) { updateConfig() }
+        }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+        updateConfig()
+    }
+
+    fun updateConfig() {
+        withMapView {mapView ->
+            id?.let { id ->
+                val config = this.config
+                if (config.isNotEmpty()) {
+                    mapView.mapView.getMapboxMap().getStyle()
+                        ?.setStyleImportConfigProperties(id, config)
+                }
+            }
+        }
+
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleImportManager.kt

@@ -0,0 +1,57 @@
+package com.rnmapbox.rnmbx.components.styles
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXStyleImportManagerInterface
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.mapbox.bindgen.Value
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.extensions.toValueHashMap
+import org.json.JSONObject
+
+class RNMBXStyleImportManager(context: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXStyleImport>(context),
+    RNMBXStyleImportManagerInterface<RNMBXStyleImport> {
+    override fun customEvents(): Map<String, String>? {
+        return MapBuilder.builder<String, String>().build()
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(context: ThemedReactContext): RNMBXStyleImport {
+        return RNMBXStyleImport(context)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXStyleImport"
+    }
+
+    @ReactProp(name = "id")
+    override fun setId(view: RNMBXStyleImport, value: String?) {
+        if (value != null) {
+            view.id = value
+        }
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(view: RNMBXStyleImport, value: Boolean) {
+
+    }
+
+    @ReactProp(name = "config")
+    override fun setConfig(view: RNMBXStyleImport, value: Dynamic) {
+        if (value.type != ReadableType.Map) {
+            Logger.e(REACT_CLASS, "config expected Map but received: ${value.type}")
+        } else {
+            view.config = value.asMap().toValueHashMap()
+        }
+    }
+}

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

@@ -1,18 +1,18 @@
-package com.mapbox.rctmgl.components.styles
+package com.rnmapbox.rnmbx.components.styles
 
 import com.facebook.react.bridge.*
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.extension.style.types.StyleTransition.Builder
-import com.mapbox.rctmgl.utils.ImageEntry
+import com.rnmapbox.rnmbx.utils.ImageEntry
 import com.mapbox.maps.extension.style.types.StyleTransition
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.light.LightPosition
-import com.mapbox.rctmgl.utils.ExpressionParser
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.Logger
 import java.util.ArrayList
 
-class RCTMGLStyleValue(config: ReadableMap) {
+class RNMBXStyleValue(config: ReadableMap) {
     val type: String?
     private var isExpression = false
     private var mExpression: Expression? = null
@@ -107,7 +107,7 @@ class RCTMGLStyleValue(config: ReadableMap) {
             if (value != null) {
                 result.add(value)
             } else {
-                Logger.e("RCTMGLStyleValue", "getStringArray: null value for item: $i")
+                Logger.e("RNMBXStyleValue", "getStringArray: null value for item: $i")
             }
         }
         return result
@@ -162,7 +162,7 @@ class RCTMGLStyleValue(config: ReadableMap) {
             if (type != "transition") {
                 return null
             }
-            val config = getMap(RCTMGLStyleFactory.VALUE_KEY)
+            val config = getMap(RNMBXStyleFactory.VALUE_KEY)
             var enablePlacementTransitions = true
             if (config!!.hasKey("enablePlacementTransitions")) {
                 enablePlacementTransitions =

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/atmosphere/RCTMGLAtmosphere.kt → java/com/rnmapbox/rnmbx/components/styles/atmosphere/RNMBXAtmosphere.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.styles.atmosphere
+package com.rnmapbox.rnmbx.components.styles.atmosphere
 
 import android.content.Context
 import com.facebook.react.bridge.ReadableMap
@@ -6,14 +6,14 @@ import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.extension.style.atmosphere.generated.Atmosphere
 import com.mapbox.maps.extension.style.terrain.generated.Terrain
 import com.mapbox.maps.extension.style.terrain.generated.removeTerrain
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.utils.Logger
 
-class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
+class RNMBXAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     override var iD: String? = null
     protected var mAtmosphere: Atmosphere? = null
 
@@ -32,7 +32,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     }
     // endregion RCTLayer
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val atmosphere = makeAtmosphere()
@@ -41,7 +41,7 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
         mapView.savedStyle?.let { atmosphere.bindTo(it) }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
         return super.removeFromMap(mapView, reason)
@@ -53,14 +53,14 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
 
     fun addStyles() {
         mAtmosphere?.also {
-            RCTMGLStyleFactory.setAtmosphereLayerStyle(
-                it, RCTMGLStyle(
+            RNMBXStyleFactory.setAtmosphereLayerStyle(
+                it, RNMBXStyle(
                     context, mReactStyle!!,
                     mMap!!
                 )
             )
         } ?: run {
-            Logger.e("RCTMGLAtmosphere", "mAtmosphere is null")
+            Logger.e("RNMBXAtmosphere", "mAtmosphere is null")
         }
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/atmosphere/RCTMGLAtmosphereManager.kt → java/com/rnmapbox/rnmbx/components/styles/atmosphere/RNMBXAtmosphereManager.kt}

@@ -1,30 +1,30 @@
-package com.mapbox.rctmgl.components.styles.atmosphere
+package com.rnmapbox.rnmbx.components.styles.atmosphere
 
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class RCTMGLAtmosphereManager : ViewGroupManager<RCTMGLAtmosphere>() {
+class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLAtmosphere {
-        return RCTMGLAtmosphere(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXAtmosphere {
+        return RNMBXAtmosphere(reactContext)
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RCTMGLAtmosphere, id: String?) {
+    fun setId(layer: RNMBXAtmosphere, id: String?) {
         layer.iD = id
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(atmosphere: RCTMGLAtmosphere, reactStyle: ReadableMap?) {
+    fun setReactStyle(atmosphere: RNMBXAtmosphere, reactStyle: ReadableMap?) {
         atmosphere.setReactStyle(reactStyle)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLAtmosphere"
+        const val REACT_CLASS = "RNMBXAtmosphere"
     }
 }

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

@@ -1,28 +1,28 @@
-package com.mapbox.rctmgl.components.styles.layers
+package com.rnmapbox.rnmbx.components.styles.layers
 
 import android.content.Context
 import com.mapbox.maps.extension.style.layers.Layer
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.Style
 import com.mapbox.maps.MapView
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.bridge.ReadableArray
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView.FoundLayerCallback
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView.FoundLayerCallback
 import com.facebook.common.logging.FLog
 import com.mapbox.maps.extension.style.expressions.dsl.generated.all
 import com.mapbox.maps.extension.style.expressions.dsl.generated.literal
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.*
 import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.styles.layers.RCTLayer
-import com.mapbox.rctmgl.components.styles.sources.RCTSource
-import com.mapbox.rctmgl.modules.RCTMGLLogging
-import com.mapbox.rctmgl.utils.ExpressionParser
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.styles.layers.RCTLayer
+import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.modules.RNMBXLogging
+import com.rnmapbox.rnmbx.utils.ExpressionParser
 import java.lang.ClassCastException
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.utils.Logger
 
 abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractSourceConsumer(
     mContext
@@ -165,7 +165,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         }
     }
 
-    fun addAbove(mapView: RCTMGLMapView, aboveLayerID: String) {
+    fun addAbove(mapView: RNMBXMapView, aboveLayerID: String) {
         mapView.waitForLayer(aboveLayerID, object : FoundLayerCallback {
             override fun found(aboveLayer: Layer?) {
                 if (!hasInitialized()) {
@@ -182,7 +182,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         })
     }
 
-    fun addBelow(mapView: RCTMGLMapView, belowLayerID: String) {
+    fun addBelow(mapView: RNMBXMapView, belowLayerID: String) {
         mapView.waitForLayer(belowLayerID, object : FoundLayerCallback {
             override fun found(belowLayer: Layer?) {
                 if (!hasInitialized()) {
@@ -263,7 +263,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         }
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val style = style ?: return
@@ -291,7 +291,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         style?.let {
             val layer = mLayer
             if (layer != null) {

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXBackgroundLayer.kt

@@ -0,0 +1,26 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import android.content.Context
+import com.mapbox.maps.extension.style.layers.generated.BackgroundLayer
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXBackgroundLayer(context: Context?) : RCTLayer<BackgroundLayer?>(
+    context!!
+) {
+    override fun makeLayer(): BackgroundLayer {
+        return BackgroundLayer(iD!!)
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setBackgroundLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXBackgroundLayer", "mLayer is null")
+        }
+    }
+}

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLBackgroundLayerManager.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXBackgroundLayerManager.kt}

@@ -1,65 +1,65 @@
-package com.mapbox.rctmgl.components.styles.layers
+package com.rnmapbox.rnmbx.components.styles.layers
 
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class RCTMGLBackgroundLayerManager : ViewGroupManager<RCTMGLBackgroundLayer>() {
+class RNMBXBackgroundLayerManager : ViewGroupManager<RNMBXBackgroundLayer>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLBackgroundLayer {
-        return RCTMGLBackgroundLayer(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXBackgroundLayer {
+        return RNMBXBackgroundLayer(reactContext)
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RCTMGLBackgroundLayer, id: String?) {
+    fun setId(layer: RNMBXBackgroundLayer, id: String?) {
         layer.iD = id
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RCTMGLBackgroundLayer, existing: Boolean) {
+    fun setExisting(layer: RNMBXBackgroundLayer, existing: Boolean) {
         layer.setExisting(existing)
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RCTMGLBackgroundLayer, sourceID: String?) {
+    fun setSourceID(layer: RNMBXBackgroundLayer, sourceID: String?) {
         layer.setSourceID(sourceID)
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RCTMGLBackgroundLayer, aboveLayerID: String?) {
+    fun setAboveLayerID(layer: RNMBXBackgroundLayer, aboveLayerID: String?) {
         layer.setAboveLayerID(aboveLayerID)
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RCTMGLBackgroundLayer, belowLayerID: String?) {
+    fun setBelowLayerID(layer: RNMBXBackgroundLayer, belowLayerID: String?) {
         layer.setBelowLayerID(belowLayerID)
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RCTMGLBackgroundLayer, layerIndex: Int) {
+    fun setLayerIndex(layer: RNMBXBackgroundLayer, layerIndex: Int) {
         layer.setLayerIndex(layerIndex)
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RCTMGLBackgroundLayer, minZoomLevel: Double) {
+    fun setMinZoomLevel(layer: RNMBXBackgroundLayer, minZoomLevel: Double) {
         layer.setMinZoomLevel(minZoomLevel)
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RCTMGLBackgroundLayer, maxZoomLevel: Double) {
+    fun setMaxZoomLevel(layer: RNMBXBackgroundLayer, maxZoomLevel: Double) {
         layer.setMaxZoomLevel(maxZoomLevel)
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RCTMGLBackgroundLayer, style: ReadableMap?) {
+    fun setReactStyle(layer: RNMBXBackgroundLayer, style: ReadableMap?) {
         layer.setReactStyle(style)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLBackgroundLayer"
+        const val REACT_CLASS = "RNMBXBackgroundLayer"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLCircleLayer.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXCircleLayer.kt}

@@ -1,14 +1,14 @@
-package com.mapbox.rctmgl.components.styles.layers
+package com.rnmapbox.rnmbx.components.styles.layers
 
 import android.content.Context
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.generated.CircleLayer
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
 
-class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
+class RNMBXCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -16,7 +16,7 @@ class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -30,9 +30,9 @@ class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
 
     override fun addStyles() {
         mLayer?.also {
-            RCTMGLStyleFactory.setCircleLayerStyle(it, RCTMGLStyle(context, mReactStyle, mMap!!))
+            RNMBXStyleFactory.setCircleLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
         } ?: run {
-            Logger.e("RCTMGLCircleLayer", "mLayer is null")
+            Logger.e("RNMBXCircleLayer", "mLayer is null")
         }
 
     }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLHeatmapLayerManager.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXCircleLayerManager.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.styles.layers
+package com.rnmapbox.rnmbx.components.styles.layers
 
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
@@ -6,71 +6,71 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class RCTMGLHeatmapLayerManager : ViewGroupManager<RCTMGLHeatmapLayer>() {
+class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLHeatmapLayer {
-        return RCTMGLHeatmapLayer(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXCircleLayer {
+        return RNMBXCircleLayer(reactContext)
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RCTMGLHeatmapLayer, id: String?) {
+    fun setId(layer: RNMBXCircleLayer, id: String?) {
         layer.iD = id
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RCTMGLHeatmapLayer, existing: Boolean) {
+    fun setExisting(layer: RNMBXCircleLayer, existing: Boolean) {
         layer.setExisting(existing)
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RCTMGLHeatmapLayer, sourceID: String?) {
+    fun setSourceID(layer: RNMBXCircleLayer, sourceID: String?) {
         layer.setSourceID(sourceID)
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RCTMGLHeatmapLayer, aboveLayerID: String?) {
+    fun setAboveLayerID(layer: RNMBXCircleLayer, aboveLayerID: String?) {
         layer.setAboveLayerID(aboveLayerID)
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RCTMGLHeatmapLayer, belowLayerID: String?) {
+    fun setBelowLayerID(layer: RNMBXCircleLayer, belowLayerID: String?) {
         layer.setBelowLayerID(belowLayerID)
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RCTMGLHeatmapLayer, layerIndex: Int) {
+    fun setLayerIndex(layer: RNMBXCircleLayer, layerIndex: Int) {
         layer.setLayerIndex(layerIndex)
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RCTMGLHeatmapLayer, minZoomLevel: Double) {
+    fun setMinZoomLevel(layer: RNMBXCircleLayer, minZoomLevel: Double) {
         layer.setMinZoomLevel(minZoomLevel)
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RCTMGLHeatmapLayer, maxZoomLevel: Double) {
+    fun setMaxZoomLevel(layer: RNMBXCircleLayer, maxZoomLevel: Double) {
         layer.setMaxZoomLevel(maxZoomLevel)
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RCTMGLHeatmapLayer, style: ReadableMap?) {
+    fun setReactStyle(layer: RNMBXCircleLayer, style: ReadableMap?) {
         layer.setReactStyle(style)
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RCTMGLHeatmapLayer, sourceLayerID: String?) {
+    fun setSourceLayerId(layer: RNMBXCircleLayer, sourceLayerID: String?) {
         layer.setSourceLayerID(sourceLayerID)
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RCTMGLHeatmapLayer, filterList: ReadableArray?) {
+    fun setFilter(layer: RNMBXCircleLayer, filterList: ReadableArray?) {
         layer.setFilter(filterList)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLHeatmapLayer"
+        const val REACT_CLASS = "RNMBXCircleLayer"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLFillExtrusionLayer.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXFillExtrusionLayer.kt}

@@ -1,14 +1,14 @@
-package com.mapbox.rctmgl.components.styles.layers
+package com.rnmapbox.rnmbx.components.styles.layers
 
 import android.content.Context
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.generated.FillExtrusionLayer
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
 
-class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?>(
+class RNMBXFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -16,7 +16,7 @@ class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -30,12 +30,12 @@ class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?
 
     override fun addStyles() {
         mLayer?.also {
-            RCTMGLStyleFactory.setFillExtrusionLayerStyle(
+            RNMBXStyleFactory.setFillExtrusionLayerStyle(
                 it,
-                RCTMGLStyle(context, mReactStyle, mMap!!)
+                RNMBXStyle(context, mReactStyle, mMap!!)
             )
         } ?: run {
-            Logger.e("RCTMGLFillExtrusionLayer", "Layer is null")
+            Logger.e("RNMBXFillExtrusionLayer", "Layer is null")
         }
     }