@rnmapbox/maps 10.1.0 → 10.1.1

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

@@ -39,14 +39,14 @@ import com.mapbox.maps.plugin.annotation.AnnotationConfig
 import com.mapbox.maps.plugin.annotation.annotations
 import com.mapbox.maps.plugin.annotation.generated.*
 import com.mapbox.maps.plugin.attribution.attribution
-import com.mapbox.maps.plugin.attribution.generated.AttributionSettings
 import com.mapbox.maps.plugin.compass.compass
-import com.mapbox.maps.plugin.compass.generated.CompassSettings
 import com.mapbox.maps.plugin.delegates.listeners.*
 import com.mapbox.maps.plugin.gestures.*
-import com.mapbox.maps.plugin.logo.generated.LogoSettings
+import com.mapbox.maps.plugin.locationcomponent.DefaultLocationProvider
+import com.mapbox.maps.plugin.locationcomponent.LocationConsumer
+import com.mapbox.maps.plugin.locationcomponent.LocationProvider
+import com.mapbox.maps.plugin.locationcomponent.location
 import com.mapbox.maps.plugin.logo.logo
-import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
 import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.rnmapbox.rnmbx.R
@@ -65,26 +65,27 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLayer
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLight
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
 import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrain
-import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.CameraChangeEvent
 import com.rnmapbox.rnmbx.events.IEvent
 import com.rnmapbox.rnmbx.events.MapChangeEvent
-import com.rnmapbox.rnmbx.events.CameraChangeEvent
 import com.rnmapbox.rnmbx.events.MapClickEvent
 import com.rnmapbox.rnmbx.events.constants.EventTypes
 import com.rnmapbox.rnmbx.utils.*
 import com.rnmapbox.rnmbx.utils.extensions.toReadableArray
 import com.rnmapbox.rnmbx.v11compat.annotation.AnnotationID
 import com.rnmapbox.rnmbx.v11compat.annotation.INVALID_ANNOTATION_ID
-import org.json.JSONException
-import org.json.JSONObject
 import java.util.*
 
 import com.mapbox.maps.MapboxMap.*;
+import com.rnmapbox.rnmbx.components.images.ImageManager
 
 import com.rnmapbox.rnmbx.v11compat.event.*
 import com.rnmapbox.rnmbx.v11compat.feature.*
 import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
 import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.*
 
 fun <T> MutableList<T>.removeIf21(predicate: (T) -> Boolean): Boolean {
     var removed = false
@@ -203,10 +204,23 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
      */
     public var offscreenAnnotationViewContainer: ViewGroup? = null
 
+
+    public var imageManager = ImageManager()
+
     private val mSources: MutableMap<String, RNMBXSource<*>>
     private val mImages: MutableList<RNMBXImages>
-    private var mPointAnnotationManager: PointAnnotationManager? = null
-    private var mActiveMarkerID: AnnotationID = INVALID_ANNOTATION_ID
+    public val pointAnnotationManager: RNMBXPointAnnotationManager by lazy {
+        val gesturesPlugin: GesturesPlugin = mapView.gestures
+        gesturesPlugin.removeOnMapClickListener(this)
+        gesturesPlugin.removeOnMapLongClickListener(this)
+
+        val result = RNMBXPointAnnotationManager(mapView)
+
+        gesturesPlugin.addOnMapClickListener(this)
+        gesturesPlugin.addOnMapLongClickListener(this)
+
+        result
+    }
     private var mProjection: ProjectionName = ProjectionName.MERCATOR
     private var mLocaleString: String? = null
     private var mLocaleLayerIds: List<String>? = null
@@ -215,7 +229,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     private var mCamera: RNMBXCamera? = null
     private val mFeatures = mutableListOf<FeatureEntry>()
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
-    private val mPointAnnotations: MutableMap<String, RNMBXPointAnnotation>
     private val mCameraChangeTracker = CameraChangeTracker()
     private lateinit var mMap: MapboxMap
 
@@ -229,8 +242,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     private var styleLoaded = false
 
     private var mHandledMapChangedEvents: HashSet<String>? = null
-    private var mAnnotationClicked = false
-    private var mAnnotationDragged = false
     private var mLocationComponentManager: LocationComponentManager? = null
     var tintColor: Int? = null
         private set
@@ -251,6 +262,8 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             updateRequestDisallowInterceptTouchEvent(oldValue, value)
         }
 
