From 04367de1126cf8970a13199ecdfa8cc5cc6ee791 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 21 Jan 2025 14:23:59 +0200
Subject: [PATCH] fix(geomap): duplicate markers

---
 src/public/app/widgets/type_widgets/geo_map.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts
index 67d41a53f..77ccfd049 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 type { LatLng, LeafletMouseEvent, Marker } from "leaflet";
+import { 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"
@@ -43,11 +43,14 @@ interface Clipboard {
     title: string;
 }
 
+type MarkerData = Record<string, Marker>;
+
 export default class GeoMapTypeWidget extends TypeWidget {
 
     private geoMapWidget: GeoMapWidget;
     private clipboard?: Clipboard;
     private L!: Leaflet;
+    private currentMarkerData: MarkerData;
 
     static getType() {
         return "geoMap";
@@ -57,6 +60,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
         super();
 
         this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L));
+        this.currentMarkerData = {};
 
         this.child(this.geoMapWidget);
     }
@@ -107,6 +111,13 @@ export default class GeoMapTypeWidget extends TypeWidget {
             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 L = this.L;
         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));
-            L.marker(L.latLng(lat, lng), {
+            const marker = L.marker(L.latLng(lat, lng), {
                 draggable: true
             })
                 .addTo(map)
@@ -124,6 +135,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
                 .on("moveend", e => {
                     this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng());
                 });
+            this.currentMarkerData[childNote.noteId] = marker;
         }
     }