Update app.py

app.py

@@ -77,8 +77,8 @@ def _to_float(x):
 
 def parse_ea0015(obj):
     """
-    CWA E-A0015-001 結構：
-    records.earthquake[] 裡主要欄位在 EarthquakeInfo.*
+    解析 CWA E-A0015-001
+    主要欄位在 records.earthquake[].EarthquakeInfo.*
     取出：OriginTime, Lat, Lon, Depth_km, Magnitude, Location, ReportURL
     """
     records = obj.get("records") or obj.get("Records") or {}
@@ -90,14 +90,20 @@ def parse_ea0015(obj):
     for q in quakes:
         ei   = q.get("EarthquakeInfo") or q.get("earthquakeInfo") or {}
         epic = ei.get("Epicenter")     or ei.get("epicenter")     or {}
-        mago = ei.get("Magnitude")     or ei.get("magnitude")     or {}
+
+        # Magnitude 可能在 Magnitude 或 EarthquakeMagnitude 物件裡
+        mago = (
+            ei.get("Magnitude") or ei.get("magnitude")
+            or ei.get("EarthquakeMagnitude") or ei.get("earthquakeMagnitude")
+            or {}
+        )
 
         origin = (
             ei.get("OriginTime") or ei.get("originTime")
             or q.get("OriginTime") or q.get("originTime")
         )
 
-        # 經緯度：同時嘗試多種鍵名（不同版本可能不同）
+        # 經緯度多種鍵名
         lat_raw = (
             epic.get("EpicenterLat") or epic.get("epicenterLat")
             or epic.get("EpicenterLatitude") or epic.get("epicenterLatitude")
@@ -109,11 +115,21 @@ def parse_ea0015(obj):
             or epic.get("Lon") or epic.get("lon")
         )
 
-        depth = ei.get("Depth") or ei.get("depth")
-        mag = (
+        # 深度：Depth / FocalDepth / FocalDepthKm / depth / focalDepth...
+        depth_raw = (
+            ei.get("Depth") or ei.get("depth")
+            or ei.get("FocalDepth") or ei.get("focalDepth")
+            or ei.get("FocalDepthKm") or ei.get("focalDepthKm")
+        )
+
+        # 規模：MagnitudeValue / value / Magnitude / magnitude
+        mag_raw = (
             mago.get("MagnitudeValue") or mago.get("magnitudeValue")
+            or mago.get("Value") or mago.get("value")
             or mago.get("Magnitude") or mago.get("magnitude")
+            or ei.get("MagnitudeValue") or ei.get("magnitudeValue")
         )
+
         loc = epic.get("Location") or epic.get("location")
         url = q.get("Web") or q.get("ReportURL") or q.get("reportURL")
 
@@ -121,8 +137,8 @@ def parse_ea0015(obj):
             "OriginTime": origin,
             "Lat": _to_float(lat_raw),
             "Lon": _to_float(lon_raw),
-            "Depth_km": _to_float(depth),
-            "Magnitude": _to_float(mag),  # ← 修正：用 mag，不是 m
+            "Depth_km": _to_float(depth_raw),
+            "Magnitude": _to_float(mag_raw),
             "Location": loc,
             "ReportURL": url,
         })
@@ -203,8 +219,7 @@ def plot_map_path(df):
     sc = ax.scatter(df["Lon"], df["Lat"], s=s, c=depth, alpha=0.85, edgecolor="black")
     cb = plt.colorbar(sc, ax=ax, fraction=0.046, pad=0.04)
     cb.set_label("Depth (km)")
-    ax.set_xlabel("Longitude (°E)")
-    ax.set_ylabel("Latitude (°N)")
+    ax.set_xlabel("Longitude (°E)"); ax.set_ylabel("Latitude (°N)")
     ax.set_title("Epicenters in Taiwan Region (119–123E, 21–26N)")
     ax.grid(True, linestyle="--", alpha=0.3)
     return _save_fig_to_tmp(fig)