Update app.py

app.py

@@ -1,105 +1,81 @@
 import json
-import math
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel
+import gradio as gr
 from shapely.geometry import shape, Point
-from pyproj import Transformer
-import requests
-import os
-from openai import OpenAI
-
-
-# ================
-# CONFIG
-# ================
-MLIT_TILE_API = "https://www.mlit-data.jp/api/v1/catalog/search"
-OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
-
-client = OpenAI(api_key=OPENAI_API_KEY)
-
-app = FastAPI()
-
-# CORS for GitHub Pages
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"],
-    allow_methods=["*"],
-    allow_headers=["*"]
-)
-
-# Load HABS (明治村界)
-with open("habs_data/meiji_village.geojson", encoding="utf-8") as f:
-    HABS = json.load(f)
-
-transformer = Transformer.from_crs("EPSG:4301", "EPSG:4612", always_xy=True)
-
-
-# ================
-# Request Model
-# ================
-class GeoQuery(BaseModel):
-    old_name: str
-    lat: float
-    lng: float
-    radius: int = 500
-
-
-# ================
-# Utility: Distance
-# ================
-def haversine(lat1, lon1, lat2, lon2):
-    R = 6371000
-    phi1, phi2 = math.radians(lat1), math.radians(lat2)
-    dphi = math.radians(lat2 - lat1)
-    dlambda = math.radians(lon2 - lon1)
-
-    a = (
-        math.sin(dphi / 2) ** 2 +
-        math.cos(phi1) * math.cos(phi2) * math.sin(dlambda / 2) ** 2
-    )
-    return 2 * R * math.atan2(a ** 0.5, (1 - a) ** 0.5)
-
-
-# ================
-# Main API
-# ================
-@app.post("/match")
-def match_geo(q: GeoQuery):
-
-    # 座標変換（古地図 → 現代）
-    new_lon, new_lat = transformer.transform(q.lng, q.lat)
-
-    # experimental_pni の現代地名取得（keyword は空で良い）
-    resp = requests.get(
-        MLIT_TILE_API,
-        params={"keyword": "", "limit": 100},
-    )
-    modern = resp.json().get("data", [])
-
-    # GPT に照合させる
-    prompt = f"""
-旧地名：{q.old_name}
-座標：{new_lat}, {new_lon}
-
-以下は周囲の現代地名候補です：
-{modern}
-
-旧地名に最も対応する現在の地名を1つ選び、理由を説明し、
-JSON形式で name, score を出力してください。
-"""
-
-    gpt = client.chat.completions.create(
-        model="gpt-4o",
-        messages=[{"role": "user", "content": prompt}]
-    )
-
-    answer = gpt.choices[0].message["content"]
-
-    return {
-        "old_name": q.old_name,
-        "lat": new_lat,
-        "lng": new_lon,
-        "gpt_match": answer,
-        "modern_candidates": modern,
-    }
+
+# ===========================
+# データロード
+# ===========================
+with open("data/meiji_village.geojson", "r", encoding="utf-8") as f:
+    geo = json.load(f)["features"]
+
+# index 作成（高速検索）
+village_index = []
+for feat in geo:
+    props = feat["properties"]
+    geom = shape(feat["geometry"])
+    village_index.append({
+        "pref": props.get("pref"),
+        "gun": props.get("gun"),
+        "mura": props.get("mura"),
+        "id": props.get("id"),
+        "geometry": geom
+    })
+
+
+# ===========================
+# 古地名検索 API
+# ===========================
+def search_place(name, lat=None, lon=None):
+    results = []
+
+    # ① 地名（村名・郡名）から検索
+    if name:
+        key = name.strip()
+        for v in village_index:
+            if key in v["mura"] or key in v["gun"]:
+                results.append({
+                    "都道府県": v["pref"],
+                    "郡": v["gun"],
+                    "村": v["mura"],
+                    "ID": v["id"]
+                })
+
+    # ② 座標を与えられた場合 → 村界にポイントが含まれるか判定
+    if lat and lon:
+        pt = Point(float(lon), float(lat))
+        for v in village_index:
+            if v["geometry"].contains(pt):
+                results.append({
+                    "都道府県": v["pref"],
+                    "郡": v["gun"],
+                    "村": v["mura"],
+                    "ID": v["id"]
+                })
+
+    if len(results) == 0:
+        return "該当なし"
+
+    return results
+
+
+# ===========================
+# Gradio UI
+# ===========================
+def run_search(name, latitude, longitude):
+    return search_place(name, latitude, longitude)
+
+
+with gr.Blocks() as app:
+    gr.Markdown("# 古地名 → 明治22年村界検索（京都＋大阪）")
+
+    with gr.Row():
+        name = gr.Textbox(label="地名（村名・郡名）")
+        lat = gr.Textbox(label="緯度 lat（任意）")
+        lon = gr.Textbox(label="経度 lon（任意）")
+
+    btn = gr.Button("検索")
+    output = gr.JSON(label="結果")
+
+    btn.click(run_search, inputs=[name, lat, lon], outputs=output)
+
+app.launch()