Update app.py

app.py

@@ -1,9 +1,15 @@
+# app.py
+# MH370 Flight Simulator — Globe + Ping Rings (from KML)
+# Improvements included: (3) legend + start/end labels, (5) thicker path + thinner rings,
+# (6) multi-leg editor as a table (Dataframe)
+
 import re
 import xml.etree.ElementTree as ET
 
 import gradio as gr
 import numpy as np
 import matplotlib.pyplot as plt
+from matplotlib.lines import Line2D
 
 import flight_plotter_v32 as fp
 
@@ -23,6 +29,7 @@ def load_ping_rings_from_kml(path=KML_FILE):
             continue
         name = name_el.text.strip()
 
+        # Only load "Ping Ring ..." LineStrings
         if not name.lower().startswith("ping ring"):
             continue
 
@@ -45,6 +52,10 @@ def load_ping_rings_from_kml(path=KML_FILE):
         if pts:
             rings[name] = pts
 
+    if not rings:
+        raise RuntimeError(
+            f"No ping rings found in KML. Check file name/path: {path} and Placemark names."
+        )
     return rings
 
 
@@ -61,20 +72,20 @@ def latlon_to_xyz(lat_deg, lon_deg, r=1.0):
     return x, y, z
 
 
-# ---------------- legs ----------------
-def parse_legs(text):
+# ---------------- legs (table) ----------------
+def parse_legs_df(df):
     """
-    Each line: heading_deg, speed_knots, minutes
+    df is a list of rows, e.g. [[300,500,10],[270,500,10],...]
+    Each row: heading_deg, speed_knots, minutes
     """
     legs = []
-    for line in (text or "").splitlines():
-        line = line.strip()
-        if not line or line.startswith("#"):
+    for row in df or []:
+        if not row or len(row) < 3:
+            continue
+        h, s, m = row[0], row[1], row[2]
+        if h is None or s is None or m is None:
             continue
-        parts = [p.strip() for p in line.split(",")]
-        if len(parts) != 3:
-            raise ValueError(f"Bad leg line: {line}  (need heading,speed,minutes)")
-        legs.append((float(parts[0]), float(parts[1]), float(parts[2])))
+        legs.append((float(h), float(s), float(m)))
 
     if not legs:
         legs = [(300, 500, 10), (270, 500, 10), (240, 500, 10)]
@@ -109,15 +120,22 @@ def plot_globe(path_pts, selected_rings):
     zs = np.sin(vv)
     ax.plot_surface(xs, ys, zs, linewidth=0, alpha=0.12)
 
-    # Flight path
+    # Flight path (thicker)
     lats = np.array([p[0] for p in path_pts])
     lons = np.array([p[1] for p in path_pts])
     xp, yp, zp = latlon_to_xyz(lats, lons)
-    ax.plot(xp, yp, zp, linewidth=2)
-    ax.scatter([xp[0]], [yp[0]], [zp[0]], s=30)      # start
-    ax.scatter([xp[-1]], [yp[-1]], [zp[-1]], s=30)   # end
 
-    # Ping rings from KML
+    ax.plot(xp, yp, zp, linewidth=3, alpha=0.95)
+
+    # Start/End markers (bigger)
+    ax.scatter([xp[0]], [yp[0]], [zp[0]], s=60)
+    ax.scatter([xp[-1]], [yp[-1]], [zp[-1]], s=60)
+
+    # Labels near points
+    ax.text(xp[0], yp[0], zp[0], " Start", fontsize=10)
+    ax.text(xp[-1], yp[-1], zp[-1], " End", fontsize=10)
+
+    # Ping rings (thinner)
     for ring_name in selected_rings or []:
         pts = PING_RINGS.get(ring_name)
         if not pts:
@@ -125,16 +143,26 @@ def plot_globe(path_pts, selected_rings):
         rlats = np.array([p[0] for p in pts])
         rlons = np.array([p[1] for p in pts])
         xr, yr, zr = latlon_to_xyz(rlats, rlons)
-        ax.plot(xr, yr, zr, linewidth=1, alpha=0.95)
-
+        ax.plot(xr, yr, zr, linewidth=1, alpha=0.9)
+
+    # Legend (proxies are reliable in 3D)
+    legend_handles = [
+        Line2D([0], [0], linewidth=3, label="Flight path"),
+        Line2D([0], [0], marker="o", linestyle="None", markersize=8, label="Start"),
+        Line2D([0], [0], marker="o", linestyle="None", markersize=8, label="End"),
+        Line2D([0], [0], linewidth=1, label="Ping rings"),
+    ]
+    ax.legend(handles=legend_handles, loc="upper left")
+
+    # Globe look
     ax.set_box_aspect([1, 1, 1])
     ax.set_axis_off()
     ax.view_init(elev=20, azim=-60)
     return fig
 
 
-def run_sim(start_lat, start_lon, legs_text, method, rings):
-    legs = parse_legs(legs_text)
+def run_sim(start_lat, start_lon, legs_df, method, rings):
+    legs = parse_legs_df(legs_df)
     path = simulate_path(start_lat, start_lon, legs, method)
     return plot_globe(path, rings)
 
@@ -148,22 +176,29 @@ with gr.Blocks() as demo:
         start_lon = gr.Slider(90, 110, value=96.3, label="Start Longitude")
         method = gr.Dropdown(["VINCENTY", "RHUMB"], value="VINCENTY", label="Method")
 
-    legs_text = gr.Textbox(
-        label="Multi-leg plan (one per line: heading_deg, speed_knots, minutes)",
-        lines=6,
-        value="300, 500, 10\n270, 500, 10\n240, 500, 10"
+    legs_df = gr.Dataframe(
+        headers=["heading_deg", "speed_knots", "minutes"],
+        datatype=["number", "number", "number"],
+        row_count=(6, "dynamic"),
+        col_count=(3, "fixed"),
+        value=[
+            [300, 500, 10],
+            [270, 500, 10],
+            [240, 500, 10],
+        ],
+        label="Multi-leg plan",
     )
 
     rings = gr.CheckboxGroup(
         choices=sorted(PING_RINGS.keys()),
-        value=["Ping Ring 1"],
-        label="Ping rings (from your KML)"
+        value=[sorted(PING_RINGS.keys())[0]],
+        label="Ping rings (from your KML)",
     )
 
     btn = gr.Button("Simulate on Globe")
     out = gr.Plot()
 
-    btn.click(run_sim, inputs=[start_lat, start_lon, legs_text, method, rings], outputs=out)
+    btn.click(run_sim, inputs=[start_lat, start_lon, legs_df, method, rings], outputs=out)
 
 demo.launch()