Distance confidence - Every distance surface takes the figure AND its "Approx." marker from one FuelStore.stationDistanceDisplay call (station rows, detail sheet, widget, Live Activity, watch, Siri), so a surface can never mark one figure approximate while showing a routed one. Radius filters and Closest ordering test that same displayed distance, so no row can read a distance outside the radius that filtered it (the reported "14.6 mi inside a 10-mile list"). Accurate distances (Settings -> Distances, default off) - Off: the browse layer serves the straight line, marked Approx., for every row, so two installs agree to the metre and the app makes no route requests at all. - On: routed distances for the whole search area, unmarked, served only from a COMPLETE set anchored within 600 m — a partial fill reverts every row at once rather than mixing road and straight-line bases. - Best Value maths sits deliberately outside the toggle: it keeps using measured road routes and its own confidence marking, so money figures never move with the switch. - Fills run only while the toggle is on and the app is frontmost; capacity raised to 600 stations per pass; completeness tolerates pins Apple Maps has no route for, which otherwise left an area permanently incomplete and the whole list stuck on estimates. Performance (the reported slowdown switching to Closest / launching with it) - FuelStore.accurateDistancesEnabled was a UserDefaults(suiteName:) read per call: a synchronous cfprefsd round-trip measured at ~1.9 us, ~200k calls per Closest sort. Memoised, with the setter keeping it in step. - Both keyed sorts decorate their keys — one distance per station, carried as an index instead of copying whole stations into the decorated array — and the comparison baseline plus per-station journeys now come from ONE pass instead of two full scans per tab. The Stations tab also reuses its single sorted list for the count and the TOP badge instead of sorting the country three times. - Measured on iPhone SE (7,914-station Closest pool): sort 36.6 ms -> 17.1 ms per list, Cheapest 6 ms, Best Value 11 ms. - DEBUG probes: FB_PERF list timing, FB_PERF_BENCH toggle-read benchmark, and FB_DIST_FOCUS now reports the served value, marker and mode (and re-prints when a fill lands). FB_ACCURATE_DISTANCES / FB_SORT_MODE env forms for devices, where devicectl eats a leading-dash argument. Tests: 198, 0 failures. Device and simulator Debug builds green.
140 lines
5.2 KiB
Swift
140 lines
5.2 KiB
Swift
import Foundation
|
|
import WatchConnectivity
|
|
|
|
extension Notification.Name {
|
|
static let fuelBoardWatchRefreshRequested = Notification.Name("FuelBoardWatchRefreshRequested")
|
|
static let fuelBoardShowStationDetail = Notification.Name("FuelBoardShowStationDetail")
|
|
/// Posted when a road-distance fill finishes, so the app's rows re-read the
|
|
/// distance they are showing — those reads happen inside the row views, so
|
|
/// nothing else would invalidate them.
|
|
static let fuelBoardRoadDistancesUpdated = Notification.Name("FuelBoardRoadDistancesUpdated")
|
|
/// Posted when "Accurate distances" is switched, so the browse layer can
|
|
/// re-render and start a fill from where the user actually is.
|
|
static let fuelBoardAccurateDistancesChanged = Notification.Name("FuelBoardAccurateDistancesChanged")
|
|
}
|
|
|
|
@MainActor
|
|
final class WatchSyncManager: NSObject, WCSessionDelegate {
|
|
static let shared = WatchSyncManager()
|
|
|
|
private var pendingSnapshotPush = false
|
|
private var activationRequested = false
|
|
|
|
private override init() {
|
|
super.init()
|
|
}
|
|
|
|
func activate() {
|
|
guard WCSession.isSupported() else { return }
|
|
let session = WCSession.default
|
|
guard session.isWatchAppInstalled else { return }
|
|
pendingSnapshotPush = true
|
|
if session.delegate !== self {
|
|
session.delegate = self
|
|
}
|
|
guard session.activationState != .activated else { return }
|
|
guard !activationRequested else { return }
|
|
activationRequested = true
|
|
session.activate()
|
|
}
|
|
|
|
func pushSnapshot() {
|
|
guard WCSession.isSupported() else { return }
|
|
let session = WCSession.default
|
|
guard session.isWatchAppInstalled else {
|
|
pendingSnapshotPush = false
|
|
return
|
|
}
|
|
guard session.activationState == .activated else {
|
|
pendingSnapshotPush = true
|
|
activate()
|
|
return
|
|
}
|
|
do {
|
|
try session.updateApplicationContext(snapshotContext())
|
|
pendingSnapshotPush = false
|
|
} catch {
|
|
print("WATCH-SYNC push failed: \(error.localizedDescription)")
|
|
}
|
|
}
|
|
|
|
private func snapshotContext() -> [String: Any] {
|
|
var context: [String: Any] = [:]
|
|
|
|
if let favourites = try? JSONEncoder().encode(FuelStore.loadFavourites()) {
|
|
context[FuelStore.favouritesKey] = favourites
|
|
}
|
|
// Do NOT send the full station dump to watchOS via WatchConnectivity.
|
|
// The UK dataset is megabytes large and exceeds application-context
|
|
// payload limits, which prevents any snapshot from arriving. The
|
|
// favourites payload already carries station snapshots + prices, so the
|
|
// watch can render favourites without the full list.
|
|
|
|
context[FuelStore.fuelKey] = FuelStore.loadSelectedFuel().rawValue
|
|
context[FuelStore.distanceUnitKey] = FuelStore.loadDistanceUnit().rawValue
|
|
context[FuelStore.priceDisplayStyleKey] = FuelStore.loadPriceDisplayStyle().rawValue
|
|
|
|
if let lastRefresh = FuelStore.loadLastRefresh() {
|
|
context[FuelStore.lastRefreshKey] = String(lastRefresh.timeIntervalSince1970)
|
|
}
|
|
|
|
if let handled = FuelStore.loadWatchRefreshHandled() {
|
|
context[FuelStore.watchRefreshHandledKey] = String(handled.timeIntervalSince1970)
|
|
}
|
|
|
|
if let location = FuelStore.loadLocationWithDate() {
|
|
context[FuelStore.locationKey] = "\(location.coordinate.lat),\(location.coordinate.lng),\(location.date.timeIntervalSince1970)"
|
|
}
|
|
|
|
return context
|
|
}
|
|
|
|
nonisolated func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: (any Error)?) {
|
|
Task { @MainActor in
|
|
self.activationRequested = false
|
|
}
|
|
if let error {
|
|
print("WATCH-SYNC activation failed: \(error.localizedDescription)")
|
|
return
|
|
}
|
|
Task { @MainActor in
|
|
if activationState == .activated, self.pendingSnapshotPush {
|
|
self.pushSnapshot()
|
|
}
|
|
}
|
|
}
|
|
|
|
nonisolated func sessionDidBecomeInactive(_ session: WCSession) {}
|
|
|
|
nonisolated func sessionDidDeactivate(_ session: WCSession) {
|
|
Task { @MainActor in
|
|
self.activationRequested = false
|
|
self.activate()
|
|
}
|
|
}
|
|
|
|
nonisolated func session(_ session: WCSession, didReceiveUserInfo userInfo: [String : Any] = [:]) {
|
|
handleIncomingMessage(userInfo)
|
|
}
|
|
|
|
nonisolated func session(_ session: WCSession, didReceiveMessage message: [String : Any]) {
|
|
handleIncomingMessage(message)
|
|
}
|
|
|
|
private nonisolated func handleIncomingMessage(_ payload: [String: Any]) {
|
|
if payload["fuelboard.snapshotRequest"] as? String != nil {
|
|
Task { @MainActor in
|
|
self.pushSnapshot()
|
|
}
|
|
}
|
|
|
|
guard let raw = payload[FuelStore.watchRefreshRequestKey] as? String,
|
|
let timestamp = TimeInterval(raw) else { return }
|
|
let date = Date(timeIntervalSince1970: timestamp)
|
|
Task { @MainActor in
|
|
FuelStore.requestWatchRefresh(date)
|
|
NotificationCenter.default.post(name: .fuelBoardWatchRefreshRequested, object: nil)
|
|
}
|
|
}
|
|
}
|