OLA added

backend/api/server.py

@@ -66,42 +66,133 @@ app.add_middleware(
 )
 
 
-@app.get("/api/geocode")
-@limiter.limit("30/minute")
-async def geocode_proxy(request: Request, q: str = Query(..., min_length=2, max_length=200)):
+# ── Geocoding helpers ─────────────────────────────────────────────
+
+async def _ola_geocode(q: str) -> list | None:
+    """Ola Maps text search → normalized LocationIQ-style list."""
+    key = os.environ.get("OLA_MAPS_KEY")
+    if not key:
+        return None
+    try:
+        async with httpx.AsyncClient(timeout=6.0) as client:
+            res = await client.get(
+                "https://api.olamaps.io/places/v1/textsearch",
+                params={"input": f"{q} Indore", "api_key": key},
+                headers={"X-Request-Id": "eudora-geocode"},
+            )
+        if res.status_code != 200:
+            return None
+        data = res.json()
+        results = data.get("results") or data.get("predictions") or []
+        normalized = []
+        for r in results[:6]:
+            loc = r.get("geometry", {}).get("location", {})
+            lat = loc.get("lat") or loc.get("latitude")
+            lon = loc.get("lng") or loc.get("longitude")
+            if not lat or not lon:
+                continue
+            normalized.append({
+                "display_name": r.get("formatted_address") or r.get("description") or r.get("name", ""),
+                "lat": str(lat),
+                "lon": str(lon),
+                "place_id": r.get("place_id", ""),
+            })
+        return normalized if normalized else None
+    except Exception as e:
+        logging.warning(f"[Geocode/Ola] {e}")
+        return None
+
+
+async def _locationiq_geocode(q: str) -> list | None:
+    """LocationIQ autocomplete fallback."""
     token = os.environ.get("LOCATIONIQ_TOKEN")
     if not token:
-        return JSONResponse(status_code=503, content={"error": "Geocoding not configured."})
-    params = {
-        "key": token, "q": q, "limit": 6, "dedupe": 1,
-        "accept-language": "en", "countrycodes": "in",
-        "lat": 22.7196, "lon": 75.8577,
-    }
+        return None
     try:
         async with httpx.AsyncClient(timeout=6.0) as client:
-            res = await client.get("https://api.locationiq.com/v1/autocomplete", params=params)
-        return res.json() if res.status_code == 200 else JSONResponse(status_code=res.status_code, content={"error": "Geocoding error."})
-    except httpx.TimeoutException:
-        return JSONResponse(status_code=504, content={"error": "Geocoding timed out."})
+            res = await client.get(
+                "https://api.locationiq.com/v1/autocomplete",
+                params={"key": token, "q": q, "limit": 6, "dedupe": 1,
+                        "accept-language": "en", "countrycodes": "in",
+                        "lat": 22.7196, "lon": 75.8577},
+            )
+        return res.json() if res.status_code == 200 else None
     except Exception as e:
-        logging.error(f"[Geocode] {e}")
-        return JSONResponse(status_code=500, content={"error": "Internal error."})
+        logging.warning(f"[Geocode/LocationIQ] {e}")
+        return None
 
 
-@app.get("/api/reverse")
-@limiter.limit("30/minute")
-async def reverse_proxy(request: Request, lat: float = Query(...), lon: float = Query(...)):
+async def _ola_reverse(lat: float, lon: float) -> dict | None:
+    """Ola Maps reverse geocode → normalized LocationIQ-style dict."""
+    key = os.environ.get("OLA_MAPS_KEY")
+    if not key:
+        return None
+    try:
+        async with httpx.AsyncClient(timeout=6.0) as client:
+            res = await client.get(
+                "https://api.olamaps.io/places/v1/reverse-geocode",
+                params={"latlng": f"{lat},{lon}", "api_key": key},
+                headers={"X-Request-Id": "eudora-reverse"},
+            )
+        if res.status_code != 200:
+            return None
+        data = res.json()
+        results = data.get("results") or []
+        if not results:
+            return None
+        top = results[0]
+        return {
+            "display_name": top.get("formatted_address", ""),
+            "lat": str(lat),
+            "lon": str(lon),
+            "address": top.get("address_components", {}),
+        }
+    except Exception as e:
+        logging.warning(f"[Reverse/Ola] {e}")
+        return None
+
+
+async def _locationiq_reverse(lat: float, lon: float) -> dict | None:
+    """LocationIQ reverse geocode fallback."""
     token = os.environ.get("LOCATIONIQ_TOKEN")
     if not token:
-        return JSONResponse(status_code=503, content={"error": "Geocoding not configured."})
+        return None
     try:
         async with httpx.AsyncClient(timeout=6.0) as client:
-            res = await client.get("https://us1.locationiq.com/v1/reverse",
-                params={"key": token, "lat": lat, "lon": lon, "format": "json"})
-        return res.json() if res.status_code == 200 else JSONResponse(status_code=res.status_code, content={"error": "Reverse geocoding error."})
+            res = await client.get(
+                "https://us1.locationiq.com/v1/reverse",
+                params={"key": token, "lat": lat, "lon": lon, "format": "json"},
+            )
+        return res.json() if res.status_code == 200 else None
     except Exception as e:
-        logging.error(f"[Reverse] {e}")
-        return JSONResponse(status_code=500, content={"error": "Internal error."})
+        logging.warning(f"[Reverse/LocationIQ] {e}")
+        return None
+
+
+# ── Proxy endpoints ───────────────────────────────────────────────
+
+@app.get("/api/geocode")
+@limiter.limit("30/minute")
+async def geocode_proxy(request: Request, q: str = Query(..., min_length=2, max_length=200)):
+    result = await _ola_geocode(q)
+    if result is None:
+        logging.info("[Geocode] Ola Maps failed or not configured — falling back to LocationIQ")
+        result = await _locationiq_geocode(q)
+    if result is None:
+        return JSONResponse(status_code=503, content={"error": "Geocoding unavailable."})
+    return result
+
+
+@app.get("/api/reverse")
+@limiter.limit("30/minute")
+async def reverse_proxy(request: Request, lat: float = Query(...), lon: float = Query(...)):
+    result = await _ola_reverse(lat, lon)
+    if result is None:
+        logging.info("[Reverse] Ola Maps failed or not configured — falling back to LocationIQ")
+        result = await _locationiq_reverse(lat, lon)
+    if result is None:
+        return JSONResponse(status_code=503, content={"error": "Reverse geocoding unavailable."})
+    return result
 
 
 @app.get("/api/tiles/{style}/{z}/{x}/{y}.png")