@rnmapbox/maps 10.0.8-rc.0 → 10.0.8-rc.1

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

@@ -42,12 +42,15 @@ fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false,
 }
 
 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)
+    val info = nativeImage.info
+    return addBitmapImage(info.name, nativeImage.drawable.bitmap, info.sdf, info.stretchX, info.stretchY, info.content, info.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
-);
+data class ImageInfo(val name: String,  val scale: Double = 1.0, val sdf: Boolean = false, val stretchX: List<ImageStretches> = listOf(),
+                     val stretchY: List<ImageStretches> = listOf(), val content: ImageContent? = null)
+{}
+
+data class NativeImage(val info: ImageInfo, val drawable: BitmapDrawable);
 
 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)
@@ -77,9 +80,10 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
     fun setNativeImages(nativeImages: List<NativeImage>) {
         val newImages: MutableMap<String, NativeImage> = HashMap()
         for (nativeImage in nativeImages) {
-            val oldValue = mNativeImages.put(nativeImage.name, nativeImage)
+            val name = nativeImage.info.name
+            val oldValue = mNativeImages.put(name, nativeImage)
             if (oldValue == null) {
-                newImages[nativeImage.name] = nativeImage
+                newImages[name] = nativeImage
             }
         }
         mMap?.let {
@@ -194,10 +198,11 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         val style = map.getStyle()
         if (style == null) return
         for (nativeImage in imageEntries) {
-            if (!hasImage(nativeImage.name, map)) {
+            val name = nativeImage.info.name
+            if (!hasImage(name, map)) {
                 val bitmap = nativeImage.drawable
                 style.addBitmapImage(nativeImage)
-                mCurrentImages.add(nativeImage.name)
+                mCurrentImages.add(name)
             }
         }
     }

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

@@ -9,12 +9,11 @@ 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 com.mapbox.rctmgl.utils.extensions.forEach
 import java.util.*
 
 class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
@@ -29,24 +28,54 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
         return RCTMGLImages(context, this)
     }
 
+    fun imageInfo(name: String, map: ReadableMap): ImageInfo {
+        var sdf = false
+        var stretchX = listOf<ImageStretches>();
+        var stretchY = listOf<ImageStretches>();
+        var content : ImageContent? = null;
+        var scale : Double = ImageEntry.defaultScale
+        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 $map")
+            }
+            scale = map.getDouble("scale")
+        }
+        return ImageInfo(name=name, sdf=sdf, scale=scale, content=content, stretchX = stretchX, stretchY = stretchY)
+    }
+
     @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))
+        val imagesList = mutableListOf<Map.Entry<String, ImageEntry>>()
+        map.forEach { imageName, imageInfo ->
+            when (imageInfo) {
+                is ReadableMap -> {
+                    val uri = imageInfo.getString("uri") ?: imageInfo.getString("url")
+                    if (uri != null) {
+                        imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(uri,  imageInfo(imageName, imageInfo))))
+                    } else {
+                        Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, no uri/url found!")
+                    }
+                }
+                is String -> {
+                    val name = imageInfo
+                    imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(name, ImageInfo(name=imageName))))
+                }
+                else -> {
+                    Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, only string/object is supported")
+                }
             }
-            imagesList.add(AbstractMap.SimpleEntry(imageName, imageEntry))
         }
         images.setImages(imagesList)
     }
@@ -63,7 +92,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 val drawable =
                     ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
                 if (drawable != null) {
-                    return NativeImage(resourceName, drawable)
+                    return NativeImage(ImageInfo(name=resourceName), drawable)
                 } else {
                     Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
                     return null
@@ -72,34 +101,10 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
             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 && resourceName != null) {
-                    return NativeImage(resourceName, drawable, scale, sdf, stretchX, stretchY)
+                    return NativeImage(imageInfo(resourceName, map), drawable)
                 } else {
                     Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
                     return null

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

@@ -3,6 +3,7 @@ package com.mapbox.rctmgl.components.styles
 import android.content.Context
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.MapboxMap
+import com.mapbox.rctmgl.components.images.ImageInfo
 import com.mapbox.rctmgl.utils.ImageEntry
 import com.mapbox.rctmgl.utils.DownloadMapImageTask
 import com.mapbox.rctmgl.utils.Logger
@@ -36,7 +37,7 @@ class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map:
     }
 
     fun imageEntry(styleValue: RCTMGLStyleValue): ImageEntry {
-        return ImageEntry(styleValue.imageURI, styleValue.imageScale)
+        return ImageEntry(styleValue.imageURI!!, ImageInfo(scale=styleValue.imageScale, name=styleValue.imageURI!!))
     }
 
     @JvmOverloads
@@ -46,7 +47,7 @@ class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map:
             return
         }
         Logger.w(LOG_TAG,"Deprecated: Image in style is deprecated, use images component instead. key: $styleKey [image-in-style-deprecated]")
