FuelBoard Contributor
2a2823c180
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.
46 lines
2.2 KiB
Swift
46 lines
2.2 KiB
Swift
// FuelBoardLiveActivity.swift — Live Activity shared model.
|
|
//
|
|
// Compiled into BOTH the app target (to start/update/end the activity) and
|
|
// the widget extension (to render it). ActivityKit is iOS-only, so this file
|
|
// is deliberately NOT symlinked into FuelBoardTests/Sources — the SPM test
|
|
// target runs on macOS where ActivityKit does not exist.
|
|
//
|
|
// The activity tracks the cheapest station for the fuel + radius configured
|
|
// in Settings → Live Activity (INDEPENDENT of the Stations-tab selection).
|
|
// Everything dynamic lives in ContentState so updates — including a fuel
|
|
// change — apply to the running activity without needing to restart it.
|
|
// Tapping the activity honours Settings → Tap station: Open map opens Apple
|
|
// Maps driving directions (maps://), More info opens the detail sheet in
|
|
// the app (fuelboard://station).
|
|
|
|
import ActivityKit
|
|
import Foundation
|
|
|
|
/// Attributes are fixed at request time. Kept empty: the fuel itself lives in
|
|
/// ContentState so a fuel change in Settings updates the running activity
|
|
/// in place instead of requiring an end + restart.
|
|
struct FuelBoardLiveActivityAttributes: ActivityAttributes {
|
|
public struct ContentState: Codable, Hashable {
|
|
var fuel: FuelType
|
|
var stationID: String
|
|
var stationName: String
|
|
var brand: String
|
|
/// Price in pence per litre (same unit as `FuelStation.prices`).
|
|
var pricePence: Double
|
|
/// Display style at push time (station sign vs pounds & pence) — carried
|
|
/// in the state so the extension renders deterministically instead of
|
|
/// re-reading storage that may not be shared on sideloads.
|
|
var priceDisplayStyle: PriceDisplayStyle
|
|
var distanceKM: Double
|
|
/// Whether `distanceKM` came from the straight-line fallback instead of a
|
|
/// routed road distance, so the extension renders the "Approx." marker
|
|
/// without re-reading storage the extension may not share.
|
|
/// Optional so a state pushed by an earlier build still decodes — nil
|
|
/// reads as "not marked", i.e. the previous behaviour.
|
|
var distanceIsApproximate: Bool?
|
|
var lat: Double
|
|
var lng: Double
|
|
var updatedAt: Date
|
|
}
|
|
}
|