mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
3f61e1ca38
Introduces a TransportModal for creating/editing flight, train, car, and cruise reservations that span multiple days. Transport entries now break the map route into disconnected segments so the polyline reflects actual travel legs. - Add TransportModal with airport/location pickers, multi-day date range, and all transport types - Extend DB schema with end_day_id on reservations (migration 110) and backfill from existing dates - Refactor useRouteCalculation to emit [][][number,number] segments split at transport boundaries - Update MapView, DayPlanSidebar, ReservationsPanel, TripPlannerPage to wire up transport flow - Add transport i18n keys across all 15 languages
124 lines
6.0 KiB
TypeScript
124 lines
6.0 KiB
TypeScript
import { useState, useCallback, useRef, useEffect, useMemo } from 'react'
|
|
import { useSettingsStore } from '../store/settingsStore'
|
|
import { useTripStore } from '../store/tripStore'
|
|
import { calculateSegments } from '../components/Map/RouteCalculator'
|
|
import type { TripStoreState } from '../store/tripStore'
|
|
import type { RouteSegment, RouteResult } from '../types'
|
|
|
|
const TRANSPORT_TYPES = ['flight', 'train', 'bus', 'car', 'cruise']
|
|
|
|
/**
|
|
* Manages route calculation state for a selected day. Extracts geo-coded waypoints from
|
|
* day assignments, draws a straight-line route, and optionally fetches per-segment
|
|
* driving/walking durations via OSRM. Aborts in-flight requests when the day changes.
|
|
*/
|
|
export function useRouteCalculation(tripStore: TripStoreState, selectedDayId: number | null) {
|
|
const [route, setRoute] = useState<[number, number][][] | null>(null)
|
|
const [routeInfo, setRouteInfo] = useState<RouteResult | null>(null)
|
|
const [routeSegments, setRouteSegments] = useState<RouteSegment[]>([])
|
|
const routeCalcEnabled = useSettingsStore((s) => s.settings.route_calculation) !== false
|
|
const routeAbortRef = useRef<AbortController | null>(null)
|
|
const reservationsForSignature = useTripStore((s) => s.reservations)
|
|
|
|
const updateRouteForDay = useCallback(async (dayId: number | null) => {
|
|
if (routeAbortRef.current) routeAbortRef.current.abort()
|
|
if (!dayId) { setRoute(null); setRouteSegments([]); return }
|
|
// Read directly from store (not a render-phase ref) so callers after optimistic
|
|
// updates or non-optimistic deletes always see the latest assignments.
|
|
const currentAssignments = useTripStore.getState().assignments || {}
|
|
const da = (currentAssignments[String(dayId)] || []).slice().sort((a, b) => a.order_index - b.order_index)
|
|
const allReservations = useTripStore.getState().reservations || []
|
|
const allDays = useTripStore.getState().days || []
|
|
const dayOrder = (id: number | null | undefined): number | null => {
|
|
if (id == null) return null
|
|
const d = allDays.find(x => x.id === id)
|
|
return d ? ((d as any).day_number ?? allDays.indexOf(d)) : null
|
|
}
|
|
const thisOrder = dayOrder(dayId)
|
|
|
|
// Transport reservations for this day with a known position — mirrors getTransportForDay semantics
|
|
const dayTransports = thisOrder == null ? [] : allReservations.filter(r => {
|
|
if (!TRANSPORT_TYPES.includes(r.type)) return false
|
|
const startId = r.day_id
|
|
if (startId == null) return false
|
|
const endId = r.end_day_id ?? startId
|
|
if (startId === endId) {
|
|
if (startId !== dayId) return false
|
|
} else {
|
|
const startOrder = dayOrder(startId)
|
|
const endOrder = dayOrder(endId)
|
|
if (startOrder == null || endOrder == null) return false
|
|
if (thisOrder < startOrder || thisOrder > endOrder) return false
|
|
}
|
|
const pos = r.day_positions?.[dayId] ?? r.day_positions?.[String(dayId)] ?? r.day_plan_position
|
|
return pos != null
|
|
})
|
|
|
|
// Build a unified list of places + transports sorted by effective position,
|
|
// then derive segments by resetting whenever a transport appears — mirrors getMergedItems order.
|
|
type Entry = { kind: 'place'; lat: number; lng: number } | { kind: 'transport' }
|
|
const entries: (Entry & { pos: number })[] = [
|
|
...da.filter(a => a.place?.lat && a.place?.lng).map(a => ({
|
|
kind: 'place' as const, lat: a.place.lat!, lng: a.place.lng!, pos: a.order_index,
|
|
})),
|
|
...dayTransports.map(r => ({
|
|
kind: 'transport' as const,
|
|
pos: (r.day_positions?.[dayId] ?? r.day_positions?.[String(dayId)] ?? r.day_plan_position) as number,
|
|
})),
|
|
].sort((a, b) => a.pos - b.pos)
|
|
|
|
const segments: [number, number][][] = []
|
|
let currentSeg: [number, number][] = []
|
|
for (const entry of entries) {
|
|
if (entry.kind === 'place') {
|
|
currentSeg.push([entry.lat, entry.lng])
|
|
} else {
|
|
if (currentSeg.length >= 2) segments.push([...currentSeg])
|
|
currentSeg = []
|
|
}
|
|
}
|
|
if (currentSeg.length >= 2) segments.push(currentSeg)
|
|
|
|
const geocodedWaypoints = da.map(a => a.place).filter(p => p?.lat && p?.lng) as { lat: number; lng: number }[]
|
|
|
|
if (segments.length === 0 && geocodedWaypoints.length < 2) {
|
|
setRoute(null); setRouteSegments([]); return
|
|
}
|
|
setRoute(segments.length > 0 ? segments : null)
|
|
if (!routeCalcEnabled) { setRouteSegments([]); return }
|
|
const controller = new AbortController()
|
|
routeAbortRef.current = controller
|
|
try {
|
|
const calcSegments = await calculateSegments(geocodedWaypoints, { signal: controller.signal })
|
|
if (!controller.signal.aborted) setRouteSegments(calcSegments)
|
|
} catch (err: unknown) {
|
|
if (err instanceof Error && err.name !== 'AbortError') setRouteSegments([])
|
|
else if (!(err instanceof Error)) setRouteSegments([])
|
|
}
|
|
}, [routeCalcEnabled])
|
|
|
|
// Stable signature for transport reservations on the selected day — changes when a transport
|
|
// is added, removed, or repositioned, ensuring route recalc fires even on transport-only reorders.
|
|
const transportSignature = useMemo(() => {
|
|
if (!selectedDayId) return ''
|
|
return reservationsForSignature
|
|
.filter(r => TRANSPORT_TYPES.includes(r.type))
|
|
.map(r => {
|
|
const pos = r.day_positions?.[selectedDayId] ?? r.day_positions?.[String(selectedDayId)] ?? r.day_plan_position
|
|
return `${r.id}:${r.day_id ?? ''}:${r.end_day_id ?? ''}:${r.reservation_time ?? ''}:${pos ?? ''}`
|
|
})
|
|
.sort()
|
|
.join('|')
|
|
}, [reservationsForSignature, selectedDayId])
|
|
|
|
// Recalculate when assignments or transport positions for the SELECTED day change
|
|
const selectedDayAssignments = selectedDayId ? tripStore.assignments?.[String(selectedDayId)] : null
|
|
useEffect(() => {
|
|
if (!selectedDayId) { setRoute(null); setRouteSegments([]); return }
|
|
updateRouteForDay(selectedDayId)
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [selectedDayId, selectedDayAssignments, transportSignature])
|
|
|
|
return { route, routeSegments, routeInfo, setRoute, setRouteInfo, updateRouteForDay }
|
|
}
|