From 6044a346868482b001a0f8d3a7175d5433db7cac Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Mon, 2 Jun 2025 23:34:57 -0400
Subject: [PATCH] bug: try to fix some multimap weirdness

---
 .idea/workspace.xml            | 50 +++++++++-------------------------
 client/src/routes/+page.svelte | 10 ++++---
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b204f90..e194d2f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,47 +7,14 @@
     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2d855648-9644-469a-afa2-59beb52bb1d6" name="Changes" comment="chore: prep for migration">
-      <change afterPath="$PROJECT_DIR$/crates/ar2/src/parse/error.rs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/crates/ar2/src/parse/mod.rs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/crates/ar2/src/parse/types.rs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/crates/ar2/src/parse/util.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Cargo.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/bun.lock" beforeDir="false" afterPath="$PROJECT_DIR$/client/bun.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/components.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/components.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/app.css" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/app.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/Map.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/Map.svelte" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/ToolbarProductSelector.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/ToolbarProductSelector.svelte" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/generated_interop/cifContainer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/generated_interop/cifContainer.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/generated_interop/digitalRadarData.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/generated_interop/digitalRadarData.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/layerList.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/layerList.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/map/default_palettes.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/map/default_palettes.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/map/map.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/map/map.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/lib/utils.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/lib/utils.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/routes/+layout.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/routes/+layout.svelte" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/routes/+page.server.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/routes/+page.server.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/crates/ar2/Cargo.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/lib.rs" beforeDir="false" afterPath="$PROJECT_DIR$/crates/ar2/src/lib.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/crates/ar2/src/main.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/parser/error.rs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/parser/message2.rs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/parser/message31.rs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/parser/mod.rs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/ar2/src/parser/types.rs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/interchange/build.rs" beforeDir="false" afterPath="$PROJECT_DIR$/crates/interchange/build.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/pal/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/crates/pal/Cargo.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/pal/src/parser.rs" beforeDir="false" afterPath="$PROJECT_DIR$/crates/pal/src/parser.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/crates/pal/src/wasm.rs" beforeDir="false" afterPath="$PROJECT_DIR$/crates/pal/src/wasm.rs" afterDir="false" />
-    </list>
+    <list default="true" id="2d855648-9644-469a-afa2-59beb52bb1d6" name="Changes" comment="feat: new ui" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="23619" />
+    <option name="totalTimeSeconds" value="23936" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -232,7 +199,15 @@
       <option name="project" value="LOCAL" />
       <updated>1748824770288</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="feat: new ui">
+      <option name="closed" value="true" />
+      <created>1748921263065</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1748921263065</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -248,6 +223,7 @@
     <MESSAGE value="feat: proper csr" />
     <MESSAGE value="feat: fix singlesite rendering, works on all sites now" />
     <MESSAGE value="chore: prep for migration" />
-    <option name="LAST_COMMIT_MESSAGE" value="chore: prep for migration" />
+    <MESSAGE value="feat: new ui" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat: new ui" />
   </component>
 </project>
\ No newline at end of file
diff --git a/client/src/routes/+page.svelte b/client/src/routes/+page.svelte
index 8c0191f..88cdce8 100644
--- a/client/src/routes/+page.svelte
+++ b/client/src/routes/+page.svelte
@@ -17,13 +17,15 @@
 	}
 	function removeThisMapFactory(idx: number) {
 		return () => {
-			maps.splice(idx);
+			maps.splice(idx, 1);
 		}
 	}
 </script>
 
 <div class="flex min-h-screen min-w-screen flex-row">
-	{#each maps as map, i}
-		<Map {addMap} removeThisMap={removeThisMapFactory(i)} mapNum={map.mapNumber} stations={data.stations} categories={data.layers} />
-	{/each}
+	{#key maps}
+		{#each maps as map, i}
+			<Map {addMap} removeThisMap={removeThisMapFactory(i)} mapNum={i+1} stations={data.stations} categories={data.layers} />
+		{/each}
+	{/key}
 </div>