Update app.py

app.py

@@ -204,4 +204,95 @@ def _make_folium_map(df_points: pd.DataFrame, base_name: str, cluster: bool, hei
     link_url = "data:text/html;base64," + base64.b64encode(html.encode("utf-8")).decode("ascii")
     iframe = (
         f'<iframe src="{data_url}" style="border:0;width:100%;height:{height_px}px"></iframe>'
-        f'<div style="margin-top:6px;"><a href="{link_url}" target="_blank" rel="noopener">↗ 地図を新しいタブで開く<
+        f'<div style="margin-top:6px;"><a href="{link_url}" target="_blank" rel="noopener">↗ 地図を新しいタブで開く</a></div>'
+    )
+    return iframe
+
+# ----------------------------
+# 実行パイプライン
+# ----------------------------
+def _parse_indexer(x):
+    try:
+        return int(x)
+    except Exception:
+        return x
+
+def run(excel_file, sheet_name, header_row, address_col, power_col, use_inet, base_name, cluster):
+    # Excel 読み込み
+    if excel_file is None or not hasattr(excel_file, "name"):
+        table_df = pd.DataFrame(columns=["address_input", "CF", "lat", "lon"])
+        return "", table_df, "Excelファイルを指定してください。"
+
+    try:
+        df = pd.read_excel(excel_file.name, sheet_name=sheet_name, header=int(header_row))
+    except Exception as e:
+        empty_df = pd.DataFrame(columns=["address_input", "CF", "lat", "lon"])
+        return "", empty_df, f"Excel の読み込みに失敗しました: {e}"
+
+    # 列参照
+    addr_series = df.iloc[:, address_col] if isinstance(address_col, int) else df[address_col]
+    cf_series   = df.iloc[:, power_col]   if isinstance(power_col,   int) else df[power_col]
+
+    addresses = addr_series.astype(str).tolist()
+    cfs       = cf_series.tolist()
+
+    geo_df = geocode_with_cache(addresses, cfs, use_internet=bool(use_inet))
+    table_df = geo_df[["address_input", "CF", "lat", "lon"]].copy()
+
+    # Folium 地図
+    try:
+        html_map = _make_folium_map(table_df, base_name=base_name, cluster=bool(cluster), height_px=640)
+        info = [f"ポイント数（有効座標）: {int(table_df[['lat','lon']].dropna().shape[0])} / {len(table_df)}"]
+    except Exception as e:
+        html_map = f"<p>地図描画に失敗しました: {e}</p>"
+        info = []
+
+    return html_map, table_df, "\n".join(info)
+
+# ----------------------------
+# Gradio UI
+# ----------------------------
+with gr.Blocks(title="Excel住所 → Folium（無料タイル・Mapbox不要）") as demo:
+    gr.Markdown("## Excelの住所を国土地理院APIでジオコーディング → Folium（Leaflet）で地図表示（無料タイル・Mapbox不要）")
+
+    with gr.Row():
+        xlsx_in = gr.File(label="Excelファイル（住所付き）", file_count="single", file_types=[".xlsx", ".xls"])
+
+    with gr.Row():
+        sheet = gr.Textbox(label="シート名", value="認定設備")
+        header_row = gr.Number(label="ヘッダー行番号（0始まり）", value=2, precision=0)
+
+    with gr.Row():
+        address_col = gr.Textbox(label="住所列（列名 or 0始まり列番号）", value="発電設備の所在地")
+        power_col   = gr.Textbox(label="数値列（任意：列名 or 0始まり列番号）", value="発電出力（kW）")
+
+    with gr.Row():
+        use_inet   = gr.Checkbox(label="国土地理院APIに問い合わせ（オフでキャッシュのみ使用）", value=True)
+        base_name  = gr.Dropdown(choices=list(TILE_CATALOG.keys()), value="GSI 標準地図", label="ベースマップ")
+        cluster    = gr.Checkbox(label="マーカーをクラスタ表示", value=True)
+
+    run_btn = gr.Button("描画")
+
+    out_html  = gr.HTML(label="地図（Folium / Leaflet）")
+    out_table = gr.Dataframe(label="ジオコーディング結果（住所・緯度・経度・CF）", wrap=True)
+    out_info  = gr.Textbox(label="メタ情報", lines=2)
+
+    def _parse(x):
+        try:
+            return int(x)
+        except Exception:
+            return x
+
+    def app_run(xls, s, h, a, p, inet, base, cl):
+        return run(
+            xls, s, int(h), _parse(a), _parse(p), inet, base, cl
+        )
+
+    run_btn.click(
+        fn=app_run,
+        inputs=[xlsx_in, sheet, header_row, address_col, power_col, use_inet, base_name, cluster],
+        outputs=[out_html, out_table, out_info],
+    )
+
+if __name__ == "__main__":
+    demo.launch()