@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotation.kt

@@ -6,9 +6,12 @@ import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.mapbox.maps.plugin.annotation.generated.PointAnnotation
 import com.mapbox.maps.MapboxMap
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils
 import com.rnmapbox.rnmbx.events.constants.EventTypes
 import com.mapbox.maps.plugin.annotation.generated.PointAnnotationOptions
+import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
 import com.mapbox.maps.extension.style.layers.properties.generated.IconAnchor
 import com.rnmapbox.rnmbx.events.PointAnnotationClickEvent
 import android.graphics.PointF
@@ -25,7 +28,7 @@ import java.util.*
 import com.rnmapbox.rnmbx.v11compat.annotation.*;
 
 class RNMBXPointAnnotation(private val mContext: Context, private val mManager: RNMBXPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
-    var annotation: PointAnnotation? = null
+    var marker: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
     private val mHasChildren = false
@@ -97,8 +100,8 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
 
     override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         val map = (if (mMapView != null) mMapView else mapView) ?: return true
-        if (annotation != null) {
-            map.pointAnnotationManager?.delete(annotation!!)
+        if (marker != null) {
+            map.pointAnnotationManager?.delete(marker!!)
         }
         if (mChildView != null) {
             map.offscreenAnnotationViewContainer?.removeView(mChildView)
@@ -138,37 +141,37 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     val latLng: LatLng?
         get() = mCoordinate?.let { GeoJSONUtils.toLatLng(it) }
     val mapboxID: AnnotationID
-        get() = if (annotation == null) INVALID_ANNOTATION_ID else annotation!!.id
+        get() = if (marker == null) INVALID_ANNOTATION_ID else marker!!.id
 
     fun setCoordinate(point: Point) {
         mCoordinate = point
-        annotation?.let {
-            it.point = point
-            mMapView?.pointAnnotationManager?.update(it)
+        if (marker != null) {
+            marker!!.point = point
+            mMapView?.pointAnnotationManager?.update(marker!!)
         }
-        mCalloutSymbol?.let {
-            it.point = point
-            mMapView?.pointAnnotationManager?.update(it)
+        if (mCalloutSymbol != null) {
+            mCalloutSymbol!!.point = point
+            mMapView?.pointAnnotationManager?.update(mCalloutSymbol!!)
         }
     }
 
     fun setAnchor(x: Float, y: Float) {
         mAnchor = arrayOf(x, y)
-        if (annotation != null) {
+        if (marker != null) {
             updateAnchor()
-            mMapView?.pointAnnotationManager?.update(annotation!!)
+            mMapView?.pointAnnotationManager?.update(marker!!)
         }
     }
 
     fun setDraggable(draggable: Boolean) {
         mDraggable = draggable
-        annotation?.let {
-            it.isDraggable = draggable
-            mMapView?.pointAnnotationManager?.update(it)
+        if (marker != null) {
+            marker!!.isDraggable = draggable
+            mMapView?.pointAnnotationManager?.update(marker!!)
         }
     }
 
-    fun doSelect(shouldSendEvent: Boolean) {
+    fun onSelect(shouldSendEvent: Boolean) {
         if (calloutView != null) {
             makeCallout()
         }
@@ -177,7 +180,7 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         }
     }
 
-    fun doDeselect() {
+    fun onDeselect() {
         mManager.handleEvent(makeEvent(false))
         if (mCalloutSymbol != null) {
             mMapView?.pointAnnotationManager?.delete(mCalloutSymbol!!)
@@ -185,17 +188,17 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     }
 
     fun onDragStart() {
-        mCoordinate = annotation!!.point
+        mCoordinate = marker!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_START))
     }
 
     fun onDrag() {
-        mCoordinate = annotation!!.point
+        mCoordinate = marker!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG))
     }
 
     fun onDragEnd() {
-        mCoordinate = annotation!!.point
+        mCoordinate = marker!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_END))
     }
 
@@ -207,42 +210,41 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
                 .withIconSize(1.0)
                 .withSymbolSortKey(10.0)
         }
-        mMapView?.pointAnnotationManager?.let { annotationManager ->
-            options?.let {
-                annotation = annotationManager.create(options)
-                updateOptions()
-            }
+        val symbolManager = mMapView?.pointAnnotationManager
+        if (symbolManager != null && options != null) {
+            marker = symbolManager.create(options)
+            updateOptions()
         }
     }
 
     private fun updateOptions() {
-        if (annotation != null) {
+        if (marker != null) {
             updateIconImage()
             updateAnchor()
-            mMapView?.pointAnnotationManager?.update(annotation!!)
+            mMapView?.pointAnnotationManager?.update(marker!!)
         }
     }
 
     private fun updateIconImage() {
         if (mChildView != null) {
             if (mChildBitmapId != null) {
-                annotation?.iconImage = mChildBitmapId
+                marker?.iconImage = mChildBitmapId
             }
         } else {
-            annotation?.iconImage = MARKER_IMAGE_ID
-            annotation?.iconAnchor = IconAnchor.BOTTOM
+            marker?.iconImage = MARKER_IMAGE_ID
+            marker?.iconAnchor = IconAnchor.BOTTOM
         }
     }
 
     private fun updateAnchor() {
-        if (mAnchor != null && mChildView != null && mChildBitmap != null && annotation != null) {
+        if (mAnchor != null && mChildView != null && mChildBitmap != null && marker != null) {
             var w = mChildBitmap!!.width
             var h = mChildBitmap!!.height
             val scale = resources.displayMetrics.density
             w = (w / scale).toInt()
             h = (h / scale).toInt()
-            annotation?.iconAnchor = IconAnchor.TOP_LEFT
-            annotation?.iconOffset = Arrays.asList(w.toDouble() * mAnchor!![0] * -1.0, h.toDouble() * mAnchor!![1] * -1.0)
+            marker?.iconAnchor = IconAnchor.TOP_LEFT
+            marker?.iconOffset = Arrays.asList(w.toDouble() * mAnchor!![0] * -1.0, h.toDouble() * mAnchor!![1] * -1.0)
         }
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotationManager.kt

@@ -11,7 +11,6 @@ import com.facebook.react.viewmanagers.RNMBXPointAnnotationManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSource
 import com.rnmapbox.rnmbx.events.constants.EventKeys
-import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
@@ -33,13 +32,13 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
     }
 
     override fun customEvents(): Map<String, String> {
-        return eventMapOf(
-            EventKeys.POINT_ANNOTATION_SELECTED to "onMapboxPointAnnotationSelected",
-            EventKeys.POINT_ANNOTATION_DESELECTED to "onMapboxPointAnnotationDeselected",
-            EventKeys.POINT_ANNOTATION_DRAG_START to "onMapboxPointAnnotationDragStart",
-            EventKeys.POINT_ANNOTATION_DRAG to "onMapboxPointAnnotationDrag",
-            EventKeys.POINT_ANNOTATION_DRAG_END to "onMapboxPointAnnotationDragEnd"
-        )
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.POINT_ANNOTATION_SELECTED, "onMapboxPointAnnotationSelected")
+            .put(EventKeys.POINT_ANNOTATION_DESELECTED, "onMapboxPointAnnotationDeselected")
+            .put(EventKeys.POINT_ANNOTATION_DRAG_START, "onMapboxPointAnnotationDragStart")
+            .put(EventKeys.POINT_ANNOTATION_DRAG, "onMapboxPointAnnotationDrag")
+            .put(EventKeys.POINT_ANNOTATION_DRAG_END, "onMapboxPointAnnotationDragEnd")
+            .build()
     }
 
     // TODO: check why it does not work correctly

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt

@@ -334,10 +334,10 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
                         if (location?.puckBearingEnabled == true) {
                             when (location.puckBearingSource) {
 
-                                PuckBearing.HEADING -> {
+                                PuckBearingSource.HEADING -> {
                                     UserTrackingMode.FollowWithHeading
                                 }
-                                PuckBearing.COURSE -> {
+                                PuckBearingSource.COURSE -> {
                                     UserTrackingMode.FollowWithCourse
                                 }
                                 else -> {
@@ -468,12 +468,12 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
             when (mFollowUserMode ?: "normal") {
                 "compass" -> {
                     location.puckBearingEnabled = true
-                    location.puckBearingSource = PuckBearing.HEADING
+                    location.puckBearingSource = PuckBearingSource.HEADING
                     followOptions.bearing(FollowPuckViewportStateBearing.SyncWithLocationPuck)
                 }
                 "course" -> {
                     location.puckBearingEnabled = true
-                    location.puckBearingSource = PuckBearing.COURSE
+                    location.puckBearingSource = PuckBearingSource.COURSE
                     followOptions.bearing(FollowPuckViewportStateBearing.SyncWithLocationPuck)
                 }
                 "normal" -> {

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

@@ -212,7 +212,6 @@ class RNMBXImages(context: Context, private val mManager: RNMBXImagesManager) :
             val name = nativeImage.info.name
             if (!hasImage(name, map)) {
                 val bitmap = nativeImage.drawable
-                mMapView!!.imageManager.resolve(name, nativeImage.drawable)
                 style.addBitmapImage(nativeImage)
                 mCurrentImages.add(name)
             }
@@ -265,7 +264,7 @@ class RNMBXImages(context: Context, private val mManager: RNMBXImagesManager) :
             }
         }
         if (missingImages.size > 0) {
-            val task = DownloadMapImageTask(context, map, mMapView!!.imageManager)
+            val task = DownloadMapImageTask(context, map, null)
             val params = missingImages.toTypedArray()
             task.execute(*params)
         }

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

@@ -1,9 +1,6 @@
 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
@@ -14,7 +11,6 @@ import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
-import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ResourceUtils
@@ -137,33 +133,12 @@ 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 =
-                    convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
                 if (drawable != null) {
                     return NativeImage(ImageInfo(name=resourceName), drawable)
                 } else {
@@ -175,7 +150,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                 val map = dynamic.asMap()
                 val resourceName = map.getString("name")
                 val drawable =
-                    convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
                 if (drawable != null && resourceName != null) {
                     return NativeImage(imageInfo(resourceName, map), drawable)
                 } else {
@@ -203,9 +178,9 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     override fun customEvents(): Map<String, String>? {
-        return eventMapOf(
-            EventKeys.IMAGES_MISSING to "onImageMissing"
-        )
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.IMAGES_MISSING, "onImageMissing")
+            .build()
     }
 
     // region RNMBXImage children
@@ -291,4 +266,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/LocationComponentManager.kt

@@ -1,22 +1,20 @@
 package com.rnmapbox.rnmbx.components.location
 
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.graphics.Color
-import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.VectorDrawable
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.lifecycle.Lifecycle
-import com.mapbox.maps.extension.style.expressions.dsl.generated.interpolate
-import com.mapbox.maps.plugin.LocationPuck2D
 import com.mapbox.maps.plugin.locationcomponent.location
-import com.rnmapbox.rnmbx.R
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.mapbox.maps.plugin.LocationPuck2D
+import com.mapbox.maps.plugin.lifecycle.lifecycle
+import com.rnmapbox.rnmbx.R
 import com.rnmapbox.rnmbx.location.LocationManager
-import com.rnmapbox.rnmbx.v11compat.image.AppCompatResourcesV11
-import com.rnmapbox.rnmbx.v11compat.image.ImageHolder
-import com.rnmapbox.rnmbx.v11compat.image.toBitmapImageHolder
-import com.rnmapbox.rnmbx.v11compat.image.toByteArray
-import com.rnmapbox.rnmbx.v11compat.image.toImageData
-import com.rnmapbox.rnmbx.v11compat.location.PuckBearing
+
+import com.rnmapbox.rnmbx.v11compat.location.PuckBearingSource;
+import com.rnmapbox.rnmbx.v11compat.image.*;
 
 /**
  * The LocationComponent on android implements display of user's current location.
@@ -25,20 +23,9 @@ import com.rnmapbox.rnmbx.v11compat.location.PuckBearing
  * And NativeUserLocation can ask for display of user's current location - independent of Camera's user tracking.
  */
 class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
-    private val MAPBOX_BLUE_COLOR = Color.parseColor("#4A90E2")
-
     var mMapView = mapView
     var mContext = context
-    private var mState = State(
-        showUserLocation = false,
-        followUserLocation = false,
-        tintColor = null,
-        bearingImage = null,
-        puckBearingSource = null,
-        topImage = null,
-        shadowImage = null,
-        scale = 1.0,
-    )
+    private var mState = State(showUserLocation=false, followUserLocation=false, tintColor= null, bearingImage = null, puckBearingSource =null)
 
     private var mLocationManager: LocationManager = LocationManager.getInstance(context)
 
@@ -50,13 +37,8 @@ class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
         val showUserLocation: Boolean,
         val followUserLocation: Boolean,
         val tintColor: Int?, // tint of location puck
-        var bearingImage: ImageHolder?, // The image used as the middle of the location indicator.
-        var topImage: ImageHolder?, // The image to use as the top layer for the location indicator.
-        var shadowImage: ImageHolder?, // The image that acts as a background of the location indicator.
-        var puckBearingSource: PuckBearing?, // bearing source
-        var pulsing: Boolean = true,
-        var scale: Double = 1.0,
-        var nativeUserLocation: Boolean = false, // LocaitonPuck managed by RNMBXNativeUserLocation
+        var bearingImage: ImageHolder?, // bearing image (background)
+        var puckBearingSource: PuckBearingSource? // bearing source
     ) {
         val enabled: Boolean
             get() = showUserLocation || followUserLocation
@@ -96,54 +78,41 @@ class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
         mapView.location.updateSettings {
             enabled = newState.enabled
 
-            if (fullUpdate ||
-                newState.hidden != oldState.hidden ||
-                newState.tintColor != oldState.tintColor ||
-                newState.scale != oldState.scale ||
-                newState.nativeUserLocation != oldState.nativeUserLocation
-            ) {
-                if (!newState.nativeUserLocation) {
-                    if (newState.hidden) {
-                        var emptyLocationPuck = LocationPuck2D()
-                        val empty =
-                            AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
-                        emptyLocationPuck.bearingImage = empty
-                        emptyLocationPuck.shadowImage = empty
-                        emptyLocationPuck.topImage = empty
-                        //emptyLocationPuck.opacity = 0.0
-                        locationPuck = emptyLocationPuck
-                        pulsingEnabled = false
+            if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
+                if (newState.hidden) {
+                    var emptyLocationPuck = LocationPuck2D()
+                    val empty = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
+                    emptyLocationPuck.bearingImage = empty
+                    emptyLocationPuck.shadowImage = empty
+                    emptyLocationPuck.topImage = empty
+                    //emptyLocationPuck.opacity = 0.0
+                    locationPuck = emptyLocationPuck
+                    pulsingEnabled = false
+                } else {
+                    val mapboxBlueColor = Color.parseColor("#4A90E2")
+                    val tintColor = newState.tintColor
+                    val defaultLocationPuck = LocationPuck2D()
+                    var topImage = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.mapbox_user_icon)
+                    if (tintColor != null) {
+                        val drawable = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon) as VectorDrawable?
+                        drawable!!.setTint(tintColor)
+                        topImage = drawable.toBitmapImageHolder()
+                    }
+                    defaultLocationPuck.topImage = topImage
+                    val defaultBearingImage = AppCompatResourcesV11.getDrawableImageHolder(
+                        mContext, R.drawable.mapbox_user_stroke_icon
+                    )
+                    defaultLocationPuck.bearingImage = newState.bearingImage ?: defaultBearingImage
+                    val shadowImage = AppCompatResourcesV11.getDrawableImageHolder(
+                        mContext, R.drawable.mapbox_user_icon_shadow
+                    )
+                    defaultLocationPuck.shadowImage = shadowImage
+                    locationPuck = defaultLocationPuck
+                    pulsingEnabled = true
+                    if (tintColor != null) {
+                        pulsingColor = tintColor
                     } else {
-                        val tintColor = newState.tintColor
-                        var topImage = newState.topImage
-                        if (tintColor != null && topImage != null) {
-                            val imageData = (topImage as ByteArray).toImageData().toByteArray()
-                            val drawable = BitmapDrawable(
-                                mContext.resources,
-                                BitmapFactory.decodeByteArray(imageData, 0, imageData.size)
-                            )
-                            drawable.setTint(tintColor)
-                            topImage = drawable.toBitmapImageHolder()
-                        }
-                        val scaleExpression = if (newState.scale != 1.0) {
-                            interpolate {
-                                linear()
-                                zoom()
-                                stop {
-                                    literal(0)
-                                    literal(newState.scale)
-                                }
-                            }.toJson()
-                        } else null
-
-                        locationPuck = LocationPuck2D(
-                            topImage = topImage,
-                            bearingImage = newState.bearingImage,
-                            shadowImage = newState.shadowImage,
-                            scaleExpression = scaleExpression,
-                        )
-                        pulsingEnabled = newState.pulsing
-                        pulsingColor = tintColor ?: MAPBOX_BLUE_COLOR
+                        pulsingColor = mapboxBlueColor
                     }
                 }
             }
@@ -183,7 +152,7 @@ class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
 
     fun showNativeUserLocation(showUserLocation: Boolean) {
         update {
-            it.copy(showUserLocation = showUserLocation, nativeUserLocation= showUserLocation)
+            it.copy(showUserLocation = showUserLocation)
         }
     }