fix popups

website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte

@@ -5,15 +5,15 @@
     import { Button } from '$lib/components/ui/button';
     import * as Select from '$lib/components/ui/select';
     import { i18n } from '$lib/i18n.svelte';
-    import { ListWaypointItem } from '$lib/components/file-list/file-list';
     import Help from '$lib/components/Help.svelte';
     import { onDestroy, onMount, untrack } from 'svelte';
     import { getURLForLanguage } from '$lib/utils';
     import { MapPin, CircleX, Save } from '@lucide/svelte';
     import { getSymbolKey, symbols } from '$lib/assets/symbols';
-    import { selection } from '$lib/logic/selection';
+    import { engine } from '$lib/engine';
+    import { selectionSize } from '$lib/selection-helpers';
+    import { getElevation } from '$lib/utils';
     import { selectedWaypoint } from './waypoint';
-    import { fileActions } from '$lib/logic/file-actions';
     import { map } from '$lib/components/map/map';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
     import maplibregl from 'maplibre-gl';
@@ -31,7 +31,9 @@
     let latitude = $state(0);
     let symbolKey = $derived(getSymbolKey(sym));
 
-    let canCreate = $derived($selection.size > 0);
+    const { selection } = engine;
+
+    let canCreate = $derived(selectionSize($selection) > 0);
 
     let sortedSymbols = $derived(
         Object.entries(symbols).sort((a, b) => {
@@ -58,24 +60,24 @@
 
     $effect(() => {
         if ($selectedWaypoint) {
-            const wpt = $selectedWaypoint[0];
+            const wpt = $selectedWaypoint.waypoint;
             untrack(() => {
                 name = wpt.name ?? '';
                 description = wpt.desc ?? '';
                 if (wpt.cmt !== undefined && wpt.cmt !== wpt.desc) {
                     description += '\n\n' + wpt.cmt;
                 }
-                link = wpt.link?.attributes?.href ?? '';
+                link = wpt.link?.href ?? '';
                 sym = wpt.sym ?? '';
-                longitude = parseFloat(wpt.getLongitude().toFixed(6));
-                latitude = parseFloat(wpt.getLatitude().toFixed(6));
+                longitude = parseFloat(wpt.lng.toFixed(6));
+                latitude = parseFloat(wpt.lat.toFixed(6));
             });
         } else {
             untrack(reset);
         }
     });
 
-    function createOrUpdateWaypoint() {
+    async function createOrUpdateWaypoint() {
         if (typeof latitude === 'string') {
             latitude = parseFloat(latitude);
         }
@@ -85,22 +87,25 @@
         latitude = parseFloat(latitude.toFixed(6));
         longitude = parseFloat(longitude.toFixed(6));
 
-        fileActions.addOrUpdateWaypoint(
-            {
-                attributes: {
-                    lat: latitude,
-                    lon: longitude,
-                },
-                name: name.length > 0 ? name : undefined,
-                desc: description.length > 0 ? description : undefined,
-                cmt: description.length > 0 ? description : undefined,
-                link: link.length > 0 ? { attributes: { href: link } } : undefined,
-                sym: sym.length > 0 ? sym : undefined,
-            },
-            selectedWaypoint.wpt && selectedWaypoint.fileId
-                ? new ListWaypointItem(selectedWaypoint.fileId, selectedWaypoint.wpt._data.index)
-                : undefined
-        );
+        const target = $selectedWaypoint;
+        const [ele] = await getElevation([{ lat: latitude, lon: longitude }]);
+        const waypoint = {
+            lng: longitude,
+            lat: latitude,
+            ele,
+            name,
+            desc: description,
+            icon: sym,
+            link,
+        };
+        if (target) {
+            // the engine changes the selected waypoint
+            await engine.selectWaypoints(target.fileId, [target.id]);
+            await engine.updateWaypoint(waypoint);
+        } else {
+            // it goes in the selected files
+            await engine.newWaypoint(waypoint);
+        }
 
         reset();
     }