-        val uriStr = styleValue.imageURI
+        val uriStr = styleValue.imageURI!!
         val images = arrayOf<Map.Entry<String, ImageEntry>>(
             AbstractMap.SimpleEntry<String, ImageEntry>(
                 uriStr,

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/DownloadMapImageTask.kt

@@ -21,6 +21,7 @@ import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.image.CloseableStaticBitmap
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.views.imagehelper.ImageSource
+import com.mapbox.rctmgl.components.images.ImageInfo
 import com.mapbox.rctmgl.components.images.addBitmapImage
 import java.io.File
 import java.lang.ref.WeakReference
@@ -28,8 +29,10 @@ import java.util.AbstractMap
 import java.util.ArrayList
 import java.util.HashMap
 
+data class DownloadedImage(val name: String, val bitmap: Bitmap, val info: ImageInfo)
+
 class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImagesLoaded?) :
-    AsyncTask<Map.Entry<String, ImageEntry>, Void?, List<Map.Entry<String, Bitmap>>?>() {
+    AsyncTask<Map.Entry<String, ImageEntry>, Void?, List<DownloadedImage>>() {
     private val mContext: WeakReference<Context>
     private val mMap: WeakReference<MapboxMap>
     private val mCallback: OnAllImagesLoaded?
@@ -40,8 +43,8 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
     }
 
     @SafeVarargs
-    protected override fun doInBackground(vararg objects: Map.Entry<String, ImageEntry>): List<Map.Entry<String, Bitmap>>? {
-        val images: MutableList<Map.Entry<String, Bitmap>> = ArrayList()
+    protected override fun doInBackground(vararg objects: Map.Entry<String, ImageEntry>): List<DownloadedImage> {
+        val images = mutableListOf<DownloadedImage>()
         val context = mContext.get() ?: return images
         val resources = context.resources
         val metrics = resources.displayMetrics
@@ -74,9 +77,7 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
                                     1.0
                                 )).toInt()
                             images.add(
-                                AbstractMap.SimpleEntry(
-                                    key, bitmap
-                                )
+                                DownloadedImage(name=key, bitmap=bitmap, info=imageEntry.info)
                             )
                         } else {
                             FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
@@ -97,12 +98,14 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
                 val bitmap = BitmapUtils.getBitmapFromResource(
                     context,
                     uri,
-                    getBitmapOptions(metrics, imageEntry.scale)
+                    getBitmapOptions(metrics, imageEntry.info.scale)
                 )
                 if (bitmap != null) {
                     images.add(
-                        AbstractMap.SimpleEntry(
-                            key, bitmap
+                        DownloadedImage(
+                            name=key,
+                            bitmap=bitmap,
+                            info=imageEntry.info
                         )
                     )
                 } else {
@@ -113,17 +116,19 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
         return images
     }
 
-    override fun onPostExecute(images: List<Map.Entry<String, Bitmap>>?) {
+    override fun onPostExecute(images: List<DownloadedImage>) {
         val map = mMap.get()
         if (map != null && images != null && images.size > 0) {
             val style = map.getStyle()
             if (style != null) {
                 val bitmapImages = HashMap<String, Bitmap>()
-                for ((key, value) in images) {
-                    bitmapImages[key] = value
-                    style.addBitmapImage(key, value)
+                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.scale
+                    )
                 }
-                // style.addImages(bitmapImages);
             }
         }
         mCallback?.onAllImagesLoaded()

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/ImageEntry.kt

@@ -0,0 +1,17 @@
+package com.mapbox.rctmgl.utils
+
+import com.mapbox.rctmgl.components.images.ImageInfo
+
+data class ImageEntry(val uri: String, val info: ImageInfo) {
+    fun getScaleOr(v: Double): Double {
+        return if (info.scale == defaultScale) {
+            v
+        } else {
+            info.scale
+        }
+    }
+
+    companion object {
+        const val defaultScale = 0.0
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/ReadableMap.kt

@@ -0,0 +1,11 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.facebook.react.bridge.ReadableMap
+
+fun ReadableMap.forEach(action: (String, Any) -> Unit) {
+    val iterator = this.entryIterator
+    while (iterator.hasNext()) {
+        val next = iterator.next()
+        action(next.key, next.value)
+    }
+}

package/package.json

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

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

@@ -1,25 +0,0 @@
-package com.mapbox.rctmgl.utils;
-
-public class ImageEntry {
-    public String uri;
-    public double scale = 1.0;
-    public static final double defaultScale = 0.0;
-
-    public ImageEntry(String _uri, Double _scale) {
-        uri = _uri;
-        scale = _scale;
-    }
-
-    public ImageEntry(String _uri) {
-        uri = _uri;
-        scale = ImageEntry.defaultScale;
-    }
-
-    public double getScaleOr(double v) {
-        if (scale == ImageEntry.defaultScale) {
-            return v;
-        } else {
-            return scale;
-        }
-    }
-}