From 65e593f3ff8ae17d8c204699647ea7af70c7817f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 23:35:34 +0200 Subject: [PATCH] fix(geo-map): duplicate tracks after refresh --- src/public/app/widgets/type_widgets/geo_map.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index 5bb060ce9..ee0f95b76 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -1,4 +1,4 @@ -import { Marker, type LatLng, type LeafletMouseEvent } from "leaflet"; +import { GPX, Marker, type LatLng, type LeafletMouseEvent } from "leaflet"; import type FNote from "../../entities/fnote.js"; import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js"; import TypeWidget from "./type_widget.js" @@ -91,8 +91,6 @@ interface CreateChildResponse { } } -type MarkerData = Record; - enum State { Normal, NewNote @@ -103,7 +101,8 @@ export default class GeoMapTypeWidget extends TypeWidget { private geoMapWidget: GeoMapWidget; private _state: State; private L!: Leaflet; - private currentMarkerData: MarkerData; + private currentMarkerData: Record; + private currentTrackData: Record; private gpxLoaded?: boolean; static getType() { @@ -115,6 +114,7 @@ export default class GeoMapTypeWidget extends TypeWidget { this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L)); this.currentMarkerData = {}; + this.currentTrackData = {}; this._state = State.Normal; this.child(this.geoMapWidget); @@ -169,6 +169,11 @@ export default class GeoMapTypeWidget extends TypeWidget { marker.remove(); } + // Delete all existing tracks + for (const track of Object.values(this.currentTrackData)) { + track.remove(); + } + // Add the new markers. this.currentMarkerData = {}; const childNotes = await this.note.getChildNotes(); @@ -203,6 +208,7 @@ export default class GeoMapTypeWidget extends TypeWidget { }); track.addTo(this.geoMapWidget.map); + this.currentTrackData[note.noteId] = track; } #processNoteWithMarker(note: FNote, latLng: string) {