@rnmapbox/maps 10.1.0 → 10.1.1

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

@@ -8,6 +8,7 @@ import com.facebook.react.viewmanagers.RNMBXCircleLayerManagerInterface
 
 class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
     RNMBXCircleLayerManagerInterface<RNMBXCircleLayer> {
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -16,6 +17,7 @@ class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
         return RNMBXCircleLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXCircleLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXCircleLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -71,6 +73,12 @@ class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXCircleLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXCircleLayer"
     }

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

@@ -16,6 +16,7 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         return RNMBXFillLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXFillLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXFillLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -31,11 +32,6 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         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())
@@ -66,11 +62,22 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         layer.setReactStyle(style.asMap())
     }
 
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXFillLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
     @ReactProp(name = "filter")
     override fun setFilter(layer: RNMBXFillLayer, filterList: Dynamic) {
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXFillLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXFillLayer"
     }

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

@@ -16,6 +16,7 @@ class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
         return RNMBXHeatmapLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXHeatmapLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXHeatmapLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -71,6 +72,12 @@ class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXHeatmapLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXHeatmapLayer"
     }

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

@@ -18,6 +18,7 @@ import com.rnmapbox.rnmbx.components.RemovalReason
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import java.lang.ClassCastException
 import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.v11compat.layer.*
 
 abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : AbstractSourceConsumer(
     mContext
@@ -133,6 +134,13 @@ abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : Abstrac
         }
     }
 
+    var mSlot: String? = null
+
+    fun setSlot(slot: String?) {
+        mSlot = slot
+        applySlot()
+    }
+
     fun setExisting(existing: Boolean) {
         mExisting = existing
     }
@@ -232,16 +240,27 @@ abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : Abstrac
                     add ()
                 } } }
             }
-            setZoomBounds()
+            applyZoomBounds()
+            applySlot()
         }
     }
 
-    protected fun setZoomBounds() {
-        if (mMaxZoomLevel != null) {
-            mLayer!!.maxZoom(mMaxZoomLevel!!.toFloat().toDouble())
+    protected fun applyZoomBounds() {
+        mLayer?.let {layer ->
+            mMaxZoomLevel?.let {
+                layer.maxZoom(it.toDouble())
+            }
+            mMinZoomLevel?.let {
+                layer.minZoom(it.toDouble())
+            }
         }
-        if (mMinZoomLevel != null) {
-            mLayer!!.minZoom(mMinZoomLevel!!.toFloat().toDouble())
+    }
+
+    protected fun applySlot() {
+        mLayer?.let { layer ->
+            mSlot?.let {
+                layer.slot(it)
+            }
         }
     }
 

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

@@ -16,6 +16,7 @@ class RNMBXLineLayerManager : ViewGroupManager<RNMBXLineLayer>(),
         return RNMBXLineLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXLineLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXLineLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -71,6 +72,12 @@ class RNMBXLineLayerManager : ViewGroupManager<RNMBXLineLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXLineLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXLineLayer"
     }

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

@@ -0,0 +1,33 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import android.content.Context
+import com.mapbox.maps.extension.style.layers.generated.ModelLayer
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXModelLayer(context: Context?) : RNMBXLayer<ModelLayer?>(
+    context!!
+) {
+    private var mSourceLayerID: String? = null
+
+    override fun makeLayer(): ModelLayer? {
+        val layer = ModelLayer(iD!!, mSourceID!!)
+        if (mSourceLayerID != null) {
+            layer.sourceLayer(mSourceLayerID!!)
+        }
+        return layer
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setModelLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXLineLayer", "mLayer is null")
+        }
+    }
+
+    fun setSourceLayerID(value: String) {
+        mSourceLayerID = value
+    }
+}

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

@@ -0,0 +1,85 @@
+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.RNMBXModelLayerManagerInterface
+
+
+class RNMBXModelLayerManager : ViewGroupManager<RNMBXModelLayer>(),
+    RNMBXModelLayerManagerInterface<RNMBXModelLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(context: ThemedReactContext): RNMBXModelLayer {
+        return RNMBXModelLayer(context)
+    }
+
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXModelLayer"})}
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXModelLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXModelLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXModelLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXModelLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXModelLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXModelLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXModelLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXModelLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXModelLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXModelLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXModelLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXModelLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
+    companion object {
+        const val REACT_CLASS = "RNMBXModelLayer"
+    }
+}

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

@@ -20,4 +20,8 @@ class RNMBXRasterLayer(context: Context?) : RNMBXLayer<RasterLayer?>(
             Logger.e("RNMBXRasterLayer", "mLayer is null")
         }
     }
