mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
Maurice
5b147af0b6
Four things that only showed up once it was on screen. The range budget treated a petrol station and a charger as the same thing, so an electric car pausing for coffee at a filling station had its battery refilled on paper: the warnings went quiet for the rest of the day and the driver was told nothing. A vehicle can now be named, and then only what actually refills it counts — and the search asks for that kind alone instead of offering pumps to a car that cannot use them. Not saying keeps the old behaviour, which is what everybody who never opens the dialog is on. The band was its own shape in a rail made of drive bands. It is one now: the same rail, the same height, the same type size, a warning tint instead of a ring, and the figures where a drive band keeps them. The buttons are icons of the same 18px square the shuffle mark uses, so the band stays one line beside its neighbours. The old range warning stood down where the band shows. Both at once said the same thing twice in the wrong order — the answer above the problem — because the warning marks the stop somebody finds out at while the band sits on the leg the fuel ends on. Two measured corrections to the search itself. The server turns a box into a circle of half its diagonal and silently narrows anything past 20 km, so a box of ±25 asked for 35 and came back flagged as narrowed EVERY time, which read on screen as "we could not check"; ±14 asks for 19.8 and is answered in full. And the circle is centred 12 km before the dry point rather than on it, because only road already driven is any use — centred on the point, half the circle was spent on road nobody can reach. An answer that finds nothing now leaves the button rather than only a close. The place search is a shared public service that does time out, and "it did not answer" with no way to ask again reads as broken rather than as busy.
43 lines
2.0 KiB
TypeScript
43 lines
2.0 KiB
TypeScript
import { useMemo } from 'react'
|
|
import type { Poi } from './poiCategories'
|
|
|
|
/**
|
|
* The findings the map should draw, when two searches can be running at once.
|
|
*
|
|
* In road trip mode the corridor search answers "what is along this drive". The category
|
|
* pill answers a different question — "what is in view right now" — and a hotel at tonight's
|
|
* stop is exactly the case where someone wants the second one without giving up the first,
|
|
* so the two lists are drawn together rather than one replacing the other.
|
|
*
|
|
* Identity is `osm_id`, the same key the corridor search dedupes its own overlapping tiles
|
|
* on: a hotel found both along the route and in the viewport is one pin, and the corridor's
|
|
* copy wins because it carries how far along the drive it sits.
|
|
*
|
|
* `offered` is the third case: the handful of filling stations proposed where a tank runs
|
|
* out. They belong on the map for a plain reason — somebody is being asked to accept a
|
|
* stop, and a stop you cannot see is not one you can judge — but they are not a search
|
|
* result and must not survive the panel being closed, which is why they arrive separately
|
|
* rather than being folded into the corridor's own list.
|
|
*
|
|
* Returns the input array itself whenever there is nothing to merge. The map redraws off
|
|
* this reference, so handing it a fresh array on every render would rebuild every pin.
|
|
*/
|
|
export function useMergedMapPois(corridor: Poi[] | null, explore: Poi[], offered: Poi[] = NONE): Poi[] {
|
|
return useMemo(() => {
|
|
const base = corridor === null ? explore : merge(corridor, explore)
|
|
return merge(base, offered)
|
|
}, [corridor, explore, offered])
|
|
}
|
|
|
|
/** Nothing offered, as one stable array, so the default never changes identity. */
|
|
const NONE: Poi[] = []
|
|
|
|
/** `a` with everything from `b` that it does not already carry, by `osm_id`. */
|
|
function merge(a: Poi[], b: Poi[]): Poi[] {
|
|
if (!b.length) return a
|
|
if (!a.length) return b
|
|
const seen = new Set(a.map(p => p.osm_id))
|
|
const extra = b.filter(p => !seen.has(p.osm_id))
|
|
return extra.length ? [...a, ...extra] : a
|
|
}
|