From 3f7913f50632d095f49ee3aa74b0621d4d06dc4b Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sun, 12 Jan 2025 15:28:32 +0100
Subject: [PATCH] fixes waypoint icon picker

---
 web/src/lib/components/base/combobox.svelte           | 2 +-
 web/src/lib/components/waypoint/waypoint_modal.svelte | 5 +++--
 web/src/lib/models/api/waypoint_schema.ts             | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/lib/components/base/combobox.svelte b/web/src/lib/components/base/combobox.svelte
index c18eae77..7ba09f34 100644
--- a/web/src/lib/components/base/combobox.svelte
+++ b/web/src/lib/components/base/combobox.svelte
@@ -48,7 +48,7 @@
         dispatch("update", q);
     }
 
-    function handleItemClick(item: ComboboxItem) {
+    function handleItemClick(item: ComboboxItem) {        
         value = item.value;
         dispatch("click", item);
     }
diff --git a/web/src/lib/components/waypoint/waypoint_modal.svelte b/web/src/lib/components/waypoint/waypoint_modal.svelte
index e1b0d5dd..66940fbf 100644
--- a/web/src/lib/components/waypoint/waypoint_modal.svelte
+++ b/web/src/lib/components/waypoint/waypoint_modal.svelte
@@ -52,8 +52,8 @@
     $: filteredIcons =
         ($data.icon?.length ?? 0) > 2
             ? icons
-                  .filter((i) => i.includes($data.icon ?? ""))
-                  .map((i) => ({ text: i, value: i, icon: i }))
+                  .filter((i) => i.replaceAll("-", " ").includes($data.icon?.toLowerCase() ?? ""))
+                  .map((i) => ({ text: i.replaceAll("-", " "), value: i, icon: i }))
             : [];
 
     function getCoordinatesFromPhoto(src: string) {
@@ -100,6 +100,7 @@
             <Combobox
                 name="icon"
                 icon={$data.icon}
+                bind:value={$data.icon}
                 items={filteredIcons}
                 label={$_("icon")}
             ></Combobox>
diff --git a/web/src/lib/models/api/waypoint_schema.ts b/web/src/lib/models/api/waypoint_schema.ts
index 91d1e1c8..14fccb5b 100644
--- a/web/src/lib/models/api/waypoint_schema.ts
+++ b/web/src/lib/models/api/waypoint_schema.ts
@@ -17,7 +17,7 @@ const WaypointUpdateSchema = z.object({
     description: z.string().optional(),
     lat: z.number({coerce: true}).min(-90).max(90).optional(),
     lon: z.number({coerce: true}).min(-180).max(180).optional(),
-    icon: z.string().optional(),
+    icon: z.string().default("circle").optional(),
     photos: z.array(z.string()).optional(),
     "photos-": z.string().optional(),
     "photos+": z.string().optional(),