Skip to content

Fit route bounds including waypoints #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M393 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fit route bounds including waypoints #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f359f84
Don't skip valid zero coordinate
M393 Aug 10, 2026
5b28023
Include the markers when fitting route to map
M393 Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/directions/summary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ export const Summary = ({
if (!mainMap || routeCoordinates.length === 0) return;

const firstCoord = routeCoordinates[0];
if (!firstCoord || !firstCoord[0] || !firstCoord[1]) return;
if (!firstCoord || firstCoord[0] == null || firstCoord[1] == null) return;

const bounds: [[number, number], [number, number]] =
routeCoordinates.reduce<[[number, number], [number, number]]>(
(acc, coord) => {
if (!coord || !coord[0] || !coord[1]) return acc;
if (!coord || coord[0] == null || coord[1] == null) return acc;
return [
[Math.min(acc[0][0], coord[1]), Math.min(acc[0][1], coord[0])],
[Math.max(acc[1][0], coord[1]), Math.max(acc[1][1], coord[0])],
Expand Down
26 changes: 20 additions & 6 deletions src/components/map/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ export const MapComponent = () => {

//First Point
const firstCoord = coordinates[0];
if (!firstCoord || !firstCoord[0] || !firstCoord[1]) return;
if (!firstCoord || firstCoord[0] == null || firstCoord[1] == null) return;

//Last Point
const lastCoord = coordinates[coordinates.length - 1]!;
Expand All @@ -464,14 +464,14 @@ export const MapComponent = () => {
lastCoord[1];
//Compare with what was last zoomed
if (coordKey === lastZoomedCoordKeyRef.current) return;
//Store thr new Key
//Store the new Key
lastZoomedCoordKeyRef.current = coordKey;

const bounds: [[number, number], [number, number]] = coordinates.reduce<
const routeBounds = coordinates.reduce<
[[number, number], [number, number]]
>(
(acc, coord) => {
if (!coord || !coord[0] || !coord[1]) return acc;
if (!coord || coord[0] == null || coord[1] == null) return acc;
return [
[Math.min(acc[0][0], coord[1]), Math.min(acc[0][1], coord[0])],
[Math.max(acc[1][0], coord[1]), Math.max(acc[1][1], coord[0])],
Expand All @@ -483,6 +483,20 @@ export const MapComponent = () => {
]
);

//Markers sit on the geocoded address, which can be off the routed
//geometry - include the ones belonging to this tab so they stay in view
const activeTabMarkerType =
activeTab === 'isochrones' ? 'isocenter' : 'waypoint';
const bounds = markers
.filter((marker) => marker.type === activeTabMarkerType)
.reduce<[[number, number], [number, number]]>(
(acc, marker) => [
[Math.min(acc[0][0], marker.lng), Math.min(acc[0][1], marker.lat)],
[Math.max(acc[1][0], marker.lng), Math.max(acc[1][1], marker.lat)],
],
routeBounds
);

//Read panel from the store directly
//avoids re-running the effect when panels open or close
const state = useCommonStore.getState();
Expand All @@ -507,9 +521,9 @@ export const MapComponent = () => {
},
maxZoom: coordinates.length === 1 ? 11 : 18,
});
//only rerun when coordinates change
//the coordKey guard above keeps this to one fit per route
//panel change no longer rerun this
}, [coordinates]);
}, [coordinates, markers, activeTab]);

const handleMapTilesClick = useCallback(
(event: maplibregl.MapLayerMouseEvent) => {
Expand Down
Loading