@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/ios/RNMBX/RNMBXLocationModuleV11.swift

@@ -133,9 +133,10 @@ extension RNMBXAppleLocationProviderProxy {
 class RNMBXLocationModule: RCTEventEmitter {
   static weak var shared : RNMBXLocationModule? = nil
   
-  var _locationProvider : LocationProvider & HeadingProvider = AppleLocationProvider()
-  var locationUpdateObserver : Cancelable? = nil
-  var locationHeadingObserver : Cancelable? = nil
+  // var _locationProvider : RNMBXAppleLocationProviderProxy = RNMBXAppleLocationProviderProxy(provider: AppleLocationProvider())
+  var _locationProvider : AppleLocationProvider = AppleLocationProvider()
+  var locationUpdateObserver : AnyCancelable? = nil
+  var locationHeadingObserver : AnyCancelable? = nil
   
   var actLocation : RNMBXLocation = RNMBXLocation()
   
@@ -163,10 +164,12 @@ class RNMBXLocationModule: RCTEventEmitter {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    setMinDisplacement(minDisplacement)
+    var newOptions = _locationProvider.options
+    newOptions.distanceFilter = minDisplacement
+    if minDisplacement >= 0.0 { _locationProvider.options = newOptions }
     
     locationUpdateObserver?.cancel()
-    locationUpdateObserver = observeLocationUpdates(_locationProvider) { location in
+    locationUpdateObserver = _locationProvider.onLocationUpdate.observe { location in
       guard self.hasListener else { return }
   
       self.actLocation.location = location.last
@@ -175,7 +178,7 @@ class RNMBXLocationModule: RCTEventEmitter {
       }
     }
     locationHeadingObserver?.cancel()
-    locationHeadingObserver = observeHeadingUpdates(_locationProvider) { heading in
+    locationHeadingObserver = _locationProvider.onHeadingUpdate.observe { heading in
       guard self.hasListener else { return }
 
       self.actLocation.heading = heading
@@ -185,64 +188,6 @@ class RNMBXLocationModule: RCTEventEmitter {
     }
   }
   
-  class _LocationObserver : Cancelable, LocationObserver  {
-    weak var locationProvider: LocationProvider?
-    var callback: (([Location]) -> Void)?
-    
-    init(_ locationProvider: LocationProvider) {
-      self.locationProvider = locationProvider
-    }
-
-    func onLocationUpdateReceived(for locations: [Location]) {
-      callback?(locations)
-    }
-  
-    func cancel() {
-      locationProvider?.removeLocationObserver(for: self)
-      locationProvider = nil
-    }
-    
-    deinit {
-      self.cancel()
-    }
-  }
-  
-  class _HeadingObserver: Cancelable, HeadingObserver {
-    var headingProvider: HeadingProvider?
-    var callback: ((Heading) -> Void)?
-
-    init(_ headingProvider: HeadingProvider) {
-      self.headingProvider = headingProvider
-    }
-    
-    func onHeadingUpdate(_ heading: MapboxMaps.Heading) {
-      callback?(heading)
-    }
-    
-    func cancel() {
-      headingProvider?.remove(headingObserver: self)
-      headingProvider = nil
-    }
-    
-    deinit {
-      self.cancel()
-    }
-  }
-  
-  func observeLocationUpdates(_ locationProvider: LocationProvider, callback: @escaping ([Location]) -> Void) -> Cancelable {
-    let observer = _LocationObserver(locationProvider)
-    observer.callback = callback
-    locationProvider.addLocationObserver(for: observer)
-    return observer
-  }
-  
-  func observeHeadingUpdates(_ headingProvider: HeadingProvider, callback: @escaping (Heading) -> Void) -> Cancelable {
-    let observer = _HeadingObserver(headingProvider)
-    observer.callback = callback
-    headingProvider.add(headingObserver: observer)
-    return observer
-  }
-  
   @objc func stop() {
     locationUpdateObserver?.cancel()
     locationUpdateObserver = nil
@@ -254,17 +199,14 @@ class RNMBXLocationModule: RCTEventEmitter {
   @objc func getLastKnownLocation() -> RNMBXLocation? {
     let last = RNMBXLocation()
     last.heading = _locationProvider.latestHeading
-    last.location = _locationProvider.getLastObservedLocation()
+    last.location = _locationProvider.latestLocation
     return last
   }
   
-  @objc
-  func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    if let appleLocationProvider = _locationProvider as? AppleLocationProvider {
-      var newOptions = appleLocationProvider.options
-      newOptions.distanceFilter = minDisplacement
-      if minDisplacement >= 0.0 { appleLocationProvider.options = newOptions }
-    }
+  @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
+    var newOptions = _locationProvider.options
+    newOptions.distanceFilter = minDisplacement
+    _locationProvider.options = newOptions
   }
   
   @objc
@@ -294,16 +236,7 @@ class RNMBXLocationModule: RCTEventEmitter {
     get {
       return _locationProvider
     }
-    set(value) {
-      _locationProvider = value
-    }
   }
-  
-  func overrideLocationProvider(newProvider: LocationProvider & HeadingProvider) {
-    _locationProvider = newProvider
-  }
-  
-  
 }
 
 class EventThrottler {

package/ios/RNMBX/RNMBXLogging.swift

@@ -115,14 +115,6 @@ func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error)
   }
 }
 
-@objc(RNMBXLogger)
-public class RNMBXLogger : NSObject {
-  @objc
-  static public func error(_ message: String) {
-    Logger.error(message)
-  }
-}
-
 @objc(RNMBXLogging)
 class RNMBXLogging: RCTEventEmitter {
   static var shared : RNMBXLogging? = nil