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

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

@@ -0,0 +1,48 @@
+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.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 RNMBXFillExtrusionLayer(context: Context?) : RNMBXLayer<FillExtrusionLayer?>(
+    context!!
+) {
+    private var mSourceLayerID: String? = null
+    override fun updateFilter(expression: Expression?) {
+        mLayer!!.filter(expression!!)
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+    }
+
+    override fun makeLayer(): FillExtrusionLayer {
+        val layer = FillExtrusionLayer(iD!!, mSourceID!!)
+        if (mSourceLayerID != null) {
+            layer.sourceLayer(mSourceLayerID!!)
+        }
+        return layer
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setFillExtrusionLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXFillExtrusionLayer", "Layer is null")
+        }
+    }
+
+    fun setSourceLayerID(sourceLayerID: String?) {
+        mSourceLayerID = sourceLayerID
+        if (mLayer != null) {
+            mLayer!!.sourceLayer(mSourceLayerID!!)
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXFillExtrusionLayerManagerInterface
+
+class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>(),
+    RNMBXFillExtrusionLayerManagerInterface<RNMBXFillExtrusionLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXFillExtrusionLayer {
+        return RNMBXFillExtrusionLayer(reactContext)
+    }
+
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXFillExtrusionLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXFillExtrusionLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXFillExtrusionLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXFillExtrusionLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXFillExtrusionLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXFillExtrusionLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXFillExtrusionLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXFillExtrusionLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXFillExtrusionLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXFillExtrusionLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXFillExtrusionLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXFillExtrusionLayer"
+    }
+}

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

@@ -0,0 +1,46 @@
+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.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 RNMBXFillLayer(context: Context?) : RNMBXLayer<FillLayer?>(
+    context!!
+) {
+    private var mSourceLayerID: String? = null
+    override fun updateFilter(expression: Expression?) {
+        mLayer!!.filter(expression!!)
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+    }
+
+    override fun makeLayer(): FillLayer {
+        val layer = FillLayer(iD!!, mSourceID!!)
+        if (mSourceLayerID != null) {
+            layer.sourceLayer(mSourceLayerID!!)
+        }
+        return layer
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setFillLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXStyleFactory", "mLayer is null")
+        }
+
+    }
+
+    fun setSourceLayerID(sourceLayerID: String?) {
+        mSourceLayerID = sourceLayerID
+        if (mLayer != null) {
+            mLayer!!.sourceLayer(mSourceLayerID!!)
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXFillLayerManagerInterface
+
+class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
+    RNMBXFillLayerManagerInterface<RNMBXFillLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXFillLayer {
+        return RNMBXFillLayer(reactContext)
+    }
+
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXFillLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXFillLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXFillLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXFillLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXFillLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXFillLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXFillLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXFillLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXFillLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXFillLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXFillLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXFillLayer"
+    }
+}

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

@@ -0,0 +1,48 @@
+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.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 RNMBXHeatmapLayer(context: Context?) : RNMBXLayer<HeatmapLayer?>(
+    context!!
+) {
+    private var mSourceLayerID: String? = null
+    override fun updateFilter(expression: Expression?) {
+        mLayer!!.filter(expression!!)
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+    }
+
+    override fun makeLayer(): HeatmapLayer {
+        val layer = HeatmapLayer(iD!!, mSourceID!!)
+        if (mSourceLayerID != null) {
+            layer.sourceLayer(mSourceLayerID!!)
+        }
+        return layer
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setHeatmapLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RNMBXHeatmapLayer", "mLayer is null")
+        }
+    }
+
+    fun setSourceLayerID(sourceLayerID: String?) {
+        mSourceLayerID = sourceLayerID
+        if (mLayer != null) {
+            mLayer!!.sourceLayer(sourceLayerID!!)
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXHeatmapLayerManagerInterface
+
+class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
+    RNMBXHeatmapLayerManagerInterface<RNMBXHeatmapLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXHeatmapLayer {
+        return RNMBXHeatmapLayer(reactContext)
+    }
+
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXHeatmapLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXHeatmapLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXHeatmapLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXHeatmapLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXHeatmapLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXHeatmapLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXHeatmapLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXHeatmapLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXHeatmapLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXHeatmapLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXHeatmapLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXHeatmapLayer"
+    }
+}

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

