mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-22 14:51:45 +00:00
e050814c42
* feat(planner): real road routes (OSRM) with travel-time connectors Replace the straight-line "as the crow flies" route with real OSRM road geometry (FOSSGIS routed-car/-foot) and an Apple-Maps style render (blue casing under a lighter core) on both the Leaflet and Mapbox GL maps. Routes are off by default and toggled per session, with a driving/walking mode switch in the day footer. Each day shows per-segment travel time/distance connectors between places, computed from the OSRM legs and split at transport bookings. Also redesigns the day header for visual consistency: vertical number+weather capsule, name with a divider before the date, subtle hotel/rental pills that stay on one line, and a hover-revealed 2x2 action square (edit / add transport / add note / collapse). Drops the Google Maps button. * test(planner): update route hook tests for calculateRouteWithLegs
214 lines
7.8 KiB
TypeScript
214 lines
7.8 KiB
TypeScript
import type { RouteResult, RouteSegment, RouteWithLegs, Waypoint } from '../../types'
|
|
|
|
const OSRM_BASE = 'https://router.project-osrm.org/route/v1'
|
|
|
|
// FOSSGIS hosts OSRM with real per-profile routing (car/foot/bike) — the
|
|
// project-osrm.org demo is car-only (it ignores the profile in the URL). Use
|
|
// the matching profile so walking routes follow footpaths, not the road network.
|
|
const OSRM_PROFILE_BASE: Record<'driving' | 'walking' | 'cycling', string> = {
|
|
driving: 'https://routing.openstreetmap.de/routed-car/route/v1/driving',
|
|
walking: 'https://routing.openstreetmap.de/routed-foot/route/v1/foot',
|
|
cycling: 'https://routing.openstreetmap.de/routed-bike/route/v1/bike',
|
|
}
|
|
|
|
// Cache route responses keyed by the exact waypoint list. Routes are stable, so
|
|
// this avoids re-hitting the public OSRM demo server on every day switch / reorder.
|
|
const routeCache = new Map<string, RouteWithLegs>()
|
|
const ROUTE_CACHE_MAX = 200
|
|
|
|
/** Fetches a full route via OSRM and returns coordinates, distance, and duration estimates for driving/walking. */
|
|
export async function calculateRoute(
|
|
waypoints: Waypoint[],
|
|
profile: 'driving' | 'walking' | 'cycling' = 'driving',
|
|
{ signal }: { signal?: AbortSignal } = {}
|
|
): Promise<RouteResult> {
|
|
if (!waypoints || waypoints.length < 2) {
|
|
throw new Error('At least 2 waypoints required')
|
|
}
|
|
|
|
const coords = waypoints.map((p) => `${p.lng},${p.lat}`).join(';')
|
|
const url = `${OSRM_BASE}/${profile}/${coords}?overview=full&geometries=geojson&steps=false`
|
|
|
|
const response = await fetch(url, { signal })
|
|
if (!response.ok) {
|
|
throw new Error('Route could not be calculated')
|
|
}
|
|
|
|
const data = await response.json()
|
|
|
|
if (data.code !== 'Ok' || !data.routes || data.routes.length === 0) {
|
|
throw new Error('No route found')
|
|
}
|
|
|
|
const route = data.routes[0]
|
|
const coordinates: [number, number][] = route.geometry.coordinates.map(([lng, lat]: [number, number]) => [lat, lng])
|
|
|
|
const distance: number = route.distance
|
|
let duration: number
|
|
if (profile === 'walking') {
|
|
duration = distance / (5000 / 3600)
|
|
} else if (profile === 'cycling') {
|
|
duration = distance / (15000 / 3600)
|
|
} else {
|
|
duration = route.duration
|
|
}
|
|
|
|
const walkingDuration = distance / (5000 / 3600)
|
|
const drivingDuration: number = route.duration
|
|
|
|
return {
|
|
coordinates,
|
|
distance,
|
|
duration,
|
|
distanceText: formatDistance(distance),
|
|
durationText: formatDuration(duration),
|
|
walkingText: formatDuration(walkingDuration),
|
|
drivingText: formatDuration(drivingDuration),
|
|
}
|
|
}
|
|
|
|
export function generateGoogleMapsUrl(places: Waypoint[]): string | null {
|
|
const valid = places.filter((p) => p.lat && p.lng)
|
|
if (valid.length === 0) return null
|
|
if (valid.length === 1) {
|
|
return `https://www.google.com/maps/search/?api=1&query=${valid[0].lat},${valid[0].lng}`
|
|
}
|
|
const stops = valid.map((p) => `${p.lat},${p.lng}`).join('/')
|
|
return `https://www.google.com/maps/dir/${stops}`
|
|
}
|
|
|
|
/** Reorders waypoints using a nearest-neighbor heuristic to minimize total Euclidean distance. */
|
|
export function optimizeRoute(places: Waypoint[]): Waypoint[] {
|
|
const valid = places.filter((p) => p.lat && p.lng)
|
|
if (valid.length <= 2) return places
|
|
|
|
const visited = new Set<number>()
|
|
const result: Waypoint[] = []
|
|
let current = valid[0]
|
|
visited.add(0)
|
|
result.push(current)
|
|
|
|
while (result.length < valid.length) {
|
|
let nearestIdx = -1
|
|
let minDist = Infinity
|
|
for (let i = 0; i < valid.length; i++) {
|
|
if (visited.has(i)) continue
|
|
const d = Math.sqrt(
|
|
Math.pow(valid[i].lat - current.lat, 2) + Math.pow(valid[i].lng - current.lng, 2)
|
|
)
|
|
if (d < minDist) { minDist = d; nearestIdx = i }
|
|
}
|
|
if (nearestIdx === -1) break
|
|
visited.add(nearestIdx)
|
|
current = valid[nearestIdx]
|
|
result.push(current)
|
|
}
|
|
return result
|
|
}
|
|
|
|
/** Fetches per-leg distance/duration from OSRM and returns segment metadata (midpoints, walking/driving times). */
|
|
export async function calculateSegments(
|
|
waypoints: Waypoint[],
|
|
{ signal }: { signal?: AbortSignal } = {}
|
|
): Promise<RouteSegment[]> {
|
|
if (!waypoints || waypoints.length < 2) return []
|
|
|
|
const coords = waypoints.map((p) => `${p.lng},${p.lat}`).join(';')
|
|
const url = `${OSRM_BASE}/driving/${coords}?overview=false&geometries=geojson&steps=false&annotations=distance,duration`
|
|
|
|
const response = await fetch(url, { signal })
|
|
if (!response.ok) throw new Error('Route could not be calculated')
|
|
|
|
const data = await response.json()
|
|
if (data.code !== 'Ok' || !data.routes?.[0]) throw new Error('No route found')
|
|
|
|
const legs = data.routes[0].legs
|
|
return legs.map((leg: { distance: number; duration: number }, i: number): RouteSegment => {
|
|
const from: [number, number] = [waypoints[i].lat, waypoints[i].lng]
|
|
const to: [number, number] = [waypoints[i + 1].lat, waypoints[i + 1].lng]
|
|
const mid: [number, number] = [(from[0] + to[0]) / 2, (from[1] + to[1]) / 2]
|
|
const walkingDuration = leg.distance / (5000 / 3600)
|
|
return {
|
|
mid, from, to,
|
|
distance: leg.distance,
|
|
duration: leg.duration,
|
|
walkingText: formatDuration(walkingDuration),
|
|
drivingText: formatDuration(leg.duration),
|
|
distanceText: formatDistance(leg.distance),
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* One OSRM call per waypoint-run that returns BOTH the real road geometry (for the
|
|
* map) and per-leg distance/duration (for the sidebar connectors). Results are cached
|
|
* by the exact waypoint list. Throws on OSRM failure so callers can fall back to a
|
|
* straight line.
|
|
*/
|
|
export async function calculateRouteWithLegs(
|
|
waypoints: Waypoint[],
|
|
{ signal, profile = 'driving' }: { signal?: AbortSignal; profile?: 'driving' | 'walking' | 'cycling' } = {}
|
|
): Promise<RouteWithLegs> {
|
|
if (!waypoints || waypoints.length < 2) {
|
|
return { coordinates: [], distance: 0, duration: 0, legs: [] }
|
|
}
|
|
|
|
const coords = waypoints.map((p) => `${p.lng},${p.lat}`).join(';')
|
|
const cacheKey = `${profile}:${coords}`
|
|
const cached = routeCache.get(cacheKey)
|
|
if (cached) return cached
|
|
|
|
const url = `${OSRM_PROFILE_BASE[profile]}/${coords}?overview=full&geometries=geojson&annotations=distance,duration`
|
|
const response = await fetch(url, { signal })
|
|
if (!response.ok) throw new Error('Route could not be calculated')
|
|
|
|
const data = await response.json()
|
|
if (data.code !== 'Ok' || !data.routes?.[0]) throw new Error('No route found')
|
|
|
|
const route = data.routes[0]
|
|
const coordinates: [number, number][] = route.geometry.coordinates.map(
|
|
([lng, lat]: [number, number]) => [lat, lng]
|
|
)
|
|
const legs: RouteSegment[] = (route.legs || []).map(
|
|
(leg: { distance: number; duration: number }, i: number): RouteSegment => {
|
|
const from: [number, number] = [waypoints[i].lat, waypoints[i].lng]
|
|
const to: [number, number] = [waypoints[i + 1].lat, waypoints[i + 1].lng]
|
|
const mid: [number, number] = [(from[0] + to[0]) / 2, (from[1] + to[1]) / 2]
|
|
const walkingDuration = leg.distance / (5000 / 3600)
|
|
return {
|
|
mid, from, to,
|
|
distance: leg.distance,
|
|
duration: leg.duration,
|
|
walkingText: formatDuration(walkingDuration),
|
|
drivingText: formatDuration(leg.duration),
|
|
distanceText: formatDistance(leg.distance),
|
|
durationText: formatDuration(leg.duration),
|
|
}
|
|
}
|
|
)
|
|
|
|
const result: RouteWithLegs = { coordinates, distance: route.distance, duration: route.duration, legs }
|
|
routeCache.set(cacheKey, result)
|
|
if (routeCache.size > ROUTE_CACHE_MAX) {
|
|
const oldest = routeCache.keys().next().value
|
|
if (oldest !== undefined) routeCache.delete(oldest)
|
|
}
|
|
return result
|
|
}
|
|
|
|
function formatDistance(meters: number): string {
|
|
if (meters < 1000) {
|
|
return `${Math.round(meters)} m`
|
|
}
|
|
return `${(meters / 1000).toFixed(1)} km`
|
|
}
|
|
|
|
function formatDuration(seconds: number): string {
|
|
const h = Math.floor(seconds / 3600)
|
|
const m = Math.floor((seconds % 3600) / 60)
|
|
if (h > 0) {
|
|
return `${h} h ${m} min`
|
|
}
|
|
return `${m} min`
|
|
}
|