Update app.py

app.py

@@ -180,4 +180,142 @@ def plot_map_path(df):
     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:
+        if series.dt.tz is None:
+            s = series.dt.tz_localize(TAIPEI_TZ)
+        else:
+            s = series.dt.tz_convert(TAIPEI_TZ)
+        return s.dt.strftime("%Y-%m-%d %H:%M:%S %Z")
+    except Exception:
+        return series.astype(str)
+
+def _to_simple_md_table(df: pd.DataFrame) -> str:
+    cols = list(df.columns)
+    header = "|" + "|".join(cols) + "|\n"
+    sep = "|" + "|".join(["---"] * len(cols)) + "|\n"
+    rows = []
+    for _, r in df.iterrows():
+        cells = []
+        for c in cols:
+            v = r.get(c, "")
+            cells.append("" if pd.isna(v) else str(v))
+        rows.append("|" + "|".join(cells) + "|")
+    return header + sep + "\n".join(rows)
+
+def df_to_markdown(df, top_n=100):
+    if df.empty:
+        return "（查無資料）"
+    cols = ["OriginTime", "Magnitude", "Depth_km", "Lat", "Lon", "Location", "ReportURL"]
+    cols = [c for c in cols if c in df.columns]
+    slim = df[cols].head(top_n).copy()
+    if "OriginTime" in slim.columns:
+        slim["OriginTime"] = _format_taipei(slim["OriginTime"])
+    header = f"共 {len(df)} 筆，顯示前 {min(len(slim), top_n)} 筆\n\n"
+    if HAS_TABULATE:
+        table = slim.to_markdown(index=False)
+    else:
+        table = _to_simple_md_table(slim.reset_index(drop=True))
+    return header + table
+
+# -----------------------------
+# 主流程
+# -----------------------------
+def query_and_render(time_from, time_to, sort_order):
+    try:
+        raw = fetch_reports(time_from, time_to)
+        df = parse_ea0015(raw)
+        if df.empty:
+            return "（查無資料）", None, None, 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)
+
+        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
+    except Exception as e:
+        return f"錯誤：{e}", None, None, None
+
+# -----------------------------
+# 介面
+# -----------------------------
+default_from, default_to = set_time_range(days=3)
+
+with gr.Blocks(fill_height=True) as demo:
+    gr.Markdown("## CWA 顯著有感地震報告 (E-A0015-001)\n預設查詢最近 3 天（台北時間）")
+
+    with gr.Column():
+        time_from = gr.Textbox(label="timeFrom yyyy-MM-ddTHH:mm:ss", value=default_from)
+        time_to = gr.Textbox(label="timeTo yyyy-MM-ddTHH:mm:ss", value=default_to)
+
+        with gr.Row():
+            btn_12h = gr.Button("最近 12 小時")
+            btn_24h = gr.Button("最近 24 小時")
+            btn_3d = gr.Button("最近 3 天")
+            btn_5d = gr.Button("最近 5 天")
+
+        sort_dd = gr.Dropdown(
+            choices=["OriginTime (新→舊)", "OriginTime (舊→新)"],
+            value="OriginTime (新→舊)",
+            label="排序",
+        )
+
+        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")  # 回傳路徑即可
+
+    # 快速鍵
+    btn_12h.click(lambda: set_time_range(hours=12), outputs=[time_from, time_to])
+    btn_24h.click(lambda: set_time_range(hours=24), outputs=[time_from, time_to])
+    btn_3d.click(lambda: set_time_range(days=3), outputs=[time_from, time_to])
+    btn_5d.click(lambda: set_time_range(days=5), outputs=[time_from, time_to])
+
+    # ���詢
+    run_btn.click(
+        query_and_render,
+        inputs=[time_from, time_to, sort_dd],
+        outputs=[table_out, trend_out, map_out, dl_btn],
+    )
+
+if __name__ == "__main__":
+    demo.launch()