From f76b454d5a6d6b0e544ed2aafca8ba32a605ef7a Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 20 Jan 2025 23:27:32 +0200
Subject: [PATCH] feat(geomap): load markers at startup

---
 src/public/app/widgets/geo_map.ts             |  9 ++++---
 .../app/widgets/type_widgets/geo_map.ts       | 27 ++++++++++++++++---
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/public/app/widgets/geo_map.ts b/src/public/app/widgets/geo_map.ts
index e0dc14aed..d49f1c1d3 100644
--- a/src/public/app/widgets/geo_map.ts
+++ b/src/public/app/widgets/geo_map.ts
@@ -16,12 +16,15 @@ const TPL = `\
     <div class="geo-map-container"></div>
 </div>`
 
+export type Leaflet = typeof import("leaflet");
+export type InitCallback = ((L: Leaflet) => void);
+
 export default class GeoMapWidget extends NoteContextAwareWidget {
 
     map?: Map;
-    private initCallback?: () => void;
+    private initCallback?: InitCallback;
 
-    constructor(widgetMode: "type", initCallback?: () => void) {
+    constructor(widgetMode: "type", initCallback?: InitCallback) {
         super();
         this.initCallback = initCallback;
     }
@@ -41,7 +44,7 @@ export default class GeoMapWidget extends NoteContextAwareWidget {
 
                 this.map = map;
                 if (this.initCallback) {
-                    this.initCallback();
+                    this.initCallback(L);
                 }
 
                 L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts
index 740f9838e..7022b9c20 100644
--- a/src/public/app/widgets/type_widgets/geo_map.ts
+++ b/src/public/app/widgets/type_widgets/geo_map.ts
@@ -1,6 +1,6 @@
 import type { LatLng, LeafletMouseEvent } from "leaflet";
 import type FNote from "../../entities/fnote.js";
-import GeoMapWidget from "../geo_map.js";
+import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js";
 import TypeWidget from "./type_widget.js"
 import server from "../../services/server.js";
 import toastService from "../../services/toast.js";
@@ -51,7 +51,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
     constructor() {
         super();
 
-        this.geoMapWidget = new GeoMapWidget("type", () => this.#onMapInitialized());
+        this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L));
 
         this.child(this.geoMapWidget);
     }
@@ -63,23 +63,42 @@ export default class GeoMapTypeWidget extends TypeWidget {
         super.doRender();
     }
 
-    async #onMapInitialized() {
+    async #onMapInitialized(L: Leaflet) {
         const map = this.geoMapWidget.map;
         if (!map) {
             throw new Error("Unable to load map.");
         }
 
-        const blob = await this.note?.getBlob();
+        if (!this.note) {
+            return;
+        }
+
+        const blob = await this.note.getBlob();
 
         let parsedContent: MapData = {};
         if (blob) {
             parsedContent = JSON.parse(blob.content);
         }
 
+        // Restore viewport position & zoom
         const center = parsedContent.view?.center ?? [51.505, -0.09];
         const zoom = parsedContent.view?.zoom ?? 13;
         map.setView(center, zoom);
 
+        // Restore markers.
+        const childNotes = await this.note.getChildNotes();
+        for (const childNote of childNotes) {
+            const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE);
+            if (!latLng) {
+                continue;
+            }
+
+            const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el));
+            L.marker(L.latLng(lat, lng))
+                .addTo(map)
+                .bindPopup(childNote.title);
+        }
+
         const updateFn = () => this.spacedUpdate.scheduleUpdate();
         map.on("moveend", updateFn);
         map.on("zoomend", updateFn);