mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 13:36:48 +00:00
Maurice
b1145e7e0a
On the first day of a trip the morning hotel is only a check-in fallback — you arrive from home, you didn't sleep there — so bookending the route from that hotel to the flight/train departure point drew a phantom hotel → departure leg, both on the map and in the day sidebar. The same backwards leg showed up on a multi-day transport's arrival day, and its mirror departure → hotel on an evening departure. getDayBookendHotels now also reports whether the morning hotel is one you actually slept in and whether you sleep in the evening hotel tonight. The map and sidebar only draw a hotel↔transport bookend when that holds; a hotel↔place leg is always kept, so the home-base loop and onward-travel legs are unaffected. The optimizer keeps using the hotel values as before.
77 lines
3.6 KiB
TypeScript
77 lines
3.6 KiB
TypeScript
import type { Day, Accommodation, RouteAnchors } from '../types'
|
|
|
|
export const getDayOrder = (day: Day, days: Day[]): number =>
|
|
day.day_number ?? days.indexOf(day)
|
|
|
|
// The two hotels that bookend a day: the one you woke up in (morning) and the one you sleep in
|
|
// tonight (evening). On a transfer day these differ; on any other day both are the single hotel.
|
|
// The morning hotel is keyed off "checked in on an earlier day and still in range" (i.e. you slept
|
|
// there) rather than "checks out today", so it stays correct when an overlapping or long stay does
|
|
// not end exactly on the transfer day.
|
|
export const getDayBookendHotels = (
|
|
day: Day,
|
|
days: Day[],
|
|
accommodations: Accommodation[],
|
|
): { morning?: Accommodation; evening?: Accommodation; morningIsSleptHere?: boolean; eveningIsOvernight?: boolean } => {
|
|
const inRange = accommodations.filter(a =>
|
|
a.place_lat != null && a.place_lng != null &&
|
|
isDayInAccommodationRange(day, a.start_day_id, a.end_day_id, days),
|
|
)
|
|
if (inRange.length === 0) return {}
|
|
|
|
const dayOrd = getDayOrder(day, days)
|
|
const orderOf = (id: number) => {
|
|
const d = days.find(x => x.id === id)
|
|
return d ? getDayOrder(d, days) : dayOrd
|
|
}
|
|
const checkIn = inRange.find(a => a.start_day_id === day.id) // the hotel you arrive at tonight
|
|
const sleptHere = inRange.find(a => orderOf(a.start_day_id) < dayOrd) // the hotel you woke up in
|
|
|
|
return {
|
|
morning: sleptHere ?? checkIn ?? inRange[0],
|
|
evening: checkIn ?? sleptHere ?? inRange[0],
|
|
// Provenance for the drawing consumers (map + sidebar). A hotel↔transport bookend
|
|
// is only real when you actually used the hotel: morningIsSleptHere is true only
|
|
// when you woke up there (not a check-in fallback on an arrival day), and
|
|
// eveningIsOvernight is true only when you sleep there tonight (you check in today,
|
|
// or an earlier stay continues past today). The optimizer keeps using the values.
|
|
morningIsSleptHere: sleptHere != null,
|
|
eveningIsOvernight: checkIn != null || (sleptHere != null && orderOf(sleptHere.end_day_id) > dayOrd),
|
|
}
|
|
}
|
|
|
|
// Derives route anchors from the accommodation(s) active on a day. A single hotel is the day's home
|
|
// base, so the route is a loop that starts and ends there. A transfer day — checking out of one hotel
|
|
// and into another — instead runs from the morning hotel to the evening one.
|
|
export const getAccommodationAnchors = (
|
|
day: Day,
|
|
days: Day[],
|
|
accommodations: Accommodation[],
|
|
): RouteAnchors => {
|
|
const { morning, evening } = getDayBookendHotels(day, days, accommodations)
|
|
if (!morning || !evening) return {}
|
|
return {
|
|
start: { lat: morning.place_lat as number, lng: morning.place_lng as number },
|
|
end: { lat: evening.place_lat as number, lng: evening.place_lng as number },
|
|
}
|
|
}
|
|
|
|
export const isDayInAccommodationRange = (
|
|
day: Day,
|
|
startDayId: number,
|
|
endDayId: number,
|
|
days: Day[],
|
|
): boolean => {
|
|
const startDay = days.find(d => d.id === startDayId)
|
|
const endDay = days.find(d => d.id === endDayId)
|
|
if (!startDay || !endDay) {
|
|
// Endpoint days not in the loaded array (e.g. sparse test data or partial load).
|
|
// Fall back to numeric ID range — acceptable since non-monotonic IDs only arise when
|
|
// both endpoints are present in a fully-loaded trip's days list.
|
|
return day.id >= Math.min(startDayId, endDayId) && day.id <= Math.max(startDayId, endDayId)
|
|
}
|
|
const lo = Math.min(getDayOrder(startDay, days), getDayOrder(endDay, days))
|
|
const hi = Math.max(getDayOrder(startDay, days), getDayOrder(endDay, days))
|
|
return getDayOrder(day, days) >= lo && getDayOrder(day, days) <= hi
|
|
}
|