@rnmapbox/maps 10.1.0-beta.20 → 10.1.0-beta.22

package/android/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "mapbox"
-def defaultMapboxMapsVersion = "10.16.1"
+def defaultMapboxMapsVersion = "10.16.2"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rnmapbox.rnmbx">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -46,6 +46,8 @@ import com.rnmapbox.rnmbx.modules.RNMBXLogging
 import com.rnmapbox.rnmbx.modules.RNMBXModule
 import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
+import com.rnmapbox.rnmbx.shape_animators.RNMBXMovePointShapeAnimatorModule
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXPackage : TurboReactPackage() {
@@ -61,6 +63,17 @@ class RNMBXPackage : TurboReactPackage() {
         return viewTagResolver
     }
 
+    var shapeAnimators: ShapeAnimatorManager? = null
+    fun getShapeAnimators(module: String): ShapeAnimatorManager {
+        val shapeAnimators = shapeAnimators
+        if (shapeAnimators == null) {
+            val result = ShapeAnimatorManager()
+            this.shapeAnimators = result
+            return result
+        }
+        return shapeAnimators
+    }
+
     fun resetViewTagResolver() {
         viewTagResolver = null
     }
@@ -80,6 +93,7 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
             RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
             RNMBXPointAnnotationModule.NAME -> return RNMBXPointAnnotationModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXMovePointShapeAnimatorModule.NAME -> return RNMBXMovePointShapeAnimatorModule(reactApplicationContext, getShapeAnimators(s))
         }
         return null
     }
@@ -107,7 +121,10 @@ class RNMBXPackage : TurboReactPackage() {
 
         // sources
         managers.add(RNMBXVectorSourceManager(reactApplicationContext))
-        managers.add(RNMBXShapeSourceManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXShapeSourceManager")))
+        managers.add(RNMBXShapeSourceManager(reactApplicationContext,
+            getViewTagResolver(reactApplicationContext, "RNMBXShapeSourceManager"),
+            getShapeAnimators("RNMBXShapeSourceManager")
+            ))
         managers.add(RNMBXRasterDemSourceManager(reactApplicationContext))
         managers.add(RNMBXRasterSourceManager(reactApplicationContext))
         managers.add(RNMBXImageSourceManager())
@@ -227,6 +244,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXMovePointShapeAnimatorModule.NAME] = ReactModuleInfo(
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                false,
+                false,
+                false,
+                false,
+                isTurboModule
+            )
             moduleInfos
         }
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocation.kt

@@ -15,6 +15,7 @@ import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.LocationPuck2D
 import com.mapbox.maps.plugin.locationcomponent.location
+import com.mapbox.maps.plugin.locationcomponent.R as LR
 import com.rnmapbox.rnmbx.R
 import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.rnmapbox.rnmbx.components.RemovalReason
@@ -234,19 +235,19 @@ fun makeDefaultLocationPuck2D(context: Context, renderMode: RenderMode): Locatio
     return LocationPuck2D(
         topImage = AppCompatResourcesV11.getDrawableImageHolder(
             context,
-            R.drawable.mapbox_user_icon
+            LR.drawable.mapbox_user_icon
         ),
         bearingImage = AppCompatResourcesV11.getDrawableImageHolder(
             context,
             when (renderMode) {
-                RenderMode.GPS -> R.drawable.mapbox_user_bearing_icon
-                RenderMode.COMPASS -> R.drawable.mapbox_user_puck_icon
-                RenderMode.NORMAL -> R.drawable.mapbox_user_stroke_icon
+                RenderMode.GPS -> LR.drawable.mapbox_user_bearing_icon
+                RenderMode.COMPASS -> LR.drawable.mapbox_user_puck_icon
+                RenderMode.NORMAL -> LR.drawable.mapbox_user_stroke_icon
             }
         ),
         shadowImage = AppCompatResourcesV11.getDrawableImageHolder(
             context,
-            R.drawable.mapbox_user_icon_shadow
+            LR.drawable.mapbox_user_icon_shadow
         )
     );
 }

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/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/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

