Update app.py

app.py

@@ -1,30 +1,25 @@
-# app.py
-# pip install keplergl pandas numpy geopandas shapely gradio requests openpyxl
+# app.py  (Kepler.glを使わない安定版：Folium + 無料タイル)
+# pip install folium gradio pandas numpy requests openpyxl
 
 import os
 import time
-import re
+import base64
 import urllib.parse
-import tempfile
 import requests
 import pandas as pd
 import numpy as np
-import geopandas as gpd
-from shapely.geometry import Point
 import gradio as gr
-from keplergl import KeplerGl
-import base64
-
 
 # ----------------------------
 # 設定
 # ----------------------------
 GSI_USER_AGENT = os.environ.get(
     "GSI_USER_AGENT",
-    "jp-gsi-geocoding-demo (contact: your_email@example.com)"
+    "jp-gsi-geocoding-demo (contact: your_email@example.com)"  # 連絡先付き推奨
 )
 GSI_TIMEOUT_SEC = float(os.environ.get("GSI_TIMEOUT_SEC", "10"))
-GEOCODE_DELAY_SEC = float(os.environ.get("GSI_RATE_LIMIT_SEC", "0.0"))
+GEOCODE_DELAY_SEC = float(os.environ.get("GSI_RATE_LIMIT_SEC", "0.0"))  # 連続呼び出し間隔（秒）
+
 GSI_GEOCODE_URL = "https://msearch.gsi.go.jp/address-search/AddressSearch"
 
 CACHE_DIR = "data/cache"
@@ -38,7 +33,8 @@ def load_cache():
     if os.path.exists(CACHE_PATH):
         try:
             df = pd.read_csv(CACHE_PATH)
-            if set(["address_input", "lat", "lon", "CF"]).issubset(df.columns):
+            need = {"address_input", "lat", "lon", "CF"}
+            if need.issubset(df.columns):
                 df["CF"]  = pd.to_numeric(df["CF"], errors="coerce")
                 df["lat"] = pd.to_numeric(df["lat"], errors="coerce")
                 df["lon"] = pd.to_numeric(df["lon"], errors="coerce")
@@ -62,7 +58,10 @@ def make_gsi_session() -> requests.Session:
     return s
 
 def gsi_geocode_once(address: str, session: requests.Session) -> tuple[float, float]:
-    """国土地理院 住所検索APIを1回呼び出し、(lat, lon) を返す。失敗時は (nan, nan)。"""
+    """
+    国土地理院住所検索APIを1回呼び出し、(lat, lon) を返す（失敗時は (nan, nan)）。
+    APIは [lon, lat] を返すため、順を入れ替えて返す。
+    """
     try:
         if not address or str(address).strip() == "" or str(address).strip().lower() in ("nan", "none"):
             return (np.nan, np.nan)
