steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-12-27 13:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wpt to segment matching

Browse Source
This commit is contained in:
vcoppe
2025-12-24 13:07:22 +01:00
parent 2e171dfbee
commit 51c85e4cd5
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/src/lib/logic/file-actions.ts
View File

@@ -473,13 +473,11 @@ export const fileActions = {
newFile.replaceWaypoints( newFile.replaceWaypoints(
0, 0,
file.wpt.length - 1, file.wpt.length - 1,
closest file.wpt.filter((wpt, wptIndex) =>
.filter((c) => closest[wptIndex].some(
c.some(
([trackIndex, segmentIndex]) => trackIndex === index ([trackIndex, segmentIndex]) => trackIndex === index
) )
) )
.map((c, wptIndex) => file.wpt[wptIndex])
); );
newFile._data.id = fileIds[index]; newFile._data.id = fileIds[index];
newFile.metadata.name = newFile.metadata.name =
@@ -499,14 +497,11 @@ export const fileActions = {
newFile.replaceWaypoints( newFile.replaceWaypoints(
0, 0,
file.wpt.length - 1, file.wpt.length - 1,
closest file.wpt.filter((wpt, wptIndex) =>
.filter((c) => closest[wptIndex].some(
c.some( ([trackIndex, segmentIndex]) => segmentIndex === index
([trackIndex, segmentIndex]) =>
segmentIndex === index
) )
) )
.map((c, wptIndex) => file.wpt[wptIndex])
); );
newFile._data.id = fileIds[index]; newFile._data.id = fileIds[index];
newFile.metadata.name = `${file.trk[0].name ?? file.metadata.name} (${index + 1})`; newFile.metadata.name = `${file.trk[0].name ?? file.metadata.name} (${index + 1})`;

9
website/src/lib/utils.ts
View File

@@ -62,15 +62,20 @@ export function getClosestTrackSegments(
let segmentBounds = segmentStatistics.global.bounds; let segmentBounds = segmentStatistics.global.bounds;
let northEast = segmentBounds.northEast; let northEast = segmentBounds.northEast;
let southWest = segmentBounds.southWest; let southWest = segmentBounds.southWest;
let bounds = new mapboxgl.LngLatBounds(southWest, northEast);
if (bounds.contains(point)) {
segmentBoundsDistances.push([0, trackIndex, segmentIndex]);
} else {
let northWest: Coordinates = { lat: northEast.lat, lon: southWest.lon }; let northWest: Coordinates = { lat: northEast.lat, lon: southWest.lon };
let southEast: Coordinates = { lat: southWest.lat, lon: northEast.lon }; let southEast: Coordinates = { lat: southWest.lat, lon: northEast.lon };
let distanceToSegment = Math.min( let distanceToBounds = Math.min(
crossarcDistance(northWest, northEast, point), crossarcDistance(northWest, northEast, point),
crossarcDistance(northEast, southEast, point), crossarcDistance(northEast, southEast, point),
crossarcDistance(southEast, southWest, point), crossarcDistance(southEast, southWest, point),
crossarcDistance(southWest, northWest, point) crossarcDistance(southWest, northWest, point)
); );
segmentBoundsDistances.push([distanceToSegment, trackIndex, segmentIndex]); segmentBoundsDistances.push([distanceToBounds, trackIndex, segmentIndex]);
}
}); });
segmentBoundsDistances.sort((a, b) => a[0] - b[0]); segmentBoundsDistances.sort((a, b) => a[0] - b[0]);