fix(iOS): added new struct IONGLOCRequestOptionsModel

OS-ruimoreiramendes · OS-ruimoreiramendes · commit cf4cc764124b · 2025-10-24T16:46:45.000+01:00
diff --git a/IONGeolocationLib.xcodeproj/project.pbxproj b/IONGeolocationLib.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1DE511302EABBBFC0096C679 /* IONGLOCRequestOptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DE5112F2EABBBF70096C679 /* IONGLOCRequestOptionsModel.swift */; };
 		752B49212D11B262002EA65D /* IONGLOCManagerWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752B49202D11B262002EA65D /* IONGLOCManagerWrapper.swift */; };
 		752B49232D11D421002EA65D /* IONGLOCAuthorisationRequestType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752B49222D11D421002EA65D /* IONGLOCAuthorisationRequestType.swift */; };
 		752B49262D11D440002EA65D /* IONGLOCAuthorisation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752B49252D11D440002EA65D /* IONGLOCAuthorisation.swift */; };
@@ -29,6 +30,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		1DE5112F2EABBBF70096C679 /* IONGLOCRequestOptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IONGLOCRequestOptionsModel.swift; sourceTree = "<group>"; };
 		752B49202D11B262002EA65D /* IONGLOCManagerWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IONGLOCManagerWrapper.swift; sourceTree = "<group>"; };
 		752B49222D11D421002EA65D /* IONGLOCAuthorisationRequestType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IONGLOCAuthorisationRequestType.swift; sourceTree = "<group>"; };
 		752B49252D11D440002EA65D /* IONGLOCAuthorisation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IONGLOCAuthorisation.swift; sourceTree = "<group>"; };
@@ -94,6 +96,7 @@
 				752B49252D11D440002EA65D /* IONGLOCAuthorisation.swift */,
 				752B49222D11D421002EA65D /* IONGLOCAuthorisationRequestType.swift */,
 				752B49272D11D46D002EA65D /* IONGLOCPositionModel.swift */,
+				1DE5112F2EABBBF70096C679 /* IONGLOCRequestOptionsModel.swift */,
 			);
 			path = IONGeolocationLib;
 			sourceTree = "<group>";
@@ -243,6 +246,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1DE511302EABBBFC0096C679 /* IONGLOCRequestOptionsModel.swift in Sources */,
 				752B49262D11D440002EA65D /* IONGLOCAuthorisation.swift in Sources */,
 				752B49282D11D46D002EA65D /* IONGLOCPositionModel.swift in Sources */,
 				752B49232D11D421002EA65D /* IONGLOCAuthorisationRequestType.swift in Sources */,
diff --git a/IONGeolocationLib/IONGLOCRequestOptionsModel.swift b/IONGeolocationLib/IONGLOCRequestOptionsModel.swift
@@ -0,0 +1,9 @@
+import Foundation
+
+public struct IONGLOCRequestOptionsModel {
+    let timeout: Int
+
+    public init(timeout: Int?) {
+        self.timeout = timeout ?? 5000
+    }
+}
diff --git a/IONGeolocationLib/Publishers/IONGLOCManagerProtocols.swift b/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()
 }
diff --git a/IONGeolocationLib/Publishers/IONGLOCManagerWrapper.swift b/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,18 +69,15 @@ 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.
         if isMonitoringLocation, let location = currentLocation {
             currentLocationForceSubject.send(location)
             return
         }
-        self.startTimer(timeout: timeoutValue)
+        self.startTimer(timeout: options.timeout)
         self.locationManager.requestLocation()
     }
     

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ public protocol IONGLOCLocationHandler {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public protocol IONGLOCSingleLocationHandler: IONGLOCLocationHandler {`
`28`		`- func requestSingleLocation(timeout: Int?)`
	`28`	`+ func requestSingleLocation(options: IONGLOCRequestOptionsModel)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public protocol IONGLOCMonitorLocationHandler: IONGLOCLocationHandler {`
`32`		`- func startMonitoringLocation(timeout: Int?)`
	`32`	`+ func startMonitoringLocation(options: IONGLOCRequestOptionsModel)`
`33`	`33`	`func startMonitoringLocation()`
`34`	`34`	`func stopMonitoringLocation()`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,9 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {`
`53`	`53`	`authorisationType.requestAuthorization(using: locationManager)`
`54`	`54`	`}`
`55`	`55`
`56`		`- public func startMonitoringLocation(timeout: Int? = nil) {`
`57`		`- let timeoutValue = timeout ?? 5000`
	`56`	`+ public func startMonitoringLocation(options: IONGLOCRequestOptionsModel) {`
`58`	`57`	`isMonitoringLocation = true`
`59`		`- self.startTimer(timeout: timeoutValue)`
	`58`	`+ self.startTimer(timeout: options.timeout)`
`60`	`59`	`locationManager.startUpdatingLocation()`
`61`	`60`	`}`
`62`	`61`
`@@ -70,18 +69,15 @@ public class IONGLOCManagerWrapper: NSObject, IONGLOCService {`
`70`	`69`	`locationManager.stopUpdatingLocation()`
`71`	`70`	`}`
`72`	`71`
`73`		`- public func requestSingleLocation(timeout: Int? = nil) {`
`74`		`- // Fallback to default timeout (5000) when the parameter is nil,`
`75`		`- // since optional defaults in Swift don't apply when nil is explicitly passed.`
`76`		`- let timeoutValue = timeout ?? 5000`
	`72`	`+ public func requestSingleLocation(options: IONGLOCRequestOptionsModel) {`
`77`	`73`	`// If monitoring is active meaning the location service is already running`
`78`	`74`	`// and calling .requestLocation() will not trigger a new location update,`
`79`	`75`	`// we can just return the current location.`
`80`	`76`	`if isMonitoringLocation, let location = currentLocation {`
`81`	`77`	`currentLocationForceSubject.send(location)`
`82`	`78`	`return`
`83`	`79`	`}`
`84`		`- self.startTimer(timeout: timeoutValue)`
	`80`	`+ self.startTimer(timeout: options.timeout)`
`85`	`81`	`self.locationManager.requestLocation()`
`86`	`82`	`}`
`87`	`83`