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

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

@@ -1,29 +1,29 @@
-@objc(RCTMGLShapeSourceManager)
-class RCTMGLShapeSourceManager: RCTViewManager {
+@objc(RNMBXShapeSourceManager)
+class RNMBXShapeSourceManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   @objc override func view() -> UIView {
-    return RCTMGLShapeSource()
+    return RNMBXShapeSource()
   }
 }
 
 // MARK: - helpers
 
-extension RCTMGLShapeSourceManager {
+extension RNMBXShapeSourceManager {
   func withShapeSource(
       _ reactTag: NSNumber,
       name: String,
       rejecter: @escaping RCTPromiseRejectBlock,
-      fn: @escaping (_: RCTMGLShapeSource) -> Void) -> Void
+      fn: @escaping (_: RNMBXShapeSource) -> Void) -> Void
   {
     self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
       let view = viewRegistry![reactTag]
 
-      guard let shapeSource = view! as? RCTMGLShapeSource else {
-        RCTMGLLogError("Invalid react tag, could not find RCTMGLShapeSource");
+      guard let shapeSource = view! as? RNMBXShapeSource else {
+        RNMBXLogError("Invalid react tag, could not find RNMBXShapeSource");
         rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
         return;
       }
@@ -35,7 +35,7 @@ extension RCTMGLShapeSourceManager {
 
 // MARK: - react methods
 
-extension RCTMGLShapeSourceManager {
+extension RNMBXShapeSourceManager {
   @objc func getClusterExpansionZoom(
     _ reactTag: NSNumber,
     featureJSON: String,

package/ios/{RCTMGL-v10/RCTMGLSingletonLayer.swift → RNMBX/RNMBXSingletonLayer.swift}

@@ -1,10 +1,10 @@
 import MapboxMaps
 
-/// RCTMGLSingletonLayer is absract superclass for Light, Atmosphere, Terrain
+/// RNMBXSingletonLayer is absract superclass for Light, Atmosphere, Terrain
 @objc
-class RCTMGLSingletonLayer : UIView {
+class RNMBXSingletonLayer : UIView {
   weak var bridge : RCTBridge? = nil
-  weak var map : RCTMGLMapView? = nil
+  weak var map : RNMBXMapView? = nil
   var style: Style? = nil
   
   var oldReactStyle: [String:Any]?
@@ -33,7 +33,7 @@ class RCTMGLSingletonLayer : UIView {
     }
   }
   
-  func update(_ map: RCTMGLMapView, _ style: Style) {
+  func update(_ map: RNMBXMapView, _ style: Style) {
     logged("LayerLike \(self)") {
       try apply(style: style)
     }

package/ios/{RCTMGL-v10/RCTMGLSkyLayer.swift → RNMBX/RNMBXSkyLayer.swift}

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

package/ios/{RCTMGL-v10/RCTMGLSkyLayerManager.m → RNMBX/RNMBXSkyLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLSkyLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXSkyLayerManager, RCTViewManager)
 
 // standard layer props
 #include "CommonLayerProperties.H"

package/ios/{RCTMGL-v10/RCTMGLLineLayerManager.swift → RNMBX/RNMBXSkyLayerManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLLineLayerManager)
-class RCTMGLLineLayerManager: RCTViewManager {
+@objc(RNMBXSkyLayerManager)
+class RNMBXSkyLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLLineLayer()
+      let layer = RNMBXSkyLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/MGLSnapshotModule.m → RNMBX/RNMBXSnapshotModule.m}

@@ -2,7 +2,7 @@
 #import <React/RCTViewManager.h>
 
 
-@interface RCT_EXTERN_MODULE(MGLSnapshotModule, NSObject<RCTBridgeModule>)
+@interface RCT_EXTERN_MODULE(RNMBXSnapshotModule, NSObject<RCTBridgeModule>)
 
 RCT_EXTERN_METHOD(takeSnap:(NSDictionary *)jsOptions
                   resolver:(RCTPromiseResolveBlock)resolve

package/ios/{RCTMGL-v10/MGLSnapshotModule.swift → RNMBX/RNMBXSnapshotModule.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(MGLSnapshotModule)
-class MGLSnapshotModule : NSObject {
+@objc(RNMBXSnapshotModule)
+class RNMBXSnapshotModule : NSObject {
   @objc
   static func requiresMainQueueSetup() -> Bool {
       return true
@@ -28,7 +28,7 @@ class MGLSnapshotModule : NSObject {
             switch (result) {
             case .success(let image):
               guard let writeToDisk = jsOptions["writeToDisk"] as? NSNumber else {
-                throw RCTMGLError.paramError("writeToDisk: is not a number")
+                throw RNMBXError.paramError("writeToDisk: is not a number")
               }
               
               let value = writeToDisk.boolValue ? RNMBImageUtils.createTempFile(image) : RNMBImageUtils.createBase64(image)
@@ -39,10 +39,10 @@ class MGLSnapshotModule : NSObject {
               _ = snapshotterReference
               snapshotterReference = nil
               Logger.log(level: .error, message: ":: Error - snapshot failed \(error) \(error.localizedDescription)")
-              rejecter("MGLSnapshotModule.start", error.localizedDescription, error)
+              rejecter("RNMBXSnapshotModule.start", error.localizedDescription, error)
             }
           } catch let error {
-            rejecter("MGLSnapshotModule.start", error.localizedDescription, error)
+            rejecter("RNMBXSnapshotModule.start", error.localizedDescription, error)
           }
         })
       }
@@ -51,47 +51,47 @@ class MGLSnapshotModule : NSObject {
 
   func _getCameraOptions(_ jsOptions: [String:Any], _ snaphotter: Snapshotter) throws -> CameraOptions {
     guard let pitch = jsOptions["pitch"] as? NSNumber else {
-      throw RCTMGLError.paramError("pitch: is not a number")
+      throw RNMBXError.paramError("pitch: is not a number")
     }
     
     guard let zoomLevel = jsOptions["zoomLevel"] as? NSNumber else {
-      throw RCTMGLError.paramError("zoomLevel: is not a number")
+      throw RNMBXError.paramError("zoomLevel: is not a number")
     }
 
     guard let heading = jsOptions["heading"] as? NSNumber else {
-      throw RCTMGLError.paramError("heading: is not a number")
+      throw RNMBXError.paramError("heading: is not a number")
     }
     
     if let centerCoordinateString = jsOptions["centerCoordinate"] as? String {
       guard let centerCoordinateData = centerCoordinateString.data(using: .utf8),
             let centerCoordinateGeometry = try JSONDecoder().decode(Feature.self, from: centerCoordinateData).geometry,
             case .point(let centerCoordinatePoint) = centerCoordinateGeometry else {
-        throw RCTMGLError.paramError("centerCoordinate: bad format")
+        throw RNMBXError.paramError("centerCoordinate: bad format")
       }
       
       return CameraOptions(center: centerCoordinatePoint.coordinates, padding: nil, anchor: nil, zoom: zoomLevel.doubleValue, bearing: heading.doubleValue, pitch: pitch.doubleValue)
     }
     else if let bounds = jsOptions["bounds"] as? String {
       guard let boundsData = bounds.data(using: .utf8) else {
-        throw RCTMGLError.paramError("bounds: bad format")
+        throw RNMBXError.paramError("bounds: bad format")
       }
       let boundsFeatures = try JSONDecoder().decode(FeatureCollection.self, from: boundsData).features
       let coords : [CLLocationCoordinate2D] = try boundsFeatures.map {
         guard case .point(let centerCoordinatePoint) = $0.geometry else {
-          throw RCTMGLError.paramError("Invalid bounds geometry")
+          throw RNMBXError.paramError("Invalid bounds geometry")
         }
         return centerCoordinatePoint.coordinates
       }
       return snaphotter.camera(for: coords, padding: .zero, bearing: heading.doubleValue, pitch: pitch.doubleValue)
     } else {
-      throw RCTMGLError.paramError("neither centerCoordinate nor bounds provided")
+      throw RNMBXError.paramError("neither centerCoordinate nor bounds provided")
     }
   }
   
   func _getSnapshotterOptions(_ jsOptions: [String:Any]) throws -> MapSnapshotOptions {
     guard let width = jsOptions["width"] as? NSNumber,
           let height = jsOptions["height"] as? NSNumber else {
-      throw RCTMGLError.paramError("width, height: is not a number")
+      throw RNMBXError.paramError("width, height: is not a number")
     }
     #if RNMBX_11
     let mapSnapshotOptions = MapSnapshotOptions(
@@ -99,7 +99,7 @@ class MGLSnapshotModule : NSObject {
       pixelRatio: 1.0
     )
     #else
-    let resourceOptions = ResourceOptions(accessToken: MGLModule.accessToken!)
+    let resourceOptions = ResourceOptions(accessToken: RNMBXModule.accessToken!)
     let mapSnapshotOptions = MapSnapshotOptions(
       size: CGSize(width: width.doubleValue, height: height.doubleValue),
       pixelRatio: 1.0,

package/ios/{RCTMGL-v10/RCTMGLSource.swift → RNMBX/RNMBXSource.swift}

@@ -1,9 +1,9 @@
 @_spi(Experimental) import MapboxMaps
 
 @objc
-class RCTMGLSource : RCTMGLInteractiveElement {
-  var layers: [RCTMGLSourceConsumer] = []
-  var components: [RCTMGLMapComponent] = []
+class RNMBXSource : RNMBXInteractiveElement {
+  var layers: [RNMBXSourceConsumer] = []
+  var components: [RNMBXMapComponent] = []
 
   var source : Source? = nil
 
@@ -13,7 +13,7 @@ class RCTMGLSource : RCTMGLInteractiveElement {
   
   override func getLayerIDs() -> [String] {
     layers.compactMap {
-      if let layer = $0 as? RCTMGLLayer {
+      if let layer = $0 as? RNMBXLayer {
         return layer.id
       } else {
         return nil
@@ -32,12 +32,12 @@ class RCTMGLSource : RCTMGLInteractiveElement {
   // MARK: - UIView+React
 
   @objc override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let layer = subview as? RCTMGLSourceConsumer {
+    if let layer = subview as? RNMBXSourceConsumer {
       if let map = map {
         layer.addToMap(map, style: map.mapboxMap.style)
       }
       layers.append(layer)
-    } else if let component = subview as? RCTMGLMapComponent {
+    } else if let component = subview as? RNMBXMapComponent {
       if let map = map {
         component.addToMap(map, style: map.mapboxMap.style)
       }
@@ -47,12 +47,12 @@ class RCTMGLSource : RCTMGLInteractiveElement {
   }
   
   @objc override func removeReactSubview(_ subview: UIView!) {
-    if let layer : RCTMGLSourceConsumer = subview as? RCTMGLSourceConsumer {
+    if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
       if let map = map {
         layer.removeFromMap(map, style: map.mapboxMap.style)
       }
       layers.removeAll { $0 as AnyObject === layer }
-    } else if let component = subview as? RCTMGLMapComponent {
+    } else if let component = subview as? RNMBXMapComponent {
       if let map = map {
         component.removeFromMap(map, reason: .ViewRemoval)
       }
@@ -65,9 +65,9 @@ class RCTMGLSource : RCTMGLInteractiveElement {
     // do nothing to prevent inserting layers to UIView hierarchy
   }
   
-  // MARK: - RCTMGLInteractiveElement
+  // MARK: - RNMBXInteractiveElement
   
-  override func addToMap(_ map: RCTMGLMapView, style: Style) {
+  override func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
 
     if style.sourceExists(withId: self.id) {
@@ -99,7 +99,7 @@ class RCTMGLSource : RCTMGLInteractiveElement {
     }
   }
 
-  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     self.map = nil
 
     for layer in self.layers {