Merge branch 'release/4.0.2'

malcommac · May 12, 2019 · 2bfacd9 · 2bfacd9
2 parents 7d5d221 + 9550ad1
commit 2bfacd9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/Configs/SwiftLocation.plist b/Configs/SwiftLocation.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>4.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/README.md b/README.md
@@ -130,7 +130,7 @@ You can also observe for changes in authorization status by subscribing auth cha
 
 ```swift
 let observerID = LocationManager.shared.onAuthorizationChange.add { newState in
-  print("Authorization status changed to \(newStatus)")
+  print("Authorization status changed to \(newState)")
 }
 ```
 
@@ -425,4 +425,4 @@ LocationManager.shared.autocomplete(partialMatch: .partialSearch("Piazza della R
 SwiftLocation is currently owned and maintained by Daniele Margutti.
 It's licensed under MIT License.
 
-<div>Icons made by <a href="https://www.flaticon.com/<?=_('authors').'/'?>eucalyp" title="Eucalyp">Eucalyp</a> from <a href="https://www.flaticon.com/" 		    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 		    title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
+<div>Icons made by <a href="https://www.flaticon.com/<?=_('authors').'/'?>eucalyp" title="Eucalyp">Eucalyp</a> from <a href="https://www.flaticon.com/" 		    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 		    title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
diff --git a/Sources/Locating/LocationRequest.swift b/Sources/Locating/LocationRequest.swift
@@ -29,7 +29,7 @@ public class LocationRequest: ServiceRequest, Hashable {
         didSet {
             // Also set the callback to receive timeout event; it will remove the request.
             timeoutManager?.callback = { interval in
-                self.stop(reason: .timeout(interval), remove: true)
+                self.stop(reason: .requiredLocationNotFound(timeout: interval, last: self.lastAbsoluteLocation), remove: true)
             }
         }
     }
@@ -142,7 +142,7 @@ public class LocationRequest: ServiceRequest, Hashable {
 
     // MARK: - Internal Methods -
 
-    /// Stop a request with passed error reason and optionally remvoe it from queue.
+    /// Stop a request with passed error reason and optionally remove it from queue.
     ///
     /// - Parameters:
     ///   - reason: reason of failure.

diff --git a/Sources/LocationManager+Support.swift b/Sources/LocationManager+Support.swift
@@ -15,13 +15,23 @@ internal let CLLocationAccuracyAccuracyAny: CLLocationAccuracy = 6000 // 6km or
 
 public extension LocationManager {
 
+    /// Errors of the location manager.
+    ///
+    /// - cancelled: operation was cancelled by the user.
+    /// - timeout: timeout reached.
+    /// - invalidAuthStatus: invalid authorization status.
+    /// - generic: generic error.
+    /// - noData: no data received from service.
+    /// - missingAPIKey: missing required api key for service.
+    /// - requiredLocationNotFound: required accurated location were not found, last found reported.
     enum ErrorReason: Error {
         case cancelled
         case timeout(TimeInterval)
         case invalidAuthStatus(CLAuthorizationStatus)
         case generic(String)
         case noData(URL?)
         case missingAPIKey
+        case requiredLocationNotFound(timeout: TimeInterval, last: CLLocation?)
     }
 
     enum State: CustomStringConvertible {

diff --git a/Sources/LocationManager.swift b/Sources/LocationManager.swift
@@ -566,10 +566,10 @@ public class LocationManager: NSObject {
         }
     }
 
-    /// Complete all requests in list and remove them.
+    /// Complete all requests in list and remove them. Optionally you can also pass a reason.
     ///
-    /// - Parameter error: error used to complete each request.
-    private func completeAllLocationRequest(error: ErrorReason) {
+    /// - Parameter error: error used to complete each request. By default is `.cancelled`.
+    public func completeAllLocationRequest(error: ErrorReason = .cancelled) {
         queueLocationRequests.forEach {
             $0.stop(reason: error, remove: true)
             updateLocationManagerSettings($0)

diff --git a/SwiftLocation.podspec b/SwiftLocation.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftLocation"
-  s.version      = "4.0.1"
+  s.version      = "4.0.2"
   s.summary      = "Easy and Efficient Location Tracking for iOS"
   s.description  = <<-DESC
   Efficient location tracking for iOS with support for oneshot/continuous/background tracking, reverse geocoding, autocomplete and more!