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

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

@@ -13,8 +13,8 @@ extension Date {
 
 
 
-@objc(RCTMGLOfflineModule)
-class RCTMGLOfflineModule: RCTEventEmitter {
+@objc(RNMBXOfflineModule)
+class RNMBXOfflineModule: RCTEventEmitter {
   var hasListeners = false
   
   static let RNMapboxInfoMetadataKey = "_rnmapbox"
@@ -36,7 +36,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     #if RNMBX_11
     return OfflineManager()
     #else
-    return OfflineManager(resourceOptions: .init(accessToken: MGLModule.accessToken!))
+    return OfflineManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
     #endif
   }()
   
@@ -44,7 +44,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     #if RNMBX_11
     return OfflineRegionManager()
     #else
-    return OfflineRegionManager(resourceOptions: .init(accessToken: MGLModule.accessToken!))
+    return OfflineRegionManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
     #endif
   }()
 
@@ -64,13 +64,13 @@ class RCTMGLOfflineModule: RCTEventEmitter {
           self.styleURI = StyleURI(rawValue: styleURI)
         }
         if let bounds = rnMetadata["bounds"] as? [String:Any] {
-          self.bounds = logged("RCTMGLOfflineModule.TileRegionPack: cannot decode bounds") {
+          self.bounds = logged("RNMBXOfflineModule.TileRegionPack: cannot decode bounds") {
             let jsonData = try JSONSerialization.data(withJSONObject: bounds)
             return try JSONDecoder().decode(Geometry.self, from: jsonData)
           }
         }
         if let zoomRange = rnMetadata["zoomRange"] as? Any {
-          self.zoomRange = logged("RCTMGLOfflineModule.TileRegionPack: cannot decode zoomRange") {
+          self.zoomRange = logged("RNMBXOfflineModule.TileRegionPack: cannot decode zoomRange") {
             let jsonData = try JSONSerialization.data(withJSONObject: zoomRange)
             return try JSONDecoder().decode(ClosedRange<UInt8>.self, from: jsonData)
           }
@@ -96,8 +96,8 @@ class RCTMGLOfflineModule: RCTEventEmitter {
       var metadata = metadata
       metadata[RNMapboxInfoMetadataKey] = [
         "styleURI": styleURI.rawValue,
-        "bounds": logged("RCTMGLOfflineModule.TileRegionPack: cannot encode bounds") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(bounds)) },
-        "zoomRange": logged("RCTMGLOfflineModule.TileRegionPack: cannot encode zoomRange") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(zoomRange))}
+        "bounds": logged("RNMBXOfflineModule.TileRegionPack: cannot encode bounds") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(bounds)) },
+        "zoomRange": logged("RNMBXOfflineModule.TileRegionPack: cannot encode zoomRange") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(zoomRange))}
       ]
       self.metadata = metadata
     }
