Update app.py

app.py

@@ -1,14 +1,15 @@
 import os
 import re
-import tempfile
 from datetime import datetime, timedelta, timezone
 
 import requests
 import pandas as pd
-import matplotlib.pyplot as plt
 import gradio as gr
+import folium
+from folium.plugins import MarkerCluster
+from branca.colormap import linear
 
-# ---------- 可選依賴偵測（沒裝也能跑） ----------
+# ---------- 可選依賴偵測（表格美化用，沒裝也能跑） ----------
 try:
     import tabulate as _tabulate  # noqa: F401
     HAS_TABULATE = True
@@ -49,15 +50,10 @@ def fetch_reports(time_from, time_to):
     return r.json()
 
 # -----------------------------
-# JSON 解析（讀 EarthquakeInfo）＋ 強化數字解析
+# 解析 JSON
 # -----------------------------
 def _to_float(x):
-    """
-    將各種數字表達轉成 float：
-    - 純數字：23.5
-    - 含單位/文字：'23.5°N'、'121.6 E'、'25.3 公里' -> 擷取第一個浮點數
-    - 其他不可解析 -> None
-    """
+    """將字串(含單位)抽出第一個數字成 float；失敗回 None。"""
     if x is None:
         return None
     if isinstance(x, (int, float)):
@@ -70,9 +66,8 @@ def _to_float(x):
 
 def parse_ea0015(obj):
     """
-    解析 CWA E-A0015-001
-    主要欄位在 records.earthquake[].EarthquakeInfo.*
-    取出：OriginTime, Lat, Lon, Depth_km, Magnitude, Location, ReportURL
+    解析 CWA E-A0015-001 -> DataFrame 欄位：
+    OriginTime, Magnitude, Depth_km, Lat, Lon, Location, ReportURL
     """
     records = obj.get("records") or obj.get("Records") or {}
     quakes = records.get("earthquake") or records.get("Earthquake") or []
@@ -83,8 +78,6 @@ 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 {}
-
-        # Magnitude 可能在 Magnitude 或 EarthquakeMagnitude
         mago = (
             ei.get("Magnitude") or ei.get("magnitude")
             or ei.get("EarthquakeMagnitude") or ei.get("earthquakeMagnitude")
@@ -96,7 +89,6 @@ def parse_ea0015(obj):
             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")
@@ -108,14 +100,12 @@ def parse_ea0015(obj):
             or epic.get("Lon") or epic.get("lon")
         )
 
-        # 深度：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")
@@ -143,71 +133,7 @@ def parse_ea0015(obj):
     return df
 
 # -----------------------------
-# 視覺化（回傳檔案路徑；相容舊/新 Gradio）
-# -----------------------------
-def _save_fig_to_tmp(fig, suffix=".png", dpi=180):
-    outpath = tempfile.NamedTemporaryFile(delete=False, suffix=suffix).name
-    fig.savefig(outpath, format="png", dpi=dpi, bbox_inches="tight")
-    plt.close(fig)
-    return outpath
-
-def plot_trend_path(df):
-    if df.empty:
-        return None
-    mag = pd.to_numeric(df["Magnitude"], errors="coerce")
-    fig, ax = plt.subplots(figsize=(6, 4))
-    ax.scatter(df["OriginTime"], mag)
-    ax.set_xlabel("Origin Time (Taipei)")
-    ax.set_ylabel("Magnitude")
-    ax.grid(True, linestyle="--", alpha=0.4)
-    fig.autofmt_xdate()
-    return _save_fig_to_tmp(fig)
-
-def plot_map_path(df):
-    """
-    最簡版地圖：純 Matplotlib 散點圖
-    - 自動依據資料決定範圍（加一點 padding）
-    - 點大小 = 規模函數；點顏色 = 深度(km)
-    """
-    if df.empty:
-        return None
-
-    d = df.dropna(subset=["Lon", "Lat"]).copy()
-    if d.empty:
-        return None
-
-    # 數值化
-    d["Magnitude"] = pd.to_numeric(d["Magnitude"], errors="coerce").fillna(0).clip(lower=0)
-    d["Depth_km"]  = pd.to_numeric(d["Depth_km"], errors="coerce")
-
-    # 自動範圍 + padding
-    pad = 0.5
-    lon_min, lon_max = d["Lon"].min() - pad, d["Lon"].max() + pad
-    lat_min, lat_max = d["Lat"].min() - pad, d["Lat"].max() + pad
-
-    # 點大小（可依喜好調係數）
-    size = (d["Magnitude"] + 2) ** 3
-
-    # 繪圖
-    fig, ax = plt.subplots(figsize=(6, 6))
-    ax.set_xlim(lon_min, lon_max)
-    ax.set_ylim(lat_min, lat_max)
-
-    sc = ax.scatter(d["Lon"], d["Lat"], s=size, c=d["Depth_km"],
-                    edgecolor="black", alpha=0.9)
-
-    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_title("Epicenters (auto region, simple map)")
-    ax.grid(True, linestyle="--", alpha=0.3)
-
-    return _save_fig_to_tmp(fig)
-
-# -----------------------------
-# 表格輸出（tabulate 可選）
+# 表格輸出
 # -----------------------------
 def _format_taipei(series):
     try:
@@ -247,6 +173,68 @@ def df_to_markdown(df, top_n=100):
         table = _to_simple_md_table(slim.reset_index(drop=True))
     return header + table
 
