Update cwa_service.py

cwa_service.py

@@ -1,11 +1,11 @@
-# cwa_service.py 
+# cwa_service.py
 # -*- coding: utf-8 -*-
 from __future__ import annotations
 import requests
 import re
 import pandas as pd
 from datetime import datetime, timedelta, timezone
-from config import CWA_API_KEY, CWA_ALARM_API, CWA_SIGNIFICANT_API, CWA_LOCAL_EQ_API
+from config import CWA_API_KEY, CWA_ALARM_API, CWA_SIGNIFICANT_API
 
 TAIPEI_TZ = timezone(timedelta(hours=8))
 
@@ -26,18 +26,6 @@ def _parse_cwa_time(s: str) -> tuple[str, str]:
     except Exception:
         return (s, "未知")
 
-def _normalize_cwa_area_name(area_name: str) -> str:
-    """自動校正縣市名稱，以符合 CWA API 查詢需求"""
-    area_name = area_name.replace("台", "臺")
-    if area_name.endswith("市") or area_name.endswith("縣"):
-        return area_name
-    
-    major_cities = "臺北,新北,基隆,桃園,新竹,臺中,嘉義,臺南,高雄".split(',')
-    if any(city in area_name for city in major_cities):
-         return f"{area_name}市"
-    else:
-         return f"{area_name}縣"
-
 # --- 地震預警 (CWA_ALARM_API) ---
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
     """抓 CWA 地震預警並格式化輸出。"""
@@ -80,7 +68,6 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
 
 # --- 顯著有感地震 (E-A0015-001) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
-    """最穩健的解析邏輯，供 /significant 和 /latest 共用"""
     records = obj.get("records") or obj.get("Records") or {}
     quakes = records.get("earthquake") or records.get("Earthquake") or []
     rows = []
@@ -88,10 +75,8 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
         ei = q.get("EarthquakeInfo") or q.get("earthquakeInfo") or {}
         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") or epic.get("epicenterLatitude")),
@@ -119,7 +104,6 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         df = _parse_significant_earthquakes(data)
         if df.empty: return f"✅ 過去 {days} 天內沒有顯著有感地震報告。"
         df = df.sort_values(by="Time", ascending=False).head(limit)
-        
         lines = [f"🚨 CWA 最新顯著有感地震 (近{days}天內):", "-" * 20]
         for _, row in df.iterrows():
             mag_str = f"{row['Magnitude']:.1f}" if pd.notna(row['Magnitude']) else "—"
@@ -147,7 +131,6 @@ def fetch_latest_significant_earthquake() -> dict | None:
     r = requests.get(CWA_SIGNIFICANT_API, params=params, timeout=15)
     r.raise_for_status()
     data = r.json()
-
     df = _parse_significant_earthquakes(data)
     if df.empty:
         return None
@@ -162,49 +145,3 @@ def fetch_latest_significant_earthquake() -> dict | None:
         latest_eq_data["TimeStr"] = latest_eq_data["Time"].strftime('%Y-%m-%d %H:%M')
 
     return latest_eq_data
-
-# --- 小區域有感地震 (E-A0016-001) ---
-def fetch_local_earthquakes(area_name: str = "", limit: int = 5) -> str:
-    """從 CWA 獲取小區域有感地震報告。如果 area_name 為空，則查詢全台灣。"""
-    if not CWA_API_KEY: return "❌ 查詢失敗：管理者尚未設定 CWA_API_KEY。"
-    
-    params = {"Authorization": CWA_API_KEY, "format": "JSON", "limit": limit}
-    title = "🇹🇼 台灣近期小區域有感地震:"
-
-    if area_name:
-        normalized_area = _normalize_cwa_area_name(area_name)
-        params["AreaName"] = normalized_area
-        title = f"🚨 「{normalized_area}」近期小區域有感地震:"
-    
-    try:
-        r = requests.get(CWA_LOCAL_EQ_API, params=params, timeout=15)
-        r.raise_for_status()
-        data = r.json()
-        
-        earthquakes = data.get("records", {}).get("Earthquake", [])
-        if not earthquakes:
-            msg = f"✅ 在「{area_name}」" if area_name else "✅ 台灣"
-            return f"{msg}近期沒有小區域有感地震報告。"
-
-        lines = [title, "-" * 20]
-        for eq in earthquakes:
-            info = eq.get("earthquakeInfo", {})
-            epi = info.get("epicenter", {})
-            mag = info.get("magnitude", {})
-            depth = info.get("depth", {})
-            
-            intensity_areas = eq.get("intensity", {}).get("shakingArea", [])
-            area_strs = [f"{area.get('areaDesc')} {area.get('areaIntensity')}級" for area in intensity_areas if area.get("areaIntensity") and float(area.get("areaIntensity", 0)) > 0]
-            intensity_str = "、".join(area_strs) if area_strs else "無具體震度回報"
-
-            lines.append(
-                f"報告: {eq.get('reportContent', '—')}\n"
-                f"時間: {info.get('originTime', '—')}\n"
-                f"地點: {epi.get('location', '—')}\n"
-                f"規模: M{mag.get('magnitudeValue', '—')} | 深度: {depth.get('value', '—')} km\n"
-                f"主要影響區域: {intensity_str}"
-            )
-        return "\n\n".join(lines)
-        
-    except Exception as e:
-        return f"❌ 小區域地震查詢失敗：{e}"