steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-08-30 23:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

detect and ignore duplicate POIs when merging

Browse Source
This commit is contained in:
vcoppe
2024-12-28 16:14:36 +01:00
parent 7a80e9e104
commit dc404706c5
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gpx/src/gpx.ts
View File

@@ -1235,6 +1235,23 @@ export class Waypoint {
});
}
equals(other: Waypoint): boolean {
if (this.attributes.lat !== other.attributes.lat || this.attributes.lon !== other.attributes.lon || this.ele !== other.ele ||
this.name !== other.name || this.cmt !== other.cmt || this.desc !== other.desc || this.sym !== other.sym || this.type !== other.type) {
return false;
}
if (this.time === undefined && other.time !== undefined || this.time !== undefined && other.time === undefined || this.time !== undefined && other.time !== undefined && this.time.getTime() !== other.time.getTime()) {
return false;
}
if (JSON.stringify(this.link) !== JSON.stringify(other.link)) {
return false;
}
return true;
}
// Producers
setHidden(hidden: boolean) {
this._data.hidden = hidden;

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

@@ -593,7 +593,11 @@ export const dbUtils = {
if (file && originalFile) {
if (level === ListLevel.FILE) {
toMerge.trk.push(...originalFile.trk.map((track) => track.clone()));
toMerge.wpt.push(...originalFile.wpt.map((wpt) => wpt.clone()));
for (const wpt of originalFile.wpt) {
if (!toMerge.wpt.some((w) => w.equals(wpt))) {
toMerge.wpt.push(wpt.clone());
}
}
if (first) {
target = items[0];
targetFile = file;