@@ -171,9 +171,9 @@ class RCTMGLOfflineModule: RCTEventEmitter {
         let boundsData = boundsStr.data(using: .utf8)
         var boundsFC = try JSONDecoder().decode(FeatureCollection.self, from: boundsData!)
         
-        var bounds = self.convertPointPairToBounds(RCTMGLFeatureUtils.fcToGeomtry(boundsFC))
+        var bounds = self.convertPointPairToBounds(RNMBXFeatureUtils.fcToGeomtry(boundsFC))
         
-        let actPack = RCTMGLOfflineModule.TileRegionPack(
+        let actPack = RNMBXOfflineModule.TileRegionPack(
           name: id,
           styleURI: StyleURI(rawValue: options["styleURL"] as! String)!,
           bounds: bounds,
@@ -198,7 +198,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
                      resolver: @escaping RCTPromiseResolveBlock,
                      rejecter: @escaping RCTPromiseRejectBlock) {
     guard tileRegionPacks[name] != nil else {
-      rejecter("RCTMGLOfflineModule.getPackStatus", "pack \(name) not found", nil)
+      rejecter("RNMBXOfflineModule.getPackStatus", "pack \(name) not found", nil)
       return
     }
     
@@ -211,18 +211,18 @@ class RCTMGLOfflineModule: RCTEventEmitter {
             let pack = TileRegionPack(
               name: name,
               progress: self.toProgress(region: region),
-              metadata: logged("RCTMGLOfflineModule.getPackStatus") { metadata as? [String:Any] } ?? [:]
+              metadata: logged("RNMBXOfflineModule.getPackStatus") { metadata as? [String:Any] } ?? [:]
             )
             self.tileRegionPacks[name] = pack
             resolver(self._makeRegionStatusPayload(pack: pack))
           case .failure(let error):
             Logger.log(level:.error, message: "Unable to fetch metadata for \(name)")
-            rejecter("RCTMGLOfflineModule.getPackStatus", error.localizedDescription, error)
+            rejecter("RNMBXOfflineModule.getPackStatus", error.localizedDescription, error)
           }
         }
       case .failure(let error):
         Logger.log(level:.error, message: "Unable to fetch region for \(name)")
-        rejecter("RCTMGLOfflineModule.getPackStatus", error.localizedDescription, error)
+        rejecter("RNMBXOfflineModule.getPackStatus", error.localizedDescription, error)
       }
     }
   }
@@ -308,20 +308,20 @@ class RCTMGLOfflineModule: RCTEventEmitter {
           switch result {
           case .success(let packs):
             packs.forEach { pack in
-              if let url = logged("RCTMGLOfflineModule.resetDatabase invalid styleURI",fn: { return URL(string: pack.styleURI) }),
-                 let styleUri = logged("RCTMGLOfflineModule.resetDatabase invalid styleURI2", fn: { return StyleURI(url: url) }) {
+              if let url = logged("RNMBXOfflineModule.resetDatabase invalid styleURI",fn: { return URL(string: pack.styleURI) }),
+                 let styleUri = logged("RNMBXOfflineModule.resetDatabase invalid styleURI2", fn: { return StyleURI(url: url) }) {
                 self.offlineManager.removeStylePack(for: styleUri)
               }
             }
             resolve(nil)
           case .failure(let error):
-            Logger.log(level:.error, message: "RCTMGLOfflineModule.resetDatabase/allStylePacks \(error.localizedDescription) \(error)")
-            rejecter("RCTMGLOfflineModule.resetDatabase/allStylePacks", error.localizedDescription, error)
+            Logger.log(level:.error, message: "RNMBXOfflineModule.resetDatabase/allStylePacks \(error.localizedDescription) \(error)")
+            rejecter("RNMBXOfflineModule.resetDatabase/allStylePacks", error.localizedDescription, error)
           }
         }
       case .failure(let error):
-        Logger.log(level:.error, message: "RCTMGLOfflineModule.resetDatabase/allTileRegions \(error.localizedDescription) \(error)")
-        rejecter("RCTMGLOfflineModule.resetDatabase/allTileRegions", error.localizedDescription, error)
+        Logger.log(level:.error, message: "RNMBXOfflineModule.resetDatabase/allTileRegions \(error.localizedDescription) \(error)")
+        rejecter("RNMBXOfflineModule.resetDatabase/allTileRegions", error.localizedDescription, error)
       }
     }
   }
@@ -344,15 +344,15 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     let id = pack.name
     let metadata = pack.metadata
     guard let bounds = pack.bounds else {
-      RCTMGLLogError("RCTMGLOfflineModule.startLoading failed as there are no bounds in pack")
+      RNMBXLogError("RNMBXOfflineModule.startLoading failed as there are no bounds in pack")
       return
     }
     guard let zoomRange = pack.zoomRange else {
-      RCTMGLLogError("RCTMGLOfflineModule.startLoading failed as there is no zoom range in pack")
+      RNMBXLogError("RNMBXOfflineModule.startLoading failed as there is no zoom range in pack")
       return
     }
     guard let styleURI = pack.styleURI else {
-      RCTMGLLogError("RCTMGLOfflineModule.startLoading failed as there is no styleURI in pack")
+      RNMBXLogError("RNMBXOfflineModule.startLoading failed as there is no styleURI in pack")
       return
     }
     
