@rnmapbox/maps 10.1.0 → 10.1.1

package/ios/RNMBX/RNMBXModelsManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXModelsManager)
+public class RNMBXModelsManager : RCTViewManager {
+  @objc
+  public override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+
+  public override func view() -> UIView! {
+    let layer = RNMBXModels()
+    return layer
+  }
+}
+

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,4 +113,28 @@ 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,8 +1,9 @@
 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"
 
@@ -10,37 +11,224 @@ public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
 
   @objc
   public var iosShowsUserHeadingIndicator : Bool = false {
-    didSet {
-      if let map = self.map { _applySettings(map) }
+    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)
     }
   }
   
-  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
+  func imageUpdated(_ image: PuckImagePart, _ uiImage: UIImage?) {
+    if let uiImage = uiImage {
+      images[image] = uiImage
     } else {
-      map.location.options.puckBearingEnabled = false
+      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
     }
   }
 
   func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
-    _applySettings(map)
+ 
+    _fetchImages(map)
+    _apply()
   }
 
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    map.location.options.puckType = nil
-    guard let mapboxMap = map.mapboxMap else {
-      return true
+    if let location = map.mapView.location {
+      location.options.puckType = nil
+      location.options.puckType = .none
+    } else {
+      Logger.error("RNMBXNativeUserLocation.removeFromMap: location is nil")
     }
-    let style = mapboxMap.style
-    map.location.options.puckType = .none
+    removeSubscriptions()
     self.map = nil
 
     return true
@@ -50,3 +238,44 @@ 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,6 +2,7 @@
 
 #import "RNMBXNativeUserLocationComponentView.h"
 #import "RNMBXFabricHelpers.h"
+#import "RNMBXFabricPropConvert.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -53,13 +54,21 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
-    id iosShowsUserHeadingIndicator = RNMBXConvertFollyDynamicToId(newProps.iosShowsUserHeadingIndicator);
-    if (iosShowsUserHeadingIndicator != nil) {
-        _view.iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;
-    }
-    
+  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)
+
   [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
 }
 
 @end

package/ios/RNMBX/RNMBXNativeUserLocationViewManager.m

@@ -4,6 +4,14 @@
 @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/RNMBXOfflineModuleLegacy.m

@@ -0,0 +1,33 @@
+#import "React/RCTBridgeModule.h"
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(RNMBXOfflineModuleLegacy, RCTEventEmitter<RCTBridgeModule>)
+
+RCT_EXTERN_METHOD(getPacks:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(createPack:(NSDictionary *) options resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(resumePackDownload:(NSString *)name
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(pausePackDownload:(NSString *)name
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getPackStatus:(NSString *)name
+                 resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(deletePack:(NSString *)name
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(invalidatePack:(NSString *)name
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(migrateOfflineCache:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(resetDatabase:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
+@end