steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-09-02 16:52:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

use replaceTrackPoints for merging

Browse Source
This commit is contained in:
vcoppe
2024-06-17 13:33:58 +02:00
parent fe4cafaa23
commit 4225db3c04
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/src/lib/db.ts
View File

@@ -547,25 +547,20 @@ export const dbUtils = {
if (mergeTraces) { if (mergeTraces) {
if (toMerge.trk.length > 0) { if (toMerge.trk.length > 0) {
let trackPoints: TrackPoint[] = []; let s = new TrackSegment();
toMerge.trk.forEach((track) => { toMerge.trk.map((track) => {
track.trkseg.forEach((segment) => { track.trkseg.forEach((segment) => {
trackPoints = trackPoints.concat(segment.trkpt.slice()); s = s.replaceTrackPoints(s.trkpt.length, s.trkpt.length, segment.trkpt.slice());
}); });
}); });
// TODO adapt timestamps of trackPoints toMerge.trk = [toMerge.trk[0].replaceTrackSegments(0, toMerge.trk[0].trkseg.length - 1, [s])[0]];
toMerge.trk[0] = toMerge.trk[0].replaceTrackPoints(0, 0, toMerge.trk[0].trkseg[0].trkpt.length - 1, trackPoints);
toMerge.trk[0] = toMerge.trk[0].replaceTrackSegments(1, toMerge.trk[0].trkseg.length - 1, [])[0];
toMerge.trk = toMerge.trk.slice(0, 1);
} }
if (toMerge.trkseg.length > 0) { if (toMerge.trkseg.length > 0) {
let trackPoints: TrackPoint[] = []; let s = new TrackSegment();
toMerge.trkseg.forEach((segment) => { toMerge.trkseg.forEach((segment) => {
trackPoints = trackPoints.concat(segment.trkpt.slice()); s = s.replaceTrackPoints(s.trkpt.length, s.trkpt.length, segment.trkpt.slice());
}); });
// TODO adapt timestamps of trackPoints toMerge.trkseg = [s];
toMerge.trkseg[0] = toMerge.trkseg[0].replaceTrackPoints(0, toMerge.trkseg[0].trkpt.length - 1, trackPoints);
toMerge.trkseg = toMerge.trkseg.slice(0, 1);
} }
} }
@@ -700,7 +695,6 @@ export const dbUtils = {
draft.set(newFile._data.id, freeze(newFile)); draft.set(newFile._data.id, freeze(newFile));
}); });
} }
// TODO waypoints
draft.delete(fileId); draft.delete(fileId);
} else if (level === ListLevel.TRACK) { } else if (level === ListLevel.TRACK) {
let newFile = file; let newFile = file;