From 137c2ee1b18717bc7e0ca668d1df03e43d7b6705 Mon Sep 17 00:00:00 2001
From: Matthias Wirth <matthias.wirth@gmail.com>
Date: Wed, 24 Jul 2024 18:00:16 +0200
Subject: [PATCH] fix location centering on first page load

---
 html/script.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/html/script.js b/html/script.js
index f00482c..97f20c7 100644
--- a/html/script.js
+++ b/html/script.js
@@ -711,6 +711,7 @@ function initialize() {
             if (receiverJson.json_trace_interval < 2)
                 traces_high_res = true;
             if (receiverJson.lat != null) {
+                //console.log("receiver.json lat: " + receiverJson.lat)
                 SiteLat = receiverJson.lat;
                 SiteLon = receiverJson.lon;
                 SitePosition = [SiteLon, SiteLat];
@@ -852,6 +853,9 @@ function initPage() {
             SiteLon = CenterLon = DefaultCenterLon = parseFloat(loStore['SiteLon']);
             SiteOverride = true;
         }
+    } else {
+        CenterLat = DefaultCenterLat;
+        CenterLon = DefaultCenterLon;
     }
 
 }
@@ -2498,11 +2502,6 @@ function ol_map_init() {
 function initMapEarly() {
 
     // Load stored map settings if present
-    CenterLon = Number(loStore['CenterLon']) || DefaultCenterLon;
-    CenterLat = Number(loStore['CenterLat']) || DefaultCenterLat;
-    zoomLvl = Number(loStore['zoomLvl']) || DefaultZoomLvl;
-    zoomLvlCache = zoomLvl;
-
     if (overrideMapType)
         MapType_tar1090 = overrideMapType;
     else if (loStore['MapType_tar1090']) {
@@ -2541,6 +2540,12 @@ function initMapEarly() {
 // Initalizes the map and starts up our timers to call various functions
 function initMap() {
 
+    CenterLon = Number(loStore['CenterLon']) || DefaultCenterLon;
+    CenterLat = Number(loStore['CenterLat']) || DefaultCenterLat;
+    //console.log("initMap Centerlat: " + CenterLat);
+    zoomLvl = Number(loStore['zoomLvl']) || DefaultZoomLvl;
+    zoomLvlCache = zoomLvl;
+
     if (globeIndex && adsbexchange) {
         jQuery('#dump1090_total_history_td').hide();
         jQuery('#dump1090_message_rate_td').hide();