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

package/ios/{RCTMGL-v10/RCTMGLLocationModule.swift → RNMBX/RNMBXLocationModule.swift}

@@ -3,8 +3,8 @@ import MapboxMaps
 
 #if !RNMBX_11
 
-@objc(RCTMGLLocation)
-class RCTMGLLocation: NSObject {
+@objc(RNMBXLocation)
+class RNMBXLocation: NSObject {
   var location : CLLocation = CLLocation(latitude: 0.0, longitude: 0.0)
   
   var heading : CLHeading? = nil
@@ -27,7 +27,7 @@ class RCTMGLLocation: NSObject {
   }
 }
 
-typealias RCTMGLLocationBlock = (RCTMGLLocation?) -> Void
+typealias RNMBXLocationBlock = (RNMBXLocation?) -> Void
 
 let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
 
@@ -44,11 +44,11 @@ internal class EmptyLocationProviderDelegate: LocationProviderDelegate {
     func locationProviderDidChangeAuthorization(_ provider: LocationProvider) {}
 }
 
-protocol LocationProviderRCTMGLDelegate : AnyObject {
-  func locationManager(_ locationManager: LocationProviderRCTMGL, didUpdateLocation: RCTMGLLocation)
+protocol LocationProviderRNMBXDelegate : AnyObject {
+  func locationManager(_ locationManager: LocationProviderRNMBX, didUpdateLocation: RNMBXLocation)
 }
 
-class RCTMGLAppleLocationProvider: NSObject {
+class RNMBXAppleLocationProvider: NSObject {
     private var locationProvider: CLLocationManager
   
   #if RNMBX_11
@@ -88,7 +88,7 @@ class RCTMGLAppleLocationProvider: NSObject {
     }
 }
 
-extension RCTMGLAppleLocationProvider: LocationProvider {
+extension RNMBXAppleLocationProvider: LocationProvider {
   #if RNMBX_11
     func addLocationObserver(for observer: LocationObserver) {
       observers.append(observer)
@@ -167,7 +167,7 @@ extension RCTMGLAppleLocationProvider: LocationProvider {
     }
 }
 
-extension RCTMGLAppleLocationProvider: CLLocationManagerDelegate {
+extension RNMBXAppleLocationProvider: CLLocationManagerDelegate {
   public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
   #if RNMBX_11
     observers.forEach { $0.onLocationUpdateReceived(for: locations) }
@@ -214,10 +214,10 @@ internal protocol CalibratingLocationProviderDelegate: LocationProviderDelegate
     func locationProviderShouldDisplayHeadingCalibration(_ locationProvider: LocationProvider) -> Bool
 }
 
-/// LocationProviderRCTMGL listens to updates from a locationProvider and implements the LocationProvider interface itself
+/// LocationProviderRNMBX listens to updates from a locationProvider and implements the LocationProvider interface itself
 /// So it can be source of Mapbox locationProduces (which updates location pluck and viewport if configured) as well as source to updates
-/// to RCTMGLLocationModules.
-class LocationProviderRCTMGL : LocationProviderDelegate {
+/// to RNMBXLocationModules.
+class LocationProviderRNMBX : LocationProviderDelegate {
   enum LocationUpdateType {
     case heading
     case location
@@ -229,7 +229,7 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
   var lastKnownHeading : CLHeading?
   var shouldRequestAlwaysAuthorization: Bool?
   
-  weak var delegate: LocationProviderRCTMGLDelegate?
+  weak var delegate: LocationProviderRNMBXDelegate?
   weak var locationProviderDelage: LocationProviderDelegate?
   
   var headingSimulator: Timer? = nil
@@ -239,24 +239,24 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
   
   struct Status {
     var provider = (updatingLocation: false, updatingHeading: false)
-    var rctmglModule = false
+    var RNMBXModule = false
     
     var shouldUpdateLocation: Bool {
-      return provider.updatingLocation || rctmglModule
+      return provider.updatingLocation || RNMBXModule
     }
     var shouldUpdateHeading: Bool {
-      return provider.updatingHeading || rctmglModule
+      return provider.updatingHeading || RNMBXModule
     }
   }
 
-  var started = Status(provider: (updatingLocation: false, updatingHeading: false), rctmglModule: false) {
+  var started = Status(provider: (updatingLocation: false, updatingHeading: false), RNMBXModule: false) {
     didSet {
       _syncStarted(oldValue: oldValue, started: started)
     }
   }
 
   init() {
-    provider = RCTMGLAppleLocationProvider()
+    provider = RNMBXAppleLocationProvider()
     provider.setDelegate(self)
   }
   
@@ -275,11 +275,11 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
       provider.requestAlwaysAuthorization()
     }
     provider.requestWhenInUseAuthorization()
-    started.rctmglModule = true
+    started.RNMBXModule = true
   }
   
   func stop() {
-    started.rctmglModule = false
+    started.RNMBXModule = false
   }
 
   func _syncStarted(oldValue: Status, started: Status) {
@@ -309,12 +309,12 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
     }
   }
   
-  func _convertToMapboxLocation(_ location: CLLocation?, type: LocationUpdateType) -> RCTMGLLocation {
+  func _convertToMapboxLocation(_ location: CLLocation?, type: LocationUpdateType) -> RNMBXLocation {
     guard let location = location else {
-      return RCTMGLLocation()
+      return RNMBXLocation()
     }
 
-    let userLocation = RCTMGLLocation()
+    let userLocation = RNMBXLocation()
     userLocation.location = location;
     userLocation.heading = lastKnownHeading
     switch type {
@@ -363,7 +363,7 @@ class LocationProviderRCTMGL : LocationProviderDelegate {
 
 // MARK: LocationProvider
 
-extension LocationProviderRCTMGL: LocationProvider {
+extension LocationProviderRNMBX: LocationProvider {
   var locationProviderOptions: LocationOptions {
     get {
       provider.locationProviderOptions
@@ -480,7 +480,7 @@ final public class SimulatedHeading: CLHeading {
     }
 }
 
-extension LocationProviderRCTMGL {
+extension LocationProviderRNMBX {
   func simulateHeading(changesPerSecond: Int, increment: Double) {
     self.simulatedHeadingIncrement = increment
     DispatchQueue.main.async {
@@ -502,17 +502,17 @@ extension LocationProviderRCTMGL {
 }
 
 // LocationModule is a sigleton class
-@objc(RCTMGLLocationModule)
-class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
+@objc(RNMBXLocationModule)
+class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
 
-  static weak var shared : RCTMGLLocationModule? = nil
+  static weak var shared : RNMBXLocationModule? = nil
 
-  var locationProviderRCTMGL : LocationProviderRCTMGL
+  var locationProviderRNMBX : LocationProviderRNMBX
   var hasListener = false
   
   var locationProvider : LocationProvider {
     get {
-      return locationProviderRCTMGL
+      return locationProviderRNMBX
     }
   }
   
@@ -525,10 +525,10 @@ class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
   )
 
   override init() {
-    locationProviderRCTMGL = LocationProviderRCTMGL()
+    locationProviderRNMBX = LocationProviderRNMBX()
     super.init()
-    locationProviderRCTMGL.delegate = self
-    RCTMGLLocationModule.shared = self
+    locationProviderRNMBX.delegate = self
+    RNMBXLocationModule.shared = self
   }
   
   @objc
@@ -547,28 +547,28 @@ class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    if minDisplacement >= 0.0 { locationProviderRCTMGL.setDistanceFilter(minDisplacement) }
-    locationProviderRCTMGL.start()
+    if minDisplacement >= 0.0 { locationProviderRNMBX.setDistanceFilter(minDisplacement) }
+    locationProviderRNMBX.start()
   }
   
   @objc func stop() {
-    locationProviderRCTMGL.stop()
+    locationProviderRNMBX.stop()
   }
   
-  @objc func getLastKnownLocation() -> RCTMGLLocation? {
-    return RCTMGLLocation()
+  @objc func getLastKnownLocation() -> RNMBXLocation? {
+    return RNMBXLocation()
   }
   
   @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    locationProviderRCTMGL.setDistanceFilter(minDisplacement)
+    locationProviderRNMBX.setDistanceFilter(minDisplacement)
   }
   
   @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
-    locationProviderRCTMGL.setRequestsAlwaysUse(requestsAlwaysUse);
+    locationProviderRNMBX.setRequestsAlwaysUse(requestsAlwaysUse);
   }
 
   @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
-    locationProviderRCTMGL.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    locationProviderRNMBX.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
   }
 
   @objc
@@ -583,7 +583,7 @@ class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
     hasListener = false
   }
   
-  func locationManager(_ locationManager: LocationProviderRCTMGL, didUpdateLocation location: RCTMGLLocation) {
+  func locationManager(_ locationManager: LocationProviderRNMBX, didUpdateLocation location: RNMBXLocation) {
     guard hasListener, let _ = bridge else {
       return
     }

package/ios/{RCTMGL-v10/RCTMGLLocationModuleV11.swift → RNMBX/RNMBXLocationModuleV11.swift}

@@ -3,14 +3,14 @@ import MapboxMaps
 
 let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
 
-@objc(RCTMGLLocationModule)
-class RCTMGLLocationModule: RCTEventEmitter {
+@objc(RNMBXLocationModule)
+class RNMBXLocationModule: RCTEventEmitter {
   
-  static weak var shared : RCTMGLLocationModule? = nil
+  static weak var shared : RNMBXLocationModule? = nil
   
   override init() {
     super.init()
-    RCTMGLLocationModule.shared = self
+    RNMBXLocationModule.shared = self
   }
   
   @objc
@@ -25,7 +25,7 @@ class RCTMGLLocationModule: RCTEventEmitter {
 
   var locationProvider : LocationProvider & HeadingProvider {
     get {
-      fatalError("RCTMGLLocationModule.locationProvider not implemented")
+      fatalError("RNMBXLocationModule.locationProvider not implemented")
     }
   }
 }

package/ios/{RCTMGL-v10/RCTMGLLogging.m → RNMBX/RNMBXLogging.m}

@@ -1,6 +1,6 @@
 #import "React/RCTBridgeModule.h"
 
-@interface RCT_EXTERN_MODULE(RCTMGLLogging, NSObject)
+@interface RCT_EXTERN_MODULE(RNMBXLogging, NSObject)
 
 RCT_EXTERN_METHOD(setLogLevel: (nonnull NSString*)logLevel)
 

package/ios/{RCTMGL-v10/RCTMGLLogging.swift → RNMBX/RNMBXLogging.swift}

@@ -1,7 +1,7 @@
 import Foundation
 import MapboxMaps
 
-enum RCTMGLError: Error, LocalizedError {
+enum RNMBXError: Error, LocalizedError {
   case parseError(String)
   case failed(String)
   case paramError(String)
@@ -115,9 +115,9 @@ func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error)
   }
 }
 
-@objc(RCTMGLLogging)
-class RCTMGLLogging: RCTEventEmitter {
-  static var shared : RCTMGLLogging? = nil
+@objc(RNMBXLogging)
+class RNMBXLogging: RCTEventEmitter {
+  static var shared : RNMBXLogging? = nil
   
   enum ErrorType {
       case argumentError
@@ -133,11 +133,11 @@ class RCTMGLLogging: RCTEventEmitter {
   
   override init() {
     super.init()
-    if let _ = RCTMGLLogging.shared {
+    if let _ = RNMBXLogging.shared {
       // seems to happen on reload in debug versions
-      // fatalError("More than one instance of RCTMGLLogging is created \(previous)")
+      // fatalError("More than one instance of RNMBXLogging is created \(previous)")
     }
-    RCTMGLLogging.shared = self
+    RNMBXLogging.shared = self
     installHandler()
   }