@rnmapbox/maps 10.1.0-beta.23 → 10.1.0-beta.25

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/camera/RNMBXViewport.kt

@@ -32,9 +32,11 @@ import com.rnmapbox.rnmbx.utils.extensions.*
 import com.rnmapbox.rnmbx.utils.writableMapOf
 
 import com.facebook.react.uimanager.events.Event
+import com.mapbox.geojson.Geometry
 import com.mapbox.maps.EdgeInsets
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateOptions
+import com.mapbox.maps.plugin.viewport.data.OverviewViewportStateOptions
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 
 class BaseEvent(
@@ -123,7 +125,9 @@ mContext
             "followPuck" -> viewport.makeFollowPuckViewportState(
                 parseFollowViewportOptions(state)
             )
-            //"overview" -> return viewport.makeOverviewViewportState()
+            "overview" -> return viewport.makeOverviewViewportState(
+                parseOverviewViewportOption(state)
+            )
             else -> {
                 Logger.e(LOG_TAG, "toState: unexpected state: $kind")
                 null
@@ -191,14 +195,73 @@ mContext
                     builder.padding(null)
                 } else {
                     options.getAndLogIfNotMap("padding", LOG_TAG)?.let { paddingMap ->
-                        paddingMap?.toPadding(LOG_TAG)?.let { padding ->
+                        paddingMap?.toPadding(LOG_TAG, resources.displayMetrics.density)?.let { padding ->
                             builder.padding(padding)
                         }
                     }
                 }
             }
+        }
+        return builder.build()
+    }
+
+    private fun parseOverviewViewportOption(state: ReadableMap): OverviewViewportStateOptions {
+        val builder = OverviewViewportStateOptions.Builder()
 
+        state.getAndLogIfNotMap("options", LOG_TAG)?.let { options ->
+            if (options.hasKey("padding")) {
+                if (!options.isNull("padding")) {
+                    options.getAndLogIfNotMap("padding", LOG_TAG)?.let { paddingMap ->
+                        paddingMap?.toPadding(LOG_TAG, resources.displayMetrics.density)?.let { padding ->
+                            builder.padding(padding)
+                        }
+                    }
+                }
+            }
+
+            if (options.hasKey("bearing")) {
+                when (options.getType("bearing")) {
+                    ReadableType.Number ->
+                        builder.bearing(options.getDouble("bearing"))
+                    ReadableType.Null ->
+                        builder.bearing(null)
+                    else -> {
+                        Logger.e(
+                            LOG_TAG,
+                            "bearing in viewport options should be either constant number or null"
+                        )
+                        null
+                    }
+                }
+            }
+
+            if (options.hasKey("pitch")) {
+                if (options.isNull("pitch")) {
+                    builder.pitch(null)
+                } else {
+                    options.getAndLogIfNotDouble("pitch", LOG_TAG)?.let {pitch ->
+                        builder.pitch(pitch)
+                    }
+                }
+            }
+
+            if (options.hasKey("animationDuration")) {
+                if (!options.isNull("animationDuration")) {
+                    options.getAndLogIfNotDouble("zoom", LOG_TAG)?.let { duration ->
+                        builder.animationDurationMs((duration * 1000.0).toLong())
+                    }
+                }
+            }
+
+            if (options.hasKey("geometry")) {
+                options.getAndLogIfNotMap("geometry")?.let {map ->
+                    map.toGeometry()?.let { geometry ->
+                        builder.geometry(geometry)
+                    }
+                }
+            }
         }
+
         return builder.build()
     }
 
@@ -215,6 +278,10 @@ mContext
         return builder.build()
     }
 
