Update cwa_service.py

cwa_service.py

@@ -1,4 +1,4 @@
-# cwa_service.py (Corrected for Magnitude and tz-naive error)
+# cwa_service.py (Final Defensive Parsing Version)
 import requests
 import re
 import pandas as pd
@@ -70,21 +70,27 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
     quakes = records.get("Earthquake", [])
     rows = []
     for q in quakes:
+        # [偵錯] 如果需要，可以取消下面這行的註解，它會在 Log 中印出最原始的資料
+        # print(f"原始地震資料: {q}") 
+        
         ei = q.get("EarthquakeInfo", {})
-        epic = ei.get("Epicenter", {})
-        mag_info = ei.get("Magnitude", {})
-        depth_raw = ei.get("FocalDepth")
         
-        # [修正] 依序嘗試多種可能的規模值鍵名，增加程式的穩健性
+        # [修正] 使用更穩健的方式取得所有資料，檢查所有已知的大小寫和備用名稱
+        epic = ei.get("Epicenter") or ei.get("epicenter") or {}
+        mag_info = ei.get("Magnitude") or ei.get("magnitude") or ei.get("EarthquakeMagnitude") or {}
+        depth_raw = ei.get("FocalDepth") or ei.get("depth") or ei.get("Depth")
         mag_raw = mag_info.get("MagnitudeValue") or mag_info.get("magnitudeValue") or mag_info.get("Value") or mag_info.get("value")
         
         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(depth_raw), "Magnitude": _to_float(mag_raw),
-            "Location": epic.get("Location"), "URL": q.get("Web"),
+            "Lat": _to_float(epic.get("EpicenterLatitude") or epic.get("epicenterLatitude")),
+            "Lon": _to_float(epic.get("EpicenterLongitude") or epic.get("epicenterLongitude")),
+            "Depth": _to_float(depth_raw), 
+            "Magnitude": _to_float(mag_raw),
+            "Location": epic.get("Location") or epic.get("location"), 
+            "URL": q.get("Web") or q.get("ReportURL"),
         })
+        
     df = pd.DataFrame(rows)
     if not df.empty and "Time" in df.columns:
         df["Time"] = pd.to_datetime(df["Time"], errors="coerce", utc=True).dt.tz_convert(TAIPEI_TZ)
@@ -138,3 +144,4 @@ def fetch_latest_significant_earthquake() -> dict | None:
         return latest_eq_data
     except Exception as e:
         raise e
+