From 007a8d50c63deddf196299fff2e02fda07aecd94 Mon Sep 17 00:00:00 2001
From: James Smith <jsmith@Jamess-MBP.Home>
Date: Thu, 19 Mar 2026 08:54:59 +0000
Subject: [PATCH] Revert "Retry ADS-B map bootstrap safely"

This reverts commit 02ce4d5bb6d0e796369333ca185090ea4ec64db2.
---
 templates/adsb_dashboard.html | 47 +++++------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/templates/adsb_dashboard.html b/templates/adsb_dashboard.html
index 311ccd3..8d69414 100644
--- a/templates/adsb_dashboard.html
+++ b/templates/adsb_dashboard.html
@@ -441,7 +441,6 @@
         let mapCrosshairRequestId = 0;
         let detectedDevicesPromise = null;
         let deviceDetectionRetryTimer = null;
-        let mapBootstrapRetryTimer = null;
         let clockInterval = null;
         let cleanupInterval = null;
         let delayedGpsInitTimer = null;
@@ -1736,7 +1735,6 @@ ACARS: ${r.statistics.acarsMessages} messages`;
             if (delayedDriverCheckTimer) { clearTimeout(delayedDriverCheckTimer); delayedDriverCheckTimer = null; }
             if (delayedAircraftDbTimer) { clearTimeout(delayedAircraftDbTimer); delayedAircraftDbTimer = null; }
             if (deviceDetectionRetryTimer) { clearTimeout(deviceDetectionRetryTimer); deviceDetectionRetryTimer = null; }
-            if (mapBootstrapRetryTimer) { clearTimeout(mapBootstrapRetryTimer); mapBootstrapRetryTimer = null; }
         });
 
         function ensureAdsbMapBootstrapped() {
@@ -2296,45 +2294,12 @@ sudo make install</code>
             const container = document.getElementById('radarMap');
             if (!container || container._leaflet_id) return;
 
-            if (typeof L === 'undefined' || typeof L.map !== 'function') {
-                if (!mapBootstrapRetryTimer) {
-                    mapBootstrapRetryTimer = setTimeout(() => {
-                        mapBootstrapRetryTimer = null;
-                        ensureAdsbMapBootstrapped();
-                    }, 300);
-                }
-                console.warn('ADS-B: Leaflet not ready yet, retrying map bootstrap');
-                return;
-            }
-
-            const normalizedLocation = (window.ObserverLocation && typeof ObserverLocation.normalize === 'function')
-                ? ObserverLocation.normalize(observerLocation?.lat, observerLocation?.lon)
-                : null;
-            const defaultLocation = {
-                lat: Number(window.INTERCEPT_DEFAULT_LAT ?? 51.5074),
-                lon: Number(window.INTERCEPT_DEFAULT_LON ?? -0.1278)
-            };
-            const initialLocation = normalizedLocation || defaultLocation;
-
-            observerLocation = initialLocation;
-
-            try {
-                radarMap = L.map('radarMap', {
-                    center: [initialLocation.lat, initialLocation.lon],
-                    zoom: 7,
-                    minZoom: 3,
-                    maxZoom: 15
-                });
-            } catch (e) {
-                console.error('ADS-B: L.map() failed:', e);
-                if (!mapBootstrapRetryTimer) {
-                    mapBootstrapRetryTimer = setTimeout(() => {
-                        mapBootstrapRetryTimer = null;
-                        ensureAdsbMapBootstrapped();
-                    }, 500);
-                }
-                return;
-            }
+            radarMap = L.map('radarMap', {
+                center: [observerLocation.lat, observerLocation.lon],
+                zoom: 7,
+                minZoom: 3,
+                maxZoom: 15
+            });
 
             // Use settings manager for tile layer (allows runtime changes)
             window.radarMap = radarMap;