react-native-nitro-geolocation 1.1.4 → 1.2.0

package/ios/LocationManager.swift

@@ -11,15 +11,15 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
     private struct LocationRequest {
         let id: UUID = UUID()
-        let success: (GeolocationResponse) -> Void
-        let error: ((GeolocationError) -> Void)?
+        let success: (CompatGeolocationResponse) -> Void
+        let error: ((CompatGeolocationError) -> Void)?
         let options: ParsedOptions
         var timer: DispatchSourceTimer?
     }
 
     private struct WatchSubscription {
-        let success: (GeolocationResponse) -> Void
-        let error: ((GeolocationError) -> Void)?
+        let success: (CompatGeolocationResponse) -> Void
+        let error: ((CompatGeolocationError) -> Void)?
         let options: ParsedOptions
     }
 
@@ -29,13 +29,18 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         let accuracy: CLLocationAccuracy
         let distanceFilter: CLLocationDistance
         let useSignificantChanges: Bool
+        let activityType: CLActivityType?
+        let pausesLocationUpdatesAutomatically: Bool?
+        let showsBackgroundLocationIndicator: Bool?
 
-        static func parse(from options: GeolocationOptions?) -> ParsedOptions {
+        static func parse(from options: CompatGeolocationOptions?) -> ParsedOptions {
             let timeout = options?.timeout ?? DEFAULT_TIMEOUT
             let maximumAge = options?.maximumAge ?? DEFAULT_MAXIMUM_AGE
             let enableHighAccuracy = options?.enableHighAccuracy ?? false
-            let accuracy =
-                enableHighAccuracy ? kCLLocationAccuracyBest : kCLLocationAccuracyHundredMeters
+            let accuracy = resolveAccuracy(
+                preset: options?.accuracy?.ios,
+                enableHighAccuracy: enableHighAccuracy
+            )
             let distanceFilter = options?.distanceFilter ?? kCLDistanceFilterNone
             let useSignificantChanges = options?.useSignificantChanges ?? false
 
@@ -44,9 +49,59 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
                 maximumAge: maximumAge,
                 accuracy: accuracy,
                 distanceFilter: distanceFilter,
-                useSignificantChanges: useSignificantChanges
+                useSignificantChanges: useSignificantChanges,
+                activityType: resolveActivityType(options?.activityType),
+                pausesLocationUpdatesAutomatically: options?.pausesLocationUpdatesAutomatically,
+                showsBackgroundLocationIndicator: options?.showsBackgroundLocationIndicator
             )
         }
+
+        private static func resolveAccuracy(
+            preset: IOSAccuracyPreset?,
+            enableHighAccuracy: Bool
+        ) -> CLLocationAccuracy {
+            guard let preset else {
+                return enableHighAccuracy
+                    ? kCLLocationAccuracyBest
+                    : kCLLocationAccuracyHundredMeters
+            }
+
+            switch preset {
+            case .bestfornavigation:
+                return kCLLocationAccuracyBestForNavigation
+            case .best:
+                return kCLLocationAccuracyBest
+            case .nearesttenmeters:
+                return kCLLocationAccuracyNearestTenMeters
+            case .hundredmeters:
+                return kCLLocationAccuracyHundredMeters
+            case .kilometer:
+                return kCLLocationAccuracyKilometer
+            case .threekilometers:
+                return kCLLocationAccuracyThreeKilometers
+            case .reduced:
+                return kCLLocationAccuracyReduced
+            }
+        }
+
+        private static func resolveActivityType(_ activityType: IOSActivityType?) -> CLActivityType? {
+            guard let activityType else {
+                return nil
+            }
+
+            switch activityType {
+            case .other:
+                return .other
+            case .automotivenavigation:
+                return .automotiveNavigation
+            case .fitness:
+                return .fitness
+            case .othernavigation:
+                return .otherNavigation
+            case .airborne:
+                return .airborne
+            }
+        }
     }
 
     // MARK: - Properties
@@ -57,7 +112,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
     // Authorization
     private var queuedAuthorizationCallbacks:
-        [(success: (() -> Void)?, error: ((GeolocationError) -> Void)?)] = []
+        [(success: (() -> Void)?, error: ((CompatGeolocationError) -> Void)?)] = []
 
     // getCurrentPosition
     private var pendingRequests: [LocationRequest] = []
@@ -83,7 +138,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         skipPermissionRequests: Bool,
         enableBackgroundLocationUpdates: Bool,
         success: (() -> Void)?,
-        error: ((GeolocationError) -> Void)?
+        error: ((CompatGeolocationError) -> Void)?
     ) {
         initializeLocationManagerIfNeeded()
         enqueueAuthorizationCallbacks(success: success, error: error)
@@ -114,7 +169,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
     }
 
     private func enqueueAuthorizationCallbacks(
-        success: (() -> Void)?, error: ((GeolocationError) -> Void)?
+        success: (() -> Void)?, error: ((CompatGeolocationError) -> Void)?
     ) {
         guard success != nil || error != nil else { return }
         queuedAuthorizationCallbacks.append((success: success, error: error))
@@ -146,9 +201,9 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
     // MARK: - Get Current Position
 
     func getCurrentPosition(
-        success: @escaping (GeolocationResponse) -> Void,
-        error: ((GeolocationError) -> Void)?,
-        options: GeolocationOptions?
+        success: @escaping (CompatGeolocationResponse) -> Void,
+        error: ((CompatGeolocationError) -> Void)?,
+        options: CompatGeolocationOptions?
     ) {
         let parsedOptions = ParsedOptions.parse(from: options)
 
@@ -170,10 +225,6 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
         initializeLocationManagerIfNeeded()
 
-        // Configure location manager
-        locationManager?.desiredAccuracy = parsedOptions.accuracy
-        locationManager?.distanceFilter = parsedOptions.distanceFilter
-
         // Create request
         var request = LocationRequest(
             success: success,
@@ -193,16 +244,17 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
         pendingRequests.append(request)
 
-        // Start location updates
+        // Update configuration and start location updates
+        updateLocationManagerConfiguration()
         startMonitoring()
     }
 
     // MARK: - Watch Position
 
     func watchPosition(
-        success: @escaping (GeolocationResponse) -> Void,
-        error: ((GeolocationError) -> Void)?,
-        options: GeolocationOptions?
+        success: @escaping (CompatGeolocationResponse) -> Void,
+        error: ((CompatGeolocationError) -> Void)?,
+        options: CompatGeolocationOptions?
     ) -> Double {
         let parsedOptions = ParsedOptions.parse(from: options)
         let watchId = nextWatchId
@@ -218,10 +270,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
         initializeLocationManagerIfNeeded()
 
-        // Configure location manager
-        locationManager?.desiredAccuracy = parsedOptions.accuracy
-        locationManager?.distanceFilter = parsedOptions.distanceFilter
-
+        updateLocationManagerConfiguration()
         startMonitoring()
 
         return watchId
@@ -233,6 +282,8 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         // Stop monitoring if no more watches or pending requests
         if activeWatches.isEmpty && pendingRequests.isEmpty {
             stopMonitoring()
+        } else {
+            updateLocationManagerConfiguration()
         }
     }
 
@@ -242,6 +293,8 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         // Stop monitoring if no pending requests
         if pendingRequests.isEmpty {
             stopMonitoring()
+        } else {
+            updateLocationManagerConfiguration()
         }
     }
 
@@ -284,11 +337,13 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         // 3. Stop monitoring if no more watches or pending requests
         if activeWatches.isEmpty && pendingRequests.isEmpty {
             stopMonitoring()
+        } else {
+            updateLocationManagerConfiguration()
         }
     }
 
     func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        let geoError: GeolocationError