@@ -0,0 +1,316 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import android.content.Context
+import com.mapbox.maps.extension.style.layers.Layer
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.mapbox.maps.Style
+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.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.generated.Expression
+import com.mapbox.maps.extension.style.layers.*
+import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.utils.ExpressionParser
+import java.lang.ClassCastException
+import com.rnmapbox.rnmbx.utils.Logger
+
+abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : AbstractSourceConsumer(
+    mContext
+) {
+    override var iD: String? = null
+    @JvmField
+    protected var mSourceID: String? = null
+    protected var mAboveLayerID: String? = null
+    protected var mBelowLayerID: String? = null
+    protected var mLayerIndex: Int? = null
+    protected var mVisible = false
+    protected var mMinZoomLevel: Double? = null
+    protected var mMaxZoomLevel: Double? = null
+    @JvmField
+    protected var mReactStyle: ReadableMap? = null
+    protected var mFilter: Expression? = null
+    @JvmField
+    protected var mMap: MapboxMap? = null
+    @JvmField
+    protected var mLayer: T? = null
+    protected var mHadFilter = false
+
+    protected var mExisting : Boolean? = null
+
+    fun setSourceID(sourceID: String?) {
+        mSourceID = sourceID
+    }
+
+    fun checkID(): String? {
+        if (iD == null) {
+            Logger.w(LOG_TAG, "iD is null in layer")
+        }
+        return iD;
+    }
+
+    fun setAboveLayerID(aboveLayerID: String?) {
+        if (mAboveLayerID != null && mAboveLayerID == aboveLayerID) {
+            return
+        }
+        mAboveLayerID = aboveLayerID
+        if (aboveLayerID == null) {
+            return
+        }
+        mMapView?.let {mapView ->
+            removeFromMap(mapView, RemovalReason.REORDER)
+            addAbove(mapView, aboveLayerID)
+        }
+    }
+
+    fun setBelowLayerID(belowLayerID: String?) {
+        if (mBelowLayerID != null && mBelowLayerID == belowLayerID) {
+            return
+        }
+        mBelowLayerID = belowLayerID
+        if (belowLayerID == null) {
+            return
+        }
+        mMapView?.let { mapView ->
+            removeFromMap(mapView,RemovalReason.REORDER)
+            addBelow(mapView, belowLayerID)
+        }
+    }
+
+    fun setLayerIndex(layerIndex: Int) {
+        if (mLayerIndex != null && mLayerIndex == layerIndex) {
+            return
+        }
+        mLayerIndex = layerIndex
+        if (mLayer != null) {
+            removeFromMap(mMapView!!,RemovalReason.REORDER)
+            addAtIndex(layerIndex)
+        }
+    }
+
+    fun setVisible(visible: Boolean) {
+        mVisible = visible
+        if (mLayer != null) {
+            mLayer!!.visibility(if (mVisible) Visibility.VISIBLE else Visibility.NONE)
+        }
+    }
+
+    fun setMinZoomLevel(minZoomLevel: Double) {
+        mMinZoomLevel = minZoomLevel
+        if (mLayer != null) {
+            mLayer!!.minZoom(minZoomLevel.toFloat().toDouble())
+        }
+    }
+
+    fun setMaxZoomLevel(maxZoomLevel: Double) {
+        mMaxZoomLevel = maxZoomLevel
+        if (mLayer != null) {
+            mLayer!!.maxZoom(maxZoomLevel.toFloat().toDouble())
+        }
+    }
+
+    fun setReactStyle(reactStyle: ReadableMap?) {
+        mReactStyle = reactStyle
+        if (mLayer != null) {
+            addStyles()
+        }
+    }
+
+    fun setFilter(readableFilterArray: ReadableArray?) {
+        val filterExpression = ExpressionParser.from(readableFilterArray)
+        mFilter = filterExpression
+        if (mLayer != null) {
+            if (mFilter != null) {
+                mHadFilter = true
+                updateFilter(mFilter)
+            } else if (mHadFilter) {
+                updateFilter(/* literal(true)*/all {} )
+            }
+        }
+    }
+
+    fun setExisting(existing: Boolean) {
+        mExisting = existing
+    }
+
+    fun add() {
+        if (!hasInitialized()) {
+            return
+        }
+        if (style == null) return
+
+        /* V10TODO
+        String userBackgroundID = LocationComponentConstants.BACKGROUND_LAYER;
+        Layer userLocationBackgroundLayer = getStyle().getLayer(userBackgroundID);
+
+        // place below user location layer
+        if (userLocationBackgroundLayer != null) {
+            getStyle().addLayerBelow(mLayer, userBackgroundID);
+            mMapView.layerAdded(mLayer);
+            return;
+        } */
+
+        Logger.logged("RNMBXLayer.add") {
+            style!!.addLayer(mLayer!!);
+            mMapView!!.layerAdded(mLayer!!)
+        }
+    }
+
+    fun addAbove(mapView: RNMBXMapView, aboveLayerID: String) {
+        mapView.waitForLayer(aboveLayerID, object : FoundLayerCallback {
+            override fun found(aboveLayer: Layer?) {
+                if (!hasInitialized()) {
+                    return
+                }
+                mapView.savedStyle?.let { style ->
+                    mLayer?.let {layer ->
+                        style.addLayerAbove(layer, aboveLayerID)
+                        mapView.layerAdded(layer)
+                        mMapView = mapView
+                    }
+                }
+            }
+        })
+    }
+
+    fun addBelow(mapView: RNMBXMapView, belowLayerID: String) {
+        mapView.waitForLayer(belowLayerID, object : FoundLayerCallback {
+            override fun found(belowLayer: Layer?) {
+                if (!hasInitialized()) {
+                    return
+                }
+                mapView.savedStyle?.let { style ->
+                    mLayer?.let { layer ->
+                        style.addLayerBelow(layer, belowLayerID)
+                        mapView.layerAdded(layer)
+                        mMapView = mapView
+                    }
+                }
+            }
+        })
+    }
+
+    fun addAtIndex(index: Int) {
+        var index = index
+        if (!hasInitialized()) {
+            return
+        }
+        val style = this.style ?: return
+        val layerSize = style!!.styleLayers.size
+        if (index >= layerSize) {
+            FLog.e(
+                LOG_TAG,
+                "Layer index is greater than number of layers on map. Layer inserted at end of layer stack."
+            )
+            index = layerSize - 1
+        }
+        val layer = mLayer ?: return
+        val mapView = mMapView ?: return
+        style.addLayerAt(layer, index)
+        mapView.layerAdded(layer)
+    }
+
+    protected fun insertLayer() {
+        val style = this.style ?: return
+        val id = checkID() ?: return
+        if (style.styleLayerExists(id)) {
+            return  // prevent adding a layer twice
+        }
+        mMapView?.let { mapView ->
+            mLayer?.let { layer ->
+                mAboveLayerID?.also {
+                    addAbove(mapView, it)
+                } ?: run { mBelowLayerID?.also {
+                    addBelow(mapView, it)
+                } ?: run { mLayerIndex?.also {
+                    addAtIndex(it)
+                } ?: run {
+                    add ()
+                } } }
+            }
+            setZoomBounds()
+        }
+    }
+
+    protected fun setZoomBounds() {
+        if (mMaxZoomLevel != null) {
+            mLayer!!.maxZoom(mMaxZoomLevel!!.toFloat().toDouble())
+        }
+        if (mMinZoomLevel != null) {
+            mLayer!!.minZoom(mMinZoomLevel!!.toFloat().toDouble())
+        }
+    }
+
+    protected open fun updateFilter(expression: Expression?) {
+        // override if you want to update the filter
+    }
+
+    private fun getLayerAs(style: Style, id: String?): T? {
+        val result = style.getLayer(iD!!)
+        return try {
+            result as T?
+        } catch (exception: ClassCastException) {
+            null
+        }
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+        mMap = mapView.getMapboxMap()
+        val style = style ?: return
+        val id = checkID() ?: return
+
+        val exists = style.styleLayerExists(id)
+        var existingLayer: T? = null;
+        if (exists) {
+            if (mExisting == null) {
+                Logger.e(LOG_TAG, "Layer $id seems to refer to an existing layer but existing flag is not specified, this is deprecated")
+            }
+            existingLayer = getLayerAs(style, id)
+        }
+        if (existingLayer != null) {
+            mLayer = existingLayer
+        } else {
+            mLayer = makeLayer()
+            insertLayer()
+        }
+
+        addStyles()
+        if (mFilter != null) {
+            mHadFilter = true
+            updateFilter(mFilter)
+        }
+    }
+
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
+        style?.let {
+            val layer = mLayer
+            if (layer != null) {
+                it.removeStyleLayer(layer.layerId)
+            } else {
+                Logger.e("RNMBXLayer","mLayer is null on removal layer from map")
+            }
+        }
+        return super.removeFromMap(mapView, reason)
+    }
+
+    private val style: Style?
+        private get() =
+            if (mMap == null) {
+                null
+            } else mMapView?.savedStyle
+
+    abstract fun makeLayer(): T
+    abstract fun addStyles()
+    private fun hasInitialized(): Boolean {
+        return mMap != null && mLayer != null
+    }
+
+    companion object {
+        const val LOG_TAG = "RNMBXLayer"
+    }
+}