apt/fuelboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort every fuel tab cheapest-first (distance only as tiebreaker) in app + widget

Browse Source
This commit is contained in:
FuelBoard Contributor
2026-08-11 14:09:14 +01:00
parent 4f5f1999a9
commit 543212a721
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FuelBoard/ContentView.swift
+7 -9
View File
@@ -19,15 +19,13 @@ struct ContentView: View {
stations stations
.filter { $0.prices[selectedFuel] != nil } .filter { $0.prices[selectedFuel] != nil }
.sorted { lhs, rhs in .sorted { lhs, rhs in
// Prefer distance when we have a location, otherwise price. // Cheapest first; distance only breaks ties.
guard let location else { let lPrice = lhs.prices[selectedFuel]!
return lhs.prices[selectedFuel]! < rhs.prices[selectedFuel]! let rPrice = rhs.prices[selectedFuel]!
} if lPrice != rPrice { return lPrice < rPrice }
let lScore = lhs.distanceKM(to: location.lat, lng2: location.lng) * 0.4 + guard let location else { return false }
lhs.prices[selectedFuel]! * 0.001 return lhs.distanceKM(to: location.lat, lng2: location.lng) <
let rScore = rhs.distanceKM(to: location.lat, lng2: location.lng) * 0.4 + rhs.distanceKM(to: location.lat, lng2: location.lng)
rhs.prices[selectedFuel]! * 0.001
return lScore < rScore
} }
} }
FuelBoardWidgets/FuelPriceWidget.swift
+6 -3
View File
@@ -91,9 +91,12 @@ struct FuelPriceTimelineProvider: TimelineProvider {
let sorted: [FuelStation] let sorted: [FuelStation]
if let location { if let location {
sorted = filtered.sorted { lhs, rhs in sorted = filtered.sorted { lhs, rhs in
let lScore = lhs.distanceKM(to: location.lat, lng2: location.lng) * 0.4 + lhs.prices[fuel]! * 0.001 // Cheapest first; distance only breaks ties.
let rScore = rhs.distanceKM(to: location.lat, lng2: location.lng) * 0.4 + rhs.prices[fuel]! * 0.001 let lPrice = lhs.prices[fuel]!
return lScore < rScore let rPrice = rhs.prices[fuel]!
if lPrice != rPrice { return lPrice < rPrice }
return lhs.distanceKM(to: location.lat, lng2: location.lng) <
rhs.distanceKM(to: location.lat, lng2: location.lng)
} }
} else { } else {
sorted = filtered.sorted { $0.prices[fuel]! < $1.prices[fuel]! } sorted = filtered.sorted { $0.prices[fuel]! < $1.prices[fuel]! }