@rnmapbox/maps 10.1.0-rc.4 → 10.1.0-rc.6

package/README.md

@@ -79,36 +79,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using
 
 ## Installation
 
-### Step 1 - Install Package:
-
-#### Using `yarn`
-Install the latest source from git:
-```sh
-yarn add @rnmapbox/maps
-``` 
-
-#### Using `npm`
-Install the latest source from git:
-```sh
-npm install --save @rnmapbox/maps
-``` 
-
-#### Installing other versions
-
-- `@rnmapbox/maps` installs the latest release from npm
-- to install current `main` from github replace `@rnmapbox/maps` with `rnmapbox/maps#main`. To install specific version use `@rnmapbox/maps@10.0.4`
-
-
-#### Using `expo`
-Please follow the [Expo Guide](/plugin/install.md).
-
-### Step 2 - Installation Guides:
-
-- [Android](/android/install.md)
-- [iOS](/ios/install.md)
-- [Expo](/plugin/install.md)
-- [Example](/example)
-
+Check our [Installation insructions](https://rnmapbox.github.io/docs/install)
 
 ### Getting Started
 For more information, check out our [Getting Started](/docs/GettingStarted.md) section

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

@@ -6,12 +6,9 @@ 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
@@ -28,7 +25,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 marker: PointAnnotation? = null
+    var annotation: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
     private val mHasChildren = false
@@ -100,8 +97,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 (marker != null) {
-            map.pointAnnotationManager?.delete(marker!!)
+        if (annotation != null) {
+            map.pointAnnotationManager?.delete(annotation!!)
         }
         if (mChildView != null) {
             map.offscreenAnnotationViewContainer?.removeView(mChildView)
@@ -141,37 +138,37 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     val latLng: LatLng?
         get() = mCoordinate?.let { GeoJSONUtils.toLatLng(it) }
     val mapboxID: AnnotationID
-        get() = if (marker == null) INVALID_ANNOTATION_ID else marker!!.id
+        get() = if (annotation == null) INVALID_ANNOTATION_ID else annotation!!.id
 
     fun setCoordinate(point: Point) {
         mCoordinate = point
-        if (marker != null) {
-            marker!!.point = point
-            mMapView?.pointAnnotationManager?.update(marker!!)
+        annotation?.let {
+            it.point = point
+            mMapView?.pointAnnotationManager?.update(it)
         }
-        if (mCalloutSymbol != null) {
-            mCalloutSymbol!!.point = point
-            mMapView?.pointAnnotationManager?.update(mCalloutSymbol!!)
+        mCalloutSymbol?.let {
+            it.point = point
+            mMapView?.pointAnnotationManager?.update(it)
         }
     }
 
     fun setAnchor(x: Float, y: Float) {
         mAnchor = arrayOf(x, y)
-        if (marker != null) {
+        if (annotation != null) {
             updateAnchor()
-            mMapView?.pointAnnotationManager?.update(marker!!)
+            mMapView?.pointAnnotationManager?.update(annotation!!)
         }
     }
 
     fun setDraggable(draggable: Boolean) {
         mDraggable = draggable
-        if (marker != null) {
-            marker!!.isDraggable = draggable
-            mMapView?.pointAnnotationManager?.update(marker!!)
+        annotation?.let {
+            it.isDraggable = draggable
+            mMapView?.pointAnnotationManager?.update(it)
         }
     }
 
-    fun onSelect(shouldSendEvent: Boolean) {
+    fun doSelect(shouldSendEvent: Boolean) {
         if (calloutView != null) {
             makeCallout()
         }
@@ -180,7 +177,7 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         }
     }
 
-    fun onDeselect() {
+    fun doDeselect() {
         mManager.handleEvent(makeEvent(false))
         if (mCalloutSymbol != null) {
             mMapView?.pointAnnotationManager?.delete(mCalloutSymbol!!)
@@ -188,17 +185,17 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     }
 
     fun onDragStart() {
-        mCoordinate = marker!!.point
+        mCoordinate = annotation!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_START))
     }
 
     fun onDrag() {
-        mCoordinate = marker!!.point
+        mCoordinate = annotation!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG))
     }
 
     fun onDragEnd() {
-        mCoordinate = marker!!.point
+        mCoordinate = annotation!!.point
         mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_END))
     }
 
@@ -210,41 +207,42 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
                 .withIconSize(1.0)
                 .withSymbolSortKey(10.0)
         }
-        val symbolManager = mMapView?.pointAnnotationManager
-        if (symbolManager != null && options != null) {
-            marker = symbolManager.create(options)
-            updateOptions()
+        mMapView?.pointAnnotationManager?.let { annotationManager ->
+            options?.let {
+                annotation = annotationManager.create(options)
+                updateOptions()
+            }
         }
     }
 
     private fun updateOptions() {
-        if (marker != null) {
+        if (annotation != null) {
             updateIconImage()
             updateAnchor()
-            mMapView?.pointAnnotationManager?.update(marker!!)
+            mMapView?.pointAnnotationManager?.update(annotation!!)
         }
     }
 
     private fun updateIconImage() {
         if (mChildView != null) {
             if (mChildBitmapId != null) {
-                marker?.iconImage = mChildBitmapId
+                annotation?.iconImage = mChildBitmapId
             }
         } else {
-            marker?.iconImage = MARKER_IMAGE_ID
-            marker?.iconAnchor = IconAnchor.BOTTOM
+            annotation?.iconImage = MARKER_IMAGE_ID
+            annotation?.iconAnchor = IconAnchor.BOTTOM
         }
     }
 
     private fun updateAnchor() {
-        if (mAnchor != null && mChildView != null && mChildBitmap != null && marker != null) {
+        if (mAnchor != null && mChildView != null && mChildBitmap != null && annotation != null) {
             var w = mChildBitmap!!.width
             var h = mChildBitmap!!.height
             val scale = resources.displayMetrics.density
             w = (w / scale).toInt()
             h = (h / scale).toInt()
-            marker?.iconAnchor = IconAnchor.TOP_LEFT
-            marker?.iconOffset = Arrays.asList(w.toDouble() * mAnchor!![0] * -1.0, h.toDouble() * mAnchor!![1] * -1.0)
+            annotation?.iconAnchor = IconAnchor.TOP_LEFT
+            annotation?.iconOffset = Arrays.asList(w.toDouble() * mAnchor!![0] * -1.0, h.toDouble() * mAnchor!![1] * -1.0)
         }
     }
 

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

@@ -209,8 +209,18 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
     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
@@ -219,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
 
@@ -233,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
@@ -255,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()
     }
@@ -264,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
@@ -478,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
@@ -514,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)
         }
@@ -783,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?>?>()
@@ -817,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)
@@ -830,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?)
     }