@@ -75,7 +74,7 @@ def gsi_geocode_once(address: str, session: requests.Session) -> tuple[float, fl
             coords = (feat.get("geometry") or {}).get("coordinates") or []
             if isinstance(coords, (list, tuple)) and len(coords) >= 2:
                 lon, lat = float(coords[0]), float(coords[1])
-                return (lat, lon)  # APIは [lon, lat] なので入れ替え
+                return (lat, lon)
     except Exception:
         pass
     return (np.nan, np.nan)
@@ -92,7 +91,7 @@ def geocode_with_cache(addresses, CFs, use_internet=True):
 
         # cache hit
         if a in cache_map:
-            lat, lon, _ = cache_map[a]
+            lat, lon, _cached_cf = cache_map[a]
             if pd.notna(lat) and pd.notna(lon):
                 results.append({"address_input": a, "CF": cf_num, "lat": float(lat), "lon": float(lon)})
                 continue
@@ -122,246 +121,87 @@ def geocode_with_cache(addresses, CFs, use_internet=True):
     return df
 
 # ----------------------------
-# 埋め込み＆パッチ
+# Folium 地図生成（無料タイル）
 # ----------------------------
-def _iframe_from_dataurl(html_text: str, height: int = 640) -> str:
-    # iframe 埋め込み用（URLエンコード）
-    data_url = "data:text/html;charset=utf-8," + urllib.parse.quote(html_text)
-    # 予備：新規タブで開く用（Base64）
-    link = "data:text/html;base64," + base64.b64encode(html_text.encode("utf-8")).decode("ascii")
-    return (
-        f'<iframe src="{data_url}" style="border:0;width:100%;height:{height}px"></iframe>'
-        f'<div style="margin-top:6px;"><a href="{link}" target="_blank" rel="noopener">↗ 地図を新しいタブで開く</a></div>'
-    )
+import folium
+from folium.plugins import MarkerCluster
 
-def _inject_relaxed_csp(html_text: str) -> str:
-    """親ページのCSPに阻害される場合の緩和（ローカル／検証用途向け）"""
-    csp = (
-        "<meta http-equiv=\"Content-Security-Policy\" "
-        "content=\"default-src * data: blob: 'unsafe-inline' 'unsafe-eval'; "
-        "img-src * data: blob:; style-src * 'unsafe-inline'; "
-        "script-src * 'unsafe-inline' 'unsafe-eval' https: http: data: blob:; "
-        "connect-src * data: blob:;\">"
-    )
-    return html_text.replace("<head>", "<head>" + csp, 1)
+TILE_CATALOG = {
+    "GSI 標準地図": "https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png",
+    "GSI 淡色地図": "https://cyberjapandata.gsi.go.jp/xyz/pale/{z}/{x}/{y}.png",
+    "GSI 写真（シームレス）": "https://cyberjapandata.gsi.go.jp/xyz/seamlessphoto/{z}/{x}/{y}.jpg",
+    "OpenStreetMap": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+}
 
-def _patch_to_mapbox113(html_text: str) -> str:
-    """
-    keplergl の保存 HTML 内の mapbox-gl 参照を、互換性が高くトークン不要の
-    Mapbox GL JS v1.13.0（BSD）に差し替える。
-    """
-    html_text = re.sub(
-        r"https://api\.tiles\.mapbox\.com/mapbox-gl-js/v[\d.]+/mapbox-gl\.css",
-        "https://cdnjs.cloudflare.com/ajax/libs/mapbox-gl/1.13.0/mapbox-gl.css",
-        html_text
-    )
-    html_text = re.sub(
-        r"https://api\.tiles\.mapbox\.com/mapbox-gl-js/v[\d.]+/mapbox-gl\.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/mapbox-gl/1.13.0/mapbox-gl.js",
-        html_text
-    )
-    return html_text
-
-# ----------------------------
-# Kepler.gl HTML 生成（Mapbox GL v1.13 + 地理院タイル）
-# ----------------------------
-def make_kepler_html(df_points: pd.DataFrame, height: int = 640) -> str:
+def _make_folium_map(df_points: pd.DataFrame, base_name: str, cluster: bool, height_px: int = 640) -> str:
     df_valid = df_points.dropna(subset=["lat", "lon"]).copy()
-    df_valid["lat"] = pd.to_numeric(df_valid["lat"], errors="coerce")
-    df_valid["lon"] = pd.to_numeric(df_valid["lon"], errors="coerce")
-    if "CF" in df_valid.columns:
-        df_valid["CF"] = pd.to_numeric(df_valid["CF"], errors="coerce")
-
-    # 地図中心
-    map_state = {"bearing": 0, "pitch": 0, "zoom": 6}
-    if not df_valid.empty:
-        map_state["latitude"]  = float(df_valid["lat"].median())
-        map_state["longitude"] = float(df_valid["lon"].median())
+    if df_valid.empty:
+        # 日本中心
+        center_lat, center_lon, zoom = 35.0, 135.0, 4
     else:
-        map_state.update({"latitude": 35.0, "longitude": 135.0, "zoom": 4})
-
-    # ポイントレイヤ
-    layer_config = {
-        "id": "point_layer",
-        "type": "point",
-        "config": {
-            "dataId": "points",
-            "label": "Points",
-            "color": [18, 147, 154],
-            "columns": {"lat": "lat", "lng": "lon"},
-            "isVisible": True,
-            "visConfig": {"radius": 10, "opacity": 0.9, "outline": False},
-        },
-        "visualChannels": {"sizeScale": "sqrt"}
-    }
+        center_lat = float(df_valid["lat"].median())
+        center_lon = float(df_valid["lon"].median())
+        zoom = 6
+
+    # ベースマップ
+    tiles_url = TILE_CATALOG.get(base_name, TILE_CATALOG["GSI 標準地図"])
+    m = folium.Map(location=[center_lat, center_lon], zoom_start=zoom, control_scale=True, tiles=None)
+
+    # 各タイルをレイヤとして追加（UIから切替可能）
+    for name, url in TILE_CATALOG.items():
+        folium.TileLayer(
+            tiles=url,
+            name=name,
+            attr=f"© {name}",
+            overlay=False,
+            control=True,
+            max_zoom=20,
+        ).add_to(m)
+
+    # マーカー（CF でサイズ可変）
+    if cluster:
+        mc = MarkerCluster(name="Points").add_to(m)
+
+    # サイズスケーリング
     if "CF" in df_valid.columns and df_valid["CF"].notna().any():
-        layer_config["visualChannels"]["sizeField"] = {"name": "CF", "type": "real"}
-
-    # 地理院タイル（標準地図）を Mapbox Style Spec v8 互換で直書き
-    gsi_raster_style = {
-        "version": 8,
-        "sources": {
-            "gsi": {
-                "type": "raster",
-                "tiles": [
-                    "https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png"
-                ],
-                "tileSize": 256,
-                "attribution": "© <a href='https://www.gsi.go.jp/' target='_blank'>GSI</a>"
-            }
-        },
-        "layers": [
-            {"id": "gsi", "type": "raster", "source": "gsi", "minzoom": 0, "maxzoom": 19}
-        ]
-    }
-
-    config = {
-        "version": "v1",
-        "config": {
-            "visState": {
-                "filters": [],
-                "layers": [layer_config],
-                "interactionConfig": {
-                    "tooltip": {
-                        "enabled": True,
-                        "fieldsToShow": {
-                            "points": [
-                                {"name":"address_input","format":None},
-                                {"name":"CF","format":None},
-                                {"name":"lat","format":None},
-                                {"name":"lon","format":None},
-                            ]
-                        },
-                        "compareMode": False,
-                        "compareType": "absolute",
-                    }
-                },
-                "layerBlending": "normal",
-            },
-            "mapState": map_state,
-            "mapStyle": {
-                "styleType": "gsi_std",
-                "topLayerGroups": {},
-                "visibleLayerGroups": {"label": True, "road": True, "border": False, "building": False, "water": True, "land": True},
-                "mapStyles": {
-                    "gsi_std": {
-                        "id": "gsi_std",
-                        "label": "GSI Standard",
-                        "style": gsi_raster_style,
-                        "accessToken": None
-                    }
-                }
-            },
-        },
-    }
-
-    # Kepler インスタンス（Mapbox トークン不要）
-    m = KeplerGl(height=height, data={}, config=config, mapbox_api_key="")
-    if not df_valid.empty:
-        m.add_data(data=df_valid[["lat","lon","address_input","CF"]], name="points")
-
-    # 保存→読込（安全に path を確保）
-    fd, path = tempfile.mkstemp(suffix=".html")
-    try:
-        os.close(fd)  # Windows のロック回避
-        m.save_to_html(file_name=path, read_only=True)
-        with open(path, "r", encoding="utf-8") as fh:
-            kepler_html = fh.read()
-    finally:
-        try:
-            os.remove(path)
-        except Exception:
-            pass
-
-    # “白紙”対策：Mapbox GL を v1.13 に置換 + CSP を緩和 + data:URL で埋め込み
-    kepler_html = _patch_to_mapbox113(kepler_html)
-    kepler_html = _inject_relaxed_csp(kepler_html)
-    return _iframe_from_dataurl(kepler_html, height=height)
-
-# ----------------------------
-# 実行パイプライン（ポイントのみ）
-# ----------------------------
-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):
-    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()
-
-    # GeoDataFrame（将来拡張用）
-    geometry = [
-        Point(lon, lat) if (pd.notna(lat) and pd.notna(lon)) else None
-        for lat, lon in zip(geo_df["lat"], geo_df["lon"])
-    ]
-    gdf_pts = gpd.GeoDataFrame(geo_df, geometry=geometry, crs="EPSG:4326")
-
-    try:
-        html_iframe = make_kepler_html(table_df, height=640)
-    except Exception as e:
-        html_iframe = f"<p>Kepler.gl描画に失敗しました: {e}</p>"
-
-    info = [f"ポイント数（有効座標）: {int(gdf_pts.geometry.notnull().sum())} / {len(gdf_pts)}"]
-    return html_iframe, table_df, "\n".join(info)
-
-# ----------------------------
-# Gradio UI（ポイントのみ）
-# ----------------------------
-with gr.Blocks(title="Excel住所 → Kepler.gl（無料タイル／Mapbox不要）") as demo:
-    gr.Markdown("## Excelの住所を国土地理院APIでジオコーディング → Kepler.gl に **ポイントのみ** を描画（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)
-
-    run_btn = gr.Button("描画")
-
-    out_html = gr.HTML(label="インタラクティブ地図（Kepler.gl：ポイントのみ）")
-    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
+        cf = df_valid["CF"].clip(lower=0)
+        # 0~1正規化 → 3~15px
+        cf_norm = (cf - cf.min()) / (cf.max() - cf.min() + 1e-9)
+        sizes = (cf_norm * 12 + 3).fillna(6).tolist()
+    else:
+        sizes = [6] * len(df_valid)
+
+    for (_, row), r in zip(df_valid.iterrows(), sizes):
+        lat, lon = float(row["lat"]), float(row["lon"])
+        addr = str(row.get("address_input", ""))
+        cfv  = row.get("CF", np.nan)
+        popup = folium.Popup(
+            folium.IFrame(
+                html=f"<b>住所:</b> {addr}<br><b>CF:</b> {'' if pd.isna(cfv) else cfv}",
+                width=260, height=80
+            ),
+            max_width=260
+        )
+        marker = folium.CircleMarker(
+            location=(lat, lon),
+            radius=float(r),
+            weight=1,
+            color="#117a8b",
+            fill=True,
+            fill_opacity=0.8,
+            fill_color="#12939A",
+            popup=popup,
+        )
+        (mc if cluster else m).add_child(marker)
 
-    def app_run(xls, s, h, a, p, inet):
-        return run(xls, s, int(h), _parse(a), _parse(p), inet)
+    folium.LayerControl(position="topright").add_to(m)
 
-    run_btn.click(
-        fn=app_run,
-        inputs=[xlsx_in, sheet, header_row, address_col, power_col, use_inet],
-        outputs=[out_html, out_table, out_info],
-    )
+    # HTML 文字列
+    html = m.get_root().render()
 
-if __name__ == "__main__":
-    demo.launch()
+    # iframe 埋め込み（data:URL）＋ 新規タブ用リンク
+    data_url = "data:text/html;charset=utf-8," + urllib.parse.quote(html)
+    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">↗ 地図を新しいタブで開く<