@rnmapbox/maps 10.1.0-beta.9 → 10.1.0-rc.1

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

@@ -1,12 +1,13 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
+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.RNMBXSymbolLayerManagerInterface
 
-class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>() {
+class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
+    RNMBXSymbolLayerManagerInterface<RNMBXSymbolLayer> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -15,61 +16,69 @@ class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>() {
         return RNMBXSymbolLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXSymbolLayer"})}
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXSymbolLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXSymbolLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXSymbolLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXSymbolLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXSymbolLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
+    override fun setSourceID(layer: RNMBXSymbolLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXSymbolLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXSymbolLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXSymbolLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXSymbolLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXSymbolLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXSymbolLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXSymbolLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXSymbolLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXSymbolLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXSymbolLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXSymbolLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXSymbolLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RNMBXSymbolLayer, sourceLayerID: String?) {
-        layer.setSourceLayerID(sourceLayerID)
+    override fun setSourceLayerID(layer: RNMBXSymbolLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RNMBXSymbolLayer, filterList: ReadableArray?) {
-        layer.setFilter(filterList)
+    override fun setFilter(layer: RNMBXSymbolLayer, filterList: Dynamic) {
+        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/light/RNMBXLightManager.kt

@@ -0,0 +1,27 @@
+package com.rnmapbox.rnmbx.components.styles.light
+
+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.RNMBXLightManagerInterface
+
+class RNMBXLightManager : ViewGroupManager<RNMBXLight>(),
+    RNMBXLightManagerInterface<RNMBXLight> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXLight {
+        return RNMBXLight(reactContext)
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(light: RNMBXLight, reactStyle: Dynamic) {
+        light.setReactStyle(reactStyle.asMap())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXLight"
+    }
+}

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/RNMBXImageSource.kt

@@ -8,7 +8,7 @@ import com.mapbox.maps.extension.style.sources.generated.ImageSource
 import com.rnmapbox.rnmbx.utils.LatLngQuad
 import java.net.URL
 
-class RNMBXImageSource(context: Context?) : RCTSource<ImageSource?>(context) {
+class RNMBXImageSource(context: Context?) : RNMBXSource<ImageSource?>(context) {
     private var mURL: URL? = null
     private var mResourceId = 0
     private var mCoordQuad: LatLngQuad? = null

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

@@ -1,13 +1,15 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.view.View
-import com.facebook.react.bridge.ReadableArray
+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.RNMBXImageSourceManagerInterface
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngQuad
 
-class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>() {
+class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>(),
+    RNMBXImageSourceManagerInterface<RNMBXImageSource> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -33,22 +35,28 @@ class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>() {
     }
 
     @ReactProp(name = "id")
-    fun setId(source: RNMBXImageSource, id: String?) {
-        source.iD = id
+    override fun setId(source: RNMBXImageSource, id: Dynamic) {
+        source.iD = id.asString()
     }
 
     @ReactProp(name = "url")
-    fun setUrl(source: RNMBXImageSource, url: String?) {
-        source.setURL(url)
+    override fun setUrl(source: RNMBXImageSource, url: Dynamic) {
+        source.setURL(url.asString())
     }
 
     @ReactProp(name = "coordinates")
-    fun setCoordinates(source: RNMBXImageSource, arr: ReadableArray?) {
-        val quad = toLatLngQuad(arr) ?: return
+    override fun setCoordinates(source: RNMBXImageSource, arr: Dynamic) {
+        val quad = toLatLngQuad(arr.asArray()) ?: return
         source.setCoordinates(quad)
     }
 
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXImageSource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
+
     companion object {
         const val REACT_CLASS = "RNMBXImageSource"
     }
+
 }

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

@@ -1,15 +1,19 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterDemSourceManagerInterface
+import com.rnmapbox.rnmbx.utils.Logger
 
 // import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout;
 // import com.rnmapbox.rnmbx.utils.ResourceUtils;
 class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext) :
     RNMBXTileSourceManager<RNMBXRasterDemSource?>(
         mContext
-    ) {
+    ), RNMBXRasterDemSourceManagerInterface<RNMBXRasterDemSource> {
     override fun customEvents(): Map<String, String>? {
         return MapBuilder.builder<String, String>()
             .build()
@@ -27,4 +31,14 @@ class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext)
         const val LOG_TAG = "RNMBXRasterDemSourceManager"
         const val REACT_CLASS = "RNMBXRasterDemSource"
     }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(view: RNMBXRasterDemSource, value: Dynamic) {
+        view.mExisting = value.asBoolean()
+    }
+
+    @ReactProp(name = "tileSize")
+    override fun setTileSize(view: RNMBXRasterDemSource, value: Dynamic) {
+        Logger.e("RNMBXRasterDemSourceManager", "tileSize not implemented")
+    }
 }

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

@@ -1,12 +1,15 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterSourceManagerInterface
 import javax.annotation.Nonnull
 
 class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
-    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext) {
+    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext),
+    RNMBXRasterSourceManagerInterface<RNMBXRasterSource> {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
@@ -18,8 +21,8 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
     }
 
     @ReactProp(name = "tileSize")
-    fun setTileSize(source: RNMBXRasterSource, tileSize: Int) {
-        source.setTileSize(tileSize)
+    override fun setTileSize(source: RNMBXRasterSource, tileSize: Dynamic) {
+        source.setTileSize(tileSize.asInt())
     }
 
     override fun customEvents(): Map<String, String>? {
@@ -29,4 +32,9 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
     companion object {
         const val REACT_CLASS = "RNMBXRasterSource"
     }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXRasterSource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
 }

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

@@ -4,6 +4,7 @@ import android.content.Context
 import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.graphics.drawable.BitmapDrawable
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.events.FeatureClickEvent
@@ -13,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
@@ -23,9 +29,10 @@ import java.util.HashMap
 import com.rnmapbox.rnmbx.v11compat.feature.*
 
 class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceManager) :
-    RCTSource<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
@@ -34,8 +41,6 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
     private var mBuffer: Long? = null
     private var mTolerance: Double? = null
     private var mLineMetrics: Boolean? = null
-    private val mImages: List<Map.Entry<String, ImageEntry>>? = null
-    private val mNativeImages: List<Map.Entry<String, BitmapDrawable>>? = null
 
     override fun hasNoDataSoRefersToExisting(): Boolean {
         return (mURL == null) && (mShape == null)
@@ -49,6 +54,11 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
         }
     }
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     override fun makeSource(): GeoJsonSource {
         val builder = GeoJsonSource.Builder(iD.toString())
         getOptions(builder)
@@ -66,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()
         }
     }
 
@@ -176,18 +230,14 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
         }
     }
 
-    private fun callbackSuccess(callbackID: String, payload: WritableMap) {
-        val event = AndroidCallbackEvent(this, callbackID, payload)
-        mManager.handleEvent(event)
+    private fun callbackSuccess(payload: WritableMap, promise: Promise) {
+        promise.resolve(payload)
     }
-    private fun callbackError(callbackID: String, error: String, where: String) {
-        val payload: WritableMap = WritableNativeMap()
-        payload.putString("error", "$where: $error")
-        val event = AndroidCallbackEvent(this, callbackID, payload)
-        mManager.handleEvent(event)
+    private fun callbackError(error: String, where: String, promise: Promise) {
+        promise.reject("error", "$where: $error")
     }
 
-    fun getClusterExpansionZoom(callbackID: String, featureJSON: String) {
+    fun getClusterExpansionZoom(featureJSON: String, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         mMap!!.getGeoJsonClusterExpansionZoom(iD!!, feature, QueryFeatureExtensionCallback { features ->
@@ -198,28 +248,29 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                 if (contents is Long) {
                     val payload: WritableMap = WritableNativeMap()
                     payload.putInt("data", contents.toInt())
-                    callbackSuccess(callbackID, payload)
+                    callbackSuccess(payload, promise)
                     return@QueryFeatureExtensionCallback
                 } else {
                     callbackError(
-                        callbackID,
+
                         "Not a number: $contents",
-                        "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom"
+                        "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom",
+                        promise
                     )
                     return@QueryFeatureExtensionCallback
                 }
             } else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom"
+                    "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }
         })
     }
 
-    fun getClusterLeaves(callbackID: String, featureJSON: String, number: Int, offset: Int) {
+    fun getClusterLeaves(featureJSON: String, number: Int, offset: Int, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         val _this = this
@@ -232,19 +283,19 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                     "data",
                     FeatureCollection.fromFeatures(leaves!!).toJson()
                 )
-                callbackSuccess(callbackID, payload)
+                callbackSuccess(payload, promise)
             } else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterLeaves/getGeoJsonClusterLeaves"
+                    "getClusterLeaves/getGeoJsonClusterLeaves",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }
         })
     }
 
-    fun getClusterChildren(callbackID: String, featureJSON: String) {
+    fun getClusterChildren(featureJSON: String, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         val _this = this
@@ -257,12 +308,12 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                     "data",
                     FeatureCollection.fromFeatures(children!!).toJson()
                 )
-                callbackSuccess(callbackID, payload)
+                callbackSuccess(payload, promise)
             }else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterLeaves/queryFeatureExtensions"
+                    "getClusterLeaves/queryFeatureExtensions",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }