@rnmapbox/maps 10.0.15-rc.1 → 10.1.0-beta.2

package/ios/RCTMGL-v10/MBXMapViewModule.mm

@@ -0,0 +1,167 @@
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
+
+#import "MBXMapViewModule.h"
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "MBXMapViewComponentView.h"
+#endif // RCT_NEW_ARCH_ENABLED
+
+// needed for compilation for some reason
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+@interface MapView : UIView
+@end
+
+#import <rnmapbox_maps-Swift.h>
+
+
+@implementation MBXMapViewModule
+
+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
+{
+  // It seems that due to how UIBlocks work with uiManager, we need to call the methods there
+  // for the blocks to be dispatched before the batch is completed
+  return RCTGetUIManagerQueue();
+}
+
+- (void)withMapView:(NSNumber*)viewRef block:(void (^)(MBXMapView *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+{
+//    void (^upperBlock)(void) = ^{
+#ifdef RCT_NEW_ARCH_ENABLED
+    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
+        MBXMapViewComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
+        MBXMapView *view = componentView.contentView;
+        
+#else
+    [self.bridge.uiManager
+     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        MBXMapView *view = [uiManager viewForReactTag:viewRef];
+#endif // RCT_NEW_ARCH_ENABLED
+        if (view != nil) {
+           block(view);
+        } else {
+            reject(methodName, [NSString stringWithFormat:@"Unknown reactTag: %@", viewRef], nil);
+        }
+    }];
+//        [self.bridge performSelector:@selector(batchDidComplete) withObject:self.bridge];
+//    };
+//      if (self.bridge) {
+//        dispatch_async(RCTGetUIManagerQueue(), upperBlock);
+//      } else {
+//        dispatch_async(dispatch_get_main_queue(), upperBlock);
+//      }
+}
+
+
+RCT_EXPORT_METHOD(takeSnap:(NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager takeSnap:view writeToDisk:writeToDisk resolver:resolve];
+    } reject:reject methodName:@"takeSnap"];
+}
+
+RCT_EXPORT_METHOD(clearData:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager clearData:view resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"clearData"];
+}
+
+
+RCT_EXPORT_METHOD(getCenter:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager getCenter:view resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getCenter"];
+}
+
+
+RCT_EXPORT_METHOD(getCoordinateFromView:(NSNumber*)viewRef atPoint:(NSArray *)atPoint resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        NSNumber* a = [atPoint objectAtIndex:0];
+        NSNumber* b = [atPoint objectAtIndex:1];
+        
+        [MBXMapViewManager getCoordinateFromView:view atPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getCoordinateFromView"];
+}
+
+
+RCT_EXPORT_METHOD(getPointInView:(nonnull NSNumber*)viewRef atCoordinate:(NSArray *)atCoordinate resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager getPointInView:view atCoordinate:atCoordinate resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getPointInView"];
+}
+
+
+RCT_EXPORT_METHOD(getVisibleBounds:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager getVisibleBounds:view resolver:resolve];
+    } reject:reject methodName:@"getVisibleBounds"];
+}
+
+
+RCT_EXPORT_METHOD(getZoom:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager getZoom:view resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getZoom"];
+}
+
+
+RCT_EXPORT_METHOD(queryRenderedFeaturesAtPoint:(nonnull NSNumber*)viewRef atPoint:(nonnull NSArray *)atPoint withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager queryRenderedFeaturesAtPoint:view atPoint:atPoint withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"queryRenderedFeaturesAtPoint"];
+}
+
+
+RCT_EXPORT_METHOD(queryRenderedFeaturesInRect:(nonnull NSNumber*)viewRef withBBox:(NSArray *)withBBox withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager queryRenderedFeaturesInRect:view withBBox:withBBox withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"queryRenderedFeaturesInRect"];
+}
+
+
+RCT_EXPORT_METHOD(queryTerrainElevation:(nonnull NSNumber*)viewRef coordinates:(NSArray *)coordinates resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager queryTerrainElevation:view coordinates:coordinates resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"queryTerrainElevation"];
+}
+
+
+RCT_EXPORT_METHOD(setHandledMapChangedEvents:(nonnull NSNumber*)viewRef events:(NSArray *)events resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager setHandledMapChangedEvents:view events:events resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"setHandledMapChangedEvents"];
+}
+
+
+RCT_EXPORT_METHOD(setSourceVisibility:(nonnull NSNumber*)viewRef visible:(BOOL)visible sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager setSourceVisibility:view visible:visible sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"setSourceVisibility"];
+}
+
+RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSString*)sourceId withFilter:(NSArray<id>*)withFilter withSourceLayerIDs:(NSArray<NSString*>*)withSourceLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(MBXMapView *view) {
+        [MBXMapViewManager querySourceFeatures:view withSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject];
+    } 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:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeMapViewModuleSpecJSI>(params);
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
+@end

