Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-11 02:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(geomap): duplicate markers

Browse Source
This commit is contained in:
Elian Doran 2025-01-21 14:23:59 +02:00
parent 3281bb8e9f
commit 04367de112
No known key found for this signature in database
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/app/widgets/type_widgets/geo_map.ts
View File

@ -1,4 +1,4 @@
import type { LatLng, LeafletMouseEvent, Marker } from "leaflet"; import { Marker, type LatLng, type LeafletMouseEvent } from "leaflet";
import type FNote from "../../entities/fnote.js"; import type FNote from "../../entities/fnote.js";
import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js"; import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js";
import TypeWidget from "./type_widget.js" import TypeWidget from "./type_widget.js"
@ -43,11 +43,14 @@ interface Clipboard {
title: string; title: string;
} }
type MarkerData = Record<string, Marker>;
export default class GeoMapTypeWidget extends TypeWidget { export default class GeoMapTypeWidget extends TypeWidget {
private geoMapWidget: GeoMapWidget; private geoMapWidget: GeoMapWidget;
private clipboard?: Clipboard; private clipboard?: Clipboard;
private L!: Leaflet; private L!: Leaflet;
private currentMarkerData: MarkerData;
static getType() { static getType() {
return "geoMap"; return "geoMap";
@ -57,6 +60,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
super(); super();
this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L)); this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L));
this.currentMarkerData = {};
this.child(this.geoMapWidget); this.child(this.geoMapWidget);
} }
@ -107,6 +111,13 @@ export default class GeoMapTypeWidget extends TypeWidget {
return; return;
} }
// Delete all existing markers
for (const marker of Object.values(this.currentMarkerData)) {
marker.remove();
}
// Add the new markers.
this.currentMarkerData = {};
const childNotes = await this.note.getChildNotes(); const childNotes = await this.note.getChildNotes();
const L = this.L; const L = this.L;
for (const childNote of childNotes) { for (const childNote of childNotes) {
@ -116,7 +127,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
} }
const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el)); const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el));
L.marker(L.latLng(lat, lng), { const marker = L.marker(L.latLng(lat, lng), {
draggable: true draggable: true
}) })
.addTo(map) .addTo(map)
@ -124,6 +135,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
.on("moveend", e => { .on("moveend", e => {
this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng()); this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng());
}); });
this.currentMarkerData[childNote.noteId] = marker;
} }
} }