+        let geoError: CompatGeolocationError
 
         if let clError = error as? CLError {
             switch clError.code {
@@ -345,26 +400,55 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         guard let manager = locationManager else { return }
 
         // Find the best (most accurate) settings from all pending requests and active watches
-        var bestAccuracy = kCLLocationAccuracyHundredMeters
-        var smallestDistanceFilter = kCLDistanceFilterNone
+        var bestAccuracy: CLLocationAccuracy?
+        var smallestDistanceFilter: CLLocationDistance?
+        var activityType: CLActivityType?
+        var pausesLocationUpdatesAutomatically: Bool?
+        var showsBackgroundLocationIndicator = false
         var shouldUseSignificantChanges = false
 
         for request in pendingRequests {
-            bestAccuracy = min(bestAccuracy, request.options.accuracy)
-            smallestDistanceFilter = min(smallestDistanceFilter, request.options.distanceFilter)
+            bestAccuracy = mergeAccuracy(bestAccuracy, request.options.accuracy)
+            smallestDistanceFilter = mergeDistanceFilter(
+                smallestDistanceFilter,
+                request.options.distanceFilter
+            )
+            activityType = mergeActivityType(activityType, request.options.activityType)
+            pausesLocationUpdatesAutomatically = mergePausesLocationUpdatesAutomatically(
+                pausesLocationUpdatesAutomatically,
+                request.options.pausesLocationUpdatesAutomatically
+            )
+            showsBackgroundLocationIndicator = showsBackgroundLocationIndicator ||
+                (request.options.showsBackgroundLocationIndicator ?? false)
             shouldUseSignificantChanges =
                 shouldUseSignificantChanges || request.options.useSignificantChanges
         }
 
         for (_, watch) in activeWatches {
-            bestAccuracy = min(bestAccuracy, watch.options.accuracy)
-            smallestDistanceFilter = min(smallestDistanceFilter, watch.options.distanceFilter)
+            bestAccuracy = mergeAccuracy(bestAccuracy, watch.options.accuracy)
+            smallestDistanceFilter = mergeDistanceFilter(
+                smallestDistanceFilter,
+                watch.options.distanceFilter
+            )
+            activityType = mergeActivityType(activityType, watch.options.activityType)
+            pausesLocationUpdatesAutomatically = mergePausesLocationUpdatesAutomatically(
+                pausesLocationUpdatesAutomatically,
+                watch.options.pausesLocationUpdatesAutomatically
+            )
+            showsBackgroundLocationIndicator = showsBackgroundLocationIndicator ||
+                (watch.options.showsBackgroundLocationIndicator ?? false)
             shouldUseSignificantChanges =
                 shouldUseSignificantChanges || watch.options.useSignificantChanges
         }
 
-        manager.desiredAccuracy = bestAccuracy
-        manager.distanceFilter = smallestDistanceFilter
+        manager.desiredAccuracy = bestAccuracy ?? kCLLocationAccuracyHundredMeters
+        manager.distanceFilter = smallestDistanceFilter ?? kCLDistanceFilterNone
+        manager.activityType = activityType ?? .other
+        manager.pausesLocationUpdatesAutomatically = pausesLocationUpdatesAutomatically ?? true
+
+        if #available(iOS 11.0, *) {
+            manager.showsBackgroundLocationIndicator = showsBackgroundLocationIndicator
+        }
 
         // Update significant changes mode if changed
         if shouldUseSignificantChanges != usingSignificantChanges {
@@ -374,6 +458,79 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         }
     }
 