+    var deselectAnnotationOnTap = false
+
     fun getMapboxMap(): MapboxMap {
         return mapView.getMapboxMap()
     }
@@ -260,66 +273,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         mManager.tagAssigned(id)
     }
 
-    val pointAnnotationManager: PointAnnotationManager?
-        get() {
-            if (mPointAnnotationManager == null) {
-                val _this = this
-                val gesturesPlugin: GesturesPlugin = mapView.gestures
-                gesturesPlugin.removeOnMapClickListener(_this)
-                gesturesPlugin.removeOnMapLongClickListener(_this)
-
-                mPointAnnotationManager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "RNMBX-mapview-annotations"))
-                mPointAnnotationManager?.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
-                        onMarkerClick(pointAnnotation)
-                        false
-                    }
-                )
-                mPointAnnotationManager?.addDragListener(object : OnPointAnnotationDragListener {
-                    override fun onAnnotationDragStarted(_annotation: Annotation<*>) {
-                        mAnnotationDragged = true;
-                        var reactAnnotation: RNMBXPointAnnotation? = null
-                        for (key in mPointAnnotations.keys) {
-                            val annotation = mPointAnnotations[key]
-                            val curMarkerID = annotation?.mapboxID
-                            if (_annotation.id == curMarkerID) {
-                                reactAnnotation = annotation
-                            }
-                        }
-                        reactAnnotation?.let { it.onDragStart() }
-                    }
-
-                   override fun onAnnotationDrag(_annotation: Annotation<*>) {
-                        var reactAnnotation: RNMBXPointAnnotation? = null
-                        for (key in mPointAnnotations.keys) {
-                            val annotation = mPointAnnotations[key]
-                            val curMarkerID = annotation?.mapboxID
-                            if (_annotation.id == curMarkerID) {
-                                reactAnnotation = annotation
-                            }
-                        }
-                        reactAnnotation?.let { it.onDrag() }
-                    }
-
-                    override fun onAnnotationDragFinished(_annotation: Annotation<*>) {
-                        mAnnotationDragged = false;
-                        var reactAnnotation: RNMBXPointAnnotation? = null
-                        for (key in mPointAnnotations.keys) {
-                            val annotation = mPointAnnotations[key]
-                            val curMarkerID = annotation?.mapboxID
-                            if (_annotation.id == curMarkerID) {
-                                reactAnnotation = annotation
-                            }
-                        }
-                        reactAnnotation?.let { it.onDragEnd() }
-                    }
-                })
-                gesturesPlugin.addOnMapClickListener(_this)
-                gesturesPlugin.addOnMapLongClickListener(_this)
-
-            }
-            return mPointAnnotationManager
-        }
-
     private fun styleLoaded(style: Style) {
         savedStyle = style
         styleLoaded = true
@@ -474,7 +427,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             feature = childView
         } else if (childView is RNMBXPointAnnotation) {
             val annotation = childView
-            mPointAnnotations[annotation.iD.toString()] = annotation
+            pointAnnotationManager.add(annotation)
             feature = childView
         } else if (childView is RNMBXMarkerView) {
             feature = childView
@@ -510,10 +463,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             mSources.remove(feature.iD)
         } else if (feature is RNMBXPointAnnotation) {
             val annotation = feature
-            if (annotation.mapboxID == mActiveMarkerID) {
-                mActiveMarkerID = INVALID_ANNOTATION_ID
-            }
-            mPointAnnotations.remove(annotation.iD)
+            pointAnnotationManager.remove(annotation)
         } else if (feature is RNMBXImages) {
             mImages.remove(feature)
         }
