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

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

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLHeatmapLayer.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHeatmapLayer.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.HeatmapLayer
-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 RCTMGLHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
+class RNMBXHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -15,7 +16,7 @@ class RCTMGLHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -28,7 +29,14 @@ class RCTMGLHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setHeatmapLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RNMBXStyleFactory.setHeatmapLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXHeatmapLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

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

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLLineLayer.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLineLayer.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.LineLayer
-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 RCTMGLLineLayer(context: Context?) : RCTLayer<LineLayer?>(
+class RNMBXLineLayer(context: Context?) : RCTLayer<LineLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -15,7 +16,7 @@ class RCTMGLLineLayer(context: Context?) : RCTLayer<LineLayer?>(
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -28,7 +29,11 @@ class RCTMGLLineLayer(context: Context?) : RCTLayer<LineLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setLineLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RNMBXStyleFactory.setLineLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXLineLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

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

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

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

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

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

@@ -0,0 +1,43 @@
+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.SkyLayer
+import com.rnmapbox.rnmbx.components.styles.layers.RCTLayer
+import com.rnmapbox.rnmbx.utils.Logger.e
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXSkyLayer(context: Context?) : RCTLayer<SkyLayer?>(
+    context!!
+) {
+    private val mSourceLayerID: String? = null
+    override fun updateFilter(expression: Expression?) {
+        mLayer!!.filter(expression!!)
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+    }
+
+    override fun makeLayer(): SkyLayer {
+        return SkyLayer(iD!!)
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setSkyLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXSkyLayer", "mLayer is null")
+        }
+    }
+
+    fun setSourceLayerID(sourceLayerID: String?) {
+        e("RNMBXSkyLayer", "Source layer should not be set for source layer id")
+    }
+}

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

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLSymbolLayer.kt → java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXSymbolLayer.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.SymbolLayer
-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 RCTMGLSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
+class RNMBXSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null
@@ -15,7 +16,7 @@ class RCTMGLSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
         mLayer!!.filter(expression!!)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
     }
 
@@ -28,7 +29,14 @@ class RCTMGLSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setSymbolLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RNMBXStyleFactory.setSymbolLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXSymbolLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {