@rnmapbox/maps 10.1.0-beta.8 → 10.1.0-rc.0

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

@@ -35,10 +35,10 @@ public class MapClickEvent extends AbstractEvent {
         String eventType = getType();
 
         if (eventType.equals(EventTypes.MAP_LONG_CLICK)) {
-            return EventKeys.MAP_LONG_CLICK;
+            return EventKeys.MAP_LONG_CLICK.getValue();
         }
 
-        return EventKeys.MAP_CLICK;
+        return EventKeys.MAP_CLICK.getValue();
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapUserTrackingModeEvent.kt

@@ -9,13 +9,13 @@ import com.rnmapbox.rnmbx.events.constants.EventTypes
 
 class MapUserTrackingModeEvent(view: View?, val userTrackingMode: Int, val basePayload: WritableMap? = null) : AbstractEvent(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE) {
     override val key
-        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
+        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE.value
 
     override val payload : WritableMap
-        get() = {
+        get() {
             val payload = basePayload?.copy() ?: Arguments.createMap()
             payload.putBoolean("followUserLocation", userTrackingMode != UserTrackingMode.NONE)
             payload.putString("followUserMode", UserTrackingMode.toString(userTrackingMode))
-            payload
-        }.invoke()
+            return payload
+        }
 }

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

@@ -28,7 +28,7 @@ public class PointAnnotationClickEvent extends MapClickEvent {
 
     @Override
     public String getKey() {
-        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED : EventKeys.POINT_ANNOTATION_DESELECTED;
+        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED.getValue() : EventKeys.POINT_ANNOTATION_DESELECTED.getValue();
     }
 
     @Override

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

@@ -31,13 +31,13 @@ public class PointAnnotationDragEvent extends MapClickEvent {
         String eventType = getType();
 
         if (eventType.equals(EventTypes.ANNOTATION_DRAG_START)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_START;
+            return EventKeys.POINT_ANNOTATION_DRAG_START.getValue();
         }
         if (eventType.equals(EventTypes.ANNOTATION_DRAG_END)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_END;
+            return EventKeys.POINT_ANNOTATION_DRAG_END.getValue();
         }
 
-        return EventKeys.POINT_ANNOTATION_DRAG;
+        return EventKeys.POINT_ANNOTATION_DRAG.getValue();
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt

@@ -0,0 +1,44 @@
+package com.rnmapbox.rnmbx.events.constants
+
+private fun ns(name: String): String {
+    val namespace = "rct.mapbox"
+    return String.format("%s.%s", namespace, name)
+}
+enum class EventKeys(val value: String) {
+    // map events
+    MAP_CLICK(ns("map.press")),
+    MAP_LONG_CLICK(ns("map.longpress")),
+    MAP_ONCHANGE(ns("map.change")),
+    MAP_ON_LOCATION_CHANGE(ns("map.location.change")),
+    MAP_ANDROID_CALLBACK(ns("map.androidcallback")),
+    MAP_USER_TRACKING_MODE_CHANGE(ns("map.usertrackingmodechange")),
+
+    // point annotation events
+    POINT_ANNOTATION_SELECTED(ns("pointannotation.selected")),
+    POINT_ANNOTATION_DESELECTED(ns("pointannotation.deselected")),
+    POINT_ANNOTATION_DRAG_START(ns("pointannotation.dragstart")),
+    POINT_ANNOTATION_DRAG(ns("pointannotation.drag")),
+    POINT_ANNOTATION_DRAG_END(ns("pointannotation.dragend")),
+
+    // source events
+    SHAPE_SOURCE_LAYER_CLICK(ns("shapesource.layer.pressed")),
+    VECTOR_SOURCE_LAYER_CLICK(ns("vectorsource.layer.pressed")),
+    RASTER_SOURCE_LAYER_CLICK(ns("rastersource.layer.pressed")),
+
+    // images event
+    IMAGES_MISSING(ns("images.missing")),
+
+    // location events
+    USER_LOCATION_UPDATE(ns("user.location.update")),
+
+    // viewport events
+    VIEWPORT_STATUS_CHANGE(ns("viewport.statuschange"))
+}
+
+fun eventMapOf(vararg values: Pair<EventKeys, String>): Map<String, String> {
+    val mapped = values.map { (k,v) -> Pair(k.value, v) }
+
+    return mapOf(
+        *mapped.toTypedArray()
+    )
+}

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

@@ -155,15 +155,9 @@ class LocationManager private constructor(private val context: Context) : Locati
 
     ////
 
-    /*
     private fun buildEngineRequest() {
-        engine = LocationEngineProvider.getBestLocationEngine(context.applicationContext)
-        locationEngineRequest = LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
-                .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
-                .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
-                .setDisplacement(mMinDisplacement)
-                .build()
-    }*/
+        engine = createLocationEngine(context.applicationContext)
+    }
 
     fun addLocationListener(listener: OnUserLocationChange) {
         if (!listeners.contains(listener)) {
@@ -278,6 +272,6 @@ class LocationManager private constructor(private val context: Context) : Locati
     }
 
     init {
-        // buildEngineRequest()
+        buildEngineRequest()
     }
 }

package/android/src/main/java/com/rnmapbox/rnmbx/modules/CustomHttpHeaders.kt

@@ -37,11 +37,5 @@ object CustomHttpHeaders : HttpServiceBase() {
     override fun onResponse(response: HttpResponse): HttpResponse {
         return response
     }
-
-    /*
-    override fun onUpload(options: UploadOptions): UploadOptions {
-        return options;
-    }
-    */
 }
 

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt

@@ -30,6 +30,7 @@ import java.nio.file.StandardCopyOption
 import java.util.concurrent.CountDownLatch
 
 import com.rnmapbox.rnmbx.v11compat.offlinemanager.*
+import com.rnmapbox.rnmbx.v11compat.resourceoption.getMapboxAccessToken
 
 data class ZoomRange(val minZoom: Byte, val maxZoom: Byte) {
 
@@ -103,7 +104,9 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
 
 
     val tileStore: TileStore by lazy {
-        TileStore.create()
+        val result = TileStore.create()
+        result.setAccessToken(RNMBXModule.getAccessToken(mReactContext));
+        result
     }
 
     val offlineManager: OfflineManager by lazy {

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"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/utils/BitmapUtils.kt

@@ -33,10 +33,6 @@ object BitmapUtils {
             }
         }
 
-    fun getBitmapFromURL(url: String?): Bitmap? {
-        return getBitmapFromURL(url, null)
-    }
-
     fun toImage(bitmap: Bitmap): Image {
         if (bitmap.config != Bitmap.Config.ARGB_8888) {
             throw RuntimeException("Only ARGB_8888 bitmap config is supported!")
@@ -71,33 +67,6 @@ object BitmapUtils {
         }
     }
 
-    fun getBitmapFromURL(url: String?, options: BitmapFactory.Options?): Bitmap? {
-        var bitmap = getImage(url)
-        if (bitmap != null) {
-            return bitmap
-        }
-        try {
-            val bitmapStream = URL(url).openStream()
-            bitmap = BitmapFactory.decodeStream(bitmapStream, null, options)
-            bitmapStream.close()
-            addImage(url, bitmap)
-        } catch (e: Exception) {
-            Log.w(LOG_TAG, e.localizedMessage)
-            bitmap =
-                Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8) // Returns a transparent bitmap
-        }
-        return bitmap
-    }
-
-    fun getBitmapFromResource(
-        context: Context,
-        resourceName: String?,
-        options: BitmapFactory.Options?
-    ): Bitmap {
-        val resources = context.resources
-        val resID = resources.getIdentifier(resourceName, "drawable", context.packageName)
-        return BitmapFactory.decodeResource(resources, resID, options)
-    }
 
     @Throws(IOException::class)
     fun createImgTempFile(context: Context, image: Image): String? {
@@ -118,6 +87,9 @@ object BitmapUtils {
         if (tempFile == null) {
             return null
         }
+        if (outputStream == null) {
+            return null
+        }
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
         closeSnapshotOutputStream(outputStream)
         return Uri.fromFile(tempFile).toString()

package/android/src/main/java/com/rnmapbox/rnmbx/utils/DownloadMapImageTask.kt

@@ -4,11 +4,9 @@ import android.content.Context
 import android.graphics.Bitmap
 import com.mapbox.maps.Style
 import com.mapbox.maps.MapboxMap
-import com.rnmapbox.rnmbx.utils.DownloadMapImageTask.OnAllImagesLoaded
 import android.os.AsyncTask
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.util.DisplayMetrics
-import com.rnmapbox.rnmbx.utils.DownloadMapImageTask
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
@@ -22,21 +20,21 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.views.imagehelper.ImageSource
 import com.rnmapbox.rnmbx.components.images.ImageInfo
-import com.rnmapbox.rnmbx.components.images.addBitmapImage
+import com.rnmapbox.rnmbx.components.images.ImageManager
 import java.io.File
 import java.lang.ref.WeakReference
-import java.util.AbstractMap
-import java.util.ArrayList
 import java.util.HashMap
+import com.rnmapbox.rnmbx.v11compat.image.*
 
 data class DownloadedImage(val name: String, val bitmap: Bitmap, val info: ImageInfo)
 
-class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImagesLoaded?) :
+class DownloadMapImageTask(context: Context, map: MapboxMap, imageManager: ImageManager?, callback: OnAllImagesLoaded? = null) :
     AsyncTask<Map.Entry<String, ImageEntry>, Void?, List<DownloadedImage>>() {
     private val mContext: WeakReference<Context>
     private val mMap: WeakReference<MapboxMap>
     private val mCallback: OnAllImagesLoaded?
     private val mCallerContext: Any
+    private val mImageManager: WeakReference<ImageManager>
 
     interface OnAllImagesLoaded {
         fun onAllImagesLoaded()
@@ -53,64 +51,40 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
             if (uri.startsWith("/")) {
                 uri = Uri.fromFile(File(uri)).toString()
             }
-            if (uri.startsWith("http://") || uri.startsWith("https://") ||
-                uri.startsWith("file://") || uri.startsWith("asset://") || uri.startsWith("data:")
-            ) {
-                val source = ImageSource(context, uri)
-                val request = ImageRequestBuilder.newBuilderWithSource(source.uri)
-                    .setRotationOptions(RotationOptions.autoRotate())
-                    .build()
-                val dataSource =
-                    Fresco.getImagePipeline().fetchDecodedImage(request, mCallerContext)
-                var result: CloseableReference<CloseableImage>? = null
-                try {
-                    result = DataSources.waitForFinalResult(dataSource)
-                    if (result != null) {
-                        val image = result.get()
-                        if (image is CloseableStaticBitmap) {
-                            val bitmap =
-                                image.underlyingBitmap // Copy the bitmap to make sure it doesn't get recycled when we release
-                                    // the fresco reference.
-                                    .copy(Bitmap.Config.ARGB_8888, true)
-                            bitmap.density =
-                                (DisplayMetrics.DENSITY_DEFAULT.toDouble() * imageEntry.getScaleOr(
-                                    1.0
-                                )).toInt()
-                            images.add(
-                                DownloadedImage(name=key, bitmap=bitmap, info=imageEntry.info)
-                            )
-                        } else {
-                            FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
-                        }
+            val source = ImageSource(context, uri)
+            val request = ImageRequestBuilder.newBuilderWithSource(source.uri)
+                .setRotationOptions(RotationOptions.autoRotate())
+                .build()
+            val dataSource =
+                Fresco.getImagePipeline().fetchDecodedImage(request, mCallerContext)
+            var result: CloseableReference<CloseableImage>? = null
+            try {
+                result = DataSources.waitForFinalResult(dataSource)
+                if (result != null) {
+                    val image = result.get()
+                    if (image is CloseableStaticBitmap) {
+                        val bitmap =
+                            image.underlyingBitmap // Copy the bitmap to make sure it doesn't get recycled when we release
+                                // the fresco reference.
+                                .copy(Bitmap.Config.ARGB_8888, true)
+                        Log.e("RNMBXImageManager", "downloadImage: $key $uri $image ${image.width}x${image.height}")
+                        bitmap.density = DisplayMetrics.DENSITY_DEFAULT
+                        images.add(
+                            DownloadedImage(name=key, bitmap=bitmap, info=imageEntry.info)
+                        )
                     } else {
                         FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
                     }
-                } catch (e: Throwable) {
-                    Log.w(LOG_TAG, e.localizedMessage)
-                } finally {
-                    dataSource.close()
-                    if (result != null) {
-                        CloseableReference.closeSafely(result)
-                    }
-                }
-            } else {
-                // local asset required from JS require('image.png') or import icon from 'image.png' while in release mode
-                val bitmap = BitmapUtils.getBitmapFromResource(
-                    context,
-                    uri,
-                    getBitmapOptions(metrics, imageEntry.info.scale)
-                )
-                if (bitmap != null) {
-                    images.add(
-                        DownloadedImage(
-                            name=key,
-                            bitmap=bitmap,
-                            info=imageEntry.info
-                        )
-                    )
                 } else {
                     FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
                 }
+            } catch (e: Throwable) {
+                Log.w(LOG_TAG, e.localizedMessage)
+            } finally {
+                dataSource.close()
+                if (result != null) {
+                    CloseableReference.closeSafely(result)
+                }
             }
         }
         return images
@@ -125,25 +99,14 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
                 for (image in images) {
                     bitmapImages[image.name] = image.bitmap
                     val info = image.info
-                    style.addBitmapImage(image.name, image.bitmap,sdf = info.sdf, stretchX = info.stretchX, stretchY = info.stretchY,
-                        content = info.content,scale = info.getScaleOr(1.0)
-                    )
+                    mImageManager.get()?.resolve(image.name, image.bitmap)
+                    style.addBitmapImage(image.name, image.bitmap, info)
                 }
             }
         }
         mCallback?.onAllImagesLoaded()
     }
 
-    private fun getBitmapOptions(metrics: DisplayMetrics, scale: Double?): BitmapFactory.Options {
-        val options = BitmapFactory.Options()
-        options.inScreenDensity = metrics.densityDpi
-        options.inTargetDensity = metrics.densityDpi
-        if (scale != null) {
-            options.inDensity = (DisplayMetrics.DENSITY_DEFAULT.toDouble() * scale).toInt()
-        }
-        return options
-    }
-
     companion object {
         const val LOG_TAG = "DownloadMapImageTask"
     }
@@ -151,6 +114,7 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
     init {
         mContext = WeakReference(context.applicationContext)
         mMap = WeakReference(map)
+        mImageManager = WeakReference(imageManager)
         mCallback = callback
         mCallerContext = this
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/PropertyChanges.kt

@@ -0,0 +1,68 @@
+package com.rnmapbox.rnmbx.utils
+
+/**
+ * This mechanism allows to separate property updates from application of property updates. Usefull for delaying the propery updates
+ * because the object is not yet created for example. Or to apply multiple propery changes at once.
+ *
+ * @sample
+ *
+ * class MapView {
+ *   enum class Property(_apply: (MapView)->Unit) : PropertyUpdaterWithName<MapView> {
+ *     class LOGO_POSITION(MapView.applyLogoPosition)
+ *
+ *     override fun apply(mapView: MapView): Unit {
+ *       _apply(mapView)
+ *     }
+ *   }
+ *     val changes: PropertyUpdates()
+ *
+ *     var logoPosition: LogoPosition;
+ *
+ *     fun setLogoPosition(value: LogoPosition) {
+ *        logoPosition = value
+ *        changes.add(Property::LOGO_POSITION)
+ *     }
+ *
+ *     fun setGestureSettings(value: Custom) {
+ *         changes.add(Property::CUSTOM("gestures") {
+ *            mapboxMap.updateGestures(...)
+ *         })
+ *     }
+ *
+ *     fun applyLogoPosition() {
+ *       mapboxMap.updateLogoPosition(logoPosition)
+ *     }
+ *   }
+ * }
+ */
+
+interface PropertyUpdater<Base: Any> {
+    fun apply(item: Base): Unit;
+}
+interface PropertyUpdaterWithName<Base: Any> : PropertyUpdater<Base> {
+    val name: String;
+}
+
+class CustomPropUpdater<T: Any>(val _apply: (T) -> Unit) : PropertyUpdater<T> {
+    override fun apply(item: T): Unit {
+        _apply(item)
+    }
+}
+class PropertyChanges<T : Any> {
+    val changes = mutableMapOf<String, PropertyUpdater<T>>();
+
+    fun add(change: PropertyUpdaterWithName<T>) {
+        changes.set(change.name, change)
+    }
+
+    fun add(key: String, apply: (T) -> Unit) {
+        changes.set(key, CustomPropUpdater(apply))
+    }
+
+    fun apply(target: T) {
+        for (entry in changes.entries.iterator()) {
+            entry.value.apply(target)
+        }
+        changes.clear()
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -1,5 +1,6 @@
 package com.rnmapbox.rnmbx.utils
 
+import android.view.View
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UIManager
@@ -14,9 +15,9 @@ data class ViewTagWaiter<V>(
 )
 
 // see https://github.com/rnmapbox/maps/pull/3074
-open class ViewTagResolver<V>(val context: ReactApplicationContext) {
+open class ViewTagResolver(val context: ReactApplicationContext) {
     private val createdViews: HashSet<Int> = hashSetOf<Int>()
-    private val viewWaiters: HashMap<Int, MutableList<ViewTagWaiter<V>>> = hashMapOf()
+    private val viewWaiters: HashMap<Int, MutableList<ViewTagWaiter<View>>> = hashMapOf()
 
     // to be called from view.setId
     fun tagAssigned(viewTag: Int) {
@@ -26,7 +27,7 @@ open class ViewTagResolver<V>(val context: ReactApplicationContext) {
         if (list != null) {
             context.runOnUiQueueThread {
                 try {
-                    val view = manager.resolveView(viewTag) as V
+                    val view = manager.resolveView(viewTag)
 
                     list.forEach { it.fn(view) }
                 } catch (err: IllegalViewOperationException) {
@@ -51,14 +52,14 @@ open class ViewTagResolver<V>(val context: ReactApplicationContext) {
             }
 
     // calls on UiQueueThread with resolved view
-    fun withViewResolved(viewTag: Int, reject: Promise? = null, fn: (V) -> Unit) {
+    fun <V>withViewResolved(viewTag: Int, reject: Promise? = null, fn: (V) -> Unit) {
         context.runOnUiQueueThread() {
             try {
                 val view = manager.resolveView(viewTag) as V
                 fn(view)
             } catch (err: IllegalViewOperationException) {
                 if (!createdViews.contains(viewTag)) {
-                    viewWaiters.getOrPut(viewTag) { mutableListOf<ViewTagWaiter<V>>() }.add(ViewTagWaiter(fn, reject))
+                    viewWaiters.getOrPut(viewTag) { mutableListOf<ViewTagWaiter<View>>() }.add(ViewTagWaiter<View>({ view -> fn(view as V) }, reject))
                 } else {
                     reject?.reject(err)
                 }