@@ -779,12 +729,14 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     override fun onMapClick(point: Point): Boolean {
         val _this = this
-        /*if (mPointAnnotationManager != nil) {
-            getAnnotations()
-        }*/if (mAnnotationClicked) {
-            mAnnotationClicked = false
+        if (pointAnnotationManager.getAndClearAnnotationClicked()) {
             return true
         }
+        if (deselectAnnotationOnTap) {
+            if (pointAnnotationManager.deselectSelectedAnnotation()) {
+                return true
+            }
+        }
         val screenPoint = mMap?.pixelForCoordinate(point)
         val touchableSources = allTouchableSources
         val hits = HashMap<String?, List<Feature?>?>()
@@ -813,8 +765,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     override fun onMapLongClick(point: Point): Boolean {
         val _this = this
-        if (mAnnotationDragged) {
-            mAnnotationDragged = false
+        if (pointAnnotationManager.getAndClearAnnotationDragged()) {
             return true
         }
         val screenPoint = mMap?.pixelForCoordinate(point)
@@ -826,35 +777,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         return false
     }
 
-    fun onMarkerClick(symbol: PointAnnotation) {
-        mAnnotationClicked = true
-        val selectedMarkerID = symbol.id
-        var activeAnnotation: RNMBXPointAnnotation? = null
-        var nextActiveAnnotation: RNMBXPointAnnotation? = null
-        for (key in mPointAnnotations.keys) {
-            val annotation = mPointAnnotations[key]
-            val curMarkerID = annotation?.mapboxID
-            if (mActiveMarkerID == curMarkerID) {
-                activeAnnotation = annotation
-            }
-            if (selectedMarkerID == curMarkerID && mActiveMarkerID != curMarkerID) {
-                nextActiveAnnotation = annotation
-            }
-        }
-        activeAnnotation?.let { deselectAnnotation(it) }
-        nextActiveAnnotation?.let { selectAnnotation(it) }
-    }
-
-    fun selectAnnotation(annotation: RNMBXPointAnnotation) {
-        mActiveMarkerID = annotation.mapboxID
-        annotation.onSelect(true)
-    }
-
-    fun deselectAnnotation(annotation: RNMBXPointAnnotation) {
-        mActiveMarkerID = INVALID_ANNOTATION_ID
-        annotation.onDeselect()
-    }
-
     interface FoundLayerCallback {
         fun found(layer: Layer?)
     }
@@ -1262,7 +1184,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
         mSources = HashMap()
         mImages = ArrayList()
-        mPointAnnotations = HashMap()
     }
 
     // region Ornaments
@@ -1606,4 +1527,154 @@ fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
     this.margins = margins
 }
 
+class RNMBXPointAnnotationManager(val mapView: MapView) {
+    val manager: PointAnnotationManager;
+    var annotationClicked = false
+    var annotationDragged = false
+
+    var selected: RNMBXPointAnnotation? = null
+
+    val annotations: MutableMap<String, RNMBXPointAnnotation> = hashMapOf()
+
+    init {
+        manager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "RNMBX-mapview-annotations"))
+        manager.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
+            onAnnotationClick(pointAnnotation)
+            false
+        })
+    }
+
+    fun getAndClearAnnotationClicked(): Boolean {
+        if (annotationClicked) {
+            annotationClicked = false
+            return true
+        }
+        return false
+    }
+
+    fun getAndClearAnnotationDragged(): Boolean {
+        if (annotationDragged) {
+            annotationDragged = false
+            return true
+        }
+        return false
+    }
+
+    fun lookup(point: PointAnnotation): RNMBXPointAnnotation? {
+        for (annotation in annotations.values) {
+            if (point.id == annotation.mapboxID) {
+                return annotation;
+            }
+        }
+        Logger.e(LOG_TAG, "Failed to find RNMBXPointAnntoation for ${point.id}")
+        return null;
+    }
+
+    fun onAnnotationClick(pointAnnotation: RNMBXPointAnnotation) {
+        var oldSelected: RNMBXPointAnnotation? = selected
+        var newSelected: RNMBXPointAnnotation? = pointAnnotation
+
+        annotationClicked = true
+
+        if (newSelected == oldSelected) {
+            newSelected = null
+        }
+
+        manager.addDragListener(object : OnPointAnnotationDragListener {
+            override fun onAnnotationDragStarted(_annotation: Annotation<*>) {
+                annotationDragged = true;
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDragStart() }
+            }
+
+            override fun onAnnotationDrag(_annotation: Annotation<*>) {
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDrag() }
+            }
+
+            override fun onAnnotationDragFinished(_annotation: Annotation<*>) {
+                annotationDragged = false;
+                var reactAnnotation: RNMBXPointAnnotation? = null
+                for (key in annotations.keys) {
+                    val annotation = annotations[key]
+                    val curMarkerID = annotation?.mapboxID
+                    if (_annotation.id == curMarkerID) {
+                        reactAnnotation = annotation
+                    }
+                }
+                reactAnnotation?.let { it.onDragEnd() }
+            }
+        })
+
+        oldSelected?.let { deselectAnnotation(it) }
+        newSelected?.let { selectAnnotation(it) }
+
+    }
+
+    fun onAnnotationClick(point: PointAnnotation) {
+        lookup(point)?.let {
+            onAnnotationClick(it)
+        }
+    }
+
+    fun deselectSelectedAnnotation(): Boolean {
+        selected?.let {
+            deselectAnnotation(it)
+            return true
+        }
+        return false
+    }
+
+    fun selectAnnotation(annotation: RNMBXPointAnnotation) {
+        selected = annotation
+        annotation.doSelect(true)
+    }
+
+    fun deselectAnnotation(annotation: RNMBXPointAnnotation) {
+        selected = null
+        annotation.doDeselect()
+    }
+
+    fun remove(annotation: RNMBXPointAnnotation) {
+        if (annotation == selected) {
+            selected = null
+        }
+        annotations.remove(annotation.iD)
+    }
+
+    fun delete(annotation: PointAnnotation) {
+        manager.delete(annotation)
+    }
+
+    fun update(annotation: PointAnnotation) {
+        manager.update(annotation)
+    }
+
+    fun create(options: PointAnnotationOptions): PointAnnotation {
+        return manager.create(options)
+    }
+
+    fun add(annotation: RNMBXPointAnnotation) {
+        annotations[annotation.iD!!] = annotation
+    }
+
+    companion object {
+        const val LOG_TAG = "RNMBXPointAnnotationManager";
+    }
+}
+
 

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