@@ -1266,7 +1184,6 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
 
         mSources = HashMap()
         mImages = ArrayList()
-        mPointAnnotations = HashMap()
     }
 
     // region Ornaments
@@ -1610,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

@@ -330,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?
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/GeoJSONUtils.kt

@@ -100,6 +100,11 @@ object GeoJSONUtils {
         val map: WritableMap = WritableNativeMap()
         map.putString("type", "Feature")
         map.putMap("geometry", toPointGeometry(latLng))
+        properties?.let {
+            if (it.hasKey("id") == true) {
+                map.putString("id", it.getString("id"));
+            }
+        }
         map.putMap("properties", properties)
         return map
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java

@@ -67,6 +67,9 @@ public class RNMBXMapViewManagerDelegate<T extends View, U extends BaseViewManag
       case "pitchEnabled":
         mViewManager.setPitchEnabled(view, new DynamicFromObject(value));
         break;
+      case "deselectAnnotationOnTap":
+        mViewManager.setDeselectAnnotationOnTap(view, new DynamicFromObject(value));
+        break;
       case "requestDisallowInterceptTouchEvent":
         mViewManager.setRequestDisallowInterceptTouchEvent(view, new DynamicFromObject(value));
         break;

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java

@@ -28,6 +28,7 @@ public interface RNMBXMapViewManagerInterface<T extends View> {
   void setScrollEnabled(T view, Dynamic value);
   void setRotateEnabled(T view, Dynamic value);
   void setPitchEnabled(T view, Dynamic value);
+  void setDeselectAnnotationOnTap(T view, Dynamic value);
   void setRequestDisallowInterceptTouchEvent(T view, Dynamic value);
   void setProjection(T view, Dynamic value);
   void setLocalizeLabels(T view, Dynamic value);

package/ios/RNMBX/RNMBXEvent.swift

@@ -38,6 +38,8 @@ class RNMBXEvent : NSObject, RNMBXEventProtocol {
       case onUserTrackingModeChange
       case vectorSourceLayerPress
       case shapeSourceLayerPress
+      case annotationSelected = "annotationselected"
+      case annotationDeselected = "annotationdeselected"
     }
     
     init(type: EventType, payload: [String:Any?]?) {