@rnmapbox/maps 10.2.10 → 10.3.0-beta.1

package/ios/RNMBX/Offline/RNMBXOfflineModule.swift

@@ -31,19 +31,11 @@ class RNMBXOfflineModule: RCTEventEmitter {
   }
   
   lazy var offlineManager : OfflineManager = {
-    #if RNMBX_11
     return OfflineManager()
-    #else
-    return OfflineManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
-  
+
   lazy var offlineRegionManager: OfflineRegionManager = {
-    #if RNMBX_11
     return OfflineRegionManager()
-    #else
-    return OfflineRegionManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
 
   lazy var tileStore : TileStore = {
@@ -363,7 +355,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
     
     let stylePackLoadOptions = StylePackLoadOptions(glyphsRasterizationMode: .ideographsRasterizedLocally, metadata: pack.metadata)!
     
-    #if RNMBX_11
     let threadedOfflineManager = OfflineManager()
     taskGroup.enter()
     let stylePackTask = threadedOfflineManager.loadStylePack(for: styleURI, loadOptions: stylePackLoadOptions) { progress in
@@ -391,20 +382,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
     )
     let tilesetDescriptor = threadedOfflineManager.createTilesetDescriptor(for: descriptorOptions)
     let descriptors = [tilesetDescriptor]
-    #else
-    let descriptorOptions = TilesetDescriptorOptions(
-      styleURI: styleURI,
-      zoomRange: zoomRange,
-      stylePackOptions: stylePackLoadOptions
-    )
-    let descriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
-    let tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets(tilesets: pack.tilesets, zoomRange: zoomRange)
-    let tilesetDescriptor = self.offlineManager.createTilesetDescriptorForTilesetDescriptorOptions(tilesetDescriptorOptions)
-    var descriptors = [descriptor]
-    if (!pack.tilesets.isEmpty) {
-      descriptors.append(tilesetDescriptor)
-    }
-    #endif
     
     let loadOptions = TileRegionLoadOptions(
       geometry: bounds, // RNMBXFeatureUtils.geometryToGeometry(bounds),
@@ -452,11 +429,7 @@ class RNMBXOfflineModule: RCTEventEmitter {
       self.tileRegionPacks[id]!.state = downloadError ? .inactive : .complete
     }
 
-    #if RNMBX_11
     self.tileRegionPacks[id]!.cancelables = [task, stylePackTask]
-    #else
-    self.tileRegionPacks[id]!.cancelables = [task]
-    #endif
   }
   
   func convertRegionsToJSON(regions: [TileRegion], resolve: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

@@ -6,11 +6,7 @@ class RNMBXOfflineModuleLegacy: RCTEventEmitter {
   final let CompleteRegionDownloadState = 2
   
   lazy var offlineRegionManager: OfflineRegionManager = {
-    #if RNMBX_11
     return OfflineRegionManager()
-    #else
-    return OfflineRegionManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
 
   @objc

package/ios/RNMBX/README.md

@@ -1 +1 @@
-iOS v10 code
+iOS native code

package/ios/RNMBX/RNMBXAtmosphere.swift

@@ -1,8 +1,6 @@
 import MapboxMaps
 
-#if RNMBX_11
 public typealias Style = StyleManager
-#endif
 
 @objc(RNMBXAtmosphere)
 public class RNMBXAtmosphere : RNMBXSingletonLayer, RNMBXMapComponent, RNMBXSourceConsumer {

package/ios/RNMBX/RNMBXAtmosphereComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXAtmosphereComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXAtmosphereComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -79,4 +78,3 @@ Class<RCTComponentViewProtocol> RNMBXAtmosphereCls(void)
   return RNMBXAtmosphereComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXBackgroundLayer.swift

@@ -6,10 +6,6 @@ public class RNMBXBackgroundLayer: RNMBXLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     var layer = LayerType(id: self.id!)
-    #if !RNMBX_11
-    layer.sourceLayer = self.sourceLayerID
-    layer.source = sourceID
-    #endif
     return layer
   }
 

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXBackgroundLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -74,4 +73,3 @@ Class<RCTComponentViewProtocol> RNMBXBackgroundLayerCls(void)
   return RNMBXBackgroundLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCalloutComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCalloutComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCalloutComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -60,4 +59,3 @@ Class<RCTComponentViewProtocol> RNMBXCalloutCls(void)
   return RNMBXCalloutComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCamera.swift

@@ -2,14 +2,12 @@ import Foundation
 import MapboxMaps
 import Turf
 
-#if RNMBX_11
 extension NSNumber {
   /// Converts an `NSNumber` to a `CGFloat` value from its `Double` representation.
   internal var CGFloat: CGFloat {
     CoreGraphics.CGFloat(doubleValue)
   }
 }
-#endif
 
 public enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
@@ -368,9 +366,6 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       if let locationModule = RNMBXLocationModule.shared {
         locationModule.override(for: map.location)
       }
-      #if !RNMBX_11
-      map.location.locationProvider.requestWhenInUseAuthorization()
-      #endif
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
       switch userTrackingMode {
@@ -518,11 +513,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
       
       withMapView { map in
-        #if RNMBX_11
         let bounds = [sw, ne]
-        #else
-        let bounds = CoordinateBounds(southwest: sw, northeast: ne)
-        #endif
 
         camera = map.mapboxMap.camera(
           for: bounds,
@@ -604,14 +595,14 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
     return super.removeFromMap(map, mapView: mapView, reason: reason)
   }
 
-  @objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  @objc public func moveBy(x: Double, y: Double, animationMode: Double, animationDuration: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     withMapView { mapView in
       let contentFrame = mapView.bounds.inset(by: mapView.safeAreaInsets)
       let centerPoint = CGPoint(x: contentFrame.midX, y: contentFrame.midY)
       let endCameraPoint = CGPoint(x: centerPoint.x + x, y: centerPoint.y + y)
       let cameraOptions = mapView.mapboxMap.dragCameraOptions(from: centerPoint, to: endCameraPoint)
       
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
 
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -620,7 +611,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 
@@ -631,18 +622,18 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
   @objc public func scaleBy(
     x: Double,
     y: Double,
-    scaleFactor: NSNumber,
-    animationMode: NSNumber?,
-    animationDuration: NSNumber?,
+    scaleFactor: Double,
+    animationMode: Double,
+    animationDuration: Double,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
     withMapView { mapView in
       let currentZoom = mapView.cameraState.zoom
-      let newZoom = currentZoom + log2(scaleFactor.doubleValue)
+      let newZoom = currentZoom + log2(scaleFactor)
       let anchor = CGPoint(x: x, y: y)
       let cameraOptions = CameraOptions(anchor: anchor, zoom: newZoom)
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
         
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -651,7 +642,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 

package/ios/RNMBX/RNMBXCameraComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCameraComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCameraComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -148,4 +147,3 @@ Class<RCTComponentViewProtocol> RNMBXCameraCls(void)
   return RNMBXCameraComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCameraGestureObserver.swift

@@ -25,9 +25,7 @@ public class RNMBXCameraGestureObserver: RNMBXMapComponentBase, GestureManagerDe
   private var timeoutTimer: DispatchSourceTimer? = nil
   private var emittedForCurrentActivity: Bool = false
 
-  #if RNMBX_11
   private var _cancelables = Set<AnyCancelable>()
-  #endif
 
   private var quietMs: Double { (quietPeriodMs?.doubleValue) ?? 200.0 }
   private var maxMs: Double? { maxIntervalMs?.doubleValue }
@@ -43,9 +41,7 @@ public class RNMBXCameraGestureObserver: RNMBXMapComponentBase, GestureManagerDe
     switch gestureType {
     case .pan: return "pan"
     case .pinch: return "pinch"
-    #if RNMBX_11
     case .rotation: return "rotate"
-    #endif
     case .pitch: return "pitch"
     default: return "\(gestureType)"
     }
@@ -145,7 +141,6 @@ public class RNMBXCameraGestureObserver: RNMBXMapComponentBase, GestureManagerDe
 
     guard hasOnMapSteady else { return }
 
-    #if RNMBX_11
     let camera = map.mapView.camera!
 
     // Camera animator lifecycle
@@ -175,14 +170,11 @@ public class RNMBXCameraGestureObserver: RNMBXMapComponentBase, GestureManagerDe
     // Subscribe to gestures as a secondary observer (multicast from RNMBXMapView)
     map.addGestureDelegate(self)
     debugLog("addToMap and subscribed to gestures")
-    #endif
   }
 
   public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    #if RNMBX_11
     _cancelables.forEach { $0.cancel() }
     _cancelables.removeAll()
-    #endif
     map.removeGestureDelegate(self)
     debugLog("removeFromMap and unsubscribed from gestures")
     cancelQuietTimer()

package/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCameraGestureObserverComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -116,4 +115,3 @@ Class<RCTComponentViewProtocol> RNMBXCameraGestureObserverCls(void)
   return RNMBXCameraGestureObserverComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCameraModule.h

@@ -2,18 +2,15 @@
 #import <UIKit/UIKit.h>
 #import "RNMBXViewResolver.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import "rnmapbox_maps_specs.h"
-#else
-#import <React/RCTBridge.h>
-#endif
 
-@interface RNMBXCameraModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>
+@interface RNMBXCameraModule : NSObject <NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>
+@end
+
 #else
-<RCTBridgeModule, RNMBXViewResolverDelegate>
-#endif
 
+@interface RNMBXCameraModule : NSObject
 @end
 
+#endif

package/ios/RNMBX/RNMBXCameraModule.mm

@@ -3,9 +3,7 @@
 #import <React/RCTUIManagerUtils.h>
 
 #import "RNMBXCameraModule.h"
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXCameraComponentView.h"
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import "rnmapbox_maps-Swift.pre.h"
 
@@ -13,9 +11,7 @@
 
 RCT_EXPORT_MODULE();
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-#endif // RCT_NEW_ARCH_ENABLED
 @synthesize bridge = _bridge;
 
 - (dispatch_queue_t)methodQueue
@@ -25,14 +21,11 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-// 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:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
     return std::make_shared<facebook::react::NativeRNMBXCameraModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
@@ -60,8 +53,8 @@ RCT_EXPORT_METHOD(updateCameraStop:(nonnull NSNumber *)viewRef
 RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
                   x:(double)x
                   y:(double)y
-                  animationMode:(nonnull NSNumber *)animationMode
-                  animationDuration:(nonnull NSNumber *)animationDuration
+                  animationMode:(double)animationMode
+                  animationDuration:(double)animationDuration
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
         [self withCamera:viewRef block:^(RNMBXCamera *camera) {
@@ -72,9 +65,9 @@ RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
  RCT_EXPORT_METHOD(scaleBy:(nonnull NSNumber *)viewRef
                    x:(double)x
                    y:(double)y
-                   animationMode:(nonnull NSNumber *)animationMode
-                   animationDuration:(nonnull NSNumber *)animationDuration
-                   scaleFactor:(nonnull NSNumber *)scaleFactor
+                   animationMode:(double)animationMode
+                   animationDuration:(double)animationDuration
+                   scaleFactor:(double)scaleFactor
                    resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject) {
          [self withCamera:viewRef block:^(RNMBXCamera *camera) {

package/ios/RNMBX/RNMBXCircleLayer.swift

@@ -7,11 +7,7 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
-    #if RNMBX_11
     var layer = LayerType(id: self.id!, source: self.sourceID!)
-    #else
-    var layer = LayerType(id: self.id!)
-    #endif
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
     return layer
@@ -26,7 +22,6 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
   func setCommonOptions(_ layer: inout CircleLayer) -> Bool {
     var changed = false
 
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -49,7 +44,6 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
 
     return changed
   }

package/ios/RNMBX/RNMBXCircleLayerComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCircleLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCircleLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -73,4 +72,3 @@ Class<RCTComponentViewProtocol> RNMBXCircleLayerCls(void)
   return RNMBXCircleLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED