dnrops
/
GeoMonitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid duplicated work when first scheduling an update, but then updating now 

Also might help with duplicated calls to update
This commit is contained in:
Adrian Schoenig 2022-12-08 18:10:09 +11:00
parent 46fedf24a9
commit 228062267a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/GeoMonitor/GeoMonitor.swift
View File

@ -306,12 +306,12 @@ public class GeoMonitor: NSObject, ObservableObject {
/// this is called in quick succession. /// this is called in quick succession.
public func scheduleUpdate(regions: [CLCircularRegion]) async { public func scheduleUpdate(regions: [CLCircularRegion]) async {
let location = isMonitoring ? (try? await fetchCurrentLocation()) : nil let location = isMonitoring ? (try? await fetchCurrentLocation()) : nil
monitorDebounced(regions, location: location) monitorDebounced(regions, location: location, delay: 2.5)
} }
public func update(regions: [CLCircularRegion]) async { public func update(regions: [CLCircularRegion]) async {
let location = isMonitoring ? (try? await fetchCurrentLocation()) : nil let location = isMonitoring ? (try? await fetchCurrentLocation()) : nil
monitorNow(regions, location: location) monitorDebounced(regions, location: location)
} }
/// Trigger a check whether the user is in any of the registered regions and, if so, trigger the primary /// Trigger a check whether the user is in any of the registered regions and, if so, trigger the primary
@ -390,15 +390,17 @@ extension GeoMonitor {
extension GeoMonitor { extension GeoMonitor {
func monitorDebounced(_ regions: [CLCircularRegion], location: CLLocation?) { private func monitorDebounced(_ regions: [CLCircularRegion], location: CLLocation?, delay: TimeInterval? = nil) {
monitorTask?.cancel() monitorTask?.cancel()
monitorTask = Task { monitorTask = Task {
try await Task.sleep(nanoseconds: 2_500_000_000) if let delay {
try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
}
monitorNow(regions, location: location) monitorNow(regions, location: location)
} }
} }
func monitorNow(_ regions: [CLCircularRegion], location: CLLocation?) { private func monitorNow(_ regions: [CLCircularRegion], location: CLLocation?) {
guard !Task.isCancelled else { return } guard !Task.isCancelled else { return }
// Remember all the regions, if it currently too far away // Remember all the regions, if it currently too far away