@@ -19,6 +19,7 @@ import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionNam
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.logo.logo
 import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
@@ -329,6 +330,13 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.requestDisallowInterceptTouchEvent = requestDisallowInterceptTouchEvent.asBoolean()
     }
 
+    @ReactProp(name = "deselectAnnotationOnTap")
+    override fun setDeselectAnnotationOnTap(mapView: RNMBXMapView, value: Dynamic?) {
+        value?.let {
+            mapView.deselectAnnotationOnTap = it.asBoolean()
+        }
+    }
+
     override fun setCompassImage(view: RNMBXMapView, value: Dynamic?) {
         // TODO: No-op on Android?
     }
@@ -336,14 +344,14 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
     //endregion
     //region Custom Events
     override fun customEvents(): Map<String, String>? {
-        return MapBuilder.builder<String, String>()
-            .put(EventKeys.MAP_CLICK, "onPress")
-            .put(EventKeys.MAP_LONG_CLICK, "onLongPress")
-            .put(EventKeys.MAP_ONCHANGE, "onMapChange")
-            .put(EventKeys.MAP_ON_LOCATION_CHANGE, "onLocationChange")
-            .put(EventKeys.MAP_USER_TRACKING_MODE_CHANGE, "onUserTrackingModeChange")
-            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-            .build()
+        return eventMapOf(
+            EventKeys.MAP_CLICK to "onPress",
+            EventKeys.MAP_LONG_CLICK to "onLongPress",
+            EventKeys.MAP_ONCHANGE to "onMapChange",
+            EventKeys.MAP_ON_LOCATION_CHANGE to "onLocationChange",
+            EventKeys.MAP_USER_TRACKING_MODE_CHANGE to "onUserTrackingModeChange",
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
     }
 
     override fun getCommandsMap(): Map<String, Int>? {

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyle.kt

@@ -57,7 +57,7 @@ class RNMBXStyle(private val mContext: Context, reactStyle: ReadableMap?, map: M
                 imageEntry(styleValue)
             )
         )
-        val task = DownloadMapImageTask(mContext, mMap, callback)
+        val task = DownloadMapImageTask(mContext, mMap, null, callback)
         task.execute(*images)
     }