mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 03:26:07 +00:00
51af575c9a
A right-click, click or drag on a repeated world copy reported the longitude it has on that copy (274.9 for -85.1). The place was saved there, the geocoder found nothing, and a route to a place on the real world ran across the whole map (#2976). Longitudes are now brought back onto [-180, 180] where the map hands them out (Leaflet and GL), where they are stored (places, booking endpoints, collection places, so REST, MCP, plugin RPC and importers alike) and before reverse geocoding. A migration moves the ones already stored. Leaflet draws a layer at its literal longitude only, so a trip from Los Angeles to Auckland had its pins at opposite ends of the world while the flight ran off the edge to the next copy (#2975). A trip that crosses the antimeridian is now drawn in one longitude frame, seamed in the widest stretch it leaves empty, so pins, routes, flights and every overlay lie on one copy and the map opens across the Pacific. Every other trip has no frame and draws exactly as before. The GL day fit also takes the short way. A new install now starts with Journey and Collections switched on, next to the trip addons (all but Road trip), Atlas, Vacay and the Naver import that already were. Existing installs keep their addons as they are. Closes #2975 Closes #2976
52 lines
1.9 KiB
TypeScript
52 lines
1.9 KiB
TypeScript
// The longitude frame of the Leaflet map, for every layer that draws in it (#2975).
|
|
// See utils/lngFrame.ts for what the frame is and why only Leaflet needs it.
|
|
|
|
import { createContext, useContext, useMemo, useState } from 'react';
|
|
import type { Place, Reservation } from '../../types';
|
|
import { tripLngFrame, type LngFrame } from '../../utils/lngFrame';
|
|
|
|
const LngFrameContext = createContext<LngFrame | null>(null);
|
|
|
|
export const LngFrameProvider = LngFrameContext.Provider;
|
|
|
|
/** The frame the map draws in, or null when it draws the plain world. */
|
|
export function useLngFrame(): LngFrame | null {
|
|
return useContext(LngFrameContext);
|
|
}
|
|
|
|
type Located = Pick<Place, 'lng'>;
|
|
|
|
function tripLngs(
|
|
places: readonly Located[],
|
|
dayPlaces: readonly Located[],
|
|
reservations: readonly Reservation[]
|
|
): number[] {
|
|
const lngs: number[] = [];
|
|
for (const p of places) if (typeof p.lng === 'number') lngs.push(p.lng);
|
|
for (const p of dayPlaces) if (typeof p.lng === 'number') lngs.push(p.lng);
|
|
for (const r of reservations) for (const e of r.endpoints ?? []) if (typeof e.lng === 'number') lngs.push(e.lng);
|
|
return lngs;
|
|
}
|
|
|
|
/**
|
|
* The frame for a trip: its places, the day's places and every endpoint of every
|
|
* booking, shown or not, so switching a day or a booking on and off does not move
|
|
* the seam. The frame in use is handed back in, which keeps it while it still fits.
|
|
*/
|
|
export function useTripLngFrame(
|
|
places: readonly Located[],
|
|
dayPlaces: readonly Located[],
|
|
reservations: readonly Reservation[]
|
|
): LngFrame | null {
|
|
const [current, setCurrent] = useState<LngFrame | null>(() =>
|
|
tripLngFrame(tripLngs(places, dayPlaces, reservations))
|
|
);
|
|
const next = useMemo(
|
|
() => tripLngFrame(tripLngs(places, dayPlaces, reservations), current),
|
|
[places, dayPlaces, reservations, current]
|
|
);
|
|
// Derived state, adjusted during render: the next render already draws in the new frame.
|
|
if (next !== current) setCurrent(next);
|
|
return next;
|
|
}
|