@capacitor/geolocation 7.1.5-dev.1 → 7.1.5-dev.3

package/ios/Sources/GeolocationPlugin/GeolocationPlugin.swift

@@ -1,8 +1,6 @@
 import Capacitor
-
 // import IONGeolocationLib
 import UIKit
-
 import Combine
 
 @objc(GeolocationPlugin)

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

@@ -0,0 +1,9 @@
+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

@@ -13,7 +13,6 @@ public protocol IONGLOCAuthorisationHandler {
 
 public enum IONGLOCLocationError: Error {
     case locationUnavailable
-    //TODO changes here
     case timeout
     case other(_ error: Error)
 }
@@ -26,13 +25,11 @@ public protocol IONGLOCLocationHandler {
 }
 
 public protocol IONGLOCSingleLocationHandler: IONGLOCLocationHandler {
-    //TODO changes here
-    func requestSingleLocation(timeout: Int?)
+    func requestSingleLocation(options: IONGLOCRequestOptionsModel)
 }
 
 public protocol IONGLOCMonitorLocationHandler: IONGLOCLocationHandler {
-    //TODO changes here
-    func startMonitoringLocation(timeout: Int?)
+    func startMonitoringLocation(options: IONGLOCRequestOptionsModel)
     func startMonitoringLocation()
     func stopMonitoringLocation()
 }

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

@@ -14,10 +14,9 @@ public struct IONGLOCServicesValidator: IONGLOCServicesChecker {
 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.
@@ -40,47 +39,37 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
     private let servicesChecker: IONGLOCServicesChecker
     
     private var isMonitoringLocation = false
-    private var shouldRunTimeout = 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)
     }
-    //TODO changes here
-    public func startMonitoringLocation(timeout: Int? = nil) {
-        let timeoutValue = timeout ?? 5000
+  
+    public func startMonitoringLocation(options: IONGLOCRequestOptionsModel) {
         isMonitoringLocation = true
-        
-        print("======================> startMonitoringLocation timeout: ", timeoutValue)
-        self.startTimer(timeout: timeoutValue)
+        self.startTimer(timeout: options.timeout)
         locationManager.startUpdatingLocation()
     }
     
     public func startMonitoringLocation() {
         isMonitoringLocation = true
         locationManager.startUpdatingLocation()
-        print("======================> startMonitoringLocation sem timer ")
     }
-    
+
     public func stopMonitoringLocation() {
         isMonitoringLocation = false
         locationManager.stopUpdatingLocation()
     }
     
-    //TODO changes here
-    public func requestSingleLocation(timeout: Int? = nil) {
-        // Fallback to default timeout (5000) when the parameter is nil,
-        // since optional defaults in Swift don't apply when nil is explicitly passed.
-        let timeoutValue = timeout ?? 5000
-        
+    public func requestSingleLocation(options: IONGLOCRequestOptionsModel) {
         // 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.
@@ -88,10 +77,8 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
             currentLocationForceSubject.send(location)
             return
         }
-        
-        self.startTimer(timeout: timeoutValue)
+        self.startTimer(timeout: options.timeout)
         self.locationManager.requestLocation()
-        print("======================> requestLocation")
     }
     
     private func startTimer(timeout: Int) {
@@ -101,9 +88,7 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
             .delay(for: .milliseconds(timeout), scheduler: DispatchQueue.main)
             .sink { [weak self] _ in
                 guard let self = self else { return }
-                print("======================> Native lib: timeout triggered (\(timeout)ms)")
                 self.locationTimeoutSubject.send(.timeout)
-                print("======================> timeoutCancellable 4")
                 self.timeoutCancellable?.cancel()
                 self.timeoutCancellable = nil
             }
@@ -115,7 +100,7 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
             locationManager.distanceFilter = $0
         }
     }
-    
+
     public func areLocationServicesEnabled() -> Bool {
         servicesChecker.areLocationServicesEnabled()
     }
@@ -125,25 +110,18 @@ extension IONGLOCManagerWrapper: CLLocationManagerDelegate {
     public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
         authorisationStatus = manager.currentAuthorisationValue
     }
-    
+
     public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         timeoutCancellable?.cancel()
         timeoutCancellable = nil
-        print("======================> timeoutCancellable 2")
-        
         guard let latestLocation = locations.last else {
-            
-            print("======================> currentLocation 1")
             currentLocation = nil
             return
         }
-        
-        print("======================> currentLocation 2")
         currentLocation = IONGLOCPositionModel.create(from: latestLocation)
     }
-    
+
     public func locationManager(_ manager: CLLocationManager, didFailWithError error: any Error) {
-        print("======================> timeoutCancellable 3")
         timeoutCancellable?.cancel()
         timeoutCancellable = nil
         currentLocation = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/geolocation",
-  "version": "7.1.5-dev.1",
+  "version": "7.1.5-dev.3",
   "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",