+    private fun toGeometry(geometry: ReadableMap): Geometry? {
+        return geometry.toGeometry()
+    }
+
     private fun toTransition(viewport: ViewportPlugin, state: ReadableMap?): ViewportTransition? {
         viewport.idle()
         return when (val kind = state?.getAndLogIfNotString("kind", LOG_TAG)) {

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/location/RNMBXNativeUserLocation.kt

@@ -7,6 +7,9 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import com.facebook.react.bridge.ColorPropConverter
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 import com.mapbox.android.core.permissions.PermissionsManager
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.Image
@@ -14,6 +17,7 @@ import com.mapbox.maps.MapView
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.LocationPuck2D
+import com.mapbox.maps.plugin.locationcomponent.LocationComponentConstants
 import com.mapbox.maps.plugin.locationcomponent.location
 import com.mapbox.maps.plugin.locationcomponent.R as LR
 import com.rnmapbox.rnmbx.R
@@ -26,6 +30,8 @@ import com.rnmapbox.rnmbx.components.mapview.OnMapReadyCallback
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.utils.BitmapUtils
 import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.extensions.getAndLogIfNotBoolean
+import com.rnmapbox.rnmbx.utils.extensions.getAndLogIfNotString
 import com.rnmapbox.rnmbx.v11compat.image.AppCompatResourcesV11
 import com.rnmapbox.rnmbx.v11compat.image.ImageHolder
 import com.rnmapbox.rnmbx.v11compat.image.toDrawable
@@ -85,6 +91,12 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
             _apply()
         }
 
+    var pulsing: ReadableMap? = null
+        set(value) {
+            field = value
+            _apply()
+        }
+
     private fun imageNameUpdated(image: PuckImagePart, name: String?) {
         if (name != null) {
             imageNames[image] = name
@@ -153,6 +165,41 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         this.puckBearingEnabled?.let {
             location2.puckBearingEnabled = it
         }
+
+        pulsing?.let { pulsing ->
+            pulsing.getAndLogIfNotString("kind")?.also { kind ->
+                if (kind == "default") {
+                    location2.pulsingEnabled = true
+                }
+            }
+            if (pulsing.hasKey("color")) {
+                when (pulsing.getType("color")) {
+                    ReadableType.Map ->
+                        location2.pulsingColor = ColorPropConverter.getColor(pulsing.getMap("color"), mContext)
+                    ReadableType.Number ->
+                        location2.pulsingColor = pulsing.getInt("color")
+                    else ->
+                        Logger.e(LOG_TAG, "pusling.color should be either a map or a number, but was ${pulsing.getDynamic("color")}")
+                }
+            }
+            pulsing.getAndLogIfNotBoolean("isEnabled")?.let { enabled ->
+               location2.pulsingEnabled = enabled
+            }
+            if (pulsing.hasKey("radius")) {
+                when (pulsing.getType("radius")) {
+                    ReadableType.Number ->
+                        location2.pulsingMaxRadius = pulsing.getDouble("radius").toFloat()
+                    ReadableType.String ->
+                        if (pulsing.getString("radius") == "accuracy") {
+                            location2.pulsingMaxRadius = LocationComponentConstants.PULSING_MAX_RADIUS_FOLLOW_ACCURACY
+                        } else {
+                            Logger.e(LOG_TAG, "Expected pulsing/radius to be a number or accuracy but was ${pulsing.getString("radius")}")
+                        }
+                    else ->
+                        Logger.e(LOG_TAG, "Expected pulsing/radius to be a number or accuracy but was ${pulsing.getString("radius")}")
+                }
+            }
+        }
     }
 
     override fun addToMap(mapView: RNMBXMapView) {
@@ -229,6 +276,10 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         }
     }
     // endregion
+
+    companion object {
+        const val LOG_TAG = "RNMBXNativeUserLocation"
+    }
 }
 
 fun makeDefaultLocationPuck2D(context: Context, renderMode: RenderMode): LocationPuck2D {

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

@@ -1,6 +1,7 @@
 package com.rnmapbox.rnmbx.components.location
 
 import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
@@ -82,6 +83,13 @@ class RNMBXNativeUserLocationManager : ViewGroupManager<RNMBXNativeUserLocation>
         view.visible = value
     }
 
+    @ReactProp(name = "pulsing")
+    override fun setPulsing(view: RNMBXNativeUserLocation, value: Dynamic) {
+        if (!value.isNull) {
+            view.pulsing = value.asMap()
+        }
+    }
+
     @Nonnull
     override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXNativeUserLocation {
         return RNMBXNativeUserLocation(reactContext)

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) {