Alerts: mile-friendly radius 1/2/3/5/8 + Follow search (capped 8 mi); Live Activity Follow search; legacy radii clamped

2026-08-13 15:00:53 +01:00
parent bb48995fac
commit 490c343fd5
5 changed files with 210 additions and 27 deletions
@@ -93,7 +93,12 @@ final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLoca
        // even before the view fully appears.
        enabled = FuelStore.loadAlertsEnabled()
        fuel = FuelStore.loadAlertsFuel()
-        radiusKM = FuelStore.loadAlertsRadius()
+        // Effective radius honours "Follow search" even on a cold launch /
+        // background region-event wake (the raw manual radius would otherwise
+        // be used until the first foreground update re-targets geofences).
+        radiusKM = FuelStore.effectiveAlertsRadiusKM(
+            followsSearch: FuelStore.loadAlertsFollowsSearch(),
+            manualKM: FuelStore.loadAlertsRadius())
        stations = FuelStore.loadStations()
        favourites = FuelStore.loadFavourites().filter { $0.fuel == fuel }.map(\.station)
    }