@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -11,8 +11,6 @@
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 #import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
 
-#import "RNMBXFabricPropConvert.h"
-
 using namespace facebook::react;
 
 @interface RNMBXMapViewComponentView () <RCTRNMBXMapViewViewProtocol>
@@ -127,110 +125,104 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-    const auto &oldViewProps = static_cast<const RNMBXMapViewProps &>(*oldProps);
-    const auto &newViewProps = static_cast<const RNMBXMapViewProps &>(*props);
-  
-    id attributionEnabled = RNMBXConvertFollyDynamicToId(newViewProps.attributionEnabled);
+  const auto &newProps = static_cast<const RNMBXMapViewProps &>(*props);
+    id attributionEnabled = RNMBXConvertFollyDynamicToId(newProps.attributionEnabled);
     if (attributionEnabled != nil) {
         _view.reactAttributionEnabled = attributionEnabled;
     }
 
-    id attributionPosition = RNMBXConvertFollyDynamicToId(newViewProps.attributionPosition);
+    id attributionPosition = RNMBXConvertFollyDynamicToId(newProps.attributionPosition);
     if (attributionPosition != nil) {
         _view.reactAttributionPosition = attributionPosition;
     }
 
-    id logoEnabled = RNMBXConvertFollyDynamicToId(newViewProps.logoEnabled);
+    id logoEnabled = RNMBXConvertFollyDynamicToId(newProps.logoEnabled);
     if (logoEnabled != nil) {
         _view.reactLogoEnabled = logoEnabled;
     }
 
-    id logoPosition = RNMBXConvertFollyDynamicToId(newViewProps.logoPosition);
+    id logoPosition = RNMBXConvertFollyDynamicToId(newProps.logoPosition);
     if (logoPosition != nil) {
         _view.reactLogoPosition = logoPosition;
     }
 
-    id compassEnabled = RNMBXConvertFollyDynamicToId(newViewProps.compassEnabled);
+    id compassEnabled = RNMBXConvertFollyDynamicToId(newProps.compassEnabled);
     if (compassEnabled != nil) {
         _view.reactCompassEnabled = compassEnabled;
     }
 
-    id compassFadeWhenNorth = RNMBXConvertFollyDynamicToId(newViewProps.compassFadeWhenNorth);
+    id compassFadeWhenNorth = RNMBXConvertFollyDynamicToId(newProps.compassFadeWhenNorth);
     if (compassFadeWhenNorth != nil) {
         _view.reactCompassFadeWhenNorth = compassFadeWhenNorth;
     }
 
-    id compassPosition = RNMBXConvertFollyDynamicToId(newViewProps.compassPosition);
+    id compassPosition = RNMBXConvertFollyDynamicToId(newProps.compassPosition);
     if (compassPosition != nil) {
         _view.reactCompassPosition = compassPosition;
     }
 
-    id compassViewPosition = RNMBXConvertFollyDynamicToId(newViewProps.compassViewPosition);
+    id compassViewPosition = RNMBXConvertFollyDynamicToId(newProps.compassViewPosition);
     if (compassViewPosition != nil) {
         _view.reactCompassViewPosition = [(NSNumber *)compassViewPosition doubleValue];
     }
 
-    NSDictionary<NSString *, NSNumber *> *compassViewMargins = RNMBXConvertFollyDynamicToId(newViewProps.compassViewMargins);
+    NSDictionary<NSString *, NSNumber *> *compassViewMargins = RNMBXConvertFollyDynamicToId(newProps.compassViewMargins);
     if (compassViewMargins != nil) {
         CGPoint margins = CGPointMake([compassViewMargins[@"x"] doubleValue], [compassViewMargins[@"y"] doubleValue]);
         _view.reactCompassViewMargins = margins;
     }
 
-    id compassImage = RNMBXConvertFollyDynamicToId(newViewProps.compassImage);
+    id compassImage = RNMBXConvertFollyDynamicToId(newProps.compassImage);
     if (compassImage != nil) {
         _view.reactCompassImage = compassImage;
     }
 
-    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarEnabled);
+    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newProps.scaleBarEnabled);
     if (scaleBarEnabled != nil) {
         _view.reactScaleBarEnabled = scaleBarEnabled;
     }
 
