Update app.py

app.py

@@ -1,13 +1,13 @@
 # app.py
 import os
 import io
+import time
+import requests
 import pandas as pd
 import numpy as np
 import geopandas as gpd
 import matplotlib.pyplot as plt
 from shapely.geometry import Point
-from geopy.geocoders import Nominatim
-from geopy.extra.rate_limiter import RateLimiter
 import folium
 import gradio as gr
 from PIL import Image
@@ -15,11 +15,14 @@ from PIL import Image
 # ----------------------------
 # 設定
 # ----------------------------
-USER_AGENT = os.environ.get(
-    "NOMINATIM_USER_AGENT",
-    "jp-geocoding-demo (contact: your_email@example.com)"  # 連絡先付きに変更推奨
+GSI_USER_AGENT = os.environ.get(
+    "GSI_USER_AGENT",
+    "jp-gsi-geocoding-demo (contact: your_email@example.com)"  # 連絡先付き推奨
 )
-GEOCODE_DELAY_SEC = 1.0
+GSI_TIMEOUT_SEC = float(os.environ.get("GSI_TIMEOUT_SEC", "10"))
+GEOCODE_DELAY_SEC = float(os.environ.get("GSI_RATE_LIMIT_SEC", "0.5"))  # マナーとして少し待機
+GSI_GEOCODE_URL = "https://msearch.gsi.go.jp/address-search/AddressSearch"
+
 CACHE_DIR = "data/cache"
 os.makedirs(CACHE_DIR, exist_ok=True)
 CACHE_PATH = os.path.join(CACHE_DIR, "geocode_cache.csv")
@@ -57,21 +60,49 @@ def load_gdf_from_zip(zip_path: str) -> gpd.GeoDataFrame:
     return gdf
 
 # ----------------------------
-# ジオコーダ
+# 国土地理院 ジオコーダ
 # ----------------------------
-def make_geocoder():
-    geolocator = Nominatim(user_agent=USER_AGENT, timeout=10)
-    geocode = RateLimiter(geolocator.geocode, min_delay_seconds=GEOCODE_DELAY_SEC)
-    return geocode
+def make_gsi_session() -> requests.Session:
+    s = requests.Session()
+    s.headers.update({"User-Agent": GSI_USER_AGENT})
+    return s
+
+def gsi_geocode_once(address: str, session: requests.Session) -> tuple[float, float]:
+    """
+    国土地理院 住所検索APIを1回呼び出し、(lat, lon) を返す。失敗時は (nan, nan)。
+    返却座標は [lon, lat] なので順を入れ替えて返す。
+    """
+    try:
+        # 空やnan文字列はスキップ
+        if not address or address.strip() == "" or address.strip().lower() in ("nan", "none"):
+            return (np.nan, np.nan)
+
+        resp = session.get(GSI_GEOCODE_URL, params={"q": address}, timeout=GSI_TIMEOUT_SEC)
+        if not resp.ok:
+            return (np.nan, np.nan)
+        data = resp.json()
+        # 返り値は配列（候補リスト）。最上位候補を採用
+        if isinstance(data, list) and len(data) > 0:
+            feat = data[0]
+            coords = (feat.get("geometry") or {}).get("coordinates") or []
+            if isinstance(coords, (list, tuple)) and len(coords) >= 2:
+                lon, lat = coords[0], coords[1]
+                # 数値化チェック
+                lat = float(lat)
+                lon = float(lon)
+                return (lat, lon)
+    except Exception:
+        pass
+    return (np.nan, np.nan)
 
 def geocode_with_cache(addresses, CFs, use_internet=True):
     cache = load_cache()
     cache_map = {row["address_input"]: (row["lat"], row["lon"], row["CF"]) for _, row in cache.iterrows()}
     results = []
-    geocode = make_geocoder() if use_internet else None
+    session = make_gsi_session() if use_internet else None
 
     for a, cf in zip(addresses, CFs):
-        a = str(a)
+        a = "" if (a is None or (isinstance(a, float) and np.isnan(a))) else str(a).strip()
         cf = "" if (cf is None or (isinstance(cf, float) and np.isnan(cf))) else str(cf)
 
         # cache hit
@@ -85,15 +116,11 @@ def geocode_with_cache(addresses, CFs, use_internet=True):
             results.append({"address_input": a, "CF": cf, "lat": np.nan, "lon": np.nan})
             continue
 
-        try:
-            loc = geocode(a, country_codes="jp", addressdetails=True)
-            if loc:
-                lat, lon = loc.latitude, loc.longitude
-            else:
-                lat, lon = np.nan, np.nan
-        except Exception:
-            lat, lon = np.nan, np.nan
+        lat, lon = gsi_geocode_once(a, session)
+        # マナーとして小休止
+        time.sleep(GEOCODE_DELAY_SEC)
 
+        # キャッシュ更新
         cache = cache[cache["address_input"] != a]
         cache = pd.concat(
             [cache, pd.DataFrame([{"address_input": a, "lat": lat, "lon": lon, "CF": cf}])],
@@ -125,22 +152,17 @@ def plot_map_png(
             gdf_pts_valid.get("CF", pd.Series([np.nan]*len(gdf_pts_valid))),
             errors="coerce"
         )
-        # 凡例縮小: legend_kwds={'shrink': ...}
         gdf_pts_valid.assign(CF_num=cf_num).plot(
             ax=ax,
             column="CF_num",
             cmap="OrRd",
-            markersize=max(2, int(marker_size)),  # ★ ポイント大きさ
+            markersize=max(2, int(marker_size)),
             alpha=0.85,
             legend=True,
-            legend_kwds={"shrink": legend_shrink},  # ★ 凡例を小さく
+            legend_kwds={"shrink": legend_shrink},
         )
-
-        # カラーバーの目盛フォントを小さく
         try:
-            # 図内の axes のうち、カラーバー（凡例）軸を見つけてフォント縮小
             for _ax in fig.axes:
-                # メイン地図の ax を除外して残りをカラーバーとみなす
                 if _ax is not ax:
                     _ax.tick_params(labelsize=legend_fontsize)
         except Exception:
@@ -173,7 +195,6 @@ def make_folium_html(gdf_pref: gpd.GeoDataFrame, gdf_pts: gpd.GeoDataFrame, mark
     except Exception:
         pass
 
-    # foliumの点サイズも拡大（matplotlibのmarker_sizeに概ね追随）
     circle_radius = max(3, int(marker_size // 3))
 
     for _, r in gdf_pts_valid.iterrows():
@@ -181,7 +202,7 @@ def make_folium_html(gdf_pref: gpd.GeoDataFrame, gdf_pts: gpd.GeoDataFrame, mark
         popup = f"{r.get('address_input','(no addr)')}<br>CF:{r.get('CF','')}"
         folium.CircleMarker(
             location=(float(lat), float(lon)),
-            radius=circle_radius,              # ★ 丸の半径
+            radius=circle_radius,
             fill=True,
             fill_opacity=0.9,
             popup=popup,
@@ -272,7 +293,7 @@ def run(zip_file, excel_file, sheet_name, header_row, address_col, power_col,
 # ----------------------------
 # Gradio UI
 # ----------------------------
-with gr.Blocks(title="Japan Shapefile + Excel Geocoding Plotter") as demo:
+with gr.Blocks(title="Japan Shapefile + Excel Geocoding Plotter (GSI)") as demo:
     gr.Markdown("## japan_ver85.shp（ZIP） + Excel住所 → 日本地図にプロット（凡例小・点大の調整可）")
 
     with gr.Row():
@@ -288,10 +309,10 @@ with gr.Blocks(title="Japan Shapefile + Excel Geocoding Plotter") as demo:
         power_col = gr.Textbox(label="数値列（任意：列名 or 0始まり列番号）", value="発電出力（kW）")
 
     with gr.Row():
-        use_inet = gr.Checkbox(label="Nominatimに問い合わせ（オフでキャッシュのみ使用）", value=True)
+        use_inet = gr.Checkbox(label="国土地理院APIに問い合わせ（オフでキャッシュのみ使用）", value=True)
         line_width = gr.Slider(0.2, 2.0, value=0.6, step=0.1, label="境界線の太さ")
 
-    # ★ 新しい見た目調整スライダ
+    # 見た目調整スライダ
     with gr.Row():
         marker_size = gr.Slider(4, 64, value=24, step=2, label="ポイントサイズ（matplotlib / folium）")
         legend_shrink = gr.Slider(0.3, 1.0, value=0.6, step=0.05, label="凡例の縮小率（小さいほど小さく）")