@rnmapbox/maps 10.1.0-beta.9 → 10.1.0-rc.0

package/ios/RNMBX/RNMBXModelLayerComponentView.mm

@@ -0,0 +1,70 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelLayerComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXModelLayerComponentView () <RCTRNMBXModelLayerViewProtocol>
+@end
+
+@implementation RNMBXModelLayerComponentView {
+    RNMBXModelLayer *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXModelLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXModelLayerProps &>(*props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelLayerCls(void)
+{
+  return RNMBXModelLayerComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXCircleLayerManager.m → RNMBXModelLayerViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXCircleLayerManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModelLayer, RNMBXModelLayerViewManager, RCTViewManager)
 
 // circle layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/RNMBX/RNMBXModelLayerViewManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXModelLayerViewManager)
+class RNMBXModelLayerViewManager: RCTViewManager {
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+  
+    override func view() -> UIView! {
+      let layer = RNMBXModelLayer()
+      layer.bridge = self.bridge
+      return layer
+    }
+}

package/ios/RNMBX/RNMBXModels.swift

@@ -0,0 +1,63 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXModels)
+open class RNMBXModels : UIView, RNMBXMapComponent {
+  var modelIdToUrl: [String: String] = [:]
+  
+  @objc(models)
+  public var models: NSDictionary {
+    set {
+      var newModels: [String: String] = [:]
+      newValue.forEach { (key, value) in
+        if let value = value as? NSDictionary, let key = key as? String {
+          if let uri = value["uri"] as? String {
+            newModels[key] = uri
+          } else if let url = value["url"] as? String {
+            newModels[key] = url
+          } else {
+            Logger.log(level: .error, message: "Unexpected value for model key: \(key) \(value) - no uri or url found")
+          }
+        }
+      }
+      self.modelIdToUrl = newModels
+    }
+    get {
+      Logger.error("RNMBXModels.models.getter not implemented")
+      return NSDictionary()
+    }
+  }
+  
+  func setModels(_ models: NSDictionary) {
+
+  }
+  
+  func addToMap(_ map: RNMBXMapView, style: Style) {
+    modelIdToUrl.forEach { (id, uri) in
+      logged("Models.addStyleModel") {
+        if let link = URL(string: uri), let scheme = link.scheme, let host = link.host,
+            let port = link.port {
+
+          // https://github.com/mapbox/mapbox-maps-ios/issues/2067
+          let uriWithoutQuery = "\(scheme)://\(host):\(port)\(link.path)"
+
+          try style.addStyleModel(modelId: id, modelUri: uriWithoutQuery)
+        } else {
+          try style.addStyleModel(modelId: id, modelUri: uri)
+        }
+      }
+    }
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    modelIdToUrl.forEach { (id, _) in
+      #if RNMBX_11
+      try? map._mapView?.mapboxMap.removeStyleModel(modelId: id)
+      #endif
+    }
+    return true
+  }
+  
+  func waitForStyleLoad() -> Bool {
+    true
+  }
+}

package/ios/RNMBX/RNMBXModelsComponentView.h

@@ -0,0 +1,17 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@interface RNMBXModelsComponentView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsComponentView.mm

@@ -0,0 +1,67 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelsComponentView.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+#import "rnmapbox_maps-Swift.pre.h"
+
+#import "RCTFollyConvert.h"
+#import "RNMBXFabricPropConvert.h"
+
+
+// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support
+using namespace facebook::react;
+
+@implementation RNMBXModelsComponentView {
+    RNMBXModels *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelsProps>();
+    _props = defaultProps;
+    _view = [[RNMBXModels alloc] init];
+    [self prepareView];
+    
+    self.contentView = _view;
+  }
+  
+  return self;
+}
+
+- (void)prepareView
+{
+}
+
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelsComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &oldViewProps = static_cast<const RNMBXModelsProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXModelsProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSDictionary(models);
+  [super updateProps:props oldProps:oldProps];
+}
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelsCls(void)
+{
+  return RNMBXModelsComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsManager.mm

@@ -0,0 +1,9 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModels, RNMBXModelsManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(models, NSDictionary)
+
+@end
+

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/RNMBXNativeUserLocation.swift

@@ -1,46 +1,234 @@
 import MapboxMaps
 
 @objc
-class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
+public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
   weak var map : RNMBXMapView! = nil
+  var imageManager: ImageManager? = nil
   
   let locationLayerId = "location-layer"
 
   var locationLayer : LocationIndicatorLayer? = nil
 
   @objc
-  var iosShowsUserHeadingIndicator : Bool = false {
-    didSet {
-      if let map = self.map { _applySettings(map) }
+  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)
     }
   }
   
-  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 @@ 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.h

@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXNativeUserLocationComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm

@@ -0,0 +1,81 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXNativeUserLocationComponentView.h"
+#import "RNMBXFabricHelpers.h"
+#import "RNMBXFabricPropConvert.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXNativeUserLocationComponentView () <RCTRNMBXNativeUserLocationViewProtocol>
+@end
+
+@implementation RNMBXNativeUserLocationComponentView {
+    RNMBXNativeUserLocation *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXNativeUserLocationProps>();
+    _props = defaultProps;
+      [self prepareView];
+    }
+
+    return self;
+  }
+
+- (void)prepareView
+{
+  _view =  [[RNMBXNativeUserLocation alloc] init];
+  self.contentView = _view;
+}
+
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXNativeUserLocationComponentDescriptor>();
+}
+
+- (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)
+
+  [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXNativeUserLocationCls(void)
+{
+  return RNMBXNativeUserLocationComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXNativeUserLocationViewManager.m

@@ -0,0 +1,17 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@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/{RNMBXNativeUserLocationManager.swift → RNMBXNativeUserLocationViewManager.swift}

@@ -1,5 +1,5 @@
-@objc(RNMBXNativeUserLocationManager)
-class RNMBXNativeUserLocationManager : RCTViewManager {
+@objc(RNMBXNativeUserLocationViewManager)
+class RNMBXNativeUserLocationViewManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true