@@ -13,6 +13,7 @@ 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
@@ -22,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> {

package/android/src/main/java/com/rnmapbox/rnmbx/shape_animators/RNMBXMovePointShapeAnimatorModule.kt

@@ -0,0 +1,55 @@
+package com.rnmapbox.rnmbx.shape_animators
+
+import com.facebook.react.bridge.ReadableArray
+import com.rnmapbox.rnmbx.NativeRNMBXMovePointShapeAnimatorModuleSpec
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+import com.google.gson.JsonObject
+import com.mapbox.geojson.GeoJson
+import com.mapbox.geojson.Point
+import com.rnmapbox.rnmbx.NativeRNMBXPointAnnotationModuleSpec
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
+import org.json.JSONObject
+import java.util.Date
+import java.util.Timer
+import java.util.TimerTask
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.DurationUnit
+
+
+/// Simple dummy animator that moves the point lng, lat by 0.01, 0.01 each second.
+class MovePointShapeAnimator(tag: Tag, val lng: Double, val lat: Double) : ShapeAnimatorCommon(tag) {
+   override fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson, Boolean> {
+       return Pair(Point.fromLngLat(lng + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01, lat + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01), true);
+   }
+}
+
+
+@ReactModule(name = RNMBXMovePointShapeAnimatorModule.NAME)
+class RNMBXMovePointShapeAnimatorModule(reactContext: ReactApplicationContext?, val shapeAnimatorManager: ShapeAnimatorManager) :
+    NativeRNMBXMovePointShapeAnimatorModuleSpec(reactContext) {
+
+    companion object {
+        const val LOG_TAG = "RNMBXMovePointShapeAnimatorModule"
+        const val NAME = "RNMBXMovePointShapeAnimatorModule"
+    }
+
+    @ReactMethod
+    override fun start(tag: Double, promise: Promise?) {
+        shapeAnimatorManager?.get(tag.toLong())?.let {
+            it.start()
+        }
+    }
+
+    @ReactMethod
+    override fun create(tag: Double, from: ReadableArray, promise: Promise) {
+        shapeAnimatorManager.add(MovePointShapeAnimator(tag.toLong(), from.getDouble(0), from.getDouble(1)))
+        promise.resolve(tag.toInt())
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/shape_animators/ShapeAnimatorCommon.kt

@@ -0,0 +1,110 @@
+package com.rnmapbox.rnmbx.shape_animators
+
+import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
+import com.mapbox.geojson.GeoJson
+import com.rnmapbox.rnmbx.utils.Logger
+import org.json.JSONObject
+import java.util.Date
+import java.util.Timer
+import java.util.TimerTask
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+typealias Tag = Long
+
+interface ShapeAnimationConsumer {
+    fun shapeUpdated(geoJson: GeoJson)
+}
+abstract class ShapeAnimator(val tag: Tag) {
+
+    abstract fun getShape(): GeoJson;
+    abstract fun start()
+
+    abstract fun subscribe(consumer: ShapeAnimationConsumer)
+    abstract fun unsubscribe(consumer: ShapeAnimationConsumer)
+}
+
+abstract class ShapeAnimatorCommon(tag: Tag): ShapeAnimator(tag) {
+    var timer: Timer? = null
+    var progress: Duration? = null
+
+    // region subscribers
+    var subscribers = mutableListOf<ShapeAnimationConsumer>()
+
+    override fun subscribe(consumer: ShapeAnimationConsumer) {
+        subscribers.add(consumer)
+    }
+
+    override fun unsubscribe(consumer: ShapeAnimationConsumer) {
+        subscribers.remove(consumer)
+    }
+    // endregion
+
+    override fun start() {
+        timer?.let { it.cancel() }
+        timer = null
+
+        val fps = 30.0
+        val period = (1000.0 / fps).toLong()
+        val start = Date()
+        val timer = Timer()
+        this.timer = timer
+        val animator = this
+
+        timer.schedule(object : TimerTask() {
+            override fun run() {
+
+                val now = Date()
+                val diff = now.time - start.time
+                val progress = diff.milliseconds
+                animator.progress = progress
+
+                val (shape,doContinue) = getAnimatedShape(progress)
+                if (!doContinue) {
+                    timer.cancel()
+                }
+                runOnUiThread {
+                    subscribers.forEach { it.shapeUpdated(shape) }
+                }
+            }
+        },0, period)
+    }
+
+    override fun getShape(): GeoJson {
+        return getAnimatedShape(progress ?: 0.0.milliseconds).first
+    }
+    abstract fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson,Boolean>
+
+}
+class ShapeAnimatorManager {
+    private val animators = hashMapOf<Tag, ShapeAnimator>();
+    fun add(animator: ShapeAnimator) {
+        animators.put(animator.tag, animator)
+    }
+
+    fun isShapeAnimatorTag(shape: String): Boolean {
+        return shape.startsWith("{\"__nativeTag\":")
+    }
+
+    fun get(tag: String): ShapeAnimator? {
+        if (isShapeAnimatorTag(tag)) {
+            val obj = JSONObject(tag)
+            val tag = obj.getLong("__nativeTag")
+            return get(tag);
+        }
+        else {
+            return null
+        }
+    }
+    fun get(tag: Tag): ShapeAnimator? {
+        val result = animators[tag]
+        if (result == null) {
+            Logger.e(LOG_TAG, "Shape animator for tag: $tag was not found")
+        }
+        return result
+    }
+
+    companion object {
+        const val LOG_TAG = "RNMBXShapeAnimators"
+    }
+}