Update cwa_service.py

cwa_service.py

@@ -29,6 +29,7 @@ def _parse_cwa_time(s: str) -> tuple[str, str]:
 # --- 地震預警 (CWA_ALARM_API) ---
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
     """抓 CWA 地震預警並格式化輸出。"""
+    # ... (此函式內容不變) ...
     try:
         r = requests.get(CWA_ALARM_API, timeout=10)
         r.raise_for_status()
@@ -68,26 +69,35 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
 
 # --- 顯著有感地震 (E-A0015-001) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
+    """[修改] 採用更穩健的方式解析 E-A0015-001 的 JSON 資料"""
     quakes = obj.get("records", {}).get("Earthquake", [])
     rows = []
     for q in quakes:
         ei = q.get("EarthquakeInfo", {})
         epic = ei.get("Epicenter", {})
         mag_info = ei.get("Magnitude", {})
+        
+        # 嘗試用多種可能的欄位名稱去取得資料
+        depth_raw = ei.get("FocalDepth") or ei.get("Depth")
+        mag_raw = mag_info.get("MagnitudeValue") or mag_info.get("value") or mag_info.get("Magnitude")
+        
         rows.append({
             "ID": q.get("EarthquakeNo"), "Time": ei.get("OriginTime"),
             "Lat": _to_float(epic.get("EpicenterLatitude")), "Lon": _to_float(epic.get("EpicenterLongitude")),
-            "Depth": _to_float(ei.get("FocalDepth")), "Magnitude": _to_float(mag_info.get("MagnitudeValue")),
+            "Depth": _to_float(depth_raw),
+            "Magnitude": _to_float(mag_raw),
             "Location": epic.get("Location"), "URL": q.get("Web"),
         })
     df = pd.DataFrame(rows)
     if not df.empty and "Time" in df.columns:
         time_series = pd.to_datetime(df["Time"], errors="coerce")
         if pd.api.types.is_datetime64_any_dtype(time_series):
+            # 假設 API 回傳的時間是 UTC 標準時間
             df["Time"] = time_series.dt.tz_localize("UTC").dt.tz_convert(TAIPEI_TZ)
     return df
 
 def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
+    # ... (此函式上半部分不變) ...
     if not CWA_API_KEY: return "❌ 顯著地震查詢失敗：管理者尚未設定 CWA_API_KEY。"
     now = datetime.now(timezone.utc)
     time_from = (now - timedelta(days=days)).strftime("%Y-%m-%d")
@@ -113,4 +123,3 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
     except Exception as e:
         return f"❌ 顯著地震查詢失敗：{e}"
 
-# [移除] _normalize_cwa_area_name 和 fetch_local_earthquakes 兩個函式