+# -----------------------------
+# OSM 地圖（Folium）輸出 HTML
+# -----------------------------
+def map_osm_html(df: pd.DataFrame):
+    if df.empty:
+        return "<div style='padding:8px'>（查無資料）</div>"
+
+    d = df.dropna(subset=["Lat", "Lon"]).copy()
+    if d.empty:
+        return "<div style='padding:8px'>（無經緯度可繪製）</div>"
+
+    # 數值化
+    d["Magnitude"] = pd.to_numeric(d["Magnitude"], errors="coerce").fillna(0).clip(lower=0)
+    d["Depth_km"]  = pd.to_numeric(d["Depth_km"], errors="coerce")
+
+    # 地圖中心 / 範圍
+    center = [d["Lat"].mean(), d["Lon"].mean()]
+    m = folium.Map(location=center, zoom_start=6, tiles="OpenStreetMap", control_scale=True)
+
+    # 顏色條（深度）
+    depth_min, depth_max = float(d["Depth_km"].min()), float(d["Depth_km"].max())
+    if depth_min == depth_max:
+        depth_min, depth_max = max(0.0, depth_min - 1), depth_max + 1
+    cmap = linear.Viridis_08.scale(depth_min, depth_max)
+    cmap.caption = "Depth (km)"
+    cmap.add_to(m)
+
+    cluster = MarkerCluster().add_to(m)
+
+    # 逐筆加入圓標
+    for _, r in d.iterrows():
+        lat, lon = float(r["Lat"]), float(r["Lon"])
+        mag = float(r["Magnitude"]) if pd.notna(r["Magnitude"]) else 0.0
+        depth = float(r["Depth_km"]) if pd.notna(r["Depth_km"]) else 0.0
+
+        size = 4 + 2.5 * max(0.0, mag)  # 依規模調整像素半徑
+        color = cmap(depth)
+
+        popup_html = f"""
+        <b>OriginTime</b>: {r['OriginTime']}<br>
+        <b>Magnitude</b>: {mag:.1f}<br>
+        <b>Depth</b>: {depth:.1f} km<br>
+        <b>Location</b>: {r.get('Location','') or ''}<br>
+        <a href="{r.get('ReportURL','') or '#'}" target="_blank">CWA 報告</a>
+        """
+
+        folium.CircleMarker(
+            location=[lat, lon],
+            radius=size,
+            color="#000000",
+            weight=1,
+            fill=True,
+            fill_color=color,
+            fill_opacity=0.85,
+            popup=folium.Popup(popup_html, max_width=320),
+        ).add_to(cluster)
+
+    # fit bounds
+    m.fit_bounds([[d["Lat"].min(), d["Lon"].min()], [d["Lat"].max(), d["Lon"].max()]], padding=(20, 20))
+
+    return m.get_root().render()
+
 # -----------------------------
 # 主流程
 # -----------------------------
@@ -255,23 +243,19 @@ def query_and_render(time_from, time_to, sort_order):
         raw = fetch_reports(time_from, time_to)
         df = parse_ea0015(raw)
         if df.empty:
-            return "（查無資料）", None, None, None
+            return "（查無資料）", "<div style='padding:8px'>（查無資料）</div>", None
 
         if sort_order == "OriginTime (舊→新)":
             df = df.sort_values("OriginTime", ascending=True, na_position="last").reset_index(drop=True)
 
         md = df_to_markdown(df)
-        trend_path = plot_trend_path(df)
-        map_path = plot_map_path(df)
+        map_html = map_osm_html(df)
 
         csv_bytes = df.to_csv(index=False).encode("utf-8-sig")
-        csv_path = tempfile.NamedTemporaryFile(delete=False, suffix=".csv", prefix="CWA_E-A0015-001_").name
-        with open(csv_path, "wb") as f:
-            f.write(csv_bytes)
-
-        return md, trend_path, map_path, csv_path
+        # Gradio DownloadButton 接受 bytes 或路徑；這裡直接給 bytes
+        return md, map_html, csv_bytes
     except Exception as e:
-        return f"錯誤：{e}", None, None, None
+        return f"錯誤：{e}", "<div style='padding:8px'>（無法繪圖）</div>", None
 
 # -----------------------------
 # 介面
@@ -300,9 +284,8 @@ with gr.Blocks(fill_height=True) as demo:
         run_btn = gr.Button("查詢", variant="primary")
 
         table_out = gr.Markdown("（尚未查詢）")
-        trend_out = gr.Image(label="趨勢圖", type="filepath")
-        map_out = gr.Image(label="台灣範圍圖（簡易）", type="filepath")
-        dl_btn = gr.DownloadButton(label="下載 CSV")  # 回傳路徑即可
+        map_out = gr.HTML()  # 嵌入 OSM 互動地圖
+        dl_btn = gr.DownloadButton(label="下載 CSV", value=None, file_name="CWA_E-A0015-001.csv")
 
     # 快速鍵
     btn_12h.click(lambda: set_time_range(hours=12), outputs=[time_from, time_to])
@@ -314,7 +297,7 @@ with gr.Blocks(fill_height=True) as demo:
     run_btn.click(
         query_and_render,
         inputs=[time_from, time_to, sort_dd],
-        outputs=[table_out, trend_out, map_out, dl_btn],
+        outputs=[table_out, map_out, dl_btn],
     )
 
 if __name__ == "__main__":