@rnmapbox/maps 10.0.0-beta.79 → 10.0.0-beta.80

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -217,7 +217,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
     }
   }
   
-  func _disableUsetTracking(_ map: MapView) {
+  func _disableUserTracking(_ map: MapView) {
     map.viewport.idle()
   }
   
@@ -263,12 +263,12 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? UserTrackingMode.normal.rawValue)
       guard let userTrackingMode = userTrackingMode else {
         Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
-        self._disableUsetTracking(map)
+        self._disableUserTracking(map)
         return
       }
 
       guard self.followUserLocation && userTrackingMode != .none else {
-        self._disableUsetTracking(map)
+        self._disableUserTracking(map)
         return
       }
 

package/ios/RCTMGL-v10/RCTMGLInteractiveElement.swift

@@ -2,7 +2,6 @@ import MapboxMaps
 
 @objc
 class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
-
   weak var map : RCTMGLMapView? = nil
 
   static let hitboxDefault = 44.0

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -38,31 +38,50 @@ internal class EmptyLocationProviderDelegate: LocationProviderDelegate {
     func locationProviderDidChangeAuthorization(_ provider: LocationProvider) {}
 }
 
-protocol RCTMGLLocationManagerDelegate : AnyObject {
-  func locationManager(_ locationManager: RCTMGLLocationManager, didUpdateLocation: RCTMGLLocation)
+protocol LocationProviderRCTMGLDelegate : AnyObject {
+  func locationManager(_ locationManager: LocationProviderRCTMGL, didUpdateLocation: RCTMGLLocation)
 }
 
-class RCTMGLLocationManager : LocationProviderDelegate {
+/// LocationProviderRCTMGL listens to updates from a locationProvider and implements the LocationProvider interface itself
+/// So it can be source of both updates to Mapbox mapView.location, and camera location updates as well as source to updates
+/// to RCTMGLLocationModules.
+class LocationProviderRCTMGL : LocationProviderDelegate {
   enum LocationUpdateType {
     case heading
     case location
   }
-
+  
   var provider: LocationProvider
   
   var lastKnownLocation : CLLocation?
   var lastKnownHeading : CLHeading?
   var shouldRequestAlwaysAuthorization: Bool?
   
-  weak var delegate: RCTMGLLocationManagerDelegate?
+  weak var delegate: LocationProviderRCTMGLDelegate?
   weak var locationProviderDelage: LocationProviderDelegate?
   
   var headingSimulator: Timer? = nil
   var simulatedHeading: Double = 0.0
   var simulatedHeadingIncrement: Double = 1.0
+  
+  
+  struct Status {
+    var provider = (updatingLocation: false, updatingHeading: false)
+    var rctmglModule = false
+    
+    var shouldUpdateLocation: Bool {
+      return provider.updatingLocation || rctmglModule
+    }
+    var shouldUpdateHeading: Bool {
+      return provider.updatingHeading || rctmglModule
+    }
+  }
 
-  var startUpdatingLocationCalled = false
-  var startUpdatingHeadingCalled = false
+  var started = Status(provider: (updatingLocation: false, updatingHeading: false), rctmglModule: false) {
+    didSet {
+      _syncStarted(oldValue: oldValue, started: started)
+    }
+  }
 
   init() {
     provider = AppleLocationProvider()
@@ -84,23 +103,36 @@ class RCTMGLLocationManager : LocationProviderDelegate {
       provider.requestAlwaysAuthorization()
     }
     provider.requestWhenInUseAuthorization()
-    provider.setDelegate(self)
-    provider.startUpdatingHeading()
-    provider.startUpdatingLocation()
+    started.rctmglModule = true
   }
   
   func stop() {
-    if !startUpdatingHeadingCalled {
-      provider.stopUpdatingHeading()
+    started.rctmglModule = false
+  }
+
+  func _syncStarted(oldValue: Status, started: Status) {
+    var stoppedSomething = false
+    if (oldValue.shouldUpdateLocation != started.shouldUpdateLocation) {
+      if started.shouldUpdateLocation {
+        provider.setDelegate(self)
+        provider.startUpdatingLocation()
+      } else {
+        provider.stopUpdatingLocation()
+        stoppedSomething = true
+      }
     }
-    if !startUpdatingLocationCalled {
-      provider.stopUpdatingLocation()
+    
+    if (oldValue.shouldUpdateHeading != started.shouldUpdateHeading) {
+      if started.shouldUpdateHeading {
+        provider.setDelegate(self)
+        provider.startUpdatingHeading()
+      } else {
+        provider.stopUpdatingHeading()
+        stoppedSomething = true
+      }
     }
-    _clearProviderDelegateIfNotListening()
-  }
-
-  func _clearProviderDelegateIfNotListening() {
-    if !startUpdatingHeadingCalled && !startUpdatingLocationCalled {
+    
+    if stoppedSomething && !started.shouldUpdateLocation && !started.shouldUpdateHeading {
       provider.setDelegate(EmptyLocationProviderDelegate())
     }
   }
@@ -159,7 +191,7 @@ class RCTMGLLocationManager : LocationProviderDelegate {
 
 // MARK: LocationProvider
 
-extension RCTMGLLocationManager: LocationProvider {
+extension LocationProviderRCTMGL: LocationProvider {
   var locationProviderOptions: LocationOptions {
     get {
       provider.locationProviderOptions
@@ -209,15 +241,11 @@ extension RCTMGLLocationManager: LocationProvider {
   }
   
   func startUpdatingLocation() {
-    startUpdatingLocationCalled = true
-    provider.startUpdatingLocation()
+    started.provider.updatingLocation = true
   }
   
   func stopUpdatingLocation() {
-    provider.stopUpdatingLocation()
-    startUpdatingLocationCalled = false
-
-    _clearProviderDelegateIfNotListening()
+    started.provider.updatingLocation = false
   }
   
   var headingOrientation: CLDeviceOrientation {
@@ -230,15 +258,11 @@ extension RCTMGLLocationManager: LocationProvider {
   }
   
   func startUpdatingHeading() {
-    startUpdatingHeadingCalled = true
-    provider.startUpdatingHeading()
+    started.provider.updatingHeading = true
   }
   
   func stopUpdatingHeading() {
-    startUpdatingHeadingCalled = false
-    provider.stopUpdatingHeading()
-
-    _clearProviderDelegateIfNotListening()
+    started.provider.updatingHeading = false
   }
   
   func dismissHeadingCalibrationDisplay() {
@@ -273,7 +297,7 @@ final public class SimulatedHeading: CLHeading {
     }
 }
 
-extension RCTMGLLocationManager {
+extension LocationProviderRCTMGL {
   func simulateHeading(changesPerSecond: Int, increment: Double) {
     self.simulatedHeadingIncrement = increment
     DispatchQueue.main.async {
@@ -294,18 +318,18 @@ extension RCTMGLLocationManager {
   }
 }
 
-
+// LocationModule is a sigleton class
 @objc(RCTMGLLocationModule)
-class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
+class RCTMGLLocationModule: RCTEventEmitter, LocationProviderRCTMGLDelegate {
 
   static weak var shared : RCTMGLLocationModule? = nil
 
-  var locationManager : RCTMGLLocationManager
+  var locationProviderRCTMGL : LocationProviderRCTMGL
   var hasListener = false
   
   var locationProvider : LocationProvider {
     get {
-      return locationManager
+      return locationProviderRCTMGL
     }
   }
   
@@ -318,9 +342,9 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   )
 
   override init() {
-    locationManager = RCTMGLLocationManager()
+    locationProviderRCTMGL = LocationProviderRCTMGL()
     super.init()
-    locationManager.delegate = self
+    locationProviderRCTMGL.delegate = self
     RCTMGLLocationModule.shared = self
   }
   
@@ -340,12 +364,12 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    if minDisplacement >= 0.0 { locationManager.setDistanceFilter(minDisplacement) }
-    locationManager.start()
+    if minDisplacement >= 0.0 { locationProviderRCTMGL.setDistanceFilter(minDisplacement) }
+    locationProviderRCTMGL.start()
   }
   
   @objc func stop() {
-    locationManager.stop()
+    locationProviderRCTMGL.stop()
   }
   
   @objc func getLastKnownLocation() -> RCTMGLLocation? {
@@ -353,15 +377,15 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   }
   
   @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    locationManager.setDistanceFilter(minDisplacement)
+    locationProviderRCTMGL.setDistanceFilter(minDisplacement)
   }
   
   @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
-    locationManager.setRequestsAlwaysUse(requestsAlwaysUse);
+    locationProviderRCTMGL.setRequestsAlwaysUse(requestsAlwaysUse);
   }
 
   @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
-    locationManager.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    locationProviderRCTMGL.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
   }
 
   @objc
@@ -376,7 +400,7 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
     hasListener = false
   }
   
-  func locationManager(_ locationManager: RCTMGLLocationManager, didUpdateLocation location: RCTMGLLocation) {
+  func locationManager(_ locationManager: LocationProviderRCTMGL, didUpdateLocation location: RCTMGLLocation) {
     guard hasListener, let _ = bridge else {
       return
     }
@@ -416,7 +440,6 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
      
     return false;
   }
-
 }
 
 

package/ios/RCTMGL-v10/RCTMGLOfflineModule.m

@@ -29,4 +29,6 @@ RCT_EXTERN_METHOD(deletePack:(NSString *)name
 
 RCT_EXTERN_METHOD(migrateOfflineCache:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(resetDatabase:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 @end

package/ios/RCTMGL-v10/RCTMGLOfflineModule.swift

@@ -572,6 +572,37 @@ class RCTMGLOfflineModule: RCTEventEmitter {
       reject("migrateOfflineCache", error.localizedDescription, error)
     }
   }
+  
+  @objc
+  func resetDatabase(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    self.tileStore.allTileRegions { result in
+      switch result {
+      case .success(let regions):
+        regions.forEach { region in
+          self.tileStore.removeTileRegion(forId: region.id)
+        }
+        self.offlineManager.allStylePacks { result in
+          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) }) {
+                self.offlineManager.removeStylePack(for: styleUri)
+              }
+            }
+            resolve(nil)
+          case .failure(let error):
+            Logger.log(level:.error, message: "RCTMGLOfflineModule.resetDatabase/allStylePacks \(error.localizedDescription) \(error)")
+            reject("RCTMGLOfflineModule.resetDatabase/allStylePacks", error.localizedDescription, error)
+          }
+        }
+      case .failure(let error):
+        Logger.log(level:.error, message: "RCTMGLOfflineModule.resetDatabase/allTileRegions \(error.localizedDescription) \(error)")
+        reject("RCTMGLOfflineModule.resetDatabase/allTileRegions", error.localizedDescription, error)
+      }
+      
+    }
+  }
 }
 
 // MARK: progress throttle

package/ios/RCTMGL-v10/RCTMGLPointAnnotation.swift

@@ -236,7 +236,10 @@ extension RCTMGLPointAnnotation {
   
   @discardableResult
   func addIfPossible() -> Bool {
-    if !added && annotation.point.coordinates.isValid(), let pointAnnotationManager = map?.pointAnnotationManager {
+    if !added
+        && annotation.point.coordinates.isValid()
+        && (logged("PointAnnotation: missing id attribute") { return id }) != nil,
+        let pointAnnotationManager = map?.pointAnnotationManager {
       pointAnnotationManager.add(annotation)
       added = true
       return true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.79",
+  "version": "10.0.0-beta.80",
   "publishConfig": {
     "access": "public"
   },