@capacitor/geolocation 7.1.5-dev.5 → 7.1.5-dev.6

package/CapacitorGeolocation.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
-  #s.dependency 'IONGeolocationLib', spec='1.0.1'
+  s.dependency 'IONGeolocationLib', spec='2.0.0'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
-        .package(url: "https://github.com/ionic-team/ion-ios-geolocation.git", from: "1.0.2")
+        .package(url: "https://github.com/ionic-team/ion-ios-geolocation.git", from: "2.0.0")
     ],
     targets: [
         .target(

package/ios/Sources/GeolocationPlugin/GeolocationCallbackManager.swift

@@ -1,5 +1,5 @@
 import Capacitor
-//import IONGeolocationLib
+import IONGeolocationLib
 
 private enum GeolocationCallbackType {
     case requestPermissions

package/ios/Sources/GeolocationPlugin/GeolocationPlugin.swift

@@ -1,5 +1,5 @@
 import Capacitor
-// import IONGeolocationLib
+import IONGeolocationLib
 import UIKit
 import Combine
 

package/ios/Sources/GeolocationPlugin/IONGLOCPositionModel+JSONTransformer.swift

@@ -1,5 +1,5 @@
 import Capacitor
-//import IONGeolocationLib
+import IONGeolocationLib
 
 extension IONGLOCPositionModel {
     func toJSObject() -> JSObject {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/geolocation",
-  "version": "7.1.5-dev.5",
+  "version": "7.1.5-dev.6",
   "description": "The Geolocation API provides simple methods for getting and tracking the current position of the device using GPS, along with altitude, heading, and speed information if available.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/IONGLOCAuthorisation.swift

@@ -1,26 +0,0 @@
-import CoreLocation
-
-public enum IONGLOCAuthorisation {
-    case notDetermined
-    case restricted
-    case denied
-    case authorisedAlways
-    case authorisedWhenInUse
-
-    init(from status: CLAuthorizationStatus) {
-        self = switch status {
-        case .notDetermined: .notDetermined
-        case .restricted: .restricted
-        case .denied: .denied
-        case .authorizedAlways: .authorisedAlways
-        case .authorizedWhenInUse: .authorisedWhenInUse
-        @unknown default: .notDetermined
-        }
-    }
-}
-
-extension CLLocationManager {
-    var currentAuthorisationValue: IONGLOCAuthorisation {
-        .init(from: authorizationStatus)
-    }
-}

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/IONGLOCAuthorisationRequestType.swift

@@ -1,16 +0,0 @@
-import CoreLocation
-
-public enum IONGLOCAuthorisationRequestType {
-    case whenInUse
-    case always
-
-    func requestAuthorization(using locationManager: CLLocationManager) {
-        let requestAuthorisation = switch self {
-        case .whenInUse:
-            locationManager.requestWhenInUseAuthorization
-        case .always:
-            locationManager.requestAlwaysAuthorization
-        }
-        requestAuthorisation()
-    }
-}

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/IONGLOCPositionModel.swift

@@ -1,44 +0,0 @@
-import CoreLocation
-
-public struct IONGLOCPositionModel: Equatable {
-    private(set) public var altitude: Double
-    private(set) public var course: Double
-    private(set) public var horizontalAccuracy: Double
-    private(set) public var latitude: Double
-    private(set) public var longitude: Double
-    private(set) public var speed: Double
-    private(set) public var timestamp: Double
-    private(set) public var verticalAccuracy: Double
-
-    private init(altitude: Double, course: Double, horizontalAccuracy: Double, latitude: Double, longitude: Double, speed: Double, timestamp: Double, verticalAccuracy: Double) {
-        self.altitude = altitude
-        self.course = course
-        self.horizontalAccuracy = horizontalAccuracy
-        self.latitude = latitude
-        self.longitude = longitude
-        self.speed = speed
-        self.timestamp = timestamp
-        self.verticalAccuracy = verticalAccuracy
-    }
-}
-
-public extension IONGLOCPositionModel {
-    static func create(from location: CLLocation) -> IONGLOCPositionModel {
-        .init(
-            altitude: location.altitude,
-            course: location.course,
-            horizontalAccuracy: location.horizontalAccuracy,
-            latitude: location.coordinate.latitude,
-            longitude: location.coordinate.longitude,
-            speed: location.speed,
-            timestamp: location.timestamp.millisecondsSinceUnixEpoch,
-            verticalAccuracy: location.verticalAccuracy
-        )
-    }
-}
-
-private extension Date {
-    var millisecondsSinceUnixEpoch: Double {
-        timeIntervalSince1970 * 1000
-    }
-}

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/IONGLOCRequestOptionsModel.swift

@@ -1,9 +0,0 @@
-import Foundation
-
-public struct IONGLOCRequestOptionsModel {
-    let timeout: Int
-
-    public init(timeout: Int? = nil) {
-        self.timeout = timeout ?? 5000
-    }
-}

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/Publishers/IONGLOCManagerProtocols.swift

@@ -1,45 +0,0 @@
-import Combine
-
-public protocol IONGLOCServicesChecker {
-    func areLocationServicesEnabled() -> Bool
-}
-
-public protocol IONGLOCAuthorisationHandler {
-    var authorisationStatus: IONGLOCAuthorisation { get }
-    var authorisationStatusPublisher: Published<IONGLOCAuthorisation>.Publisher { get }
-
-    func requestAuthorisation(withType authorisationType: IONGLOCAuthorisationRequestType)
-}
-
-public enum IONGLOCLocationError: Error {
-    case locationUnavailable
-    case timeout
-    case other(_ error: Error)
-}
-
-public protocol IONGLOCLocationHandler {
-    var currentLocation: IONGLOCPositionModel? { get }
-    var currentLocationPublisher: AnyPublisher<IONGLOCPositionModel, IONGLOCLocationError> { get }
-    var locationTimeoutPublisher: AnyPublisher<IONGLOCLocationError, Never> { get }
-    func updateConfiguration(_ configuration: IONGLOCConfigurationModel)
-}
-
-public protocol IONGLOCSingleLocationHandler: IONGLOCLocationHandler {
-    func requestSingleLocation(options: IONGLOCRequestOptionsModel)
-}
-
-public protocol IONGLOCMonitorLocationHandler: IONGLOCLocationHandler {
-    func startMonitoringLocation(options: IONGLOCRequestOptionsModel)
-    func startMonitoringLocation()
-    func stopMonitoringLocation()
-}
-
-public struct IONGLOCConfigurationModel {
-    private(set) var enableHighAccuracy: Bool
-    private(set) var minimumUpdateDistanceInMeters: Double?
-
-    public init(enableHighAccuracy: Bool, minimumUpdateDistanceInMeters: Double? = nil) {
-        self.enableHighAccuracy = enableHighAccuracy
-        self.minimumUpdateDistanceInMeters = minimumUpdateDistanceInMeters
-    }
-}

package/ios/Sources/GeolocationPlugin/IONGeolocationLib/Publishers/IONGLOCManagerWrapper.swift

@@ -1,152 +0,0 @@
-import Combine
-import CoreLocation
-
-public typealias IONGLOCService = IONGLOCServicesChecker & IONGLOCAuthorisationHandler & IONGLOCSingleLocationHandler & IONGLOCMonitorLocationHandler
-
-public struct IONGLOCServicesValidator: IONGLOCServicesChecker {
-    public init() {}
-    
-    public func areLocationServicesEnabled() -> Bool {
-        CLLocationManager.locationServicesEnabled()
-    }
-}
-
-public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
-    @Published public var authorisationStatus: IONGLOCAuthorisation
-    public var authorisationStatusPublisher: Published<IONGLOCAuthorisation>.Publisher { $authorisationStatus }
-
-    @Published public var currentLocation: IONGLOCPositionModel?
-    private var timeoutCancellable: AnyCancellable?
-    public var currentLocationPublisher: AnyPublisher<IONGLOCPositionModel, IONGLOCLocationError> {
-        Publishers.Merge($currentLocation, currentLocationForceSubject)
-            .dropFirst()    // ignore the first value as it's the one set on the constructor.
-            .tryMap { location in
-                guard let location else { throw IONGLOCLocationError.locationUnavailable }
-                return location
-            }
-            .mapError { $0 as? IONGLOCLocationError ?? .other($0) }
-            .eraseToAnyPublisher()
-    }
-    
-    public var locationTimeoutPublisher: AnyPublisher<IONGLOCLocationError, Never> {
-        locationTimeoutSubject.eraseToAnyPublisher()
-    }
-    
-    private let currentLocationForceSubject = PassthroughSubject<IONGLOCPositionModel?, Never>()
-    private let locationTimeoutSubject = PassthroughSubject<IONGLOCLocationError, Never>()
-    
-    private let locationManager: CLLocationManager
-    private let servicesChecker: IONGLOCServicesChecker
-    
-    private var isMonitoringLocation = false
-
-    // Flag used to indicate that the location request has timed out.
-    // When `true`, the wrapper ignores any location updates received from CLLocationManager.
-    // This prevents "stale" or "ghost" events from being sent to subscribers after the timeout has occurred.
-    private var timeoutTriggered = false
-
-    public init(locationManager: CLLocationManager = .init(), servicesChecker: IONGLOCServicesChecker = IONGLOCServicesValidator()) {
-        self.locationManager = locationManager
-        self.servicesChecker = servicesChecker
-        self.authorisationStatus = locationManager.currentAuthorisationValue
-
-        super.init()
-        locationManager.delegate = self
-    }
-
-    public func requestAuthorisation(withType authorisationType: IONGLOCAuthorisationRequestType) {
-        authorisationType.requestAuthorization(using: locationManager)
-    }
-    
-    public func startMonitoringLocation(options: IONGLOCRequestOptionsModel) {
-        timeoutTriggered = false
-        isMonitoringLocation = true
-        locationManager.startUpdatingLocation()
-        self.startTimer(timeout: options.timeout)
-    }
-    
-    public func startMonitoringLocation() {
-        guard !timeoutTriggered else {
-            return
-        }
-        
-        isMonitoringLocation = true
-        locationManager.startUpdatingLocation()
-    }
-
-    public func stopMonitoringLocation() {
-        isMonitoringLocation = false
-        locationManager.stopUpdatingLocation()
-    }
-    
-    public func requestSingleLocation(options: IONGLOCRequestOptionsModel) {
-        timeoutTriggered = false
-        // If monitoring is active meaning the location service is already running
-        // and calling .requestLocation() will not trigger a new location update,
-        // we can just return the current location.
-        if isMonitoringLocation, let location = currentLocation {
-            currentLocationForceSubject.send(location)
-            return
-        }
-        
-        self.locationManager.requestLocation()
-        self.startTimer(timeout: options.timeout)
-    }
-    
-    private func startTimer(timeout: Int) {
-        timeoutCancellable?.cancel()
-        timeoutCancellable = nil
-        timeoutCancellable = Just(())
-            .delay(for: .milliseconds(timeout), scheduler: DispatchQueue.main)
-            .sink { [weak self] _ in
-                guard let self = self else { return }
-                self.timeoutTriggered = true
-                self.locationTimeoutSubject.send(.timeout)
-                
-                if self.isMonitoringLocation {
-                    self.isMonitoringLocation = false
-                    self.stopMonitoringLocation()
-                }
-                
-                self.timeoutCancellable?.cancel()
-                self.timeoutCancellable = nil
-            }
-    }
-    
-    public func updateConfiguration(_ configuration: IONGLOCConfigurationModel) {
-        locationManager.desiredAccuracy = configuration.enableHighAccuracy ? kCLLocationAccuracyBest : kCLLocationAccuracyThreeKilometers
-        configuration.minimumUpdateDistanceInMeters.map {
-            locationManager.distanceFilter = $0
-        }
-    }
-
-    public func areLocationServicesEnabled() -> Bool {
-        servicesChecker.areLocationServicesEnabled()
-    }
-}
-
-extension IONGLOCManagerWrapper: CLLocationManagerDelegate {
-    public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        authorisationStatus = manager.currentAuthorisationValue
-    }
-    
-    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        guard !timeoutTriggered else {
-            return
-        }
-     
-        timeoutCancellable?.cancel()
-        timeoutCancellable = nil
-        guard let latestLocation = locations.last else {
-            currentLocation = nil
-            return
-        }
-        currentLocation = IONGLOCPositionModel.create(from: latestLocation)
-    }
-    
-    public func locationManager(_ manager: CLLocationManager, didFailWithError error: any Error) {
-        timeoutCancellable?.cancel()
-        timeoutCancellable = nil
-        currentLocation = nil
-    }
-}