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

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

@@ -1,17 +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.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
@@ -97,12 +98,17 @@ class RCTMGLStyleValue(config: ReadableMap) {
 
         return stringArr;
     } */
-    fun getStringArray(key: String?): List<String?> {
+    fun getStringArray(key: String?): List<String> {
         val arr = getArray(key)
-        val result = ArrayList<String?>(arr!!.size())
+        val result = ArrayList<String>(arr!!.size())
         for (i in 0 until arr.size()) {
             val item = arr.getMap(i)
-            result.add(item.getString("value"))
+            val value = item.getString("value")
+            if (value != null) {
+                result.add(value)
+            } else {
+                Logger.e("RNMBXStyleValue", "getStringArray: null value for item: $i")
+            }
         }
         return result
     }
@@ -156,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
-
-class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
+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 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)
@@ -52,11 +52,15 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     fun addStyles() {
-        RCTMGLStyleFactory.setAtmosphereLayerStyle(
-            mAtmosphere, RCTMGLStyle(
-                context, mReactStyle!!,
-                mMap!!
+        mAtmosphere?.also {
+            RNMBXStyleFactory.setAtmosphereLayerStyle(
+                it, RNMBXStyle(
+                    context, mReactStyle!!,
+                    mMap!!
+                )
             )
-        )
+        } ?: run {
+            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,13 +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.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
@@ -15,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)
     }
 
@@ -28,7 +29,12 @@ class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setCircleLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RNMBXStyleFactory.setCircleLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXCircleLayer", "mLayer is null")
+        }
+
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

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,13 +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.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
@@ -15,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)
     }
 
@@ -28,10 +29,14 @@ class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setFillExtrusionLayerStyle(
-            mLayer,
-            RCTMGLStyle(context, mReactStyle, mMap!!)
-        )
+        mLayer?.also {
+            RNMBXStyleFactory.setFillExtrusionLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXFillExtrusionLayer", "Layer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLCircleLayerManager.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXFillExtrusionLayerManager.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 RCTMGLCircleLayerManager : ViewGroupManager<RCTMGLCircleLayer>() {
+class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLCircleLayer {
-        return RCTMGLCircleLayer(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXFillExtrusionLayer {
+        return RNMBXFillExtrusionLayer(reactContext)
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RCTMGLCircleLayer, id: String?) {
+    fun setId(layer: RNMBXFillExtrusionLayer, id: String?) {
         layer.iD = id
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RCTMGLCircleLayer, existing: Boolean) {
+    fun setExisting(layer: RNMBXFillExtrusionLayer, existing: Boolean) {
         layer.setExisting(existing)
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RCTMGLCircleLayer, sourceID: String?) {
+    fun setSourceID(layer: RNMBXFillExtrusionLayer, sourceID: String?) {
         layer.setSourceID(sourceID)
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RCTMGLCircleLayer, aboveLayerID: String?) {
+    fun setAboveLayerID(layer: RNMBXFillExtrusionLayer, aboveLayerID: String?) {
         layer.setAboveLayerID(aboveLayerID)
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RCTMGLCircleLayer, belowLayerID: String?) {
+    fun setBelowLayerID(layer: RNMBXFillExtrusionLayer, belowLayerID: String?) {
         layer.setBelowLayerID(belowLayerID)
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RCTMGLCircleLayer, layerIndex: Int) {
+    fun setLayerIndex(layer: RNMBXFillExtrusionLayer, layerIndex: Int) {
         layer.setLayerIndex(layerIndex)
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RCTMGLCircleLayer, minZoomLevel: Double) {
+    fun setMinZoomLevel(layer: RNMBXFillExtrusionLayer, minZoomLevel: Double) {
         layer.setMinZoomLevel(minZoomLevel)
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RCTMGLCircleLayer, maxZoomLevel: Double) {
+    fun setMaxZoomLevel(layer: RNMBXFillExtrusionLayer, maxZoomLevel: Double) {
         layer.setMaxZoomLevel(maxZoomLevel)
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RCTMGLCircleLayer, style: ReadableMap?) {
+    fun setReactStyle(layer: RNMBXFillExtrusionLayer, style: ReadableMap?) {
         layer.setReactStyle(style)
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RCTMGLCircleLayer, sourceLayerID: String?) {
+    fun setSourceLayerId(layer: RNMBXFillExtrusionLayer, sourceLayerID: String?) {
         layer.setSourceLayerID(sourceLayerID)
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RCTMGLCircleLayer, filterList: ReadableArray?) {
+    fun setFilter(layer: RNMBXFillExtrusionLayer, filterList: ReadableArray?) {
         layer.setFilter(filterList)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLCircleLayer"
+        const val REACT_CLASS = "RNMBXFillExtrusionLayer"
     }
 }

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

@@ -1,13 +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.FillLayer
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+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 RCTMGLFillLayer(context: Context?) : RCTLayer<FillLayer?>(
+class RNMBXFillLayer(context: Context?) : RCTLayer<FillLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -15,7 +16,7 @@ class RCTMGLFillLayer(context: Context?) : RCTLayer<FillLayer?>(
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -28,7 +29,12 @@ class RCTMGLFillLayer(context: Context?) : RCTLayer<FillLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setFillLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RNMBXStyleFactory.setFillLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXStyleFactory", "mLayer is null")
+        }
+
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {