@rnmapbox/maps 10.0.0-beta.72 → 10.0.0-beta.73

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/RCTMGLPackage.java

@@ -15,6 +15,7 @@ import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager;
 import com.mapbox.rctmgl.components.annotation.RCTMGLCalloutManager;
 import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotationManager;
 import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager;
+import com.mapbox.rctmgl.components.images.RCTMGLImageManager;
 import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
 import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
@@ -94,6 +95,7 @@ public class RCTMGLPackage implements ReactPackage {
 
         // images
         managers.add(new RCTMGLImagesManager(reactApplicationContext));
+        managers.add(new RCTMGLImageManager(reactApplicationContext));
 
         // layers
         managers.add(new RCTMGLFillLayerManager());

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.kt

@@ -53,7 +53,6 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         childView.addOnLayoutChangeListener(this)
 
         mMapView?.offscreenAnnotationViewContainer?.addView(childView)
-
     }
 
     override fun removeView(childView: View) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImage.kt

@@ -0,0 +1,74 @@
+package com.mapbox.rctmgl.components.images
+
+import android.graphics.Bitmap
+import android.view.View
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.views.view.ReactViewGroup
+import com.mapbox.maps.ImageContent
+import com.mapbox.maps.ImageStretches
+import com.mapbox.rctmgl.components.annotation.RCTMGLCallout
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.mapbox.rctmgl.utils.BitmapUtils
+import com.mapbox.rctmgl.utils.Logger
+
+class RCTMGLImage(private val mContext: ReactApplicationContext, private val mManager: RCTMGLImageManager): ReactViewGroup(mContext), View.OnLayoutChangeListener {
+    var name: String? = null
+    var sdf: Boolean = false
+    var scale: Double = 1.0
+    var stretchX = listOf<ImageStretches>();
+    var stretchY = listOf<ImageStretches>();
+    var content: ImageContent? = null;
+
+    var mChildView: View? = null;
+
+    var mMapView: RCTMGLMapView? = null;
+
+    var nativeImageUpdater: NativeImageUpdater? = null;
+
+    var mBitmap : Bitmap? = null
+
+    override fun onLayoutChange(v: View, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int,
+                                oldRight: Int, oldBottom: Int) {
+        if (left == 0 && top == 0 && right == 0 && bottom == 0) {
+            return
+        }
+        if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
+            refreshBitmap(v, left, top, right, bottom)
+        }
+    }
+
+    private fun refreshBitmap(v: View, left: Int = v.left, top: Int = v.top, right: Int = v.right, bottom: Int = v.bottom) {
+        val name = this.name
+        if (name == null) {
+            Logger.e("RCTMGLImage", "Image component has no name")
+            return
+        }
+        val bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom)
+        nativeImageUpdater?.let {
+            it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
+            mBitmap = null;
+        }
+    }
+
+    fun refresh() {
+        mChildView?.let {
+            refreshBitmap(it)
+        }
+    }
+
+    override fun addView(childView: View, childPosition: Int) {
+        if (childPosition != 0) {
+            Logger.e("RCTMGLImage", "expected a single subview got childView:$childView position:$childPosition")
+        }
+        mMapView?.offscreenAnnotationViewContainer?.addView(childView)
+        mChildView = childView
+        childView.addOnLayoutChangeListener(this)
+    }
+
+    // region add/remove to Map
+    fun addToMap(mapView: RCTMGLMapView) {
+        mMapView = mapView
+    }
+    // endregion
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImageManager.kt

@@ -0,0 +1,67 @@
+package com.mapbox.rctmgl.components.images
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.DynamicFromArray
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.mapbox.rctmgl.events.constants.EventKeys
+
+class RCTMGLImageManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RCTMGLImage>(
+mContext
+) {
+    override fun getName(): String {
+        return "RCTMGLImage"
+    }
+
+    override fun createViewInstance(p0: ThemedReactContext): RCTMGLImage {
+        return RCTMGLImage(mContext, this)
+    }
+
+    override fun customEvents(): MutableMap<String, String>? {
+        return mutableMapOf();
+    }
+
+    // region React properties
+    @ReactProp(name="name")
+    fun setName(image: RCTMGLImage, value: String) {
+        image.name = value
+    }
+
+    @ReactProp(name="sdf")
+    fun setSdf(image: RCTMGLImage, value: Boolean) {
+        image.sdf = value
+    }
+
+    @ReactProp(name="stretchX")
+    fun setStretchX(image: RCTMGLImage, value: Dynamic) {
+        image.stretchX = RCTMGLImagesManager.convertStretch(value) ?: listOf()
+    }
+
+    @ReactProp(name="stretchY")
+    fun setStretchY(image: RCTMGLImage, value: Dynamic) {
+        image.stretchY = RCTMGLImagesManager.convertStretch(value) ?: listOf()
+    }
+
+    @ReactProp(name="content")
+    fun setContent(image: RCTMGLImage, value: Dynamic) {
+        image.content = RCTMGLImagesManager.convertContent(value)
+    }
+
+    @ReactProp(name="scale")
+    fun setScale(image: RCTMGLImage, value: Double) {
+        image.scale = value
+    }
+    // endregion
+
+    // region React methods
+    override fun receiveCommand(root: RCTMGLImage, commandId: String?, args: ReadableArray?) {
+        if (commandId == "refresh") {
+            root.refresh()
+        }
+    }
+    // endregion
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImages.kt

@@ -10,6 +10,8 @@ import androidx.core.content.res.ResourcesCompat
 import com.mapbox.bindgen.Expected
 import com.mapbox.bindgen.None
 import com.mapbox.maps.Image
+import com.mapbox.maps.ImageContent
+import com.mapbox.maps.ImageStretches
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.rctmgl.R
@@ -24,28 +26,40 @@ import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
 
-fun Style.addBitmapImage(imageId: String, bitmap: Bitmap) : Expected<String, None> {
+fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0) : Expected<String, None> {
     val byteBuffer = ByteBuffer.allocate(bitmap.byteCount)
     bitmap.copyPixelsToBuffer(byteBuffer)
-    val sdf = false
     return this.addStyleImage(
         imageId,
-        (1.0/((160.0/bitmap.density))).toFloat(),
+        (1.0/((160.0/bitmap.density)) * scale).toFloat() ,
         Image(bitmap.width, bitmap.height, byteBuffer.array()),
         sdf,
-        listOf(),
-        listOf(),
-        null
+        stretchX,
+        stretchY,
+        content,
     )
 }
 
-class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager) : AbstractMapFeature(context) {
+fun Style.addBitmapImage(nativeImage: NativeImage) : Expected<String, None> {
+    return addBitmapImage(nativeImage.name, nativeImage.drawable.bitmap, nativeImage.sdf, nativeImage.stretchX, nativeImage.stretchY, nativeImage.content, nativeImage.scale)
+}
+
+data class NativeImage(val name: String, val drawable: BitmapDrawable, val scale: Double = 1.0, val sdf: Boolean = false, val stretchX: List<ImageStretches> = listOf(),
+                       val stretchY: List<ImageStretches> = listOf(), val content: ImageContent? = null
+);
+
+interface NativeImageUpdater {
+    fun updateImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0)
+}
+
+class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager) : AbstractMapFeature(context), NativeImageUpdater {
     var mCurrentImages: MutableSet<String?>
+    var mImageViews = mutableListOf<RCTMGLImage>();
     private var mImages: MutableMap<String, ImageEntry>?
-    private var mNativeImages: MutableMap<String?, BitmapDrawable?>?
+    private var mNativeImages = mutableMapOf<String, NativeImage>()
     private var mSendMissingImageEvents = false
     private var mMap: MapboxMap? = null
-    var iD: String? = null
+
     fun setImages(images: List<Map.Entry<String, ImageEntry>>) {
         val newImages: MutableMap<String, ImageEntry> = HashMap()
         for ((key, value) in images) {
@@ -59,16 +73,18 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         }
     }
 
-    fun setNativeImages(nativeImages: List<Map.Entry<String, BitmapDrawable>>) {
-        val newImages: MutableMap<String?, BitmapDrawable?> = HashMap()
-        for ((key, value) in nativeImages) {
-            val oldValue = mNativeImages?.put(key, value)
+    fun setNativeImages(nativeImages: List<NativeImage>) {
+        val newImages: MutableMap<String, NativeImage> = HashMap()
+        for (nativeImage in nativeImages) {
+            val oldValue = mNativeImages.put(nativeImage.name, nativeImage)
             if (oldValue == null) {
-                newImages[key] = value
+                newImages[nativeImage.name] = nativeImage
             }
         }
-        if (mMap != null && mMap?.getStyle() != null) {
-            addNativeImagesToStyle(newImages, mMap!!)
+        mMap?.let {
+            if (it.getStyle() != null) {
+                addNativeImagesToStyle(newImages, it)
+            }
         }
     }
 
@@ -79,7 +95,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
     override fun removeFromMap(mapView: RCTMGLMapView) {
         removeImages(mapView)
         mMap = null
-        mNativeImages = HashMap()
+        mNativeImages = mutableMapOf()
         mImages = HashMap()
         mCurrentImages = HashSet()
         super.removeFromMap(mapView)
@@ -111,12 +127,10 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
     }
 
     fun addMissingImageToStyle(id: String, map: MapboxMap): Boolean {
-        if (mNativeImages != null) {
-            val drawable = mNativeImages!![id]
-            if (drawable != null) {
-                addNativeImages(entry<String?, BitmapDrawable?>(id, drawable), map)
-                return true
-            }
+        val nativeImage = mNativeImages.get(id)
+        if (nativeImage != null) {
+            addNativeImages(listOf(nativeImage), map)
+            return true
         }
         if (mImages != null) {
             val entry = mImages!![id]
@@ -134,10 +148,8 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         }
     }
 
-    fun addNativeImagesToStyle(images: Map<String?, BitmapDrawable?>?, map: MapboxMap) {
-        if (images != null) {
-            addNativeImages(ArrayList(images.entries), map)
-        }
+    fun addNativeImagesToStyle(images: Map<String, NativeImage>, map: MapboxMap) {
+        addNativeImages(images.values.toList(), map)
     }
 
     fun sendImageMissingEvent(id: String, map: MapboxMap) {
@@ -153,6 +165,10 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
 
     override fun addToMap(mapView: RCTMGLMapView) {
         super.addToMap(mapView)
+
+        mImageViews.forEach {
+            it.addToMap(mapView)
+        }
         // Wait for style before adding the source to the map
         // only then we can pre-load required images / placeholders into the style
         // before we add the ShapeSource to the map
@@ -163,18 +179,22 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
                 addNativeImagesToStyle(mNativeImages, map)
                 addImagesToStyle(mImages, map)
                 // super.addToMap(mapView);
+
+                mImageViews.forEach {
+                    it.refresh()
+                }
             }
         })
     }
 
-    private fun addNativeImages(imageEntries: List<Map.Entry<String?, BitmapDrawable?>>?, map: MapboxMap) {
+    private fun addNativeImages(imageEntries: List<NativeImage>, map: MapboxMap) {
         val style = map.getStyle()
-        if (style == null || imageEntries == null) return
-        for ((key, value) in imageEntries) {
-            if (key != null && !hasImage(key, map)) {
-                val bitmap = value!!.bitmap
-                style.addBitmapImage(key, bitmap)
-                mCurrentImages.add(key)
+        if (style == null) return
+        for (nativeImage in imageEntries) {
+            if (!hasImage(nativeImage.name, map)) {
+                val bitmap = nativeImage.drawable
+                style.addBitmapImage(nativeImage)
+                mCurrentImages.add(nativeImage.name)
             }
         }
     }
@@ -193,7 +213,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
         for (imageEntry in imageEntries) {
             if (!hasImage(imageEntry.key, map)) {
-                mImagePlaceholder?.let { style.addBitmapImage(imageEntry.key, it) }
+                mImagePlaceholder?.let { style.addBitmapImage(imageEntry.key, it, false, listOf(), listOf(), null,1.0) }
                 missingImages.add(imageEntry)
                 mCurrentImages.add(imageEntry.key)
             }
@@ -220,4 +240,11 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
             mImagePlaceholder = BitmapUtils.getBitmapFromDrawable(ResourcesCompat.getDrawable(context.resources, R.drawable.empty_drawable, null))
         }
     }
+
+    override fun updateImage(imageId: String, bitmap: Bitmap, sdf: Boolean, stretchX: List<ImageStretches>, stretchY: List<ImageStretches>, content: ImageContent?, scale: Double)
+    {
+        mMap?.getStyle()?.let {
+            it.addBitmapImage(imageId, bitmap, sdf, stretchX, stretchY, content, scale);
+        }
+    }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImagesManager.kt

@@ -0,0 +1,216 @@
+package com.mapbox.rctmgl.components.images
+
+import android.graphics.drawable.BitmapDrawable
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.mapbox.maps.ImageContent
+import com.mapbox.maps.ImageStretches
+import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.mapbox.rctmgl.events.constants.EventKeys
+import com.mapbox.rctmgl.modules.RCTMGLLogging
+import com.mapbox.rctmgl.utils.ImageEntry
+import com.mapbox.rctmgl.utils.Logger
+import com.mapbox.rctmgl.utils.ResourceUtils
+import java.util.*
+
+class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
+    AbstractEventEmitter<RCTMGLImages?>(
+        mContext
+    ) {
+    override fun getName(): String {
+        return "RCTMGLImages"
+    }
+
+    public override fun createViewInstance(context: ThemedReactContext): RCTMGLImages {
+        return RCTMGLImages(context, this)
+    }
+
+    @ReactProp(name = "images")
+    fun setImages(images: RCTMGLImages, map: ReadableMap) {
+        val imagesList: MutableList<Map.Entry<String, ImageEntry>> = ArrayList()
+        val iterator = map.keySetIterator()
+        while (iterator.hasNextKey()) {
+            val imageName = iterator.nextKey()
+            var imageEntry: ImageEntry? = null
+            imageEntry = if (map.getType(imageName) == ReadableType.Map) {
+                val imageMap = map.getMap(imageName)
+                val uri = imageMap!!.getString("uri")
+                val hasScale =
+                    imageMap.hasKey("scale") && imageMap.getType("scale") == ReadableType.Number
+                val scale = if (hasScale) imageMap.getDouble("scale") else ImageEntry.defaultScale
+                ImageEntry(uri, scale)
+            } else {
+                ImageEntry(map.getString(imageName))
+            }
+            imagesList.add(AbstractMap.SimpleEntry(imageName, imageEntry))
+        }
+        images.setImages(imagesList)
+    }
+
+    @ReactProp(name = "hasOnImageMissing")
+    fun setHasOnImageMissing(images: RCTMGLImages, value: Boolean?) {
+        images.setHasOnImageMissing(value!!)
+    }
+
+    fun toNativeImage(dynamic: Dynamic): NativeImage? {
+        when (dynamic.type) {
+            ReadableType.String -> {
+                val resourceName = dynamic.asString();
+                val drawable =
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
+                if (drawable != null) {
+                    return NativeImage(name, drawable)
+                } else {
+                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $name")
+                    return null
+                }
+            }
+            ReadableType.Map -> {
+                val map = dynamic.asMap()
+                val resourceName = map.getString("name")
+                var sdf = false
+                var stretchX = listOf<ImageStretches>();
+                var stretchY = listOf<ImageStretches>();
+                var content : ImageContent? = null;
+                var scale : Double = 1.0;
+                if (map.hasKey("sdf")) {
+                    sdf = map.getBoolean("sdf");
+                }
+                if (map.hasKey("stretchX")) {
+                    stretchX = convertStretch(map.getDynamic("stretchX")) ?: listOf()
+                }
+                if (map.hasKey("stretchY")) {
+                    stretchY = convertStretch(map.getDynamic("stretchY")) ?: listOf()
+                }
+                if (map.hasKey("content")) {
+                    content = convertContent(map.getDynamic("content")) ?: null
+                }
+                if (map.hasKey("scale")) {
+                    if (map.getType("scale") != ReadableType.Number) {
+                        Logger.e("RCTMGLImages", "scale should be a number found: $scale in $dynamic")
+                        return null
+                    }
+                    scale = map.getDouble("scale")
+                }
+                val drawable =
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
+                if (drawable != null) {
+                    return NativeImage(name, drawable, scale, sdf, stretchX, stretchY)
+                } else {
+                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $name")
+                    return null
+                }
+            }
+            else -> {
+                Logger.e("RCTMGLImages", "nativeImages element should be a string or a object, but was: $dynamic")
+                return null
+            }
+        }
+    }
+
+    @ReactProp(name = "nativeImages")
+    fun setNativeImages(images: RCTMGLImages, arr: ReadableArray) {
+        val nativeImages = mutableListOf<NativeImage>();
+        for (i in 0 until arr.size()) {
+            val nativeImage = toNativeImage(arr.getDynamic(i))
+            if (nativeImage != null) {
+                nativeImages.add(nativeImage)
+            }
+        }
+        images.setNativeImages(nativeImages)
+    }
+
+    override fun customEvents(): Map<String, String>? {
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.IMAGES_MISSING, "onImageMissing")
+            .build()
+    }
+
+    // region RCTMGLImage children
+
+    override fun addView(parent: RCTMGLImages?, childView: View?, childPosition: Int) {
+        if (parent == null || childView == null) {
+            Logger.e("RCTMGLImages", "addView: parent or childView is null")
+            return
+        }
+
+        if (childView !is RCTMGLImage) {
+            Logger.e("RCTMGLImages", "child view should be RCTMGLImage")
+            return
+        }
+
+        parent.mImageViews.add(childPosition, childView)
+        childView.nativeImageUpdater = parent
+    }
+
+    override fun removeView(parent: RCTMGLImages?, view: View?) {
+        if (parent == null || view == null) {
+            Logger.e("RCTMGLImages", "removeView: parent or view is null")
+            return
+        }
+
+        parent.mImageViews.remove(view)
+    }
+
+    override fun removeAllViews(parent: RCTMGLImages?) {
+        if (parent == null) {
+            Logger.e("RCTMGLImages", "removeAllViews parent is null")
+            return
+        }
+
+        parent.mImageViews.clear()
+    }
+
+    // endregion
+
+    companion object {
+        const val REACT_CLASS = "RCTMGLImages"
+
+        fun convertStretch(stretch: Dynamic) : List<ImageStretches>? {
+            if (stretch.type != ReadableType.Array) {
+                Logger.e("RCTMGLImages", "stretch should be an array, got $stretch")
+                return null
+            }
+            val array = stretch.asArray()
+            var result = mutableListOf<ImageStretches>();
+            for (i in 0 until array.size()) {
+                if (array.getType(i) != ReadableType.Array) {
+                    Logger.e("RTMGLImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
+                } else {
+                    val pair = array.getArray(i)
+                    if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
+                        Logger.e("RCTMGLImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                    }
+                    result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
+                }
+            }
+            return result;
+        }
+
+        fun convertContent(content: Dynamic) : ImageContent? {
+            if (content.type != ReadableType.Array) {
+                Logger.e("RCTMGLImages", "content should be an array, got $content")
+                return null
+            }
+            val array = content.asArray()
+            if (array.size() != 4) {
+                Logger.e("RCTMGLImages", "content should be an array of 4 numbers, got $content")
+                return null
+            }
+            val result = arrayOf(0.0, 0.0, 0.0, 0.0, 0.0)
+            for (i in 0 until array.size()) {
+                if (array.getType(i) != ReadableType.Number) {
+                    Logger.e("RTMGLImages", "each element of content should be an number but was : ${array}")
+                    return null
+                } else {
+                    result[i] = array.getDouble(i)
+                }
+            }
+            return ImageContent(result[0].toFloat(), result[1].toFloat() ,result[2].toFloat(), result[3].toFloat())
+        }
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTLayer.kt

@@ -11,6 +11,7 @@ import com.mapbox.maps.MapboxMap
 import com.facebook.react.bridge.ReadableArray
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView.FoundLayerCallback
 import com.facebook.common.logging.FLog
+import com.mapbox.maps.extension.style.expressions.dsl.generated.all
 import com.mapbox.maps.extension.style.expressions.dsl.generated.literal
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.*
@@ -115,7 +116,7 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
                 mHadFilter = true
                 updateFilter(mFilter)
             } else if (mHadFilter) {
-                updateFilter(literal(true))
+                updateFilter(/* literal(true)*/all {} )
             }
         }
     }

package/index.d.ts

@@ -78,7 +78,6 @@ import type {
 import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';
 import type {
   Location as _Location,
-  Coordinates as _Coordinates,
   LocationManager,
 } from './javascript/modules/location/locationManager';
 
@@ -180,7 +179,9 @@ declare namespace MapboxGL {
   type UserTrackingMode = _UserTrackingMode;
   type UserTrackingModeChangeCallback = _UserTrackingModeChangeCallback;
   type Location = _Location;
-  type Coordinates = _Coordinates;
+
+  /** @deprecated This will be removed in a future release. Use `Location['coords']` instead. */
+  type Coordinates = Location['coords'];
 
   const offlineManager: OfflineManager;
   const snapshotManager: SnapshotManager;

package/javascript/components/Image.tsx

@@ -2,19 +2,27 @@ import React, { memo, forwardRef, ReactElement } from 'react';
 import { requireNativeComponent } from 'react-native';
 
 interface Props {
-  /** Image name */
+  /** ID of the image */
   name: string;
 
   /** Make image an sdf optional - see [SDF icons](https://docs.mapbox.com/help/troubleshooting/using-recolorable-images-in-mapbox-maps/) */
   sdf?: boolean;
 
-  /** stretch along x axis - optional */
+  /** An array of two-element arrays, consisting of two numbers that represent, the from position and the to position of areas that can be stretched horizontally. */
   stretchX?: [number, number][];
 
-  /** stretch along y axis - optional */
+  /** An array of two-element arrays, consisting of two numbers that represent, the from position and the to position of areas that can be stretched vertically. */
   stretchY?: [number, number][];
 
-  /** Single react native view generating the image */
+  /** An array of four numbers, with the first two specifying the left, top
+   * corner, and the last two specifying the right, bottom corner. If present, and if the
+   * icon uses icon-text-fit, the symbol's text will be fit inside the content box. */
+  content?: [number, number, number, number];
+
+  /** Scale factor for the image. */
+  scale?: number;
+
+  /** Single react native view rendering the image */
   children: ReactElement;
 }
 

package/javascript/components/annotations/Annotation.js

@@ -51,11 +51,16 @@ class Annotation extends React.Component {
       prevProps.coordinates[0] !== this.props.coordinates[0] ||
       prevProps.coordinates[1] !== this.props.coordinates[1];
 
-    if (!hasCoordChanged) {
-      return;
-    }
+    if (
+      prevProps.animated !== this.props.animated ||
+      (hasCoordChanged && (!this.state.shape || !this.props.animated))
+    ) {
+      const shape = this._getShapeFromProps(this.props);
 
-    if (this.props.animated && this.state.shape) {
+      this.setState({
+        shape: this.props.animated ? new AnimatedPoint(shape) : shape,
+      });
+    } else if (hasCoordChanged && this.props.animated && this.state.shape) {
       // flush current animations
       this.state.shape.stopAnimation();
 
@@ -66,12 +71,6 @@ class Annotation extends React.Component {
           duration: this.props.animationDuration,
         })
         .start();
-    } else if (!this.state.shape || !this.props.animated) {
-      const shape = this._getShapeFromProps(this.props);
-
-      this.setState({
-        shape: this.props.animated ? new AnimatedPoint(shape) : shape,
-      });
     }
   }
 

package/javascript/modules/location/locationManager.ts

@@ -25,7 +25,7 @@ export interface Location {
 /**
  * Coorinates sent by locationManager
  */
-export interface Coordinates {
+interface Coordinates {
   /**
    * The heading (measured in degrees) relative to true north.
    * Heading is used to describe the direction the device is pointing to (the value of the compass).

package/lib/commonjs/components/Image.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Image","memo","forwardRef","_ref","ref","name","sdf","stretchX","stretchY","children","nativeProps","createElement","RCTMGLImage","NATIVE_MODULE_NAME","exports","requireNativeComponent","displayName","_default"],"sourceRoot":"../../../javascript","sources":["components/Image.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAAsD,SAAAE,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAuBtD,MAAMW,KAAK,gBAAG,IAAAC,WAAI,gBAChB,IAAAC,iBAAU,EAAa,SAASF,KAAKA,CAAAG,IAAA,EAEnCC,GAA4B,EAC5B;EAAA,IAFA;IAAEC,IAAI;IAAEC,GAAG;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAgB,CAAC,GAAAN,IAAA;EAGlD,MAAMO,WAAW,GAAG;IAClBL,IAAI;IACJC,GAAG;IACHC,QAAQ;IACRC,QAAQ;IACRC;EACF,CAAC;EACD,oBAAOnC,MAAA,CAAAW,OAAA,CAAA0B,aAAA,CAACC,WAAW,EAAKF,WAAW,CAAI;AACzC,CAAC,CAAC,CACH;AAUM,MAAMG,kBAAkB,GAAG,aAAa;AAACC,OAAA,CAAAD,kBAAA,GAAAA,kBAAA;AAEhD,MAAMD,WAAW,GAAG,IAAAG,mCAAsB,EAAcF,kBAAkB,CAAC;AAE3Eb,KAAK,CAACgB,WAAW,GAAG,OAAO;AAAC,IAAAC,QAAA,GAEbjB,KAAK;AAAAc,OAAA,CAAA7B,OAAA,GAAAgC,QAAA"}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Image","memo","forwardRef","_ref","ref","name","sdf","stretchX","stretchY","children","nativeProps","createElement","RCTMGLImage","NATIVE_MODULE_NAME","exports","requireNativeComponent","displayName","_default"],"sourceRoot":"../../../javascript","sources":["components/Image.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAAsD,SAAAE,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AA+BtD,MAAMW,KAAK,gBAAG,IAAAC,WAAI,gBAChB,IAAAC,iBAAU,EAAa,SAASF,KAAKA,CAAAG,IAAA,EAEnCC,GAA4B,EAC5B;EAAA,IAFA;IAAEC,IAAI;IAAEC,GAAG;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAgB,CAAC,GAAAN,IAAA;EAGlD,MAAMO,WAAW,GAAG;IAClBL,IAAI;IACJC,GAAG;IACHC,QAAQ;IACRC,QAAQ;IACRC;EACF,CAAC;EACD,oBAAOnC,MAAA,CAAAW,OAAA,CAAA0B,aAAA,CAACC,WAAW,EAAKF,WAAW,CAAI;AACzC,CAAC,CAAC,CACH;AAUM,MAAMG,kBAAkB,GAAG,aAAa;AAACC,OAAA,CAAAD,kBAAA,GAAAA,kBAAA;AAEhD,MAAMD,WAAW,GAAG,IAAAG,mCAAsB,EAAcF,kBAAkB,CAAC;AAE3Eb,KAAK,CAACgB,WAAW,GAAG,OAAO;AAAC,IAAAC,QAAA,GAEbjB,KAAK;AAAAc,OAAA,CAAA7B,OAAA,GAAAgC,QAAA"}

package/lib/commonjs/components/annotations/Annotation.js

@@ -44,10 +44,12 @@ class Annotation extends _react.default.Component {
       return;
     }
     const hasCoordChanged = prevProps.coordinates[0] !== this.props.coordinates[0] || prevProps.coordinates[1] !== this.props.coordinates[1];
-    if (!hasCoordChanged) {
-      return;
-    }
-    if (this.props.animated && this.state.shape) {
+    if (prevProps.animated !== this.props.animated || hasCoordChanged && (!this.state.shape || !this.props.animated)) {
+      const shape = this._getShapeFromProps(this.props);
+      this.setState({
+        shape: this.props.animated ? new _classes.AnimatedPoint(shape) : shape
+      });
+    } else if (hasCoordChanged && this.props.animated && this.state.shape) {
       // flush current animations
       this.state.shape.stopAnimation();
       this.state.shape.timing({
@@ -55,11 +57,6 @@ class Annotation extends _react.default.Component {
         easing: this.props.animationEasingFunction,
         duration: this.props.animationDuration
       }).start();
-    } else if (!this.state.shape || !this.props.animated) {
-      const shape = this._getShapeFromProps(this.props);
-      this.setState({
-        shape: this.props.animated ? new _classes.AnimatedPoint(shape) : shape
-      });
     }
   }
   onPress() {

package/lib/commonjs/components/annotations/Annotation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_propTypes","_SymbolLayer","_Animated","_classes","obj","__esModule","default","Annotation","React","Component","propTypes","id","PropTypes","string","isRequired","animated","bool","animationDuration","number","animationEasingFunction","func","coordinates","arrayOf","onPress","children","any","style","icon","oneOfType","object","defaultProps","Easing","linear","constructor","props","shape","_getShapeFromProps","state","AnimatedPoint","bind","componentDidUpdate","prevProps","Array","isArray","setState","hasCoordChanged","stopAnimation","timing","easing","duration","start","arguments","length","undefined","lng","lat","type","symbolStyle","Object","assign","iconImage","render","createElement","ShapeSource","ref","SymbolLayer","_default","exports"],"sourceRoot":"../../../../javascript","sources":["components/annotations/Annotation.js"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_propTypes","_SymbolLayer","_Animated","_classes","obj","__esModule","default","Annotation","React","Component","propTypes","id","PropTypes","string","isRequired","animated","bool","animationDuration","number","animationEasingFunction","func","coordinates","arrayOf","onPress","children","any","style","icon","oneOfType","object","defaultProps","Easing","linear","constructor","props","shape","_getShapeFromProps","state","AnimatedPoint","bind","componentDidUpdate","prevProps","Array","isArray","setState","hasCoordChanged","stopAnimation","timing","easing","duration","start","arguments","length","undefined","lng","lat","type","symbolStyle","Object","assign","iconImage","render","createElement","ShapeSource","ref","SymbolLayer","_default","exports"],"sourceRoot":"../../../../javascript","sources":["components/annotations/Annotation.js"],"mappings":"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"}

package/lib/module/components/Image.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","memo","forwardRef","requireNativeComponent","Image","_ref","ref","name","sdf","stretchX","stretchY","children","nativeProps","createElement","RCTMGLImage","NATIVE_MODULE_NAME","displayName"],"sourceRoot":"../../../javascript","sources":["components/Image.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,IAAI,EAAEC,UAAU,QAAsB,OAAO;AAC7D,SAASC,sBAAsB,QAAQ,cAAc;AAuBrD,MAAMC,KAAK,gBAAGH,IAAI,eAChBC,UAAU,CAAa,SAASE,KAAKA,CAAAC,IAAA,EAEnCC,GAA4B,EAC5B;EAAA,IAFA;IAAEC,IAAI;IAAEC,GAAG;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAgB,CAAC,GAAAN,IAAA;EAGlD,MAAMO,WAAW,GAAG;IAClBL,IAAI;IACJC,GAAG;IACHC,QAAQ;IACRC,QAAQ;IACRC;EACF,CAAC;EACD,oBAAOX,KAAA,CAAAa,aAAA,CAACC,WAAW,EAAKF,WAAW,CAAI;AACzC,CAAC,CAAC,CACH;AAUD,OAAO,MAAMG,kBAAkB,GAAG,aAAa;AAE/C,MAAMD,WAAW,GAAGX,sBAAsB,CAAcY,kBAAkB,CAAC;AAE3EX,KAAK,CAACY,WAAW,GAAG,OAAO;AAE3B,eAAeZ,KAAK"}
+{"version":3,"names":["React","memo","forwardRef","requireNativeComponent","Image","_ref","ref","name","sdf","stretchX","stretchY","children","nativeProps","createElement","RCTMGLImage","NATIVE_MODULE_NAME","displayName"],"sourceRoot":"../../../javascript","sources":["components/Image.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,IAAI,EAAEC,UAAU,QAAsB,OAAO;AAC7D,SAASC,sBAAsB,QAAQ,cAAc;AA+BrD,MAAMC,KAAK,gBAAGH,IAAI,eAChBC,UAAU,CAAa,SAASE,KAAKA,CAAAC,IAAA,EAEnCC,GAA4B,EAC5B;EAAA,IAFA;IAAEC,IAAI;IAAEC,GAAG;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAgB,CAAC,GAAAN,IAAA;EAGlD,MAAMO,WAAW,GAAG;IAClBL,IAAI;IACJC,GAAG;IACHC,QAAQ;IACRC,QAAQ;IACRC;EACF,CAAC;EACD,oBAAOX,KAAA,CAAAa,aAAA,CAACC,WAAW,EAAKF,WAAW,CAAI;AACzC,CAAC,CAAC,CACH;AAUD,OAAO,MAAMG,kBAAkB,GAAG,aAAa;AAE/C,MAAMD,WAAW,GAAGX,sBAAsB,CAAcY,kBAAkB,CAAC;AAE3EX,KAAK,CAACY,WAAW,GAAG,OAAO;AAE3B,eAAeZ,KAAK"}

package/lib/module/components/annotations/Annotation.js

@@ -37,10 +37,12 @@ class Annotation extends React.Component {
       return;
     }
     const hasCoordChanged = prevProps.coordinates[0] !== this.props.coordinates[0] || prevProps.coordinates[1] !== this.props.coordinates[1];
-    if (!hasCoordChanged) {
-      return;
-    }
-    if (this.props.animated && this.state.shape) {
+    if (prevProps.animated !== this.props.animated || hasCoordChanged && (!this.state.shape || !this.props.animated)) {
+      const shape = this._getShapeFromProps(this.props);
+      this.setState({
+        shape: this.props.animated ? new AnimatedPoint(shape) : shape
+      });
+    } else if (hasCoordChanged && this.props.animated && this.state.shape) {
       // flush current animations
       this.state.shape.stopAnimation();
       this.state.shape.timing({
@@ -48,11 +50,6 @@ class Annotation extends React.Component {
         easing: this.props.animationEasingFunction,
         duration: this.props.animationDuration
       }).start();
-    } else if (!this.state.shape || !this.props.animated) {
-      const shape = this._getShapeFromProps(this.props);
-      this.setState({
-        shape: this.props.animated ? new AnimatedPoint(shape) : shape
-      });
     }
   }
   onPress() {

package/lib/module/components/annotations/Annotation.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Easing","PropTypes","SymbolLayer","Animated","AnimatedPoint","Annotation","Component","propTypes","id","string","isRequired","animated","bool","animationDuration","number","animationEasingFunction","func","coordinates","arrayOf","onPress","children","any","style","icon","oneOfType","object","defaultProps","linear","constructor","props","shape","_getShapeFromProps","state","bind","componentDidUpdate","prevProps","Array","isArray","setState","hasCoordChanged","stopAnimation","timing","easing","duration","start","arguments","length","undefined","lng","lat","type","symbolStyle","Object","assign","iconImage","render","createElement","ShapeSource","ref"],"sourceRoot":"../../../../javascript","sources":["components/annotations/Annotation.js"],"mappings":"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"}
+{"version":3,"names":["React","Easing","PropTypes","SymbolLayer","Animated","AnimatedPoint","Annotation","Component","propTypes","id","string","isRequired","animated","bool","animationDuration","number","animationEasingFunction","func","coordinates","arrayOf","onPress","children","any","style","icon","oneOfType","object","defaultProps","linear","constructor","props","shape","_getShapeFromProps","state","bind","componentDidUpdate","prevProps","Array","isArray","setState","hasCoordChanged","stopAnimation","timing","easing","duration","start","arguments","length","undefined","lng","lat","type","symbolStyle","Object","assign","iconImage","render","createElement","ShapeSource","ref"],"sourceRoot":"../../../../javascript","sources":["components/annotations/Annotation.js"],"mappings":"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"}

package/lib/typescript/components/Image.d.ts

@@ -1,14 +1,20 @@
 import React, { ReactElement } from 'react';
 interface Props {
-    /** Image name */
+    /** ID of the image */
     name: string;
     /** Make image an sdf optional - see [SDF icons](https://docs.mapbox.com/help/troubleshooting/using-recolorable-images-in-mapbox-maps/) */
     sdf?: boolean;
-    /** stretch along x axis - optional */
+    /** An array of two-element arrays, consisting of two numbers that represent, the from position and the to position of areas that can be stretched horizontally. */
     stretchX?: [number, number][];
-    /** stretch along y axis - optional */
+    /** An array of two-element arrays, consisting of two numbers that represent, the from position and the to position of areas that can be stretched vertically. */
     stretchY?: [number, number][];
-    /** Single react native view generating the image */
+    /** An array of four numbers, with the first two specifying the left, top
+     * corner, and the last two specifying the right, bottom corner. If present, and if the
+     * icon uses icon-text-fit, the symbol's text will be fit inside the content box. */
+    content?: [number, number, number, number];
+    /** Scale factor for the image. */
+    scale?: number;
+    /** Single react native view rendering the image */
     children: ReactElement;
 }
 interface Ref {

package/lib/typescript/components/Image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../javascript/components/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAoB,YAAY,EAAE,MAAM,OAAO,CAAC;AAG9D,UAAU,KAAK;IACb,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,0IAA0I;IAC1I,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,sCAAsC;IACtC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAE9B,sCAAsC;IACtC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAE9B,oDAAoD;IACpD,QAAQ,EAAE,YAAY,CAAC;CACxB;AAED,UAAU,GAAG;IACX,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,QAAA,MAAM,KAAK,8FAcV,CAAC;AAUF,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAMhD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../javascript/components/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAoB,YAAY,EAAE,MAAM,OAAO,CAAC;AAG9D,UAAU,KAAK;IACb,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IAEb,0IAA0I;IAC1I,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,mKAAmK;IACnK,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAE9B,iKAAiK;IACjK,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAE9B;;wFAEoF;IACpF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,mDAAmD;IACnD,QAAQ,EAAE,YAAY,CAAC;CACxB;AAED,UAAU,GAAG;IACX,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,QAAA,MAAM,KAAK,8FAcV,CAAC;AAUF,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAMhD,eAAe,KAAK,CAAC"}

package/lib/typescript/modules/location/locationManager.d.ts

@@ -10,7 +10,7 @@ export interface Location {
 /**
  * Coorinates sent by locationManager
  */
-export interface Coordinates {
+interface Coordinates {
     /**
      * The heading (measured in degrees) relative to true north.
      * Heading is used to describe the direction the device is pointing to (the value of the compass).

package/lib/typescript/modules/location/locationManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locationManager.d.ts","sourceRoot":"","sources":["../../../../javascript/modules/location/locationManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAElB,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAC;AAKtB,eAAO,MAAM,0BAA0B,oBAEtC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,cAAM,eAAe;IACnB,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;IAC7C,kBAAkB,EAAE,QAAQ,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACzC,iBAAiB,EAAE,uBAAuB,CAAC;IAC3C,gBAAgB,CAAC,EAAE,MAAM,CAAC;;IAgBpB,oBAAoB;IAuB1B,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI;IAalD,cAAc,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI;IAOrD,kBAAkB;IAKlB,qBAAqB,CAAC,QAAQ,EAAE,cAAc;IAY9C,KAAK,CAAC,YAAY,SAAK;IAwBvB,IAAI;IAUJ,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAK1C,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAK/C,SAAS,CAAC,QAAQ,EAAE,QAAQ;IAM5B;;OAEG;IACH,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI5D;;;;;;;;;OASG;IACH,wBAAwB,CAAC,aAAa,EAAE,MAAM;CAG/C;;AAED,wBAAqC"}
+{"version":3,"file":"locationManager.d.ts","sourceRoot":"","sources":["../../../../javascript/modules/location/locationManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAElB,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAC;AAKtB,eAAO,MAAM,0BAA0B,oBAEtC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,UAAU,WAAW;IACnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,cAAM,eAAe;IACnB,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;IAC7C,kBAAkB,EAAE,QAAQ,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACzC,iBAAiB,EAAE,uBAAuB,CAAC;IAC3C,gBAAgB,CAAC,EAAE,MAAM,CAAC;;IAgBpB,oBAAoB;IAuB1B,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI;IAalD,cAAc,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI;IAOrD,kBAAkB;IAKlB,qBAAqB,CAAC,QAAQ,EAAE,cAAc;IAY9C,KAAK,CAAC,YAAY,SAAK;IAwBvB,IAAI;IAUJ,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAK1C,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAK/C,SAAS,CAAC,QAAQ,EAAE,QAAQ;IAM5B;;OAEG;IACH,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI5D;;;;;;;;;OASG;IACH,wBAAwB,CAAC,aAAa,EAAE,MAAM;CAG/C;;AAED,wBAAqC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.72",
+  "version": "10.0.0-beta.73",
   "publishConfig": {
     "access": "public"
   },

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImagesManager.java

@@ -1,103 +0,0 @@
-package com.mapbox.rctmgl.components.images;
-
-import android.graphics.drawable.BitmapDrawable;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLShapeSource;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.utils.ImageEntry;
-import com.mapbox.rctmgl.utils.ResourceUtils;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-public class RCTMGLImagesManager extends AbstractEventEmitter<RCTMGLImages> {
-    public static final String REACT_CLASS = "RCTMGLImages";
-
-    private ReactApplicationContext mContext;
-
-    @Override
-    public String getName() {
-        return "RCTMGLImages";
-    }
-
-
-    public RCTMGLImagesManager(ReactApplicationContext context) {
-        super(context);
-        mContext = context;
-    }
-
-    @Override
-    public RCTMGLImages createViewInstance(ThemedReactContext context) {
-        return new RCTMGLImages(context, this);
-    }
-
-    @ReactProp(name = "id")
-    public void setId(RCTMGLImages source, String id) {
-        source.setID(id);
-    }
-
-    @ReactProp(name = "images")
-    public void setImages(RCTMGLImages images, ReadableMap map) {
-        List<Map.Entry<String, ImageEntry>> imagesList = new ArrayList<>();
-
-        ReadableMapKeySetIterator iterator = map.keySetIterator();
-        while (iterator.hasNextKey()) {
-            String imageName = iterator.nextKey();
-            ImageEntry imageEntry = null;
-            if (map.getType(imageName) == ReadableType.Map) {
-                ReadableMap imageMap = map.getMap(imageName);
-                String uri = imageMap.getString("uri");
-                boolean hasScale = imageMap.hasKey("scale") && imageMap.getType("scale") == ReadableType.Number;
-                double scale = hasScale ? imageMap.getDouble("scale") : ImageEntry.defaultScale;
-                imageEntry = new ImageEntry(uri, scale);
-            } else {
-                imageEntry = new ImageEntry(map.getString(imageName));
-            }
-            imagesList.add(new AbstractMap.SimpleEntry<String, ImageEntry>(imageName, imageEntry));
-        }
-
-        images.setImages(imagesList);
-    }
-
-    @ReactProp(name = "hasOnImageMissing")
-    public void setHasOnImageMissing(RCTMGLImages images, Boolean value) {
-        images.setHasOnImageMissing(value);
-    }
-
-    @ReactProp(name = "nativeImages")
-    public void setNativeImages(RCTMGLImages images, ReadableArray arr) {
-        List<Map.Entry<String, BitmapDrawable>> resources = new ArrayList<>();
-
-        for (int i = 0; i < arr.size(); i++) {
-            String resourceName = arr.getString(i);
-            BitmapDrawable drawable = (BitmapDrawable) ResourceUtils.getDrawableByName(mContext, resourceName);
-
-            if (drawable != null) {
-                resources.add(new AbstractMap.SimpleEntry<String, BitmapDrawable>(resourceName, drawable));
-            }
-        }
-
-        images.setNativeImages(resources);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .put(EventKeys.IMAGES_MISSING, "onImageMissing")
-                .build();
-    }
-}