+
+    fun setSourceLayerID(asString: String?) {
+        // no-op
+    }
 }

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

@@ -16,6 +16,7 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
         return RNMBXRasterLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXRasterLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXRasterLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -63,8 +64,7 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
 
     @ReactProp(name = "sourceLayerID")
     override fun setSourceLayerID(layer: RNMBXRasterLayer, sourceLayerID: Dynamic) {
-        // not available
-        // layer.setSourceLayerID(sourceLayerID.asString())
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
@@ -72,6 +72,12 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXRasterLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXRasterLayer"
     }

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

@@ -16,6 +16,7 @@ class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
         return RNMBXSymbolLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXSymbolLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXSymbolLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -71,6 +72,13 @@ class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXSymbolLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXSymbolLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/codeparts/LayerManagerCommonProps.codepart-kt.ejs

@@ -0,0 +1,59 @@
+    @ReactProp(name = "id")
+    override fun setId(layer: <%= layerType %>, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: <%= layerType %>, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: <%= layerType %>, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: <%= layerType %>, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: <%= layerType %>, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: <%= layerType %>, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: <%= layerType %>, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: <%= layerType %>, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: <%= layerType %>, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: <%= layerType %>, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: <%= layerType %>, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: <%= layerType %>, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }

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

@@ -0,0 +1,33 @@
+package com.rnmapbox.rnmbx.components.styles.model
+
+import android.content.Context
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableMap
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import java.net.URI
+
+class RNMBXModels(context: Context?) : AbstractMapFeature(context) {
+    private var models: Map<String, String>? = null;
+
+    fun setModels(value: Map<String,String>) {
+        this.models = value;
+        applyModels()
+    }
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+        applyModels()
+    }
+
+    private fun applyModels(){
+        mMapView?.mapView?.getMapboxMap()?.getStyle()?.let { style ->
+            models?.forEach { (modelId,modelUri) ->
+                val uri = URI.create(modelUri)
+                val modelUriWithoutQuery = URI(uri.scheme, uri.userInfo, uri.host, uri.port, uri.path, null, uri.fragment).toString()
+
+                style.addStyleModel(modelId, modelUriWithoutQuery)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.rnmapbox.rnmbx.components.styles.model
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+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
+import com.facebook.react.viewmanagers.RNMBXModelLayerManagerInterface
+import com.facebook.react.viewmanagers.RNMBXModelsManagerInterface
+import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.extensions.forEach
+
+class RNMBXModelsManager(private val mContext: ReactApplicationContext) : ViewGroupManager<RNMBXModels>(),
+    RNMBXModelsManagerInterface<RNMBXModels> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(context: ThemedReactContext): RNMBXModels {
+        return RNMBXModels(context)
+    }
+
+    @ReactProp(name = "models")
+    override fun setModels(view: RNMBXModels, value: Dynamic?) {
+        val map = hashMapOf<String,String>()
+        value?.asMap()?.forEach { modelName, model ->
+            when (model) {
+                is ReadableMap -> {
+                    model.getString("uri")?.also {
+                        map.put(modelName, it)
+                    } ?: model.getString("url")?.also {
+                        map.put(modelName, it)
+                    } ?: run {
+                        Logger.e(
+                            LOG_TAG,
+                            "Invalid value for model key: ${modelName} => ${model} is not an uri/url"
+                        )
+                    }
+                }
+
+                else -> {
+                    Logger.e(
+                        LOG_TAG,
+                        "Invalid value for model key: ${modelName} => ${model} is not an uri/url"
+                    )
+
+                }
+            }
+        }
+        view.setModels(map)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXModels"
+            const val LOG_TAG = "RNMBXModels"
+    }
+}

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

@@ -14,8 +14,13 @@ import com.mapbox.bindgen.Value
 import com.mapbox.geojson.Feature
 import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.mapbox.geojson.FeatureCollection
+import com.mapbox.geojson.GeoJson
+import com.mapbox.geojson.Geometry
 import com.mapbox.maps.*
 import com.mapbox.maps.extension.style.expressions.generated.Expression
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimationConsumer
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimator
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.Logger
 import java.net.URL
 import java.util.ArrayList
@@ -24,9 +29,10 @@ import java.util.HashMap
 import com.rnmapbox.rnmbx.v11compat.feature.*
 
 class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceManager) :
-    RNMBXSource<GeoJsonSource>(context) {
+    RNMBXSource<GeoJsonSource>(context), ShapeAnimationConsumer {
     private var mURL: URL? = null
     private var mShape: String? = null
+    private var mShapeAnimator: ShapeAnimator? = null
     private var mCluster: Boolean? = null
     private var mClusterRadius: Long? = null
     private var mClusterMaxZoom: Long? = null
@@ -70,11 +76,55 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
     }
 
     fun setShape(geoJSONStr: String) {
-        mShape = geoJSONStr
-        if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
-            mSource!!.data(mShape!!)
-            val result = mMap!!.getStyle()!!
-                .setStyleSourceProperty(iD!!, "data", Value.valueOf(mShape!!))
+        mShapeAnimator?.unsubscribe(this)
+        mShapeAnimator = null
+
+        val shapeAnimatorManager = mManager.shapeAnimatorManager
+        if (shapeAnimatorManager.isShapeAnimatorTag(geoJSONStr)) {
+            shapeAnimatorManager.get(geoJSONStr)?.let { shapeAnimator ->
+                mShapeAnimator = shapeAnimator
+                shapeAnimator.subscribe(this)
+
+                shapeUpdated(shapeAnimator.getShape())
+            }
+        } else {
+            mShape = geoJSONStr
+            if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
+                mSource!!.data(mShape!!)
+                val result = mMap!!.getStyle()!!
+                    .setStyleSourceProperty(iD!!, "data", Value.valueOf(mShape!!))
+            }
+        }
+    }
+
+    private fun toGeoJSONSourceData(geoJson: GeoJson): GeoJSONSourceData? {
+        return when (geoJson) {
+            is Geometry ->
+                GeoJSONSourceData(geoJson)
+            is Feature ->
+                GeoJSONSourceData(geoJson)
+            is FeatureCollection ->
+                GeoJSONSourceData(geoJson.features() ?: listOf())
+            else -> {
+                Logger.e(
+                    LOG_TAG,
+                    "Cannot convert shape to GeoJSONSourceData, neitthe Geometry, nor Feature or FeatureCollection: $geoJson"
+                );
+                return null
+            }
+        }
+    }
+    override fun shapeUpdated(geoJson: GeoJson) {
+        mSource?.also {
+            if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
+                toGeoJSONSourceData(geoJson)?.let {
+                    mMap?.getStyle()?.setStyleGeoJSONSourceData(iD!!,
+                        "animated-shape",
+                        it)
+                }
+            }
+        } ?: run {
+            mShape = geoJson.toJson()
         }
     }
 

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