@@ -375,7 +375,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     let tilesetDescriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
     
     let loadOptions = TileRegionLoadOptions(
-      geometry: bounds, // RCTMGLFeatureUtils.geometryToGeometry(bounds),
+      geometry: bounds, // RNMBXFeatureUtils.geometryToGeometry(bounds),
       descriptors: [tilesetDescriptor],
       metadata: metadata,
       acceptExpired: true,
@@ -397,7 +397,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
             self.offlinePackProgressDidChange(progress: progess, metadata: metadata, state: .complete)
           } else {
             Logger.log(level: .warn,
-                       message: "RCTMGLOfflineModule: startLoading: tile region completed, but got no progress information")
+                       message: "RNMBXOfflineModule: startLoading: tile region completed, but got no progress information")
           }
           self.tileRegionPacks[id]!.state = .complete
         }
@@ -467,7 +467,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
           name: region.id,
           state: .unknown,
           progress: self.toProgress(region: region),
-          metadata: logged("RCTMGLOfflineModule.getPacks metadata is null") { metadata } ?? [:]
+          metadata: logged("RNMBXOfflineModule.getPacks metadata is null") { metadata } ?? [:]
         )
         
         if ((region.hasCompleted())) {
@@ -482,7 +482,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
   }
   
   func convertRegionToJSON(region: TileRegion, geometry: Geometry, metadata: [String:Any]?) -> [String:Any] {
-    let bb = RCTMGLFeatureUtils.boundingBox(geometry: geometry)
+    let bb = RNMBXFeatureUtils.boundingBox(geometry: geometry)
     
     if let bb = bb {
       let jsonBounds = [
@@ -548,7 +548,7 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     ]))
   }
   
