From e02d67c15358a53d659fb21aa2fcfee5322452ea Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Mon, 15 Jun 2026 01:14:20 -0500
Subject: [PATCH] gaslight2

---
 .../navigation/navigation_destination.js      | 111 +++++++++++-------
 .../the_pond/assets/components/router.js      |   2 +-
 .../system/the_pond/templates/index.html      |   4 +-
 3 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/starpilot/system/the_pond/assets/components/navigation/navigation_destination.js b/starpilot/system/the_pond/assets/components/navigation/navigation_destination.js
index 682b1e4e8..aa0f097ae 100644
--- a/starpilot/system/the_pond/assets/components/navigation/navigation_destination.js
+++ b/starpilot/system/the_pond/assets/components/navigation/navigation_destination.js
@@ -140,39 +140,44 @@ function parseCoordinatePair(value) {
   return { latitude, longitude };
 }
 
+let map;
+let destinationMarker;
+let favoriteMarkers = [];
+let sessionToken = crypto.randomUUID?.() || Math.random().toString(36).slice(2);
+let remountCheckScheduled = false;
+
+const state = reactive({
+  amap1Key: undefined,
+  amap2Key: undefined,
+  canToggleProvider: false,
+  confirmedRoute: null,
+  confirmedRouteRefresh: 0,
+  destination: undefined,
+  favoriteRoutes: [],
+  favoriteToRemove: null,
+  favoriteToRename: null,
+  favoritesCount: 0,
+  favoritesVisible: false,
+  fetched: false,
+  initialized: false,
+  isMetric: true,
+  lastPosition: undefined,
+  loadingRoute: false,
+  mapboxPublic: undefined,
+  mapboxSecret: undefined,
+  missingKeys: null,
+  newFavoriteName: "",
+  previousDestinations: "[]",
+  searchProvider: "mapbox",
+  selectedRoute: null,
+  showRemoveFavoriteModal: false,
+  showRenameFavoriteModal: false,
+  suggestions: "[]"
+});
+
+const searchFieldState = reactive({ value: "" });
+
 export function NavDestination() {
-  let map;
-  let destinationMarker;
-  let favoriteMarkers = [];
-  const state = reactive({
-    amap1Key: undefined,
-    amap2Key: undefined,
-    canToggleProvider: false,
-    confirmedRoute: null,
-    confirmedRouteRefresh: 0,
-    destination: undefined,
-    favoriteRoutes: [],
-    favoriteToRemove: null,
-    favoriteToRename: null,
-    favoritesCount: 0,
-    favoritesVisible: false,
-    initialized: false,
-    isMetric: true,
-    lastPosition: undefined,
-    loadingRoute: false,
-    mapboxPublic: undefined,
-    mapboxSecret: undefined,
-    missingKeys: null,
-    newFavoriteName: "",
-    previousDestinations: "[]",
-    searchProvider: "mapbox",
-    selectedRoute: null,
-    showRemoveFavoriteModal: false,
-    showRenameFavoriteModal: false,
-    suggestions: "[]"
-  });
-  const searchFieldState = reactive({ value: "" });
-  const sessionToken = crypto.randomUUID?.() || Math.random().toString(36).slice(2);
 
   function areRoutesEqual(a, b) {
     return a?.routeHash && b?.routeHash && a.routeHash === b.routeHash;
@@ -585,18 +590,31 @@ export function NavDestination() {
   }
 
   const setupMap = async (retries = 0) => {
-    if (!state.mapboxPublic || state.initialized) return;
+    if (!state.mapboxPublic) return false;
+
+    const container = document.getElementById("map");
+    if (!container) {
+      if (retries >= 50) return false;
+      await new Promise(r => requestAnimationFrame(r));
+      return setupMap(retries + 1);
+    }
+
+    if (map?.getContainer?.() && map.getContainer() !== container) {
+      favoriteMarkers.forEach(marker => marker.remove());
+      favoriteMarkers = [];
+      destinationMarker?.remove();
+      destinationMarker = undefined;
+      map.remove();
+      map = undefined;
+      state.initialized = false;
+    }
+
+    if (state.initialized) return false;
 
     if (typeof mapboxgl === "undefined") {
       await loadMapboxGL();
     }
 
-    const container = document.getElementById("map");
-    if (!container) {
-      if (retries >= 50) return;
-      await new Promise(r => requestAnimationFrame(r));
-      return setupMap(retries + 1);
-    }
     state.initialized = true;
     mapboxgl.accessToken = state.mapboxPublic;
     const initialCenter = state.lastPosition
@@ -654,9 +672,22 @@ export function NavDestination() {
         labelLayer
       );
     });
+    return true;
   };
 
-  getNavigationData();
+  if (!state.fetched) {
+    state.fetched = true;
+    void getNavigationData();
+  } else if (!remountCheckScheduled && !state.missingKeys) {
+    remountCheckScheduled = true;
+    queueMicrotask(async () => {
+      remountCheckScheduled = false;
+      const recreated = await setupMap();
+      if (recreated) {
+        await loadFavoritesAlphabetically();
+      }
+    });
+  }
 
   return html`
     <div class="navigation-container">
diff --git a/starpilot/system/the_pond/assets/components/router.js b/starpilot/system/the_pond/assets/components/router.js
index bbbc4b108..88de4abae 100644
--- a/starpilot/system/the_pond/assets/components/router.js
+++ b/starpilot/system/the_pond/assets/components/router.js
@@ -9,7 +9,7 @@ import { Home } from "/assets/components/home/home.js"
 import { LateralManeuvers } from "/assets/components/tools/lateral_maneuvers.js"
 import { LongitudinalManeuvers } from "/assets/components/tools/longitudinal_maneuvers.js"
 import { MapsManager } from "/assets/components/tools/maps.js"
-import { NavDestination } from "/assets/components/navigation/navigation_destination.js?v=nav-favorites-1"
+import { NavDestination } from "/assets/components/navigation/navigation_destination.js?v=nav-favorites-2"
 import { NavKeys } from "/assets/components/navigation/navigation_keys.js"
 import { RouteRecordings } from "/assets/components/recordings/dashcam_routes.js"
 import { SettingsView } from "/assets/components/settings.js"
diff --git a/starpilot/system/the_pond/templates/index.html b/starpilot/system/the_pond/templates/index.html
index 0e891e58f..52cb11680 100644
--- a/starpilot/system/the_pond/templates/index.html
+++ b/starpilot/system/the_pond/templates/index.html
@@ -19,7 +19,7 @@
   <link rel="stylesheet" href="/assets/components/home/home.css">
   <link rel="stylesheet" href="/assets/components/main.css">
   <link rel="stylesheet" href="/assets/components/modal.css">
-  <link rel="stylesheet" href="/assets/components/navigation/navigation_destination.css?v=nav-favorites-1">
+  <link rel="stylesheet" href="/assets/components/navigation/navigation_destination.css?v=nav-favorites-2">
   <link rel="stylesheet" href="/assets/components/navigation/navigation_keys.css">
   <link rel="stylesheet" href="/assets/components/recordings/dashcam_routes.css">
   <link rel="stylesheet" href="/assets/components/recordings/screen_recordings.css">
@@ -44,7 +44,7 @@
   <link rel="stylesheet" href="/assets/components/tools/tsk_manager.css">
 
   <script type="module">
-    import("/assets/components/router.js?v=favorite-slots-5").catch((err) => {
+    import("/assets/components/router.js?v=favorite-slots-6").catch((err) => {
       console.error("[the_pond] bootstrap failed", err);
       const target = document.getElementById("app") || document.body;
       const pre = document.createElement("pre");