Update planmate/attractions.py

planmate/attractions.py

@@ -2,78 +2,52 @@
 
 import requests
 from typing import List, Dict
-from .config import OPENTRIPMAP_BASE, get_opentripmap_key
+from .config import OPENTRIPMAP_API_KEY  # Geoapify key stored under this name
 
-def _get(path: str, params: Dict):
-    url = f"{OPENTRIPMAP_BASE}{path}"
+GEOAPIFY_BASE = "https://api.geoapify.com/v2/places"
+
+def _get(params: Dict):
     params = dict(params or {})
-    params["apikey"] = get_opentripmap_key()
-    r = requests.get(url, params=params, timeout=30)
+    params["apiKey"] = OPENTRIPMAP_API_KEY  # keep the same name
+    r = requests.get(GEOAPIFY_BASE, params=params, timeout=30)
     try:
         r.raise_for_status()
     except requests.HTTPError as e:
-        # make API errors easier to debug in Streamlit
         snippet = (r.text or "")[:300]
-        raise RuntimeError(f"OpenTripMap error {r.status_code}: {snippet}") from e
+        raise RuntimeError(f"Geoapify error {r.status_code}: {snippet}") from e
     return r.json()
 
-def get_poi_radius(lat: float, lon: float, radius=7000, kinds="interesting_places", limit=50) -> List[Dict]:
+def get_poi_radius(lat: float, lon: float, radius=7000, categories="tourism.sights", limit=50) -> List[Dict]:
     return _get(
-        "/places/radius",
         {
-            "lat": lat,
-            "lon": lon,
-            "radius": radius,
-            "kinds": kinds,
-            "format": "json",
-            "limit": limit,
-            "rate": 2,
-        },
-    )
-
-def get_details(xid: str) -> Dict:
-    return _get(f"/places/xid/{xid}", {})
+            "categories": categories,
+            "filter": f"circle:{lon},{lat},{radius}",
+            "limit": limit
+        }
+    ).get("features", [])
 
-def enrich_pois(pois: List[Dict], fetch_details=False) -> List[Dict]:
+def enrich_pois(pois: List[Dict]) -> List[Dict]:
     out = []
     for p in pois:
+        props = p.get("properties", {})
         item = {
-            "name": p.get("name") or "(Unnamed)",
-            "dist": p.get("dist"),
-            "rate": p.get("rate"),
-            "kinds": p.get("kinds", ""),
-            "xid": p.get("xid"),
-            "point": p.get("point", {}),
+            "name": props.get("name") or "(Unnamed)",
+            "dist": props.get("distance"),
+            "kinds": props.get("categories", ""),
+            "point": {"lat": props.get("lat"), "lon": props.get("lon")},
+            "address": props.get("formatted")
         }
-        if fetch_details and item["xid"]:
-            try:
-                det = get_details(item["xid"])
-                item["wikipedia"] = det.get("wikipedia")
-                item["url"] = det.get("url")
-                item["address"] = det.get("address", {})
-                item["otm"] = det.get("otm")
-            except Exception:
-                pass
         out.append(item)
     return out
 
 def get_attractions_and_stays(lat: float, lon: float, radius=7000, limit=40):
-    # Attractions remain unchanged
-    attractions_kinds = "interesting_places,cultural,historic,museums,architecture"
-
-    # IMPORTANT: Use taxonomy accepted by OpenTripMap.
-    # "accomodations" (sic) is the umbrella category; for hotels use "other_hotels", not "hotels".
-    # See OTM catalog: Accomodations (accomodations), Hotels (other_hotels), Hostels (hostels).
-    # https://dev.opentripmap.org/catalog
-    stays_kinds = (
-        "accomodations,other_hotels,hostels,apartments,guest_houses,"
-        "resorts,motels,villas_and_chalet,alpine_hut"
-    )
+    attractions_categories = "tourism.sights,tourism.museum,historic"
+    stays_categories = "accommodation.hotel,accommodation.hostel,accommodation.guest_house,accommodation.apartment"
 
-    attractions = get_poi_radius(lat, lon, radius, attractions_kinds, limit)
-    stays = get_poi_radius(lat, lon, radius, stays_kinds, limit=30)
+    attractions = get_poi_radius(lat, lon, radius, attractions_categories, limit)
+    stays = get_poi_radius(lat, lon, radius, stays_categories, limit=30)
 
     return {
-        "attractions": enrich_pois(attractions, fetch_details=False),
-        "stays": enrich_pois(stays, fetch_details=False),
-    }
+        "attractions": enrich_pois(attractions),
+        "stays": enrich_pois(stays),
+    }