@rnmapbox/maps 10.0.10-rc.0 → 10.0.10-rc.2

package/android/rctmgl/build.gradle

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

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

@@ -43,12 +43,16 @@ fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false,
 
 fun Style.addBitmapImage(nativeImage: NativeImage) : Expected<String, None> {
     val info = nativeImage.info
-    return addBitmapImage(info.name, nativeImage.drawable.bitmap, info.sdf, info.stretchX, info.stretchY, info.content, info.scale)
+    return addBitmapImage(info.name, nativeImage.drawable.bitmap, info.sdf, info.stretchX, info.stretchY, info.content, info.getScaleOr(1.0))
 }
 
-data class ImageInfo(val name: String,  val scale: Double = 1.0, val sdf: Boolean = false, val stretchX: List<ImageStretches> = listOf(),
+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)
-{}
+{
+    fun getScaleOr(default: Double): Double {
+        return scale ?: default;
+    }
+}
 
 data class NativeImage(val info: ImageInfo, val drawable: BitmapDrawable);
 

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

@@ -30,10 +30,10 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
 
     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
+        var stretchX = listOf<ImageStretches>()
+        var stretchY = listOf<ImageStretches>()
+        var content : ImageContent? = null
+        var scale : Double? = null
         if (map.hasKey("sdf")) {
             sdf = map.getBoolean("sdf");
         }

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

@@ -18,7 +18,7 @@ class RCTMGLStyleValue(config: ReadableMap) {
     private val mPayload: ReadableMap?
     var imageURI: String? = ""
     private var isAddImage = false
-    var imageScale = ImageEntry.defaultScale
+    var imageScale: Double? = null
     private fun isTokenizedValue(value: String): Boolean {
         return value.startsWith("{") && value.endsWith("}")
     }
@@ -185,7 +185,7 @@ class RCTMGLStyleValue(config: ReadableMap) {
         mPayload = config.getMap("stylevalue")
         isAddImage = false
         if ("image" == type) {
-            imageScale = ImageEntry.defaultScale
+            imageScale = null
             if ("hashmap" == mPayload!!.getString("type")) {
                 val map = map
                 imageURI = map!!.getMap("uri")!!.getString("value")

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

@@ -126,7 +126,7 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
                     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
+                        content = info.content,scale = info.getScaleOr(1.0)
                     )
                 }
             }
@@ -134,11 +134,11 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
         mCallback?.onAllImagesLoaded()
     }
 
-    private fun getBitmapOptions(metrics: DisplayMetrics, scale: Double): BitmapFactory.Options {
+    private fun getBitmapOptions(metrics: DisplayMetrics, scale: Double?): BitmapFactory.Options {
         val options = BitmapFactory.Options()
         options.inScreenDensity = metrics.densityDpi
         options.inTargetDensity = metrics.densityDpi
-        if (scale != ImageEntry.defaultScale) {
+        if (scale != null) {
             options.inDensity = (DisplayMetrics.DENSITY_DEFAULT.toDouble() * scale).toInt()
         }
         return options

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

@@ -4,14 +4,6 @@ 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
+        return info.getScaleOr(v)
     }
 }

package/ios/RCTMGL-v10/RCTMGLStyleValue.swift

@@ -362,11 +362,30 @@ class RCTMGLStyleValue {
   func mglStyleValueLineCap() -> Value<LineCap> {
     return mglStyleValueEnum()
   }
+    
+  func parseExpression(_ expression: [Any]) throws -> Expression {
+    let data = try JSONSerialization.data(withJSONObject: expression, options: .prettyPrinted)
+    let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+    return decodedExpression
+  }
   
   func mglStyleValueEnum<Enum : RawRepresentable>() -> Value<Enum> where Enum.RawValue == String {
     if let value = value as? Dictionary<String,Any> {
       let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
-      return Value.constant(Enum(rawValue: value as! String)!)
+        if let value = value as? String {
+            return Value.constant(Enum(rawValue: value )!)
+        } else if let value = value as? [Any] {
+            if let parsedExpression = (logged("mglStyleValueEnum: failed to parse expression") {
+                try parseExpression(value)
+            }) {
+                return .expression(parsedExpression)
+            } else {
+                return Value.constant(Enum(rawValue: value[0] as! String)!)
+            }
+        } else {
+            Logger.log(level: .error, message:"Invalid value for enum (nor string, not array): \(value) returning something")
+            return Value.constant(Enum(rawValue: value as! String)!)
+        }
     } else {
       Logger.log(level: .error, message:"Invalid value for enum: \(value) returning something")
       return Value.constant(Enum(rawValue: value as! String)!)

package/package.json

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