Update app.py

app.py

@@ -1,4 +1,5 @@
 import os
+import re
 import tempfile
 from datetime import datetime, timedelta, timezone
 
@@ -55,15 +56,24 @@ def fetch_reports(time_from, time_to):
     return r.json()
 
 # -----------------------------
-# JSON 解析（讀 EarthquakeInfo）
+# JSON 解析（讀 EarthquakeInfo）＋ 強化數字解析
 # -----------------------------
 def _to_float(x):
-    try:
-        if x is None or str(x).strip() == "":
-            return None
-        return float(str(x).strip())
-    except Exception:
+    """
+    將各種數字表達轉成 float：
+    - 純數字：23.5
+    - 含單位/文字：'23.5°N'、'121.6 E'、'25.3 公里' -> 取第一個浮點數
+    - 其他不可解析 -> None
+    """
+    if x is None:
+        return None
+    if isinstance(x, (int, float)):
+        return float(x)
+    s = str(x).strip()
+    if s == "":
         return None
+    m = re.search(r"[-+]?\d+(?:\.\d+)?", s)
+    return float(m.group()) if m else None
 
 def parse_ea0015(obj):
     """
@@ -78,30 +88,41 @@ def parse_ea0015(obj):
 
     rows = []
     for q in quakes:
-        ei = q.get("EarthquakeInfo") or q.get("earthquakeInfo") or {}
-        epic = ei.get("Epicenter") or ei.get("epicenter") or {}
-        magobj = ei.get("Magnitude") or ei.get("magnitude") or {}
+        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 {}
 
         origin = (
             ei.get("OriginTime") or ei.get("originTime")
             or q.get("OriginTime") or q.get("originTime")
         )
-        lat = epic.get("EpicenterLat") or epic.get("epicenterLat")
-        lon = epic.get("EpicenterLon") or epic.get("epicenterLon")
+
+        # 經緯度：同時嘗試多種鍵名（不同版本可能不同）
+        lat_raw = (
+            epic.get("EpicenterLat") or epic.get("epicenterLat")
+            or epic.get("EpicenterLatitude") or epic.get("epicenterLatitude")
+            or epic.get("Lat") or epic.get("lat")
+        )
+        lon_raw = (
+            epic.get("EpicenterLon") or epic.get("epicenterLon")
+            or epic.get("EpicenterLongitude") or epic.get("epicenterLongitude")
+            or epic.get("Lon") or epic.get("lon")
+        )
+
         depth = ei.get("Depth") or ei.get("depth")
         mag = (
-            magobj.get("MagnitudeValue") or magobj.get("magnitudeValue")
-            or magobj.get("Magnitude") or magobj.get("magnitude")
+            mago.get("MagnitudeValue") or mago.get("magnitudeValue")
+            or mago.get("Magnitude") or mago.get("magnitude")
         )
         loc = epic.get("Location") or epic.get("location")
         url = q.get("Web") or q.get("ReportURL") or q.get("reportURL")
 
         rows.append({
             "OriginTime": origin,
-            "Lat": _to_float(lat),
-            "Lon": _to_float(lon),
+            "Lat": _to_float(lat_raw),
+            "Lon": _to_float(lon_raw),
             "Depth_km": _to_float(depth),
-            "Magnitude": _to_float(mag),
+            "Magnitude": _to_float(m),
             "Location": loc,
             "ReportURL": url,
         })
@@ -124,7 +145,6 @@ def _save_fig_to_tmp(fig, suffix=".png", dpi=180):
 def plot_trend_path(df):
     if df.empty:
         return None
-    # 顯式轉數值更穩
     m = pd.to_numeric(df["Magnitude"], errors="coerce")
     fig, ax = plt.subplots(figsize=(6, 4))
     ax.scatter(df["OriginTime"], m)
@@ -146,13 +166,9 @@ def plot_map_path(df):
         d = df.dropna(subset=["Lon", "Lat"]).copy()
         if not d.empty:
             mag = pd.to_numeric(d["Magnitude"], errors="coerce").fillna(0).clip(lower=0)
-            size_cm = 0.06 * (mag + 1.5)          # 每點大小（cm）
+            size_cm = 0.06 * (mag + 1.5)         # 每點大小（cm）
             depth = pd.to_numeric(d["Depth_km"], errors="coerce").fillna(0)
 
-            vmin = float(max(0, float(depth.min()) if len(depth) else 0))
-            vmax = float(max(100, float(depth.max()) if len(depth) else 100))
-            cmap = "roma"
-
             fig = pygmt.Figure()
             region = [lon_min, lon_max, lat_min, lat_max]
             fig.coast(
@@ -161,11 +177,11 @@ def plot_map_path(df):
                 shorelines="0.5p,black", borders="1/0.6p,black",
                 frame=["WSen", "xaf", "yaf"]
             )
-            # per-point size
+            # 變動大小：使用 sizes 參數（單位 cm），色彩以 depth
             fig.plot(
                 x=d["Lon"].to_list(), y=d["Lat"].to_list(),
-                style=["c{}c".format(s) for s in size_cm.to_list()],
-                color=depth.to_list(), cmap=cmap, pen="0.25p,black"
+                style="cc", sizes=size_cm.to_list(),
+                color=depth.to_list(), cmap="roma", pen="0.25p,black"
             )
             fig.colorbar(frame=["x+lDepth (km)"], cmap=True, position="JMR+w7c/0.4c+o0.6c/0c")
             fig.basemap(map_scale="jBL+w50k+o0.6c/0.6c+f+lkm")
@@ -174,7 +190,7 @@ def plot_map_path(df):
             fig.savefig(outpath, dpi=220)
             return outpath
 
-    # --- Matplotlib 備援（顯式轉數值，避免 FutureWarning） ---
+    # --- Matplotlib 備援 ---
     if df.empty:
         return None
     fig, ax = plt.subplots(figsize=(6, 6))