Update app.py

app.py

@@ -16,8 +16,6 @@
 # THIS VERSION (changes requested):
 # - Mode D constant southern speed changed from 447 kt -> 443 kt
 # - NEW Map feature: show lat/lon under mouse cursor (Leaflet MousePosition plugin)
-# - FIX: Avoid heavy work at import (lazy-load KML/KMZ + satLoc patch) to prevent exit 137
-# - FIX: Launch Gradio with Spaces PORT
 
 import os
 import re
@@ -239,6 +237,15 @@ def load_ping_rings_from_kml(path: str):
     return rings
 
 
+try:
+    PING_RINGS = load_ping_rings_from_kml(KML_FILE)
+except Exception as e:
+    PING_RINGS = {}
+    KML_LOAD_ERROR = str(e)
+else:
+    KML_LOAD_ERROR = ""
+
+
 # ================= KMZ (Search Areas) =================
 def _kml_ns_from_root(root):
     m = re.match(r"\{(.*)\}", root.tag)
@@ -320,62 +327,13 @@ def load_search_areas_from_kmz(kmz_path: str):
     return out
 
 
-# ================= LAZY LOAD (prevents exit 137 on Spaces) =================
-PING_RINGS = {}
-SEARCH_AREAS = []
-KML_LOAD_ERROR = ""
-KMZ_LOAD_ERROR = ""
-_LOADED_ONCE = False
-
-
-def _patch_measured_bfo_0020():
-    target_labels = {"24:20:00", "00:20:00"}
-    patched = False
-    try:
-        for row in fp.satLoc:
-            try:
-                lbl = fp._extract_time_string(row[0])
-            except Exception:
-                continue
-            if lbl in target_labels:
-                try:
-                    row[SATLOC_IDX_MEAS_BFO] = float(MEASURED_BFO_0020_HZ)
-                    patched = True
-                except Exception:
-                    pass
-    except Exception:
-        return False
-    return patched
-
-
-def ensure_loaded_once():
-    global PING_RINGS, SEARCH_AREAS, KML_LOAD_ERROR, KMZ_LOAD_ERROR, _LOADED_ONCE
-    if _LOADED_ONCE:
-        return
-
-    # KML
-    try:
-        PING_RINGS = load_ping_rings_from_kml(KML_FILE)
-        KML_LOAD_ERROR = ""
-    except Exception as e:
-        PING_RINGS = {}
-        KML_LOAD_ERROR = str(e)
-
-    # KMZ
-    try:
-        SEARCH_AREAS = load_search_areas_from_kmz(SEARCH_AREAS_KMZ)
-        KMZ_LOAD_ERROR = ""
-    except Exception as e:
-        SEARCH_AREAS = []
-        KMZ_LOAD_ERROR = str(e)
-
-    # Patch satLoc
-    try:
-        _patch_measured_bfo_0020()
-    except Exception:
-        pass
-
-    _LOADED_ONCE = True
+try:
+    SEARCH_AREAS = load_search_areas_from_kmz(SEARCH_AREAS_KMZ)
+except Exception as e:
+    SEARCH_AREAS = []
+    KMZ_LOAD_ERROR = str(e)
+else:
+    KMZ_LOAD_ERROR = ""
 
 
 # ================= LEGS HELPERS =================
@@ -558,6 +516,30 @@ def dt_0020_utc() -> datetime:
     return fp._time_label_to_dt("24:20:00", fp.SAT_EPOCH_UTC)
 
 
+# ================= PATCH satLoc: ensure measured BFO at 00:20 is 182 Hz =================
+def _patch_measured_bfo_0020():
+    target_labels = {"24:20:00", "00:20:00"}
+    patched = False
+    try:
+        for row in fp.satLoc:
+            try:
+                lbl = fp._extract_time_string(row[0])
+            except Exception:
+                continue
+            if lbl in target_labels:
+                try:
+                    row[SATLOC_IDX_MEAS_BFO] = float(MEASURED_BFO_0020_HZ)
+                    patched = True
+                except Exception:
+                    pass
+    except Exception:
+        return False
+    return patched
+
+
+_ = _patch_measured_bfo_0020()
+
+
 # ================= ALTITUDE HELPERS =================
 def altitude_ft_at_dt(dt_ping: datetime, start_dt: datetime, alt0_ft: float,
                       vs_fpm: float, descent_start_dt: datetime | None):
@@ -1030,9 +1012,6 @@ def add_named_marker(m, name: str, lat: float, lon: float):
 
 
 def build_leaflet_map(path_pts, legs, method, start_dt):
-    # Ensure KML/KMZ are loaded only when actually needed
-    ensure_loaded_once()
-
     start_lat, start_lon = path_pts[0]
     is_guided = (start_dt == RADAR_FIX_TIME_UTC)
 
@@ -1975,8 +1954,6 @@ def _run_common(start_lat, start_lon, legs, method, start_dt, alt_ft, vs_fpm, de
 
 
 def run_sim_manual(start_lat, start_lon, legs_df, method, start_time_str, alt_ft, vs_fpm, descent_start_choice):
-    ensure_loaded_once()
-
     legs = parse_legs_df(legs_df)
     start_dt = _parse_start_time(start_time_str)
 
@@ -1988,8 +1965,6 @@ def run_sim_manual(start_lat, start_lon, legs_df, method, start_time_str, alt_ft
 
 
 def run_guided(guided_mode, start_lat, start_lon, method, alt_ft, vs_fpm, descent_start_choice):
-    ensure_loaded_once()
-
     if guided_mode == "Straight heading":
         legs, _report_md, start_dt = solve_guided_straight(method, alt_ft, vs_fpm, descent_start_choice)
     elif guided_mode == "Variable heading & speed":
@@ -2027,8 +2002,6 @@ def run_guided(guided_mode, start_lat, start_lon, method, alt_ft, vs_fpm, descen
 with gr.Blocks() as demo:
     gr.Markdown("## ✈️ MH370 Flight Simulator — Leaflet + Esri Ocean/Satellite")
 
-    # NOTE: KML/KMZ now lazy-loaded, so we can only show errors after load.
-    # We keep the old blocks but they will likely be empty at startup.
     if KML_LOAD_ERROR:
         gr.Markdown(
             "### ⚠️ KML not loaded\n"
@@ -2132,6 +2105,4 @@ with gr.Blocks() as demo:
     add_btn.click(add_leg, inputs=[legs_df], outputs=[legs_df])
     reset_btn.click(reset_legs, outputs=[legs_df])
 
-
-if __name__ == "__main__":
-    demo.launch(server_name="0.0.0.0", server_port=int(os.getenv("PORT", "7860")))
+demo.launch()