-    id scaleBarPosition = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarPosition);
+    id scaleBarPosition = RNMBXConvertFollyDynamicToId(newProps.scaleBarPosition);
     if (scaleBarPosition != nil) {
         _view.reactScaleBarPosition = scaleBarPosition;
     }
 
-    id zoomEnabled = RNMBXConvertFollyDynamicToId(newViewProps.zoomEnabled);
+    id zoomEnabled = RNMBXConvertFollyDynamicToId(newProps.zoomEnabled);
     if (zoomEnabled != nil) {
         _view.reactZoomEnabled = zoomEnabled;
     }
 
-    id scrollEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scrollEnabled);
+    id scrollEnabled = RNMBXConvertFollyDynamicToId(newProps.scrollEnabled);
     if (scrollEnabled != nil) {
         _view.reactScrollEnabled = scrollEnabled;
     }
 
-    id rotateEnabled = RNMBXConvertFollyDynamicToId(newViewProps.rotateEnabled);
+    id rotateEnabled = RNMBXConvertFollyDynamicToId(newProps.rotateEnabled);
     if (rotateEnabled != nil) {
         _view.reactRotateEnabled = rotateEnabled;
     }
 
-    id pitchEnabled = RNMBXConvertFollyDynamicToId(newViewProps.pitchEnabled);
+    id pitchEnabled = RNMBXConvertFollyDynamicToId(newProps.pitchEnabled);
     if (pitchEnabled != nil) {
         _view.reactPitchEnabled = pitchEnabled;
     }
 
-    id projection = RNMBXConvertFollyDynamicToId(newViewProps.projection);
+    id projection = RNMBXConvertFollyDynamicToId(newProps.projection);
     if (projection != nil) {
         _view.reactProjection = projection;
     }
 
-    id localizeLabels = RNMBXConvertFollyDynamicToId(newViewProps.localizeLabels);
+    id localizeLabels = RNMBXConvertFollyDynamicToId(newProps.localizeLabels);
     if (localizeLabels != nil) {
         _view.reactLocalizeLabels = localizeLabels;
     }
-  
-    RNMBX_OPTIONAL_PROP_BOOL(deselectAnnotationOnTap);
 
-    id styleURL = RNMBXConvertFollyDynamicToId(newViewProps.styleURL);
+    id styleURL = RNMBXConvertFollyDynamicToId(newProps.styleURL);
     if (styleURL != nil) {
         _view.reactStyleURL = styleURL;
     }
 
   [super updateProps:props oldProps:oldProps];
-
-  [_view didSetProps:@[]];
 }
 
 - (void)prepareForRecycle

package/ios/RNMBX/RNMBXMapViewManager.m

@@ -25,7 +25,6 @@ RCT_REMAP_VIEW_PROPERTY(zoomEnabled, reactZoomEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(deselectAnnotationOnTap, BOOL)
 
 RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
 RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary)

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -246,4 +246,5 @@ extension RNMBXMapViewManager {
           }
         }
     }
+
 }

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -139,6 +139,7 @@ RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSStr
     } reject:reject methodName:@"querySourceFeatures"];
 }
 
+
 // Thanks to this guard, we won't compile this code when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

package/ios/RNMBX/RNMBXMarkerView.swift

@@ -22,6 +22,7 @@ class RNMBXMarkerViewParentViewAnnotation : UIView {
     if actSize.width != size.width || actSize.height != size.height {
       let dx = ((size.width/2.0) - newOffset.dx) - ((actSize.width/2.0) - oldOffset.dx)
       let dy = ((size.height/2.0) + newOffset.dy) - ((actSize.height/2.0) + oldOffset.dy)
+      print(" => size=\(size) actSize=\(actSize) newOffset=\(newOffset) oldOffset=\(oldOffset)  dx=\(dx) dy=\(dy)")
       var frame = self.frame
       frame = frame.offsetBy(dx: -dx, dy: -dy)
       frame.size = size
@@ -60,12 +61,6 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     }
   }
   
