mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
Maurice
88129e4546
The category pill was switched off whenever road trip mode was on, which left the corridor search as the only way to find anything. The two answer different questions though — 'what is along this drive' against 'what is in view right now' — and looking for a hotel at tonight's stop is exactly the second one. Furkot shows accommodation at a stop for the same reason (disc #1797 thread). Both searches now draw together. A place found by both appears once, as the corridor knows it, because only that copy carries how far along the drive it sits, and the merged list keeps its reference while nothing changes so the map does not rebuild every pin on each render.
29 lines
1.3 KiB
TypeScript
29 lines
1.3 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.
|
|
*
|
|
* 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[]): Poi[] {
|
|
return useMemo(() => {
|
|
if (!corridor) return explore
|
|
if (!explore.length) return corridor
|
|
if (!corridor.length) return explore
|
|
const seen = new Set(corridor.map(p => p.osm_id))
|
|
const extra = explore.filter(p => !seen.has(p.osm_id))
|
|
return extra.length ? [...corridor, ...extra] : corridor
|
|
}, [corridor, explore])
|
|
}
|