@capacitor/geolocation 7.1.5-dev.2 → 7.1.5-dev.4

package/ios/Sources/GeolocationPlugin/GeolocationPlugin.swift

@@ -1,8 +1,6 @@
 import Capacitor
-
 // import IONGeolocationLib
 import UIKit
-
 import Combine
 
 @objc(GeolocationPlugin)
@@ -218,10 +216,10 @@ private extension GeolocationPlugin {
             callbackManager?.sendRequestPermissionsSuccess(Constants.AuthorisationStatus.Status.granted)
         }
         if shouldRequestCurrentPosition {
-            locationService?.requestSingleLocation(timeout: self.timeout)
+            locationService?.requestSingleLocation(options: IONGLOCRequestOptionsModel(timeout: self.timeout))
         }
         if shouldRequestLocationMonitoring {
-            locationService?.startMonitoringLocation(timeout: self.timeout)
+            locationService?.startMonitoringLocation(options: IONGLOCRequestOptionsModel(timeout: self.timeout))
         }
     }
 

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

@@ -25,11 +25,11 @@ public protocol IONGLOCLocationHandler {
 }
 
 public protocol IONGLOCSingleLocationHandler: IONGLOCLocationHandler {
-    func requestSingleLocation(timeout: Int?)
+    func requestSingleLocation(options: IONGLOCRequestOptionsModel)
 }
 
 public protocol IONGLOCMonitorLocationHandler: IONGLOCLocationHandler {
-    func startMonitoringLocation(timeout: Int?)
+    func startMonitoringLocation(options: IONGLOCRequestOptionsModel)
     func startMonitoringLocation()
     func stopMonitoringLocation()
 }

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

@@ -53,10 +53,9 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
         authorisationType.requestAuthorization(using: locationManager)
     }
   
-    public func startMonitoringLocation(timeout: Int? = nil) {
-        let timeoutValue = timeout ?? 5000
+    public func startMonitoringLocation(options: IONGLOCRequestOptionsModel) {
         isMonitoringLocation = true
-        self.startTimer(timeout: timeoutValue)
+        self.startTimer(timeout: options.timeout)
         locationManager.startUpdatingLocation()
     }
     
@@ -70,10 +69,7 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
         locationManager.stopUpdatingLocation()
     }
     
-    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.
@@ -81,7 +77,7 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {
             currentLocationForceSubject.send(location)
             return
         }
-        self.startTimer(timeout: timeoutValue)
+        self.startTimer(timeout: options.timeout)
         self.locationManager.requestLocation()
     }
     

package/package.json

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