@@ -12,6 +12,8 @@ import com.facebook.react.viewmanagers.RNMBXShapeSourceManagerInterface
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
@@ -21,7 +23,7 @@ import java.util.ArrayList
 import java.util.HashMap
 
 
-class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
+class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver, val shapeAnimatorManager: ShapeAnimatorManager) :
     AbstractEventEmitter<RNMBXShapeSource>(
         mContext
     ), RNMBXShapeSourceManagerInterface<RNMBXShapeSource> {
@@ -158,10 +160,10 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
     }
 
     override fun customEvents(): Map<String, String>? {
-        return MapBuilder.builder<String, String>()
-            .put(EventKeys.SHAPE_SOURCE_LAYER_CLICK, "onMapboxShapeSourcePress")
-            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-            .build()
+        return eventMapOf(
+            EventKeys.SHAPE_SOURCE_LAYER_CLICK to "onMapboxShapeSourcePress",
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
     }
 
     companion object {

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

@@ -23,7 +23,7 @@ class RNMBXVectorSource(context: Context?, private val mManager: RNMBXVectorSour
     }
 
     override fun hasNoDataSoRefersToExisting(): Boolean {
-        return uRL == null;
+        return uRL == null && tileUrlTemplates == null;
     }
 
     override fun makeSource(): VectorSource {

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

@@ -7,6 +7,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXVectorSourceManagerInterface
 import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import javax.annotation.Nonnull
 
 class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
@@ -38,10 +39,10 @@ class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext)
     }
 
     override fun customEvents(): Map<String, String>? {
-        return MapBuilder.builder<String, String>()
-            .put(EventKeys.VECTOR_SOURCE_LAYER_CLICK, "onMapboxVectorSourcePress")
-            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-            .build()
+        return eventMapOf(
+            EventKeys.VECTOR_SOURCE_LAYER_CLICK to "onMapboxVectorSourcePress",
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/events/AndroidCallbackEvent.java

@@ -16,7 +16,7 @@ public class AndroidCallbackEvent extends AbstractEvent {
 
     @Override
     public String getKey() {
-        return EventKeys.MAP_ANDROID_CALLBACK;
+        return EventKeys.MAP_ANDROID_CALLBACK.getValue();
     }
 
     @Override