-  @objc public var allowOverlapWithPuck: Bool = false {
-    didSet {
-      update()
-    }
-  }
-  
   @objc public var isSelected: Bool = false {
     didSet {
       update()
@@ -75,7 +70,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
   // MARK: - Derived variables
   
   var annotationManager: ViewAnnotationManager? {
-    self.map?.mapView?.viewAnnotations
+    self.map?.viewAnnotations
   }
 
   var point: Point? {
@@ -233,7 +228,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     let size = self.bounds.size
     let offset = calcOffset(size: size)
   
-    var options = ViewAnnotationOptions(
+    let options = ViewAnnotationOptions(
       geometry: geometry,
       width: size.width,
       height: size.height,
@@ -242,9 +237,6 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
       offsetY: offset.dy,
       selected: isSelected
     )
-    #if RNMBX_11
-    options.allowOverlapWithPuck = allowOverlapWithPuck
-    #endif
     return options
   }
   

package/ios/RNMBX/RNMBXMarkerViewComponentView.mm

@@ -84,10 +84,6 @@ using namespace facebook::react;
     if (allowOverlap != nil) {
         _view.allowOverlap = allowOverlap;
     }
-    id allowOverlapWithPuck = RNMBXConvertFollyDynamicToId(newProps.allowOverlapWithPuck);
-    if (allowOverlapWithPuck != nil) {
-        _view.allowOverlapWithPuck = allowOverlapWithPuck;
-    }
     id isSelected = RNMBXConvertFollyDynamicToId(newProps.isSelected);
     if (isSelected != nil) {
         _view.isSelected = isSelected;
@@ -113,7 +109,6 @@ using namespace facebook::react;
         layoutMetrics.borderWidth,
         layoutMetrics.displayType,
         layoutMetrics.layoutDirection,
-        layoutMetrics.wasLeftAndRightSwapped,
         layoutMetrics.pointScaleFactor,
         layoutMetrics.overflowInset
     };

package/ios/RNMBX/RNMBXMarkerViewManager.m

@@ -7,7 +7,6 @@
 RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(isSelected, BOOL)
 
 @end

package/ios/RNMBX/RNMBXModule.m

@@ -9,6 +9,6 @@ RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
 
 RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled)
 RCT_EXTERN_METHOD(setWellKnownTileServer:(NSString *)tileServer)
-RCT_EXTERN_METHOD(clearData:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 
 @end

package/ios/RNMBX/RNMBXModule.swift

@@ -113,28 +113,4 @@ class RNMBXModule : NSObject {
       Logger.error("setWellKnownTileServer: \(tileServer) should be mapbox")
     }
   }
-
-  @objc func clearData(_ resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-    
-    DispatchQueue.main.async {
-      #if RNMBX_11
-      MapboxMap.clearData { error in
-        if let error = error {
-          rejecter("error", error.localizedDescription, error)
-        } else {
-          resolver(nil)
-        }
-      }
-      #else
-      MapboxMap.clearData(for: ResourceOptions(accessToken: RNMBXModule.accessToken ?? "")) { error in
-        if let error = error {
-          rejecter("error", error.localizedDescription, error)
-        } else {
-          resolver(nil)
-        }
-      }
-      #endif
-    }
-  }
 }

package/ios/RNMBX/RNMBXNativeUserLocation.swift

@@ -1,9 +1,8 @@
 import MapboxMaps
 
 @objc
-public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
+public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
   weak var map : RNMBXMapView! = nil
-  var imageManager: ImageManager? = nil
   
   let locationLayerId = "location-layer"
 
@@ -11,224 +10,37 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
 
   @objc
   public var iosShowsUserHeadingIndicator : Bool = false {
-    didSet { _apply() }
-  }
-  
-  enum PuckImagePart: String {
-    case top
-    case bearing
-    case shadow
-  }
-  
-  var imageNames: [PuckImagePart: String] = [:]
-  var subscriptions: [PuckImagePart: ImageManager.Subscription] = [:]
-  var images: [PuckImagePart: UIImage] = [:]
-  
-  @objc
-  public var topImage : String? = nil {
-    didSet { imageNameUpdated(.top, topImage) }
-  }
-
-  @objc
-  public var bearingImage : String? = nil {
-    didSet { imageNameUpdated(.bearing, bearingImage) }
-  }
-    
-  @objc
-  public var shadowImage : String? = nil {
-    didSet { imageNameUpdated(.shadow, shadowImage) }
-  }
-    
-  @objc
-  public var scale : Any? = nil
-  
-  @objc
-  public var visible: Bool = false
-  
-  var _puckBearing: PuckBearing? = nil
-  
-  @objc
-  public var puckBearing: String? {
-    get {
-      switch (_puckBearing) {
-      case .heading:
-        return "heading"
-      case .course:
-        return "course"
-      case nil:
-        return nil
-      }
-    }
-    set(value) {
-      switch(value) {
-      case "heading":
-        _puckBearing = .heading
-      case "coures":
-        _puckBearing = .course
-      case nil:
-        _puckBearing = nil
-      default:
-        Logger.error("RNMBXNativeUserLocation puckBearing is uncrecognized: \(value)")
-        _puckBearing = nil
-      }
-    }
-  }
-  
-  @objc
-  public var puckBearingEnabled: Bool = false
-  
-  @objc
-  public var pulsing: NSDictionary? = nil
-
-  @objc
-  override public func didSetProps(_ props: [String]) {
-    _apply()
-  }
-
-  func imageNameUpdated(_ image: PuckImagePart, _ name: String?) {
-    imageNames[image] = name
-    if let subscription = subscriptions[image] {
-      subscription.cancel()
-      subscriptions.removeValue(forKey: image)
-    }
-    
-    guard let name = name else {
-      imageUpdated(image, nil)
-      return
-    }
-    
-    if let imageManager = imageManager {
-      subscribe(imageManager, image, name)
+    didSet {
+      if let map = self.map { _applySettings(map) }
     }
   }
   
-  func imageUpdated(_ image: PuckImagePart, _ uiImage: UIImage?) {
-    if let uiImage = uiImage {
-      images[image] = uiImage
+  func _applySettings(_ map: RNMBXMapView) {
+    map.location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
+    if (iosShowsUserHeadingIndicator) {
+       #if RNMBX_11
+      map.location.options.puckBearing = .heading
+      #else
+      map.location.options.puckBearingSource = .heading
+      #endif
+      map.location.options.puckBearingEnabled = true
     } else {
-      images.removeValue(forKey: image)
-    }
-    _apply()
-  }
-
-  func toDoubleValue(value: Any?, name: String) -> Value<Double>? {
-    if value == nil {
-      return nil
-    }
-    switch value {
-    case let value as NSNumber:
-      return .constant(value.doubleValue)
-    case let value as Int:
-      return .constant(Double(value))
-    case let value as Double:
-      return .constant(value)
-    case let value as Array<Any>:
-      do {
-        let data = try JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
-        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-        return Value.expression(decodedExpression)
-      } catch {
-        Logger.error("toDoubleValue: \(name): unable to parse as expression \(value) with type: \(type(of:value))")
-        return Value.constant(0.0)
-      }
-    default:
-      Logger.error("toDoubleValue: \(name): has unknown type: \(type(of:value)) \(value) ")
-      return .constant(1.0)
-    }
-  }
-  
-  func _apply() {
-    guard let map = self.map else {
-      return
-    }
-    guard let mapView = map.mapView else {
-      Logger.error("RNMBXNativeUserLocation mapView was nil")
-      return
-    }
-    _apply(mapView)
-  }
-
-  func _apply(_ mapView: MapView) {
-    guard let location = mapView.location else {
-      Logger.error("RNMBXNativeUserLocation location was nil")
-      return
-    }
-
-    if (!visible) {
-      let emptyImage = UIGraphicsImageRenderer(size: CGSize(width: 1, height: 1)).image { _ in }
-      location.options.puckType = .puck2D(
-        Puck2DConfiguration(
-          topImage: emptyImage,
-          bearingImage: emptyImage,
-          shadowImage: emptyImage,
-          scale: Value.constant(1.0)
-        )
-      )
-      return
-    } else {
-      var configuration : Puck2DConfiguration = images.isEmpty ?
-        .makeDefault(showBearing: puckBearingEnabled) : Puck2DConfiguration(
-          topImage: self.images[.top],
-          bearingImage: self.images[.bearing],
-          shadowImage: self.images[.shadow])
-      
-      if let scale = toDoubleValue(value: scale, name: "scale") {
-        configuration.scale = scale
-      }
-      
-      if let pulsing = pulsing {
-        if let kind = pulsing["kind"] as? String, kind == "default" {
-          configuration.pulsing = .default
-        } else {
-          var pulsingConfig = Puck2DConfiguration.Pulsing()
-          if let isEnabled = pulsing["isEnabled"] as? Bool {
-            pulsingConfig.isEnabled = isEnabled
-          }
-          
-          if let radius = pulsing["radius"] as? String {
-            if radius == "accuracy" {
-              pulsingConfig.radius = .accuracy
-            } else {
-              Logger.log(level: .error, message: "expected pulsing/radius to be either a number or accuracy but was \(radius)")
-            }
-          } else if let radius = pulsing["radius"] as? NSNumber {
-            pulsingConfig.radius = .constant(radius.doubleValue)
-          }
-          
-          if let color = pulsing["color"] as? Any {
-            if let uicolor = RCTConvert.uiColor(color) {
-              pulsingConfig.color = uicolor
-            } else {
-              Logger.log(level: .error, message: "expected color to be a color but was \(color)")
-            }
-          }
-          
-          configuration.pulsing = pulsingConfig
-        }
-      }
-      location.options.puckType = .puck2D(configuration)
-    }
-    location.options.puckBearingEnabled = puckBearingEnabled
-    if let puckBearing = _puckBearing {
-      location.options.puckBearing = puckBearing
+      map.location.options.puckBearingEnabled = false
     }
   }
 
   func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
- 
-    _fetchImages(map)
-    _apply()
+    _applySettings(map)
   }
 
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    if let location = map.mapView.location {
-      location.options.puckType = nil
-      location.options.puckType = .none
-    } else {
-      Logger.error("RNMBXNativeUserLocation.removeFromMap: location is nil")
+    map.location.options.puckType = nil
+    guard let mapboxMap = map.mapboxMap else {
+      return true
     }
-    removeSubscriptions()
+    let style = mapboxMap.style
+    map.location.options.puckType = .none
     self.map = nil
 
     return true
@@ -238,44 +50,3 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
     return true
   }
 }
-
-// MARK: fetch images and subscribe on updates
-
-extension RNMBXNativeUserLocation {
-  func subscribe(_ imageManager: ImageManager, _ image: PuckImagePart, _ name: String) {
-    if let subscription = subscriptions[image] {
-      subscription.cancel()
-      subscriptions[image] = nil
-      Logger.error("RNMBXNativeUserLocation.subscribe: there is already a subscription for image: \(image)")
-    }
-
-    subscriptions[image] = imageManager.subscribe(name: name) { name, uiImage in
-      self.imageUpdated(image, uiImage)
-    }
-  }
-
-  func removeSubscriptions() {
-    self.subscriptions.forEach { (part,subscription) in
-      subscription.cancel()
-    }
-    self.subscriptions.removeAll()
-  }
-
-  func _fetchImages(_ map: RNMBXMapView) {
-    if let style = map.mapView?.mapboxMap?.style {
-      imageNames.forEach { (part, name) in
-        if style.imageExists(withId: name), let image = style.image(withId: name) {
-          images[part] = image
-        }
-      }
-    }
-
-    let imageManager = map.imageManager
-    removeSubscriptions()
-    self.imageManager = imageManager
-    imageNames.forEach { (part,name) in
-      subscribe(imageManager, part, name)
-    }
-  }
-
-}

package/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm

@@ -2,7 +2,6 @@
 
 #import "RNMBXNativeUserLocationComponentView.h"
 #import "RNMBXFabricHelpers.h"
-#import "RNMBXFabricPropConvert.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -54,21 +53,13 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &oldViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*oldProps);
-  const auto &newViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
-
-  RNMBX_OPTIONAL_PROP_NSString(puckBearing)
-  RNMBX_OPTIONAL_PROP_BOOL(puckBearingEnabled)
-  RNMBX_OPTIONAL_PROP_NSString(bearingImage)
-  RNMBX_OPTIONAL_PROP_NSString(shadowImage)
-  RNMBX_OPTIONAL_PROP_NSString(topImage)
-  RNMBX_OPTIONAL_PROP_ExpressionDouble(scale)
-  RNMBX_PROP_BOOL(visible)
-  RNMBX_OPTIONAL_PROP_NSDictionary(pulsing)
-
+  const auto &newProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
+    id iosShowsUserHeadingIndicator = RNMBXConvertFollyDynamicToId(newProps.iosShowsUserHeadingIndicator);
+    if (iosShowsUserHeadingIndicator != nil) {
+        _view.iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;
+    }
+    
   [super updateProps:props oldProps:oldProps];
-
-  [_view didSetProps:@[]];
 }
 
 @end

package/ios/RNMBX/RNMBXNativeUserLocationViewManager.m

@@ -4,14 +4,6 @@
 @interface RCT_EXTERN_REMAP_MODULE(RNMBXNativeUserLocation, RNMBXNativeUserLocationViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL);
-RCT_EXPORT_VIEW_PROPERTY(topImage, NSString);
-RCT_EXPORT_VIEW_PROPERTY(bearingImage, NSString);
-RCT_EXPORT_VIEW_PROPERTY(shadowImage, NSString);
-RCT_EXPORT_VIEW_PROPERTY(scale, NSArray);
-RCT_EXPORT_VIEW_PROPERTY(visible, BOOL);
-RCT_EXPORT_VIEW_PROPERTY(puckBearing, NSString);
-RCT_EXPORT_VIEW_PROPERTY(puckBearingEnabled, BOOL);
-RCT_EXPORT_VIEW_PROPERTY(pulsing, NSDictionary);
 
 @end
 

package/ios/RNMBX/RNMBXOfflineModule.m

@@ -31,4 +31,4 @@ RCT_EXTERN_METHOD(migrateOfflineCache:(RCTPromiseResolveBlock)resolve reject:(RC
 
 RCT_EXTERN_METHOD(resetDatabase:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
-@end
+@end

package/ios/RNMBX/RNMBXPointAnnotation.swift

@@ -155,39 +155,6 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
     return image
   }
   
-  func makeEvent(isSelect: Bool, deselectAnnotationOnMapTap: Bool = false) -> RNMBXEvent {
-    let position = superview?.convert(layer.position, to: nil)
-    let location = map?.mapboxMap.coordinate(for: position!)
-    var geojson = Feature(geometry: .point(Point(location!)))
-    geojson.identifier = .string(id)
-    var properties : [String: JSONValue?] = [
-      "screenPointX": .number(Double(position!.x)),
-      "screenPointY": .number(Double(position!.y))
-    ]
-    if deselectAnnotationOnMapTap {
-      properties["deselectAnnotationOnMapTap"] = true
-    }
-    geojson.properties = properties
-    let event = RNMBXEvent(type:isSelect ? .annotationSelected : .annotationDeselected, payload: logged("doHandleTap") { try geojson.toJSON() })
-    return event
-  }
-  
-  func doSelect() {
-    let event = makeEvent(isSelect: true)
-    if let onSelected = onSelected {
-      onSelected(event.toJSON())
-    }
-    onSelect()
-  }
-  
-  func doDeselect(deselectAnnotationOnMapTap: Bool = false) {
-    let event = makeEvent(isSelect: false, deselectAnnotationOnMapTap: deselectAnnotationOnMapTap)
-    if let onDeselected = onDeselected {
-      onDeselected(event.toJSON())
-    }
-    onDeselect()
-  }
-  
   func onSelect() {
     if let callout = callout,
        let calloutImage = _createViewSnapshot(view: callout),
@@ -285,7 +252,7 @@ extension RNMBXPointAnnotation {
         && annotation.point.coordinates.isValid()
         && (logged("PointAnnotation: missing id attribute") { return id }) != nil,
         let pointAnnotationManager = map?.pointAnnotationManager {
-      pointAnnotationManager.add(annotation, self)
+      pointAnnotationManager.add(annotation)
       added = true
       return true
     }