@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/ios/{RCTMGL-v10/MBXMapViewManager.swift → RNMBX/RNMBXMapViewManager.swift}

@@ -6,8 +6,8 @@ extension QueriedSourceFeature {
 }
 #endif
 
-@objc(MBXMapViewManager)
-public class MBXMapViewManager: RCTViewManager {
+@objc(RNMBXMapViewManager)
+public class RNMBXMapViewManager: RCTViewManager {
     @objc
     override public static func requiresMainQueueSetup() -> Bool {
         return true
@@ -18,22 +18,22 @@ public class MBXMapViewManager: RCTViewManager {
     }
   
     override public func view() -> UIView! {
-        let result = RCTMGLMapView(frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
+        let result = RNMBXMapView(frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
         return result
     }
 }
 
 // MARK: helpers
 
-extension MBXMapViewManager {
+extension RNMBXMapViewManager {
     static func withMapboxMap(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         name: String,
         rejecter: @escaping RCTPromiseRejectBlock,
         fn: @escaping (_: MapboxMap) -> Void) -> Void
     {
         guard let mapboxMap = view.mapboxMap else {
-          RCTMGLLogError("MapboxMap is not yet available");
+          RNMBXLogError("MapboxMap is not yet available");
           rejecter(name, "Map not loaded yet", nil)
           return;
         }
@@ -44,15 +44,15 @@ extension MBXMapViewManager {
 
 // MARK: - react methods
 
-extension MBXMapViewManager {
-    @objc public static func takeSnap(_ view: RCTMGLMapView,
+extension RNMBXMapViewManager {
+    @objc public static func takeSnap(_ view: RNMBXMapView,
                          writeToDisk: Bool,
                          resolver: @escaping RCTPromiseResolveBlock) {
         let uri = view.takeSnap(writeToDisk: writeToDisk)
         resolver(["uri": uri.absoluteString])
     }
   
-    @objc public static func queryTerrainElevation(_ view: RCTMGLMapView,
+    @objc public static func queryTerrainElevation(_ view: RNMBXMapView,
                                   coordinates: [NSNumber],
                                   resolver: @escaping RCTPromiseResolveBlock,
                                   rejecter: @escaping RCTPromiseRejectBlock
@@ -65,7 +65,7 @@ extension MBXMapViewManager {
        }
     }
 
-    @objc public static func setSourceVisibility(_ view: RCTMGLMapView,
+    @objc public static func setSourceVisibility(_ view: RNMBXMapView,
                                       visible: Bool,
                                       sourceId: String,
                                       sourceLayerId: String?,
@@ -75,7 +75,7 @@ extension MBXMapViewManager {
           resolver(nil)
     }
     
-    @objc public static func getCenter(_ view: RCTMGLMapView, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    @objc public static func getCenter(_ view: RNMBXMapView, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
         withMapboxMap(view, name: "getCenter", rejecter:rejecter) { map in
             resolver(["center": [
                 map.cameraState.center.longitude,
@@ -85,7 +85,7 @@ extension MBXMapViewManager {
     }
 
     @objc public static func getCoordinateFromView(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         atPoint point: CGPoint,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
@@ -97,7 +97,7 @@ extension MBXMapViewManager {
     }
 
     @objc public static func getPointInView(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         atCoordinate coordinate: [NSNumber],
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
@@ -110,18 +110,18 @@ extension MBXMapViewManager {
       }
 
     @objc public static func setHandledMapChangedEvents(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         events: [String],
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
           view.handleMapChangedEvents = Set(events.compactMap {
-            RCTMGLEvent.EventType(rawValue: $0)
+            RNMBXEvent.EventType(rawValue: $0)
           })
           resolver(nil);
       }
 
     @objc public static func getZoom(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock) {
             withMapboxMap(view, name: "getZoom", rejecter:rejecter) { map in
@@ -131,7 +131,7 @@ extension MBXMapViewManager {
     }
 
     @objc public static func getVisibleBounds(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         resolver: @escaping RCTPromiseResolveBlock) {
             resolver(["visibleBounds":  view.mapboxMap.coordinateBounds(for: view.bounds).toArray()])
     }
@@ -140,9 +140,9 @@ extension MBXMapViewManager {
 
 // MARK: - queryRenderedFeatures
 
-extension MBXMapViewManager {
+extension RNMBXMapViewManager {
     @objc public static func queryRenderedFeaturesAtPoint(
-        _ view: RCTMGLMapView,
+        _ view: RNMBXMapView,
         atPoint point: [NSNumber],
         withFilter filter: [Any]?,
         withLayerIDs layerIDs: [String]?,
@@ -172,7 +172,7 @@ extension MBXMapViewManager {
       }
 
     @objc public static func queryRenderedFeaturesInRect(
-        _ map: RCTMGLMapView,
+        _ map: RNMBXMapView,
         withBBox bbox: [NSNumber],
         withFilter filter: [Any]?,
         withLayerIDs layerIDs: [String]?,
@@ -201,7 +201,7 @@ extension MBXMapViewManager {
         }
 
     @objc public static func querySourceFeatures(
-    _ map: RCTMGLMapView,
+    _ map: RNMBXMapView,
     withSourceId sourceId: String,
     withFilter filter: [Any]?,
     withSourceLayerIds sourceLayerIds: [String]?,
@@ -225,7 +225,7 @@ extension MBXMapViewManager {
       }
     }
 
-    static func clearData(_ view: RCTMGLMapView, completion: @escaping (Error?) -> Void) {
+    static func clearData(_ view: RNMBXMapView, completion: @escaping (Error?) -> Void) {
       #if RNMBX_11
       MapboxMap.clearData(completion: completion)
       #else
@@ -234,7 +234,7 @@ extension MBXMapViewManager {
     }
   
     @objc public static func clearData(
-        _ mapView: RCTMGLMapView,
+        _ mapView: RNMBXMapView,
         resolver:@escaping RCTPromiseResolveBlock,
         rejecter:@escaping RCTPromiseRejectBlock
     ) {

package/ios/{RCTMGL-v10/MBXMapViewModule.h → RNMBX/RNMBXMapViewModule.h}

@@ -7,7 +7,7 @@
 #import <React/RCTBridge.h>
 #endif
 
-@interface MBXMapViewModule : NSObject
+@interface RNMBXMapViewModule : NSObject
 #ifdef RCT_NEW_ARCH_ENABLED
 <NativeMapViewModuleSpec>
 #else

package/ios/{RCTMGL-v10/MBXMapViewModule.mm → RNMBX/RNMBXMapViewModule.mm}

@@ -2,9 +2,9 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTUIManagerUtils.h>
 
-#import "MBXMapViewModule.h"
+#import "RNMBXMapViewModule.h"
 #ifdef RCT_NEW_ARCH_ENABLED
-#import "MBXMapViewComponentView.h"
+#import "RNMBXMapViewComponentView.h"
 #endif // RCT_NEW_ARCH_ENABLED
 
 // needed for compilation for some reason
@@ -17,7 +17,7 @@
 #import <rnmapbox_maps-Swift.h>
 
 
-@implementation MBXMapViewModule
+@implementation RNMBXMapViewModule
 
 RCT_EXPORT_MODULE();
 
@@ -33,18 +33,18 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withMapView:(NSNumber*)viewRef block:(void (^)(MBXMapView *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withMapView:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXMapView *))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;
+        RNMBXMapViewComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
+        RNMBXMapView *view = componentView.contentView;
         
 #else
     [self.bridge.uiManager
      addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        MBXMapView *view = [uiManager viewForReactTag:viewRef];
+        RNMBXMapView *view = [uiManager viewForReactTag:viewRef];
 #endif // RCT_NEW_ARCH_ENABLED
         if (view != nil) {
            block(view);
@@ -52,105 +52,98 @@ RCT_EXPORT_MODULE();
             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)
+RCT_EXPORT_METHOD(takeSnap:(nonnull NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
-    [self withMapView:viewRef block:^(MBXMapView *view) {
-        [MBXMapViewManager takeSnap:view writeToDisk:writeToDisk resolver:resolve];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+RCT_EXPORT_METHOD(clearData:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+RCT_EXPORT_METHOD(getCenter:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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) {
+RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSArray *)atPoint resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
         
-        [MBXMapViewManager getCoordinateFromView:view atPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+RCT_EXPORT_METHOD(getVisibleBounds:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+RCT_EXPORT_METHOD(getZoom:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager 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];
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager querySourceFeatures:view withSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject];
     } reject:reject methodName:@"querySourceFeatures"];
 }
 

package/ios/{RCTMGL-v10/RCTMGLMarkerView.swift → RNMBX/RNMBXMarkerView.swift}

@@ -1,10 +1,10 @@
 import MapboxMaps
 import UIKit
 
-/// dummy parent of RCTMGLMarkerView, so react-native changes visibility on RCTMGLMarkerView,
-/// and Mapbox changes visibility on RCTMGLMarkerViewParentViewAnnotation
-class RCTMGLMarkerViewParentViewAnnotation : UIView {
-  required init(marker: RCTMGLMarkerView) {
+/// dummy parent of RNMBXMarkerView, so react-native changes visibility on RNMBXMarkerView,
+/// and Mapbox changes visibility on RNMBXMarkerViewParentViewAnnotation
+class RNMBXMarkerViewParentViewAnnotation : UIView {
+  required init(marker: RNMBXMarkerView) {
     super.init(frame: marker.bounds)
     insertSubview(marker, at: 0)
   }
@@ -13,7 +13,7 @@ class RCTMGLMarkerViewParentViewAnnotation : UIView {
     fatalError("not implented")
   }
 
-  func remove(marker: RCTMGLMarkerView) {
+  func remove(marker: RNMBXMarkerView) {
     marker.removeFromSuperview()
   }
 
@@ -31,14 +31,14 @@ class RCTMGLMarkerViewParentViewAnnotation : UIView {
   }
 }
 
-class RCTMGLMarkerView: UIView, RCTMGLMapComponent {
+class RNMBXMarkerView: UIView, RNMBXMapComponent {
   // MARK: - Instance variables
   
-  static let key = "RCTMGLMarkerView"
+  static let key = "RNMBXMarkerView"
   let id: String = "marker-\(UUID().uuidString)"
   
-  weak var map: RCTMGLMapView?
-  weak var _annotationView: RCTMGLMarkerViewParentViewAnnotation?
+  weak var map: RNMBXMapView?
+  weak var _annotationView: RNMBXMarkerViewParentViewAnnotation?
   
   var didAddToMap = false
   
@@ -101,14 +101,14 @@ class RCTMGLMarkerView: UIView, RCTMGLMapComponent {
     return _point
   }
 
-  // MARK: - RCTMGLMapComponent methods
+  // MARK: - RNMBXMapComponent methods
 
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
     add()
   }
 
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     remove()
     return true
   }
@@ -244,11 +244,11 @@ class RCTMGLMarkerView: UIView, RCTMGLMapComponent {
     return CGVector(dx: x, dy: y)
   }
   
-  var annotationView : RCTMGLMarkerViewParentViewAnnotation {
+  var annotationView : RNMBXMarkerViewParentViewAnnotation {
     if let result = _annotationView {
       return result
     }
-    let result = RCTMGLMarkerViewParentViewAnnotation(marker: self)
+    let result = RNMBXMarkerViewParentViewAnnotation(marker: self)
     _annotationView = result
     return result
   }

package/ios/{RCTMGL-v10/RCTMGLMarkerViewManager.m → RNMBX/RNMBXMarkerViewManager.m}

@@ -2,7 +2,7 @@
 #import <React/RCTViewManager.h>
 #import <Foundation/Foundation.h>
 
-@interface RCT_EXTERN_REMAP_MODULE(RCTMGLMarkerView, RCTMGLMarkerViewManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerView, RNMBXMarkerViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)

package/ios/{RCTMGL-v10/RCTMGLMarkerViewManager.swift → RNMBX/RNMBXMarkerViewManager.swift}

@@ -1,14 +1,14 @@
 import Foundation
 import MapboxMaps
 
-@objc(RCTMGLMarkerViewManager)
-class RCTMGLMarkerViewManager : RCTViewManager {
+@objc(RNMBXMarkerViewManager)
+class RNMBXMarkerViewManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
   
   override func view() -> UIView! {
-    return RCTMGLMarkerView()
+    return RNMBXMarkerView()
   }
 }

package/ios/{RCTMGL-v10/MGLModule.m → RNMBX/RNMBXModule.m}

@@ -1,6 +1,6 @@
 #import "React/RCTBridgeModule.h"
 
-@interface RCT_EXTERN_MODULE(MGLModule, NSObject)
+@interface RCT_EXTERN_MODULE(RNMBXModule, NSObject)
 
 RCT_EXTERN_METHOD(setAccessToken:(NSString *)accessToken resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 

package/ios/{RCTMGL-v10/MGLModule.swift → RNMBX/RNMBXModule.swift}

@@ -7,8 +7,8 @@ import MapboxMobileEvents
 
 let DEFAULT_SOURCE_ID = "composite";
 
-@objc(MGLModule)
-class MGLModule : NSObject {
+@objc(RNMBXModule)
+class RNMBXModule : NSObject {
   #if RNMBX_11
   static var accessToken : String? {
     didSet {
@@ -36,10 +36,10 @@ class MGLModule : NSObject {
         ],
       "OfflinePackDownloadState":
         [
-          "Inactive": RCTMGLOfflineModule.State.inactive.rawValue,
-          "Active": RCTMGLOfflineModule.State.active.rawValue,
-          "Complete": RCTMGLOfflineModule.State.complete.rawValue,
-          "Unknown": RCTMGLOfflineModule.State.unknown.rawValue,
+          "Inactive": RNMBXOfflineModule.State.inactive.rawValue,
+          "Active": RNMBXOfflineModule.State.active.rawValue,
+          "Complete": RNMBXOfflineModule.State.complete.rawValue,
+          "Unknown": RNMBXOfflineModule.State.unknown.rawValue,
         ],
       "StyleSource":
         ["DefaultSourceID": DEFAULT_SOURCE_ID],
@@ -60,21 +60,21 @@ class MGLModule : NSObject {
         ],
       "EventTypes":
         [
-          "RegionIsChanging" : RCTMGLEvent.EventType.regionIsChanging.rawValue,
-          "RegionDidChange" : RCTMGLEvent.EventType.regionDidChange.rawValue,
-          "CameraChanged" : RCTMGLEvent.EventType.cameraChanged.rawValue,
-          "MapIdle" : RCTMGLEvent.EventType.mapIdle.rawValue,
-          "WillStartLoadingMap": RCTMGLEvent.EventType.willStartLoadingMap.rawValue,
-          "DidFinishLoadingStyle": RCTMGLEvent.EventType.didFinishLoadingStyle.rawValue,
-          "DidFinishLoadingMap": RCTMGLEvent.EventType.didFinishLoadingMap.rawValue,
-          "MapLoadingError": RCTMGLEvent.EventType.mapLoadingError.rawValue,
-          "DidFinishRenderingFrameFully":  RCTMGLEvent.EventType.didFinishRenderingFully.rawValue,
-          "DidFinishRenderingFrame": RCTMGLEvent.EventType.didFinishRendering.rawValue,
+          "RegionIsChanging" : RNMBXEvent.EventType.regionIsChanging.rawValue,
+          "RegionDidChange" : RNMBXEvent.EventType.regionDidChange.rawValue,
+          "CameraChanged" : RNMBXEvent.EventType.cameraChanged.rawValue,
+          "MapIdle" : RNMBXEvent.EventType.mapIdle.rawValue,
+          "WillStartLoadingMap": RNMBXEvent.EventType.willStartLoadingMap.rawValue,
+          "DidFinishLoadingStyle": RNMBXEvent.EventType.didFinishLoadingStyle.rawValue,
+          "DidFinishLoadingMap": RNMBXEvent.EventType.didFinishLoadingMap.rawValue,
+          "MapLoadingError": RNMBXEvent.EventType.mapLoadingError.rawValue,
+          "DidFinishRenderingFrameFully":  RNMBXEvent.EventType.didFinishRenderingFully.rawValue,
+          "DidFinishRenderingFrame": RNMBXEvent.EventType.didFinishRendering.rawValue,
         ],
       "OfflineCallbackName":
         [
-          "Error": RCTMGLOfflineModule.Callbacks.error.rawValue,
-          "Progress": RCTMGLOfflineModule.Callbacks.progress.rawValue
+          "Error": RNMBXOfflineModule.Callbacks.error.rawValue,
+          "Progress": RNMBXOfflineModule.Callbacks.progress.rawValue
         ],
       "TileServers":
         ["Mapbox": "mapbox"]
@@ -90,7 +90,7 @@ class MGLModule : NSObject {
     _ token: String, 
     resolver: RCTPromiseResolveBlock,
     rejecter: RCTPromiseRejectBlock) {
-      MGLModule.accessToken = token
+      RNMBXModule.accessToken = token
       resolver(token)
   }
 

package/ios/{RCTMGL-v10/RCTMGLNativeUserLocation.swift → RNMBX/RNMBXNativeUserLocation.swift}

@@ -1,8 +1,8 @@
 import MapboxMaps
 
 @objc
-class RCTMGLNativeUserLocation : UIView, RCTMGLMapComponent {
-  weak var map : RCTMGLMapView! = nil
+class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
+  weak var map : RNMBXMapView! = nil
   
   let locationLayerId = "location-layer"
 
@@ -15,7 +15,7 @@ class RCTMGLNativeUserLocation : UIView, RCTMGLMapComponent {
     }
   }
   
-  func _applySettings(_ map: RCTMGLMapView) {
+  func _applySettings(_ map: RNMBXMapView) {
     map.location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
     if (iosShowsUserHeadingIndicator) {
       #if RNMBX_11
@@ -29,12 +29,12 @@ class RCTMGLNativeUserLocation : UIView, RCTMGLMapComponent {
     }
   }
 
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
     _applySettings(map)
   }
 
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     map.location.options.puckType = nil
     guard let mapboxMap = map.mapboxMap else {
       return true

package/ios/{RCTMGL-v10/RCTMGLNativeUserLocationManager.m → RNMBX/RNMBXNativeUserLocationManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLNativeUserLocationManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXNativeUserLocationManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL);
 

package/ios/{RCTMGL-v10/RCTMGLNativeUserLocationManager.swift → RNMBX/RNMBXNativeUserLocationManager.swift}

@@ -1,11 +1,11 @@
-@objc(RCTMGLNativeUserLocationManager)
-class RCTMGLNativeUserLocationManager : RCTViewManager {
+@objc(RNMBXNativeUserLocationManager)
+class RNMBXNativeUserLocationManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   @objc override func view() -> UIView {
-    return RCTMGLNativeUserLocation()
+    return RNMBXNativeUserLocation()
   }
 }

package/ios/{RCTMGL-v10/RCTMGLOfflineModule.m → RNMBX/RNMBXOfflineModule.m}

@@ -1,7 +1,7 @@
 #import "React/RCTBridgeModule.h"
 #import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLOfflineModule, RCTEventEmitter<RCTBridgeModule>)
+@interface RCT_EXTERN_MODULE(RNMBXOfflineModule, RCTEventEmitter<RCTBridgeModule>)
 
 RCT_EXTERN_METHOD(getPacks:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(createPack:(NSDictionary *) options resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)