+    private func mergeAccuracy(
+        _ current: CLLocationAccuracy?,
+        _ next: CLLocationAccuracy
+    ) -> CLLocationAccuracy {
+        guard let current else {
+            return next
+        }
+
+        return min(current, next)
+    }
+
+    private func mergeActivityType(
+        _ current: CLActivityType?,
+        _ next: CLActivityType?
+    ) -> CLActivityType? {
+        guard let next else {
+            return current
+        }
+
+        guard let current else {
+            return next
+        }
+
+        return activityTypeRank(next) > activityTypeRank(current) ? next : current
+    }
+
+    private func activityTypeRank(_ activityType: CLActivityType) -> Int {
+        switch activityType {
+        case .other:
+            return 0
+        case .otherNavigation:
+            return 1
+        case .automotiveNavigation:
+            return 2
+        case .fitness:
+            return 3
+        case .airborne:
+            return 4
+        @unknown default:
+            return 0
+        }
+    }
+
+    private func mergePausesLocationUpdatesAutomatically(
+        _ current: Bool?,
+        _ next: Bool?
+    ) -> Bool? {
+        guard let next else {
+            return current
+        }
+
+        guard let current else {
+            return next
+        }
+
+        return current && next
+    }
+
+    private func mergeDistanceFilter(
+        _ current: CLLocationDistance?,
+        _ next: CLLocationDistance
+    ) -> CLLocationDistance {
+        guard let current else {
+            return next
+        }
+
+        if current == kCLDistanceFilterNone || next == kCLDistanceFilterNone {
+            return kCLDistanceFilterNone
+        }
+
+        return min(current, next)
+    }
+
     private func startMonitoring() {
         if usingSignificantChanges {
             locationManager?.startMonitoringSignificantLocationChanges()
@@ -427,6 +584,8 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
             // Stop monitoring if no more watches or pending requests
             if activeWatches.isEmpty && pendingRequests.isEmpty {
                 stopMonitoring()
+            } else {
+                updateLocationManagerConfiguration()
             }
         }
     }
@@ -450,13 +609,13 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         invokeQueuedAuthorizationCallbacks(error: error)
     }
 
-    private func createGeolocationError(for status: CLAuthorizationStatus) -> GeolocationError {
+    private func createGeolocationError(for status: CLAuthorizationStatus) -> CompatGeolocationError {
         let message =
             status == .restricted
             ? "This application is not authorized to use location services"
             : "User denied access to location services."
 
-        return GeolocationError(
+        return CompatGeolocationError(
             code: Double(PERMISSION_DENIED),
             message: message,
             PERMISSION_DENIED: Double(PERMISSION_DENIED),
@@ -466,7 +625,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
     }
 
     private func invokeQueuedAuthorizationCallbacks(
-        success: Bool = false, error: GeolocationError? = nil
+        success: Bool = false, error: CompatGeolocationError? = nil
     ) {
         for callback in queuedAuthorizationCallbacks {
             if success {
@@ -478,23 +637,18 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         queuedAuthorizationCallbacks.removeAll()
     }
 
-    func locationToPosition(_ location: CLLocation) -> GeolocationResponse {
-        let altitude = location.verticalAccuracy < 0 ? 0.0 : location.altitude
-        let altitudeAccuracy = location.verticalAccuracy < 0 ? 0.0 : location.verticalAccuracy
-        let heading = location.course >= 0 ? location.course : -1.0
-        let speed = location.speed >= 0 ? location.speed : 0.0
-
+    func locationToPosition(_ location: CLLocation) -> CompatGeolocationResponse {
         let coordsObj = GeolocationCoordinates(
             latitude: location.coordinate.latitude,
             longitude: location.coordinate.longitude,
-            altitude: .second(altitude),
+            altitude: location.nitroGeolocationAltitude,
             accuracy: location.horizontalAccuracy,
-            altitudeAccuracy: .second(altitudeAccuracy),
-            heading: .second(heading),
-            speed: .second(speed)
+            altitudeAccuracy: location.nitroGeolocationAltitudeAccuracy,
+            heading: location.nitroGeolocationHeading,
+            speed: location.nitroGeolocationSpeed
         )
 
-        let position = GeolocationResponse(
+        let position = CompatGeolocationResponse(
             coords: coordsObj,
             timestamp: location.timestamp.timeIntervalSince1970 * 1000
         )
@@ -502,8 +656,8 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         return position
     }
 
-    private func createError(code: Int, message: String) -> GeolocationError {
-        return GeolocationError(
+    private func createError(code: Int, message: String) -> CompatGeolocationError {
+        return CompatGeolocationError(
             code: Double(code),
             message: message,
             PERMISSION_DENIED: Double(PERMISSION_DENIED),