-  func _sendEvent(_ name:String, event: RCTMGLEvent) {
+  func _sendEvent(_ name:String, event: RNMBXEvent) {
     if !hasListeners {
       return
     }
@@ -586,8 +586,8 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     return _makeRegionStatusPayload(pack.name, progress: pack.progress, state: pack.state, metadata: pack.metadata)
   }
   
-  func makeProgressEvent(_ name: String, progress: TileRegionLoadProgress, state: State) -> RCTMGLEvent {
-    RCTMGLEvent(type: .offlineProgress, payload: self._makeRegionStatusPayload(name, progress: progress, state: state, metadata: nil))
+  func makeProgressEvent(_ name: String, progress: TileRegionLoadProgress, state: State) -> RNMBXEvent {
+    RNMBXEvent(type: .offlineProgress, payload: self._makeRegionStatusPayload(name, progress: progress, state: state, metadata: nil))
   }
   
   func offlinePackProgressDidChange(progress: TileRegionLoadProgress, metadata: [String:Any], state: State) {
@@ -598,13 +598,13 @@ class RCTMGLOfflineModule: RCTEventEmitter {
   }
   
   func offlinePackDidReceiveError(name: String, error: Error) {
-    let event = RCTMGLEvent(type: .offlineError, payload: ["name": name, "message": error.localizedDescription])
+    let event = RNMBXEvent(type: .offlineError, payload: ["name": name, "message": error.localizedDescription])
     self._sendEvent(Callbacks.error.rawValue, event: event)
   }
 }
 // MARK: progress throttle
 
-extension RCTMGLOfflineModule {
+extension RNMBXOfflineModule {
   @objc
   func setProgressEventThrottle(_ throttleValue: NSNumber) {
     progressEventThrottle.waitBetweenEvents = throttleValue.doubleValue

package/ios/{RCTMGL-v10/RCTMGLPointAnnotation.swift → RNMBX/RNMBXPointAnnotation.swift}

@@ -9,19 +9,19 @@ final class WeakRef<T: AnyObject> {
   }
 }
 
-class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
-  static let key = "RCTMGLPointAnnotation"
+class RNMBXPointAnnotation : RNMBXInteractiveElement {
+  static let key = "RNMBXPointAnnotation"
   static var gid = 0;
   
   lazy var annotation : PointAnnotation = {
     var result = PointAnnotation(coordinate: CLLocationCoordinate2D())
     result.isDraggable = false // we implement our own drag logic
-    result.userInfo = [RCTMGLPointAnnotation.key:WeakRef(self)]
+    result.userInfo = [RNMBXPointAnnotation.key:WeakRef(self)]
     return result
   }()
   var added = false
 
-  weak var callout: RCTMGLCallout? = nil
+  weak var callout: RNMBXCallout? = nil
   var calloutId : String?
   var image : UIImage? = nil
   var reactSubviews : [UIView] = []
@@ -105,8 +105,8 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
   }
    
   func gid() -> Int {
-    RCTMGLPointAnnotation.gid = RCTMGLPointAnnotation.gid + 1
-    return RCTMGLPointAnnotation.gid
+    RNMBXPointAnnotation.gid = RNMBXPointAnnotation.gid + 1
+    return RNMBXPointAnnotation.gid
   }
    
   @objc
@@ -178,7 +178,7 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
   
   @objc
   override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let callout = subview as? RCTMGLCallout {
+    if let callout = subview as? RNMBXCallout {
       self.callout = callout
     } else {
       reactSubviews.insert(subview, at: atIndex)
@@ -195,7 +195,7 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
 
   @objc
   override func removeReactSubview(_ subview: UIView!) {
-    if let callout = subview as? RCTMGLCallout {
+    if let callout = subview as? RNMBXCallout {
       if self.callout == callout {
         self.callout = nil
       }
@@ -204,21 +204,21 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
     }
   }
   
-  // MARK: - RCTMGLMapComponent
+  // MARK: - RNMBXMapComponent
   
-  override func addToMap(_ map: RCTMGLMapView, style: Style) {
+  override func addToMap(_ map: RNMBXMapView, style: Style) {
     super.addToMap(map, style: style)
     self.map = map
     addIfPossible()
   }
 
-  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     removeIfAdded()
     self.map = nil
     return true
   }
   
-  // MARK: - RCTMGLInteractiveElement
+  // MARK: - RNMBXInteractiveElement
   
   override func getLayerIDs() -> [String] {
     return []
@@ -227,7 +227,7 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
 
 // MARK: - add/remove/update of point annotation
 
-extension RCTMGLPointAnnotation {
+extension RNMBXPointAnnotation {
   func removeIfAdded() {
     if added, let pointAnnotationManager = map?.pointAnnotationManager {
       pointAnnotationManager.remove(annotation)

package/ios/{RCTMGL-v10/RCTMGLPointAnnotationManager.m → RNMBX/RNMBXPointAnnotationManager.m}

@@ -2,7 +2,7 @@
 #import <React/RCTViewManager.h>
 #import <Foundation/Foundation.h>
 
-@interface RCT_EXTERN_REMAP_MODULE(RCTMGLPointAnnotation, RCTMGLPointAnnotationManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXPointAnnotation, RNMBXPointAnnotationManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL)

package/ios/{RCTMGL-v10/RCTMGLPointAnnotationManager.swift → RNMBX/RNMBXPointAnnotationManager.swift}

@@ -1,15 +1,15 @@
 import Foundation
 import MapboxMaps
 
-@objc(RCTMGLPointAnnotationManager)
-class RCTMGLPointAnnotationManager  : RCTViewManager {
+@objc(RNMBXPointAnnotationManager)
+class RNMBXPointAnnotationManager  : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
   
   override func view() -> UIView! {
-    return RCTMGLPointAnnotation()
+    return RNMBXPointAnnotation()
   }
 
   @objc
@@ -23,8 +23,8 @@ class RCTMGLPointAnnotationManager  : RCTViewManager {
         Logger.log(level: .error, message: "View with tag: \(reactTag) not found")
         return
       }
-      guard let view = view as? RCTMGLPointAnnotation else {
-        Logger.log(level: .error, message: "View \(view) is not RCTMGLPointAnnotation")
+      guard let view = view as? RNMBXPointAnnotation else {
+        Logger.log(level: .error, message: "View \(view) is not RNMBXPointAnnotation")
         return
       }
           

package/ios/{RCTMGL-v10/RCTMGLRasterDemSource.swift → RNMBX/RNMBXRasterDemSource.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 @objc
-class RCTMGLRasterDemSource : RCTMGLSource {
+class RNMBXRasterDemSource : RNMBXSource {
   typealias SourceType = RasterDemSource
   
   @objc
@@ -40,7 +40,7 @@ class RCTMGLRasterDemSource : RCTMGLSource {
     } else if let tileUrlTemplates = tileUrlTemplates {
       result.tiles = tileUrlTemplates
     } else {
-      Logger.log(level: .error, message: "RCTMGLRasterDemSource should have either url or tileUrlTemplates ")
+      Logger.log(level: .error, message: "RNMBXRasterDemSource should have either url or tileUrlTemplates ")
       return result
     }
     

package/ios/{RCTMGL-v10/RCTMGLRasterDemSourceManager.m → RNMBX/RNMBXRasterDemSourceManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLRasterDemSourceManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXRasterDemSourceManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/{RCTMGL-v10/RCTMGLRasterDemSourceManager.swift → RNMBX/RNMBXRasterDemSourceManager.swift}

@@ -1,11 +1,11 @@
-@objc(RCTMGLRasterDemSourceManager)
-class RCTMGLRasterDemSourceManager: RCTViewManager {
+@objc(RNMBXRasterDemSourceManager)
+class RNMBXRasterDemSourceManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   @objc override func view() -> UIView {
-    return RCTMGLRasterDemSource()
+    return RNMBXRasterDemSource()
   }
 }

package/ios/{RCTMGL-v10/RCTMGLRasterLayer.swift → RNMBX/RNMBXRasterLayer.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(RCTMGLRasterLayer)
-class RCTMGLRasterLayer: RCTMGLLayer {
+@objc(RNMBXRasterLayer)
+class RNMBXRasterLayer: RNMBXLayer {
   typealias LayerType = RasterLayer
 
   override func makeLayer(style: Style) throws -> Layer {
@@ -26,7 +26,7 @@ class RCTMGLRasterLayer: RCTMGLLayer {
   override func addStyles() {
     if let style : Style = self.style,
        let reactStyle = reactStyle {
-      let styler =  RCTMGLStyle(style: self.style!)
+      let styler =  RNMBXStyle(style: self.style!)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? LayerType {
@@ -34,7 +34,7 @@ class RCTMGLRasterLayer: RCTMGLLayer {
           layer: &styleLayer,
           reactStyle: reactStyle,
           oldReactStyle: oldReatStyle,
-          applyUpdater:{ (updater) in logged("RCTMGLRasterLayer.updateLayer") {
+          applyUpdater:{ (updater) in logged("RNMBXRasterLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},
           isValid: { return self.isAddedToMap() }

package/ios/{RCTMGL-v10/RCTMGLRasterLayerManager.m → RNMBX/RNMBXRasterLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLRasterLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXRasterLayerManager, RCTViewManager)
 
 // symbol layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/RNMBX/RNMBXRasterLayerManager.swift

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

package/ios/{RCTMGL-v10/RCTMGLRasterSource.swift → RNMBX/RNMBXRasterSource.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 @objc
-class RCTMGLRasterSource : RCTMGLSource {
+class RNMBXRasterSource : RNMBXSource {
   typealias SourceType = RasterSource
 
   @objc var url: String? = nil

package/ios/{RCTMGL-v10/RCTMGLRasterSourceManager.m → RNMBX/RNMBXRasterSourceManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLRasterSourceManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXRasterSourceManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/{RCTMGL-v10/RCTMGLRasterSourceManager.swift → RNMBX/RNMBXRasterSourceManager.swift}

@@ -1,14 +1,14 @@
 import Foundation
 import MapboxMaps
 
-@objc(RCTMGLRasterSourceManager)
-class RCTMGLRasterSourceManager : RCTViewManager {
+@objc(RNMBXRasterSourceManager)
+class RNMBXRasterSourceManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
   
   override func view() -> UIView! {
-    return RCTMGLRasterSource()
+    return RNMBXRasterSource()
   }
 }

package/ios/{RCTMGL-v10/RCTMGLShapeSource.swift → RNMBX/RNMBXShapeSource.swift}

@@ -2,7 +2,7 @@ import MapboxMaps
 import Turf
 
 @objc
-class RCTMGLShapeSource : RCTMGLSource {
+class RNMBXShapeSource : RNMBXSource {
   @objc var url : String? {
     didSet {
       parseJSON(url) { [weak self] result in
@@ -11,7 +11,7 @@ class RCTMGLShapeSource : RCTMGLSource {
         switch result {
           case .success(let obj):
             self.doUpdate { (style) in
-              logged("RCTMGLShapeSource.setUrl") {
+              logged("RNMBXShapeSource.setUrl") {
                 try style.updateGeoJSONSource(withId: self.id, geoJSON: obj)
               }
             }
@@ -25,11 +25,11 @@ class RCTMGLShapeSource : RCTMGLSource {
 
   @objc var shape : String? {
     didSet {
-      logged("RCTMGLShapeSource.updateShape") {
+      logged("RNMBXShapeSource.updateShape") {
         let obj : GeoJSONObject = try parse(shape)
 
         doUpdate { (style) in
-          logged("RCTMGLShapeSource.setShape") {
+          logged("RNMBXShapeSource.setShape") {
             try style.updateGeoJSONSource(withId: id, geoJSON: obj)
           }
         }
@@ -41,10 +41,10 @@ class RCTMGLShapeSource : RCTMGLSource {
   @objc var clusterRadius : NSNumber?
   @objc var clusterMaxZoomLevel : NSNumber? {
     didSet {
-      logged("RCTMGLShapeSource.clusterMaxZoomLevel") {
+      logged("RNMBXShapeSource.clusterMaxZoomLevel") {
         if let number = clusterMaxZoomLevel?.doubleValue {
           doUpdate { (style) in
-            logged("RCTMGLShapeSource.doUpdate") {
+            logged("RNMBXShapeSource.doUpdate") {
               try style.setSourceProperty(for: id, property: "clusterMaxZoom", value: number)
             }
           }
@@ -106,7 +106,7 @@ class RCTMGLShapeSource : RCTMGLSource {
         }
       }
     } catch {
-      Logger.log(level: .error, message: "RCTMGLShapeSource.parsing clusterProperties failed", error: error)
+      Logger.log(level: .error, message: "RNMBXShapeSource.parsing clusterProperties failed", error: error)
     }
 
     if let maxZoomLevel = maxZoomLevel {
@@ -148,7 +148,7 @@ class RCTMGLShapeSource : RCTMGLSource {
 
 // MARK: - parseJSON(url)
 
-extension RCTMGLShapeSource
+extension RNMBXShapeSource
 {
   func parseJSON(_ url: String?, completion: @escaping (Result<GeoJSONObject, Error>) -> Void) {
     guard let url = url else { return }
@@ -174,11 +174,11 @@ extension RCTMGLShapeSource
 
 // MARK: - parse(shape)
 
-extension RCTMGLShapeSource
+extension RNMBXShapeSource
 {
   func parse(_ shape: String) throws -> GeoJSONSourceData {
     guard let data = shape.data(using: .utf8) else {
-      throw RCTMGLError.parseError("shape is not utf8")
+      throw RNMBXError.parseError("shape is not utf8")
     }
     do {
       return try JSONDecoder().decode(GeoJSONSourceData.self, from: data)
@@ -196,7 +196,7 @@ extension RCTMGLShapeSource
 
   func parse(_ shape: String) throws -> Feature {
     guard let data = shape.data(using: .utf8) else {
-      throw RCTMGLError.parseError("shape is not utf8")
+      throw RNMBXError.parseError("shape is not utf8")
     }
     return try JSONDecoder().decode(Feature.self, from: data)
   }
@@ -218,10 +218,10 @@ extension RCTMGLShapeSource
     #if RNMBX_11
     case .string(_):
       // RNMBX_11_TODO
-      throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
+      throw RNMBXError.parseError("url as shape is not supported when updating a ShapeSource")
     #else
     case .url(_):
-      throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
+      throw RNMBXError.parseError("url as shape is not supported when updating a ShapeSource")
       #endif
     }
   }
@@ -307,18 +307,18 @@ extension MapboxMap {
 
 // MARK: - getClusterExpansionZoom/getClusterLeaves
 
-extension RCTMGLShapeSource
+extension RNMBXShapeSource
 {
   func getClusterExpansionZoom(
     _ featureJSON: String,
     completion: @escaping (Result<Int, Error>) -> Void)
   {
     guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: no mapView")))
+      completion(.failure(RNMBXError.failed("getClusterExpansionZoom: no mapView")))
       return
     }
 
-    logged("RCTMGLShapeSource.getClusterExpansionZoom", rejecter: { (_,_,error) in
+    logged("RNMBXShapeSource.getClusterExpansionZoom", rejecter: { (_,_,error) in
       completion(.failure(error!))
     }) {
       let cluster : Feature = try parse(featureJSON);
@@ -327,7 +327,7 @@ extension RCTMGLShapeSource
         switch result {
         case .success(let features):
           guard let value = features.value as? NSNumber else {
-            completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
+            completion(.failure(RNMBXError.failed("getClusterExpansionZoom: not a number")))
             return
           }
 
@@ -345,11 +345,11 @@ extension RCTMGLShapeSource
                               completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void)
   {
     guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterLeaves: no mapView")))
+      completion(.failure(RNMBXError.failed("getClusterLeaves: no mapView")))
       return
     }
 
-    logged("RCTMGLShapeSource.getClusterLeaves", rejecter: { (_,_,error) in
+    logged("RNMBXShapeSource.getClusterLeaves", rejecter: { (_,_,error) in
       completion(.failure(error!))
     }) {
       let cluster : Feature = try parse(featureJSON);
@@ -367,11 +367,11 @@ extension RCTMGLShapeSource
 
   func getClusterChildren(_ featureJSON: String, completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) {
     guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterChildren: no mapView")))
+      completion(.failure(RNMBXError.failed("getClusterChildren: no mapView")))
       return
     }
 
-    logged("RCTMGLShapeSource.getClusterChildren", rejecter: { (_,_,error) in
+    logged("RNMBXShapeSource.getClusterChildren", rejecter: { (_,_,error) in
       completion(.failure(error!))
     }) {
       let cluster : Feature = try parse(featureJSON);

package/ios/{RCTMGL-v10/RCTMGLShapeSourceManager.m → RNMBX/RNMBXShapeSourceManager.m}

@@ -2,7 +2,7 @@
 #import <React/RCTViewManager.h>
 
 @interface
-RCT_EXTERN_REMAP_MODULE(RCTMGLShapeSource, RCTMGLShapeSourceManager, RCTViewManager)
+RCT_EXTERN_REMAP_MODULE(RNMBXShapeSource, RNMBXShapeSourceManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)