@rnmapbox/maps 10.3.0-beta.1 → 10.3.0

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

@@ -6,22 +6,18 @@ import com.mapbox.maps.extension.style.sources.addSource
 import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.MapboxMap
-import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
 import com.facebook.react.bridge.ReadableMap
-import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
-import android.graphics.PointF
 import android.view.View
 import com.facebook.react.common.MapBuilder
 import com.mapbox.geojson.Feature
+import com.mapbox.maps.ScreenCoordinate
 import com.mapbox.maps.Style
 import com.mapbox.maps.extension.style.StyleContract
 import com.mapbox.maps.extension.style.sources.Source
 import com.rnmapbox.rnmbx.components.RemovalReason
-import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource.OnPressEvent
 import com.rnmapbox.rnmbx.utils.LatLng
 import com.rnmapbox.rnmbx.utils.Logger
 import java.lang.ClassCastException
-import java.util.ArrayList
 import java.util.HashMap
 
 data class FeatureInfo(val feature: AbstractMapFeature?, var added: Boolean) {
@@ -221,7 +217,7 @@ abstract class RNMBXSource<T : Source?>(context: Context?) : AbstractMapFeature(
 
 
     abstract fun makeSource(): T
-    class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: PointF)
+    class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: ScreenCoordinate)
 
     abstract fun onPress(event: OnPressEvent?)
 

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