package/ios/RCTMGL-v10/MGLModule.swift

@@ -1,13 +1,25 @@
 import Foundation
 import MapboxMaps
+#if canImport(MapboxMobileEvents)
 import MapboxMobileEvents
+#endif
 
 
 let DEFAULT_SOURCE_ID = "composite";
 
 @objc(MGLModule)
 class MGLModule : NSObject {
-  static var accessToken : String?
+  #if RNMBX_11
+  static var accessToken : String? {
+    didSet {
+      if let token = accessToken {
+        MapboxOptions.accessToken = token
+      }
+    }
+  }
+  #else
+    static var accessToken : String?
+  #endif
     
   @objc
   func constantsToExport() -> [AnyHashable: Any]! {
@@ -91,7 +103,9 @@ class MGLModule : NSObject {
   }
   
   @objc func setTelemetryEnabled(_ telemetryEnabled: Bool) {
+    #if !RNMBX_11 // RNMBX_11_TODO
     UserDefaults.mme_configuration().mme_isCollectionEnabled = telemetryEnabled
+    #endif
   }
 
   @objc func setWellKnownTileServer(_ tileServer: String) {

package/ios/RCTMGL-v10/MGLSnapshotModule.swift

@@ -93,13 +93,19 @@ class MGLSnapshotModule : NSObject {
           let height = jsOptions["height"] as? NSNumber else {
       throw RCTMGLError.paramError("width, height: is not a number")
     }
-    
+    #if RNMBX_11
+    let mapSnapshotOptions = MapSnapshotOptions(
+      size: CGSize(width: width.doubleValue, height: height.doubleValue),
+      pixelRatio: 1.0
+    )
+    #else
     let resourceOptions = ResourceOptions(accessToken: MGLModule.accessToken!)
     let mapSnapshotOptions = MapSnapshotOptions(
       size: CGSize(width: width.doubleValue, height: height.doubleValue),
       pixelRatio: 1.0,
       resourceOptions: resourceOptions
     )
+    #endif
     
     return mapSnapshotOptions
   }

package/ios/RCTMGL-v10/RCTMGLAtmosphere.swift

@@ -1,5 +1,9 @@
 import MapboxMaps
 
+#if RNMBX_11
+typealias Style = StyleManager
+#endif
+
 @objc(RCTMGLAtmosphere)
 class RCTMGLAtmosphere : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceConsumer {
   var atmosphere : Atmosphere? = nil

package/ios/RCTMGL-v10/RCTMGLBackgroundLayer.swift

@@ -5,10 +5,11 @@ class RCTMGLBackgroundLayer: RCTMGLLayer {
   typealias LayerType = BackgroundLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
     var layer = LayerType(id: self.id!)
+    #if !RNMBX_11
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
+    #endif
     return layer
   }
 

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -2,6 +2,15 @@ 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
+
 enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
 }
@@ -279,16 +288,26 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
 
       if let locationModule = RCTMGLLocationModule.shared {
         var isSameProvider = false
+        #if !RNMBX_11
         if let currentProvider = map.location.locationProvider as? AnyObject, let newProvider = locationModule.locationProvider as? AnyObject {
           if currentProvider === newProvider {
             isSameProvider = true
           }
         }
+        #endif
         if !isSameProvider {
+          #if RNMBX_11
+          map.location.override(provider: locationModule.locationProvider)
+          #else
           map.location.overrideLocationProvider(with: locationModule.locationProvider)
+          #endif
         }
       }
+      #if RNMBX_11
+      // RNMBX_11_TODO
+      #else
       map.location.locationProvider.requestWhenInUseAuthorization()
+      #endif
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
       switch userTrackingMode {
@@ -427,7 +446,11 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       }
       
       withMapView { map in
+        #if RNMBX_11
+        let bounds = [sw, ne]
+        #else
         let bounds = CoordinateBounds(southwest: sw, northeast: ne)
+        #endif
         let camera = map.mapboxMap.camera(
           for: bounds,
           padding: padding,

package/ios/RCTMGL-v10/RCTMGLCircleLayer.swift

@@ -7,7 +7,11 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
 
   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

package/ios/RCTMGL-v10/RCTMGLFillExtrustionLayer.swift

@@ -6,7 +6,11 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source:sourceID!)
+    #else
     var layer = LayerType(id: self.id!)
+    #endif
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
     return layer

package/ios/RCTMGL-v10/RCTMGLFillLayer.swift

@@ -6,7 +6,11 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer: Layer = FillLayer(id: self.id!, source: sourceID!)
+    #else
     var layer: Layer = FillLayer(id: self.id!)
+    #endif
     
     setOptions(&layer)
     

package/ios/RCTMGL-v10/RCTMGLHeatmapLayer.swift

@@ -6,8 +6,11 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer: Layer = LayerType(id: self.id!, source: self.sourceID!)
+    #else
     var layer: Layer = LayerType(id: self.id!)
-    
+    #endif
     setOptions(&layer)
     
     return layer

package/ios/RCTMGL-v10/RCTMGLImageSource.swift

@@ -35,7 +35,11 @@ class RCTMGLImageSource : RCTMGLSource {
 
   override func makeSource() -> Source
   {
+    #if RNMBX_11
+    var result = ImageSource(id: self.id)
+    #else
     var result = ImageSource()
+    #endif
     if let url = url {
       result.url = url
     }

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -4,6 +4,18 @@ protocol RCTMGLImageSetter : AnyObject {
   func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
 }
 
+func hasImage(style: Style, name: String) -> Bool {
+  #if RNMBX_11
+  return style.imageExists(withId: name)
+  #else
+  return (style.styleManager.getStyleImage(forImageId: name) != nil)
+  #endif
+}
+
+#if RNMBX_11
+typealias StyleImageMissingPayload = StyleImageMissing
+#endif
+
 class RCTMGLImages : UIView, RCTMGLMapComponent {
   
   weak var bridge : RCTBridge! = nil
@@ -104,7 +116,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
         if !sameImage(oldValue: oldImages[name], newValue: images[name]) {
           missingImages[name] = images[name]
         } else {
-          if style.styleManager.getStyleImage(forImageId: name) == nil {
+          if !hasImage(style: style, name: name) {
             logged("RCTMGLImages.addImagePlaceholder") {
               try? style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
@@ -231,7 +243,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
     for imageInfo in nativeImages {
       let imageName = imageInfo.name
-      if style.styleManager.getStyleImage(forImageId: imageInfo.name) == nil {
+      if !hasImage(style: style, name: imageInfo.name) {
         if let image = UIImage(named: imageName) {
           logged("RCTMGLImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -5,6 +5,14 @@ protocol RCTMGLSourceConsumer : class {
   func removeFromMap(_ map: RCTMGLMapView, style: Style)
 }
 
+func styleLayerExists(_ style: Style, id: String) -> Bool {
+  #if RNMBX_11
+  return style.layerExists(withId: id)
+  #else
+  return style.styleManager.styleLayerExists(forLayerId: id)
+  #endif
+}
+
 @objc(RCTMGLLayer)
 class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   weak var bridge : RCTBridge? = nil
@@ -129,7 +137,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     addStyles()
     if let style = style,
       let map = map {
-      if style.styleManager.styleLayerExists(forLayerId: id) {
+      if styleLayerExists(style, id: id) {
         self.updateLayer(map)
       }
     }
@@ -215,7 +223,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
 
     do {
-      if (style.styleManager.styleLayerExists(forLayerId: id)) {
+      if (styleLayerExists(style,id: id)) {
         styleLayer = try findLayer(style: style, id: id)
         existingLayer = true
       } else {
@@ -244,14 +252,25 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     removeFromMap(style)
   }
   
+  func setBaseOptions<T: Layer>(_ layer: inout T) {
+    if let minZoom = minZoomLevel {
+      layer.minZoom = minZoom.doubleValue
+    }
+    
+    if let maxZoom = maxZoomLevel {
+      layer.maxZoom = maxZoom.doubleValue
+    }
+  }
+  
   func setOptions(_ layer: inout Layer) {
+    setBaseOptions(&layer)
+    #if !RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
     }
     
     if let sourceID = sourceID {
       if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
-        
         layer.source = sourceID
       }
     }
@@ -265,14 +284,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    
-    if let minZoom = minZoomLevel {
-      layer.minZoom = minZoom.doubleValue
-    }
-    
-    if let maxZoom = maxZoomLevel {
-      layer.maxZoom = maxZoom.doubleValue
-    }
+    #endif
   }
   
   private func optionsChanged() {
@@ -341,3 +353,15 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     return true
   }
 }
+
+#if RNMBX_11
+protocol LayerWithSource : Layer {
+  var source: String? { get set }
+  var sourceLayer: String? { get set }
+  var filter: Expression? { get set}
+}
+#else
+protocol LayerWithSource : Layer {
+  
+}
+#endif

package/ios/RCTMGL-v10/RCTMGLLight.swift

@@ -1,4 +1,8 @@
-import MapboxMaps
+@_spi(Experimental) import MapboxMaps
+
+#if RNMBX_11
+typealias Light = FlatLight
+#endif
 
 @objc(RCTMGLLight)
 class RCTMGLLight: UIView, RCTMGLMapComponent {
@@ -17,9 +21,15 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
   }
   
   func apply(light: Light) {
-    let lightData = try! JSONEncoder().encode(light)
-    let lightDictionary = try! JSONSerialization.jsonObject(with: lightData)
-    try! self.map.style.setLight(properties: lightDictionary as! [String:Any])
+    logged("RCTMGLLight.apply") {
+#if RNMBX_11
+      try self.map.setLights(light)
+#else
+      let lightData = try JSONEncoder().encode(light)
+      let lightDictionary = try JSONSerialization.jsonObject(with: lightData)
+      try self.map.style.setLight(properties: lightDictionary as! [String:Any])
+#endif
+    }
   }
 
   func addStyles() {

package/ios/RCTMGL-v10/RCTMGLLineLayer.swift

@@ -6,7 +6,11 @@ class RCTMGLLineLayer: RCTMGLVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
     var layer = LayerType(id: self.id!)
+    #endif
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
     return layer

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -1,6 +1,8 @@
 import Foundation
 import MapboxMaps
 
+#if !RNMBX_11
+
 @objc(RCTMGLLocation)
 class RCTMGLLocation: NSObject {
   var location : CLLocation = CLLocation(latitude: 0.0, longitude: 0.0)
@@ -32,6 +34,10 @@ let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
 /// This implementation of LocationProviderDelegate is used by `LocationManager` to work around
 /// the fact that the `LocationProvider` API does not allow the delegate to be set to `nil`.
 internal class EmptyLocationProviderDelegate: LocationProviderDelegate {
+    #if RNMBX_11
+    func onLocationUpdateReceived(for locations: [Location]) {}
+    #endif
+  
     func locationProvider(_ provider: LocationProvider, didFailWithError error: Error) {}
     func locationProvider(_ provider: LocationProvider, didUpdateHeading newHeading: CLHeading) {}
     func locationProvider(_ provider: LocationProvider, didUpdateLocations locations: [CLLocation]) {}
@@ -44,6 +50,18 @@ protocol LocationProviderRCTMGLDelegate : AnyObject {
 
 class RCTMGLAppleLocationProvider: NSObject {
     private var locationProvider: CLLocationManager
+  
+  #if RNMBX_11
+    private var observers : [LocationObserver] = []
+    private var privateAppleLocationProviderOptions: AppleLocationProvider.Options {
+        didSet {
+            locationProvider.distanceFilter = privateAppleLocationProviderOptions.distanceFilter
+            locationProvider.desiredAccuracy = privateAppleLocationProviderOptions.desiredAccuracy
+            locationProvider.activityType = privateAppleLocationProviderOptions.activityType
+        }
+    }
+    private var privateLocationProviderOptions: LocationOptions
+  #else
     private var privateLocationProviderOptions: LocationOptions {
         didSet {
             locationProvider.distanceFilter = privateLocationProviderOptions.distanceFilter
@@ -52,6 +70,7 @@ class RCTMGLAppleLocationProvider: NSObject {
         }
     }
     private weak var delegate: LocationProviderDelegate?
+  #endif
 
     public var headingOrientation: CLDeviceOrientation {
         didSet { locationProvider.headingOrientation = headingOrientation }
@@ -59,6 +78,9 @@ class RCTMGLAppleLocationProvider: NSObject {
 
     public override init() {
         locationProvider = CLLocationManager()
+      #if RNMBX_11
+        privateAppleLocationProviderOptions = AppleLocationProvider.Options()
+      #endif
         privateLocationProviderOptions = LocationOptions()
         headingOrientation = locationProvider.headingOrientation
         super.init()
@@ -67,6 +89,20 @@ class RCTMGLAppleLocationProvider: NSObject {
 }
 
 extension RCTMGLAppleLocationProvider: LocationProvider {
+  #if RNMBX_11
+    func addLocationObserver(for observer: LocationObserver) {
+      observers.append(observer)
+    }
+    
+    func removeLocationObserver(for observer: LocationObserver) {
+      observers.removeAll { $0 === observer }
+    }
+    
+    func getLastObservedLocation() -> Location? {
+      locationProvider.location
+    }
+  #endif
+  
 
     public var locationProviderOptions: LocationOptions {
         get { privateLocationProviderOptions }
@@ -132,22 +168,38 @@ extension RCTMGLAppleLocationProvider: LocationProvider {
 }
 
 extension RCTMGLAppleLocationProvider: CLLocationManagerDelegate {
-    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        delegate?.locationProvider(self, didUpdateLocations: locations)
-    }
+  public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+  #if RNMBX_11
+    observers.forEach { $0.onLocationUpdateReceived(for: locations) }
+  #else
+    delegate?.locationProvider(self, didUpdateLocations: locations)
+  #endif
+  }
 
-    public func locationManager(_ manager: CLLocationManager, didUpdateHeading heading: CLHeading) {
-        delegate?.locationProvider(self, didUpdateHeading: heading)
-    }
+    public func locationManager(_ manager: CLLocationManager, didUpdateHeading heading: CLHeading)
+  {
+    #if RNMBX_11
+      
+    #else
+      delegate?.locationProvider(self, didUpdateHeading: heading)
+    #endif
+  }
 
-    public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        delegate?.locationProvider(self, didFailWithError: error)
-    }
+  public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+    #if RNMBX_11
+      
+    #else
+      delegate?.locationProvider(self, didFailWithError: error)
+    #endif
+  }
 
     @available(iOS 14.0, *)
-    public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        delegate?.locationProviderDidChangeAuthorization(self)
-    }
+  public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+    #if RNMBX_11
+    #else
+      delegate?.locationProviderDidChangeAuthorization(self)
+    #endif
+  }
 
     public func locationManagerShouldDisplayHeadingCalibration(_ manager: CLLocationManager) -> Bool {
         guard let calibratingDelegate = delegate as? CalibratingLocationProviderDelegate else {
@@ -573,4 +625,5 @@ class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
   }
 }
 
+#endif