@rnmapbox/maps 10.1.0 → 10.1.1

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXViewportModuleSpec.java

@@ -0,0 +1,49 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.rnmapbox.rnmbx;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public abstract class NativeRNMBXViewportModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNMBXViewportModule";
+
+  public NativeRNMBXViewportModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getState(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void transitionTo(@Nullable Double viewRef, ReadableMap state, ReadableMap transition, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void idle(@Nullable Double viewRef, Promise promise);
+}

package/ios/RNMBX/CommonLayerProperties.H

@@ -10,4 +10,6 @@ RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber);
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
 
+RCT_EXPORT_VIEW_PROPERTY(slot, NSString);
+
 

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -46,23 +46,16 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
+  #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
     customHeaders.forEach {(key,value) in
       download.request.headers[key] = value
     }
     return download
   }
+  #endif
 
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
-  
-  #if RNMBX_11
-  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
-    customHeaders.forEach {(key,value) in
-      upload.headers[key] = value
-    }
-    return upload
-  }
-  #endif
 }

package/ios/RNMBX/ImageManager.swift

@@ -0,0 +1,41 @@
+import MapboxMaps
+/**
+  ImageManager helps to resolve images defined by any of RNMBXImages component.
+ */
+class ImageManager {
+  typealias Resolver = (String, UIImage) -> Void
+  var subscriptions: [String: [Subscription]] = [:]
+  
+  class Subscription : Cancelable {
+    var name: String
+    var resolved: Resolver
+    weak var manager: ImageManager?
+    
+    init(name: String, resolved: @escaping Resolver) {
+      self.name = name
+      self.resolved = resolved
+    }
+    
+    func cancel() {
+      manager?.unsubscript(subscription: self)
+    }
+  }
+  
+  func subscribe(name: String, resolved: @escaping Resolver) -> Subscription {
+    var subscription = Subscription(name: name, resolved: resolved)
+    var list = subscriptions[name] ?? []
+    list.append(subscription)
+    subscriptions[name] = list
+    return subscription
+  }
+  
+  func unsubscript(subscription: Subscription) {
+    var list = subscriptions[subscription.name] ?? []
+    list.removeAll { $0 === subscription }
+    subscriptions[subscription.name] = list
+  }
+
+  func resolve(name: String, image: UIImage) {
+    subscriptions[name]?.forEach { $0.resolved(name, image) }
+  }
+}

package/ios/RNMBX/RNMBXCamera.swift

@@ -42,11 +42,11 @@ struct CameraUpdateItem {
       }
       switch mode {
         case .flight:
-          map.camera.fly(to: camera, duration: duration)
+        map.mapView.camera.fly(to: camera, duration: duration)
         case .ease:
-          map.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
+        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
         case .linear:
-          map.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
+        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
         default:
           map.mapboxMap.setCamera(to: camera)
       }
@@ -524,7 +524,7 @@ open class RNMBXCamera : RNMBXMapComponentBase {
       return false
     }
 
-    map.viewport.removeStatusObserver(self)
+    map.mapView.viewport.removeStatusObserver(self)
     return super.removeFromMap(map, reason:reason)
   }
 }

package/ios/RNMBX/RNMBXCustomLocationProvider.swift

@@ -0,0 +1,274 @@
+import MapboxMaps
+
+@objc
+public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
+  var map: RNMBXMapView? = nil
+  
+  let changes : PropertyChanges<RNMBXCustomLocationProvider> = PropertyChanges()
+  
+  enum Property: String {
+    case coordinate
+    case heading
+    
+    func apply(locationProvider: RNMBXCustomLocationProvider) {
+      switch self {
+        case .coordinate: locationProvider.applyCoordinate()
+        case .heading: locationProvider.applyHeading()
+      }
+    }
+  }
+  
+  @objc
+  public var coordinate: [Double] = [] {
+    didSet { changed(.coordinate) }
+  }
+    
+  @objc
+  public var heading: NSNumber = 0.0 {
+    didSet { changed(.heading) }
+  }
+  
+  func changed(_ property: Property) {
+    changes.add(name: property.rawValue, update: property.apply)
+  }
+  
+  @objc
+  override public func didSetProps(_ props: [String]) {
+    changes.apply(self)
+  }
+  
+  var customLocationProvider: CustomLocationProvider? = nil
+  #if RNMBX_11
+  #else
+  var defaultLocationProvider: LocationProvider?
+  #endif
+
+  func addToMap(_ map: RNMBXMapView, style: Style) {
+    self.map = map
+    if let mapView = map.mapView {
+      installCustomeLocationProviderIfNeeded(mapView: mapView)
+    }
+  }
+  
+  private func applyCoordinate() {
+    updateCoordinate(latitude: coordinate[1], longitude: coordinate[0])
+  }
+  
+  private func applyHeading() {
+    updateHeading(heading: heading.doubleValue)
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    if let mapView = map.mapView {
+      removeCustomLocationProvider(mapView: mapView)
+    }
+    self.map = nil
+    return true
+  }
+
+  func waitForStyleLoad() -> Bool {
+    false
+  }
+}
+
+#if RNMBX_11
+// MARK: V11 location provider
+extension RNMBXCustomLocationProvider {
+  func installCustomeLocationProviderIfNeeded(mapView: MapView) {
+    if (customLocationProvider == nil) {
+      let customLocationProvider = CustomLocationProvider()
+      self.customLocationProvider = customLocationProvider
+      
+      if let locationModule = RNMBXLocationModule.shared {
+        locationModule.locationProvider = customLocationProvider
+        locationModule.override(for: mapView.location)
+        //locationModule.locationProvider = customLocationProvider
+        // mapView.location.overrideLocationProvider(with: customLocationProvider!)
+      }
+      
+      // customHeadingProvider = CustomHeadingProvider()
+      mapView.location.override(locationProvider: customLocationProvider, headingProvider: customLocationProvider)
+    }
+  }
+  
+  func removeCustomLocationProvider(mapView: MapView) {
+    mapView.location.override(provider: AppleLocationProvider())
+    if let locationModule = RNMBXLocationModule.shared {
+      locationModule.locationProvider = AppleLocationProvider()
+    }
+    customLocationProvider = nil
+  }
+  
+  func updateCoordinate(latitude: Double, longitude: Double) {
+    customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
+  }
+  
+  func updateHeading(heading: Double) {
+    customLocationProvider?.setHeading(heading: NSNumber(floatLiteral: heading))
+  }
+}
+#else
+// MARK: V10 location provider
+extension RNMBXCustomLocationProvider {
+  func installCustomeLocationProviderIfNeeded(mapView: MapView) {
+    if (customLocationProvider == nil) {
+      if (defaultLocationProvider == nil) {
+        defaultLocationProvider = mapView.location.locationProvider
+      }
+      let customLocationProvider = CustomLocationProvider()
+      self.customLocationProvider = customLocationProvider
+      if let locationModule = RNMBXLocationModule.shared {
+        locationModule.override(for: mapView.location)
+        locationModule.locationProvider = customLocationProvider
+        // mapView.location.overrideLocationProvider(with: customLocationProvider!)
+      }
+      
+    }
+  }
+  
+  func removeCustomLocationProvider(mapView: MapView) {
+    if let provider = defaultLocationProvider {
+      mapView.location.overrideLocationProvider(with: provider)
+    }
+    customLocationProvider = nil
+  }
+  
+  func updareCoordinate(latitude: Double, longitude: Double) {
+    customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
+  }
+  
+  func updateCoordinate(latitude: Double, longitude: Double) {
+    customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
+  }
+  
+  func updateHeading(heading: Double) {
+    customLocationProvider?.setHeading(heading: NSNumber(floatLiteral: heading))
+  }
+}
+#endif
+
+
+#if RNMBX_11
+class CustomLocationProvider: LocationProvider & HeadingProvider {
+  // MARK: LocationProvider
+  private var observers: NSHashTable<AnyObject> = .weakObjects()
+  private var location: Location? = nil
+
+  func addLocationObserver(for observer: LocationObserver) {
+    observers.add(observer)
+  }
+
+  func removeLocationObserver(for observer: LocationObserver) {
+    observers.remove(observer)
+  }
+
+  func getLastObservedLocation() -> Location? {
+    return location
+  }
+
+  func setLocation(latitude: NSNumber, longitude: NSNumber) {
+    let lat = CLLocationDegrees(truncating: latitude)
+    let lon = CLLocationDegrees(truncating: longitude)
+    self.location = Location(clLocation: CLLocation(latitude: lat, longitude: lon))
+    for observer in observers.allObjects {
+      (observer as? LocationObserver)?.onLocationUpdateReceived(for: [self.location!])
+    }
+  }
+  
+  // MARK: HeadingProvider
+  var latestHeading: Heading?
+  private let headingObservers: NSHashTable<AnyObject> = .weakObjects()
+
+  func add(headingObserver: HeadingObserver) {
+    headingObservers.add(headingObserver)
+  }
+
+  func remove(headingObserver: HeadingObserver) {
+    headingObservers.remove(headingObserver)
+  }
+    
+  func setHeading(heading: NSNumber) {
+    let latestHeading = Heading(direction: CLLocationDirection(truncating: heading), accuracy: CLLocationDirection(truncating: 1))
+    self.latestHeading = latestHeading
+    for observer in headingObservers.allObjects {
+      (observer as? HeadingObserver)?.onHeadingUpdate(latestHeading)
+    }
+  }
+}
+#else
+final public class CustomHeading: CLHeading {
+    private var _magneticHeading: CLLocationDirection = 0
+    
+    public override var trueHeading: CLLocationDirection {
+        get { -1 }
+    }
+    
+    public override var magneticHeading: CLLocationDirection {
+        get { _magneticHeading }
+        set { _magneticHeading = newValue }
+    }
+}
+
+class CustomLocationProvider: LocationProvider {
+    var locationProviderOptions: MapboxMaps.LocationOptions = .init()
+    
+    var authorizationStatus: CLAuthorizationStatus = .authorizedAlways
+    
+    var accuracyAuthorization: CLAccuracyAuthorization = .fullAccuracy
+    
+    var heading: CLHeading?
+    var location: CLLocation?
+    var updateLocation = false
+    var updateHeading = false
+    
+    var locationProviderDelegate: MapboxMaps.LocationProviderDelegate?
+    
+    func setDelegate(_ delegate: MapboxMaps.LocationProviderDelegate) {
+        locationProviderDelegate = delegate
+    }
+    
+    func setLocation(latitude: NSNumber, longitude: NSNumber) {
+        let lat = CLLocationDegrees(truncating: latitude)
+        let lon = CLLocationDegrees(truncating: longitude)
+        self.location = CLLocation(latitude: lat, longitude: lon)
+        if (updateLocation) {
+          locationProviderDelegate?.locationProvider(self, didUpdateLocations: [self.location!])
+        }
+    }
+    
+    func setHeading(heading: NSNumber) {
+        let latestHeading = CustomHeading()
+        latestHeading.magneticHeading = CLLocationDirection(truncating: heading)
+        self.heading = latestHeading
+        if (self.updateHeading) {
+          locationProviderDelegate?.locationProvider(self, didUpdateHeading: self.heading!)
+        }
+    }
+    
+    func requestAlwaysAuthorization() { }
+    
+    func requestWhenInUseAuthorization() { }
+    
+    func requestTemporaryFullAccuracyAuthorization(withPurposeKey purposeKey: String) { }
+    
+    func startUpdatingLocation() {
+        self.updateLocation = true
+    }
+    
+    func stopUpdatingLocation() {
+        self.updateLocation = false
+    }
+    
+    var headingOrientation: CLDeviceOrientation = .unknown
+    
+    func startUpdatingHeading() {
+        self.updateHeading = true
+    }
+    
+    func stopUpdatingHeading() {
+        self.updateHeading = false
+    }
+    
+    func dismissHeadingCalibrationDisplay() { }
+}
+#endif

package/ios/RNMBX/RNMBXCustomLocationProviderComponentView.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 RNMBXCustomLocationProviderComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm

@@ -0,0 +1,67 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXCustomLocationProviderComponentView.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 RNMBXCustomLocationProviderComponentView () <RCTRNMBXCustomLocationProviderViewProtocol>
+@end
+
+@implementation RNMBXCustomLocationProviderComponentView {
+    RNMBXCustomLocationProvider *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXCircleLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXCustomLocationProvider alloc] init];
+  //_view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXCircleLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXCustomLocationProviderCls(void)
+{
+  return RNMBXCustomLocationProviderComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift

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

package/ios/RNMBX/RNMBXCustomLocationProviderViewManager.m

@@ -0,0 +1,10 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXCustomLocationProvider, RNMBXCustomLocationProviderViewManager, RCTViewManager)
+
+// circle layer props
+RCT_EXPORT_VIEW_PROPERTY(coordinate, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(heading, NSNumber)
+
+@end

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?]?) {

package/ios/RNMBX/RNMBXFabricPropConvert.h

@@ -0,0 +1,47 @@
+#pragma once
+
+/**
+ *
+ * 1. Requirest the following prelude
+ * const auto &oldViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*oldProps);
+ * const auto &newViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
+ *
+ * 2. OPTION_PROPS are not set when the prop is undefined/null
+ */
+
+NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSString* propertyName);
+BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propertyName);
+NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName);
+id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSString* propertyName);
+BOOL RNMBXPropConvert_BOOL(const folly::dynamic &dyn, NSString* propertyName);
+NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn, NSString* propertyName);
+
+#define RNMBX_OPTIONAL_PROP_BOOL_NSNumber(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_BOOL_NSNumber(newViewProps.name, @#name); \
+  }
+
+#define RNMBX_OPTIONAL_PROP_BOOL(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
+  }
+
+#define RNMBX_OPTIONAL_PROP_NSString(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_NSString(newViewProps.name, @#name); \
+  }
+
+#define RNMBX_OPTIONAL_PROP_ExpressionDouble(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_ExpressionDouble(newViewProps.name, @#name); \
+  }
+
+#define RNMBX_PROP_BOOL(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name)) { \
+    _view.name = RNMBXPropConvert_BOOL(newViewProps.name, @#name); \
+  }
+
+#define RNMBX_OPTIONAL_PROP_NSDictionary(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name)) { \
+    _view.name = RNMBXPropConvert_Optional_NSDictionary(newViewProps.name, @#name); \
+  }