@@ -2,6 +2,7 @@ package com.rnmapbox.rnmbx.components.styles.terrain
 
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXTerrainManagerInterface
@@ -23,7 +24,7 @@ class RNMBXTerrainManager : ViewGroupManager<RNMBXTerrain>(),
 
     @ReactProp(name = "reactStyle")
     override fun setReactStyle(terrain: RNMBXTerrain, reactStyle: Dynamic) {
-        terrain.setReactStyle(reactStyle.asMap())
+        terrain.setReactStyle(reactStyle.asMapOrNull())
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/events/FeatureClickEvent.java

@@ -1,16 +1,15 @@
 package com.rnmapbox.rnmbx.events;
 
-import android.graphics.PointF;
 import android.view.View;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.mapbox.geojson.Feature;
+import com.mapbox.maps.ScreenCoordinate;
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource;
 import com.rnmapbox.rnmbx.events.constants.EventKeys;
 import com.rnmapbox.rnmbx.events.constants.EventTypes;
-import com.rnmapbox.rnmbx.utils.ConvertUtils;
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
 import com.rnmapbox.rnmbx.utils.LatLng;
 
@@ -24,9 +23,9 @@ public class FeatureClickEvent extends AbstractEvent {
     private String mEventKey;
     private List<Feature> mFeatures;
     private LatLng mLatLng;
-    private PointF mPoint;
+    private ScreenCoordinate mPoint;
 
-    public FeatureClickEvent(View view, String eventKey, String eventType, List<Feature> features, LatLng latLng, PointF point) {
+    public FeatureClickEvent(View view, String eventKey, String eventType, List<Feature> features, LatLng latLng, ScreenCoordinate point) {
         super(view, eventType);
         mFeatures = features;
         mEventKey = eventKey;
@@ -55,8 +54,8 @@ public class FeatureClickEvent extends AbstractEvent {
         map.putMap("coordinates", coordinates);
 
         WritableMap point = Arguments.createMap();
-        point.putDouble("x", mPoint.x);
-        point.putDouble("y", mPoint.y);
+        point.putDouble("x", mPoint.getX());
+        point.putDouble("y", mPoint.getY());
         map.putMap("point", point);
 
         return map;

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt

@@ -114,6 +114,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
         val locationModuleCallbackNames: MutableMap<String, String> = HashMap()
         locationModuleCallbackNames["Update"] = RNMBXLocationModule.LOCATION_UPDATE
         return MapBuilder.builder<String, Any>()
+            // Deprecated: means v10 or later, always true. Will be removed in next major version.
             .put("MapboxV10", true)
             .put("StyleURL", styleURLS)
             .put("EventTypes", eventTypes)

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXSnapshotModule.kt

@@ -8,10 +8,13 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.mapbox.geojson.Feature
+import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
 import com.mapbox.maps.CameraOptions
+import com.mapbox.maps.EdgeInsets
 import com.mapbox.maps.MapSnapshotOptions
 import com.mapbox.maps.Size
+import com.mapbox.maps.SnapshotOverlayOptions
 import com.mapbox.maps.Snapshotter
 import com.rnmapbox.rnmbx.modules.RNMBXModule.Companion.getAccessToken
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
@@ -43,30 +46,38 @@ class RNMBXSnapshotModule(private val mContext: ReactApplicationContext) :
         // FileSource.getInstance(mContext).activate();
         mContext.runOnUiQueueThread {
             val snapshotterID = UUID.randomUUID().toString()
-            val snapshotter = Snapshotter(mContext, getOptions(jsOptions))
+            val showLogo = if (jsOptions.hasKey("withLogo")) jsOptions.getBoolean("withLogo") else true
+            val overlayOptions = SnapshotOverlayOptions(showLogo = showLogo)
+            val snapshotter = Snapshotter(mContext, getOptions(jsOptions), overlayOptions)
             snapshotter.setStyleUri(jsOptions.getString("styleURL")!!)
-            snapshotter.setCamera(getCameraOptions(jsOptions))
+            try {
+                snapshotter.setCamera(getCameraOptions(jsOptions, snapshotter))
+            } catch (e: IllegalArgumentException) {
+                promise.reject(REACT_CLASS, e.message, e)
+                return@runOnUiQueueThread
+            }
             mSnapshotterMap[snapshotterID] = snapshotter
-            snapshotter.startV11 { image,error ->
+
+            snapshotter.start(null) { image, error ->
                 try {
                     if (image == null) {
                         Log.w(REACT_CLASS, "Snapshot failed: $error")
                         promise.reject(REACT_CLASS, "Snapshot failed: $error")
                         mSnapshotterMap.remove(snapshotterID)
                     } else {
-                        val image = image.toMapboxImage()
+                        val mapboxImage = image.toMapboxImage()
                         var result: String? = null
                         result = if (jsOptions.getBoolean("writeToDisk")) {
-                            BitmapUtils.createImgTempFile(mContext, image)
+                            BitmapUtils.createImgTempFile(mContext, mapboxImage)
                         } else {
-                            BitmapUtils.createImgBase64(image)
+                            BitmapUtils.createImgBase64(mapboxImage)
                         }
                         if (result == null) {
                             promise.reject(
                                 REACT_CLASS,
                                 "Could not generate snapshot, please check Android logs for more info."
                             )
-                            return@startV11
+                            return@start
                         }
                         promise.resolve(result)
                         mSnapshotterMap.remove(snapshotterID)
@@ -79,17 +90,44 @@ class RNMBXSnapshotModule(private val mContext: ReactApplicationContext) :
         }
     }
 
-    private fun getCameraOptions(jsOptions: ReadableMap): CameraOptions {
-        val centerPoint =
-            Feature.fromJson(jsOptions.getString("centerCoordinate")!!)
-        val point = centerPoint.geometry() as Point?
-        val cameraOptionsBuilder = CameraOptions.Builder()
-        return cameraOptionsBuilder
-            .center(point)
-            .pitch(jsOptions.getDouble("pitch"))
-            .bearing(jsOptions.getDouble("heading"))
-            .zoom(jsOptions.getDouble("zoomLevel"))
-            .build()
+    private fun getCameraOptions(jsOptions: ReadableMap, snapshotter: Snapshotter): CameraOptions {
+        val pitch = jsOptions.getDouble("pitch")
+        val heading = jsOptions.getDouble("heading")
+        val zoomLevel = jsOptions.getDouble("zoomLevel")
+
+        // Check if centerCoordinate is provided
+        if (jsOptions.hasKey("centerCoordinate") && !jsOptions.isNull("centerCoordinate")) {
+            val centerPoint = Feature.fromJson(jsOptions.getString("centerCoordinate")!!)
+            val point = centerPoint.geometry() as Point?
+            return CameraOptions.Builder()
+                .center(point)
+                .pitch(pitch)
+                .bearing(heading)
+                .zoom(zoomLevel)
+                .build()
+        }
+
+        // Check if bounds is provided
+        if (jsOptions.hasKey("bounds") && !jsOptions.isNull("bounds")) {
+            val boundsJson = jsOptions.getString("bounds")!!
+            val featureCollection = FeatureCollection.fromJson(boundsJson)
+            val coords = featureCollection.features()?.mapNotNull { feature ->
+                feature.geometry() as? Point
+            } ?: emptyList()
+
+            if (coords.isEmpty()) {
+                throw IllegalArgumentException("bounds contains no valid coordinates")
+            }
+
+            return snapshotter.cameraForCoordinates(
+                coords,
+                EdgeInsets(0.0, 0.0, 0.0, 0.0),
+                heading,
+                pitch
+            )
+        }
+
+        throw IllegalArgumentException("neither centerCoordinate nor bounds provided")
     }
 
     private fun getOptions(jsOptions: ReadableMap): MapSnapshotOptions {

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

@@ -1,7 +1,5 @@
 package com.rnmapbox.rnmbx.utils
 
-import android.graphics.PointF
-import android.graphics.RectF
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.NoSuchKeyException
@@ -172,34 +170,6 @@ object ConvertUtils {
         return list
     }
 
-    fun toPointF(array: ReadableArray?): PointF {
-        val pointF = PointF()
-
-        if (array == null) {
-            return pointF
-        }
-
-        pointF.set(array.getDouble(0).toFloat(), array.getDouble(1).toFloat())
-        return pointF
-    }
-
-    // returns null if array is null
-    fun toRectF(array: ReadableArray?): RectF? {
-        val rectF = RectF()
-
-        if (array == null || array.size() == 0) {
-            return null
-        }
-
-        rectF.set(
-            array.getDouble(3).toFloat(),
-            array.getDouble(0).toFloat(),
-            array.getDouble(1).toFloat(),
-            array.getDouble(2).toFloat()
-        )
-        return rectF
-    }
-
     fun getDouble(key: String, map: ReadableMap, defaultValue: Double): Double {
         var value = defaultValue
 

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

@@ -107,4 +107,6 @@ fun Dynamic.asStringOrNull(): String? {
     } else {
         asString()
     }
-}
+}
+
+fun Dynamic.asMapOrNull(): ReadableMap? = if (isNull) null else asMap()

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

@@ -1,17 +1,15 @@
 package com.rnmapbox.rnmbx.utils.extensions
 
-import android.graphics.RectF
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.mapbox.geojson.Point
+import com.mapbox.maps.ScreenBox
 import com.mapbox.maps.ScreenCoordinate
-import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.Logger
-import org.json.JSONArray
-import java.lang.Float.max
-import java.lang.Float.min
+import kotlin.math.max
+import kotlin.math.min
 
 fun ReadableArray.toCoordinate() : Point {
     if (this.size() != 2) {
@@ -25,20 +23,24 @@ fun ReadableArray.toCoordinate() : Point {
 
 fun ReadableArray.toScreenCoordinate() : ScreenCoordinate {
     if (this.size() != 2) {
-        Logger.e("ReadableArray.toCoordinate","Cannot convert $this to point, 2 coordinates are required")
+        Logger.e("ReadableArray.toScreenCoordinate","Cannot convert $this to point, 2 coordinates are required")
     }
     return ScreenCoordinate(getDouble(0), getDouble(1))
 }
 
-fun ReadableArray.toRectF() : RectF? {
-    if (size() != 4) {
-        return null;
+fun ReadableArray.toScreenBox() : ScreenBox {
+    if (this.size() != 4) {
+        Logger.e("ReadableArray.toScreenBox","Cannot convert $this to box, 4 coordinates are required")
     }
-    return RectF(
-        min(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        min(getDouble(0).toFloat(), getDouble(2).toFloat()),
-        max(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        max(getDouble(0).toFloat(), getDouble(2).toFloat())
+
+    val top = getDouble(0)
+    val left = getDouble(1)
+    val bottom = getDouble(2)
+    val right = getDouble(3)
+
+    return ScreenBox(
+        ScreenCoordinate(min(left, right), min(top, bottom)),
+        ScreenCoordinate(max(left, right), max(top, bottom))
     )
 }
 

package/ios/RNMBX/RNMBXBackgroundLayer.swift

@@ -30,7 +30,7 @@ public class RNMBXBackgroundLayer: RNMBXLayer {
         styler.backgroundLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXBackgroundLayer.addStyles") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXCalloutComponentView.mm

@@ -45,6 +45,16 @@ using namespace facebook::react;
   return concreteComponentDescriptorProvider<RNMBXCalloutComponentDescriptor>();
 }
 
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    [_view insertSubview:childComponentView atIndex:index];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    [childComponentView removeFromSuperview];
+}
+
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
   const auto &newProps = static_cast<const RNMBXCalloutProps &>(*props);

package/ios/RNMBX/RNMBXCircleLayer.swift

@@ -80,7 +80,7 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXCircleLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXFillExtrusionLayer.swift

@@ -78,7 +78,7 @@ public class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXFillExtrusionLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXFillLayer.swift

@@ -80,7 +80,7 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
         styler.fillLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXFillLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXHeatmapLayer.swift

@@ -34,7 +34,7 @@ public class RNMBXHeatmapLayer: RNMBXVectorLayer {
         styler.heatmapLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXHeatmapLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXHillshadeLayer.swift

@@ -73,7 +73,7 @@ public class RNMBXHillshadeLayer: RNMBXLayer {
         styler.hillshadeLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater:{ (updater) in logged("RNMBXHillshadeLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXLayer.swift

@@ -19,10 +19,10 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     didSet { self.optionsChanged() }
   }
 
-  var oldReatStyle: Dictionary<String, Any>? = nil
+  var oldReactStyle: Dictionary<String, Any>? = nil
   @objc public var reactStyle : Dictionary<String, Any>? = nil {
     willSet {
-      oldReatStyle = reactStyle
+      oldReactStyle = reactStyle
     }
     didSet {
       DispatchQueue.main.async {

package/ios/RNMBX/RNMBXLineLayer.swift

@@ -79,7 +79,7 @@ public class RNMBXLineLayer: RNMBXVectorLayer {
         styler.lineLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXLineLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXMapView.swift

@@ -236,7 +236,9 @@ open class RNMBXMapView: UIView, RCTInvalidating {
   }()
 
   lazy var calloutAnnotationManager : MapboxMaps.PointAnnotationManager = {
-    return mapView.annotations.makePointAnnotationManager(id: "RNMBX-mapview-callouts")
+    let manager = mapView.annotations.makePointAnnotationManager(id: "RNMBX-mapview-callouts")
+    manager.iconAllowOverlap = true
+    return manager
   }()
 
   var _mapView: MapView! = nil
@@ -1893,6 +1895,20 @@ class RNMBXPointAnnotationManager : AnnotationInteractionDelegate {
     //   onTap(annotations: annotations)
   }
 
+  func selected(pointAnnotation: RNMBXPointAnnotation) {
+    if (selected != nil) {
+      deselectCurrentlySelected(deselectAnnotationOnTap: false)
+    }
+    pointAnnotation.doSelect()
+    selected = pointAnnotation
+  }
+
+  func unselected(pointAnnotation: RNMBXPointAnnotation) {
+    if (selected == pointAnnotation) {
+      deselectCurrentlySelected(deselectAnnotationOnTap: false)
+    }
+  }
+
   func deselectCurrentlySelected(deselectAnnotationOnTap: Bool = false) -> Bool {
     if let selected = selected {
       selected.doDeselect(deselectAnnotationOnMapTap: deselectAnnotationOnTap)
@@ -2120,6 +2136,7 @@ class RNMBXPointAnnotationManager : AnnotationInteractionDelegate {
     )
 
   func add(_ annotation: PointAnnotation, _ rnmbxPointAnnotation: RNMBXPointAnnotation) {
+    rnmbxPointAnnotation.manager = self
     manager.annotations.append(annotation)
     manager.refresh()
     annotations.setObject(rnmbxPointAnnotation, forKey: annotation.id as NSString)

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -120,6 +120,9 @@ using namespace facebook::react;
 }
 
 - (void)dispatchCameraChangedEvent:(NSDictionary*)event {
+    if (self->_eventEmitter == nullptr) {
+        return;
+    }
     const auto [type, json] = RNMBXStringifyEventData(event);
     std::dynamic_pointer_cast<const facebook::react::RNMBXMapViewEventEmitter>(self->_eventEmitter)->onCameraChanged({type, json});
 }

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -60,7 +60,7 @@ RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSAr
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
 
-        [view getCoordinateFromViewWithAtPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
+        [view getCoordinateFromViewWithAtPoint:CGPointMake(a.doubleValue, b.doubleValue) resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCoordinateFromView"];
 }
 

package/ios/RNMBX/RNMBXModelLayer.swift

@@ -79,7 +79,7 @@ public class RNMBXModelLayer: RNMBXVectorLayer {
         styler.modelLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXModelLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXModule.swift

@@ -23,6 +23,7 @@ class RNMBXModule : NSObject {
   @objc
   func constantsToExport() -> [AnyHashable: Any]! {
     return [
+      // Deprecated: means v10 or later, always true. Will be removed in next major version.
       "MapboxV10":true,
       "StyleURL":
         [

package/ios/RNMBX/RNMBXPointAnnotation.swift

@@ -10,6 +10,8 @@ final class WeakRef<T: AnyObject> {
 }
 @objc
 public class RNMBXPointAnnotation : RNMBXInteractiveElement {
+  weak var manager: RNMBXPointAnnotationManager? = nil
+
   static let key = "RNMBXPointAnnotation"
   static var gid = 0;
   
@@ -31,7 +33,25 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
   @objc public var onDrag: RCTBubblingEventBlock? = nil
   @objc public var onDragEnd: RCTBubblingEventBlock? = nil
   @objc public var onSelected: RCTBubblingEventBlock? = nil
-  
+
+  private var selected: Bool? = nil {
+    didSet {
+      update { annotation in
+        if let selected = selected {
+          annotation.isSelected = selected
+        }
+      }
+    }
+  }
+
+  @objc public func setReactSelected(_ _selected: Bool) {
+    if (_selected == true && self.selected != true) {
+      manager?.selected(pointAnnotation: self)
+    } else if (_selected == false && self.selected == true) {
+      manager?.unselected(pointAnnotation: self)
+    }
+  }
+
   @objc public var coordinate : String? {
     didSet {
       _updateCoordinate()
@@ -173,14 +193,16 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
   }
   
   func doSelect() {
+    self.selected = true
     let event = makeEvent(isSelect: true)
     if let onSelected = onSelected {
       onSelected(event.toJSON())
     }
     onSelect()
   }
-  
+
   func doDeselect(deselectAnnotationOnMapTap: Bool = false) {
+    self.selected = false
     let event = makeEvent(isSelect: false, deselectAnnotationOnMapTap: deselectAnnotationOnMapTap)
     if let onDeselected = onDeselected {
       onDeselected(event.toJSON())
@@ -192,7 +214,7 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
     if let callout = callout,
        let calloutImage = _createViewSnapshot(view: callout),
        let point = point() {
-      
+
       var calloutPtAnnotation = PointAnnotation(point: point)
       calloutId = calloutPtAnnotation.id
       let name =  "rnviewcallout-\(gid())-\(calloutPtAnnotation.id)"

package/ios/RNMBX/RNMBXPointAnnotationComponentView.mm

@@ -130,6 +130,7 @@ using namespace facebook::react;
   RNMBX_OPTIONAL_PROP_BOOL(draggable)
   RNMBX_OPTIONAL_PROP_NSString(id)
   RNMBX_OPTIONAL_PROP_NSDictionary(anchor)
+  RNMBX_REMAP_OPTIONAL_PROP_BOOL(selected, reactSelected)
 
   [super updateProps:props oldProps:oldProps];
 }

package/ios/RNMBX/RNMBXRasterLayer.swift

@@ -74,7 +74,7 @@ public class RNMBXRasterLayer: RNMBXLayer {
         styler.rasterLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater:{ (updater) in logged("RNMBXRasterLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXRasterParticleLayer.swift

@@ -73,7 +73,7 @@ public class RNMBXRasterParticleLayer: RNMBXLayer {
         styler.rasterParticleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater:{ (updater) in logged("RNMBXRasterParticleLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXSkyLayer.swift

@@ -54,7 +54,7 @@ public class RNMBXSkyLayer: RNMBXLayer {
         styler.skyLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in logged("RNMBXSkyLayer.addStyles") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RNMBX/RNMBXSnapshotModule.swift

@@ -93,10 +93,12 @@ class RNMBXSnapshotModule : NSObject {
           let height = jsOptions["height"] as? NSNumber else {
       throw RNMBXError.paramError("width, height: is not a number")
     }
-    let mapSnapshotOptions = MapSnapshotOptions(
+    let showsLogo = jsOptions["withLogo"] as? Bool ?? true
+    var mapSnapshotOptions = MapSnapshotOptions(
       size: CGSize(width: width.doubleValue, height: height.doubleValue),
       pixelRatio: 1.0
     )
+    mapSnapshotOptions.showsLogo = showsLogo
 
     return mapSnapshotOptions
   }