@rnmapbox/maps 10.1.0-beta.24 → 10.1.0-beta.26

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

@@ -30,10 +30,12 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
+import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
@@ -111,6 +113,7 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXViewportManager(reactApplicationContext))
         managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
+        managers.add(RNMBXModelsManager(reactApplicationContext))
 
         // annotations
         managers.add(RNMBXMarkerViewManager(reactApplicationContext))
@@ -146,6 +149,7 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXAtmosphereManager())
         managers.add(RNMBXBackgroundLayerManager())
         managers.add(RNMBXLightManager())
+        managers.add(RNMBXModelLayerManager())
         return managers
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt

@@ -1,6 +1,9 @@
 package com.rnmapbox.rnmbx.components.images
 
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.view.View
 import com.facebook.react.bridge.*
 import com.facebook.react.common.MapBuilder
@@ -134,12 +137,33 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
         images.setHasOnImageMissing(value.asBoolean())
     }
 
+    private fun convertDrawableToBitmap(sourceDrawable: Drawable?): BitmapDrawable? {
+        if (sourceDrawable == null) {
+            return null
+        }
+        return if (sourceDrawable is BitmapDrawable) {
+            sourceDrawable
+        } else {
+            // copying drawable object to not manipulate on the same reference
+            val constantState = sourceDrawable.constantState ?: return null
+            val drawable = constantState.newDrawable().mutate()
+            val bitmap: Bitmap = Bitmap.createBitmap(
+                drawable.intrinsicWidth, drawable.intrinsicHeight,
+                Bitmap.Config.ARGB_8888
+            )
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+            BitmapDrawable(mContext.resources, bitmap)
+        }
+    }
+
     fun toNativeImage(dynamic: Dynamic): NativeImage? {
         when (dynamic.type) {
             ReadableType.String -> {
                 val resourceName = dynamic.asString();
                 val drawable =
-                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
+                    convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
                 if (drawable != null) {
                     return NativeImage(ImageInfo(name=resourceName), drawable)
                 } else {
@@ -151,7 +175,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                 val map = dynamic.asMap()
                 val resourceName = map.getString("name")
                 val drawable =
-                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
+                    convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
                 if (drawable != null && resourceName != null) {
                     return NativeImage(imageInfo(resourceName, map), drawable)
                 } else {
@@ -267,4 +291,4 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
             return ImageContent(result[0].toFloat(), result[1].toFloat() ,result[2].toFloat(), result[3].toFloat())
         }
     }
-}
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt

@@ -125,7 +125,7 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         viewRef: Double?,
         withBBox: ReadableArray,
         withFilter: ReadableArray,
-        withLayerIDs: ReadableArray,
+        withLayerIDs: ReadableArray?,
         promise: Promise
     ) {
         withMapViewOnUIThread(viewRef, promise) {