Add: Drop-down menu of the filter map by application and project list

Author: andrea-chirillano

backend/app/api/routes/open_aerial_map/open_aerial_map.py

@@ -1,8 +1,9 @@
-# portal/backend/app/api/routes/open_aerial_map/open_aerial_map.py
-
 import asyncio
+import logging
 from typing import Optional
 
+logger = logging.getLogger(__name__)
+
 import httpx
 from fastapi import APIRouter, Depends, HTTPException, Path, Query
 from hotosm_auth_fastapi import CurrentUser
@@ -38,7 +39,7 @@ async def _db_sync_scheduler() -> None:
             async with AsyncSessionLocal() as db:
                 await oam_service.sync_from_oam_api(db)
         except Exception as e:
-            print(f"OAM DB sync scheduler error: {e}")
+            logger.error("OAM DB sync scheduler error: %s", e)
 
         await asyncio.sleep(SYNC_INTERVAL)
 
@@ -48,15 +49,15 @@ def start_sync_scheduler() -> None:
     global _sync_task
     if _sync_task is None or _sync_task.done():
         _sync_task = asyncio.create_task(_db_sync_scheduler())
-        print("OAM DB sync scheduler started (weekly updates)")
+        logger.info("OAM DB sync scheduler started (weekly updates)")
 
 
 def stop_sync_scheduler() -> None:
     """Cancel the background sync task on shutdown."""
     global _sync_task
     if _sync_task and not _sync_task.done():
         _sync_task.cancel()
-        print("OAM DB sync scheduler stopped")
+        logger.info("OAM DB sync scheduler stopped")
 
 
 # Keep legacy name so main.py import doesn't break during transition

backend/app/api/routes/umap/umap.py

@@ -6,8 +6,14 @@
 import re
 import logging
 import httpx
+from bs4 import BeautifulSoup
 from fastapi import APIRouter, HTTPException, Path, Request
-from app.models.umap import UMapFeatureCollection, ShowcaseResponse
+from app.models.umap import (
+    UMapFeatureCollection,
+    ShowcaseResponse,
+    UserMapsResponse,
+    UserTemplatesResponse,
+)
 from app.core.cache import get_cached, set_cached, DEFAULT_TTL
 from app.core.config import settings
 
@@ -18,189 +24,188 @@
 
 # uMap HOT OSM URLs derived from settings
 UMAP_BASE_URL = settings.umap_base_url
+UMAP_LOCALE = settings.umap_locale
 UMAP_API_BASE_URL = f"{UMAP_BASE_URL}/en/datalayer"
 UMAP_SHOWCASE_URL = f"{UMAP_BASE_URL}/en/showcase/"
 
 # SSL verification: disabled by default for .test domains (self-signed certs)
 # Set UMAP_VERIFY_SSL=true in production with valid certificates
 UMAP_VERIFY_SSL = os.getenv("UMAP_VERIFY_SSL", "false").lower() == "true"
 
+# Matches /es/map/slug_123 or /map/slug_123 (any locale prefix or none)
+_MAP_HREF_RE = re.compile(r"^/(?:[a-z]{2}/)?map/(.+)$")
+
 logger.info(f"uMap Base URL: {UMAP_BASE_URL}")
+logger.info(f"uMap Locale: {UMAP_LOCALE}")
 logger.info(f"uMap SSL Verification: {UMAP_VERIFY_SSL}")
 
 
-@router.get("/user/templates")
+def _parse_map_links(html: str) -> list[dict]:
+    """Extract unique map entries from an HTML page using BeautifulSoup.
+
+    Returns a list of dicts with keys: id, slug, href, url.
+    Skips ?share / ?edit variants and deduplicates by map ID.
+    """
+    soup = BeautifulSoup(html, "html.parser")
+    results = []
+    seen: set[str] = set()
+
+    for a in soup.find_all("a", href=True):
+        href: str = a["href"]
+        if "?share" in href or "?edit" in href:
+            continue
+        match = _MAP_HREF_RE.match(href)
+        if not match:
+            continue
+        slug = match.group(1)
+        parts = slug.rsplit("_", 1)
+        map_id = parts[-1] if len(parts) > 1 and parts[-1].isdigit() else slug
+        if map_id in seen:
+            continue
+        seen.add(map_id)
+        results.append(
+            {"id": map_id, "slug": slug, "href": href, "url": f"{UMAP_BASE_URL}{href}"}
+        )
+
+    return results
+
+
+def _check_login_redirect(response: httpx.Response, html: str) -> bool:
+    """Return True if uMap redirected to the login page (auth failed)."""
+    return "/login" in str(response.url) or "Iniciar sesión" in html
+
+
+@router.get("/user/templates", response_model=UserTemplatesResponse)
 async def get_user_templates(request: Request) -> dict:
     """Fetch the user's templates page from uMap and return a JSON list.
 
     Uses Hanko authentication cookie to authenticate with the uMap instance.
-    Parses the returned HTML for links to maps of the form
-    `/es/map/map_<id>` (also accepts `/map/map_<id>` without locale).
     Returns JSON with an array under `templates` containing objects with
-    `id`, `href` and `url` keys.
+    `id`, `href`, `url` and `slug` keys.
     """
-    # Extract Hanko cookie from the incoming request
     hanko_cookie = request.cookies.get("hanko")
-
     logger.info(f"[Templates] Hanko cookie present: {bool(hanko_cookie)}")
 
     if not hanko_cookie:
         logger.warning("No Hanko cookie found in request")
         raise HTTPException(
             status_code=401,
-            detail="Hanko authentication cookie not found. Please log in."
+            detail="Hanko authentication cookie not found. Please log in.",
         )
 
-    url = f"{UMAP_BASE_URL}/es/me/templates"
+    url = f"{UMAP_BASE_URL}/{UMAP_LOCALE}/me/templates"
     logger.info(f"[Templates] Target URL: {url}")
 
     try:
         async with httpx.AsyncClient(
             timeout=30.0,
             verify=UMAP_VERIFY_SSL,
-            follow_redirects=True
+            follow_redirects=True,
         ) as client:
-            headers = {"User-Agent": "portal-umap-client/1.0"}
-            # Send hanko token as cookie (uMap's HankoAuthMiddleware reads from cookies)
-            cookies = {"hanko": hanko_cookie}
-            response = await client.get(url, headers=headers, cookies=cookies)
+            response = await client.get(
+                url,
+                headers={"User-Agent": "portal-umap-client/1.0"},
+                cookies={"hanko": hanko_cookie},
+            )
             response.raise_for_status()
             html = response.text
 
             logger.info(f"[Templates] Final URL: {response.url}")
             logger.info(f"[Templates] Response length: {len(html)} chars")
-
-            # Log first 500 chars of HTML for debugging
             logger.debug(f"[Templates] HTML preview: {html[:500]}")
 
-            # Check if we were redirected to login page (auth failed)
-            # Look for login indicators in URL or page title
-            is_login_page = "/login" in str(response.url) or "Iniciar sesión" in html
-            if is_login_page:
+            if _check_login_redirect(response, html):
                 logger.warning("[Templates] Auth failed - redirected to login page")
                 raise HTTPException(
                     status_code=401,
-                    detail="uMap authentication failed. Your session may have expired."
+                    detail="uMap authentication failed. Your session may have expired.",
                 )
 
-            # Find hrefs like /es/map/mapa-sin-titulo_1814 or /map/some-slug_123
-            # URL format: /<locale>/map/<slug>_<id> where slug can be any string
-            pattern = re.compile(r'href=["\'](?P<href>/(?:[a-z]{2}/)?map/(?P<slug>[^"\']+))["\']')
-            matches = pattern.findall(html)
-
-            templates = []
-            seen = set()
-            for href, slug in matches:
-                # Skip hrefs with ?share or ?edit query parameters
-                if "?share" in href or "?edit" in href:
-                    continue
-                # Extract ID from slug (format: "name_123" -> "123")
-                # The ID is the number at the end after the last underscore
-                parts = slug.rsplit('_', 1)
-                template_id = parts[-1] if len(parts) > 1 and parts[-1].isdigit() else slug
-                if template_id in seen:
-                    continue
-                seen.add(template_id)
-                full_url = f"{UMAP_BASE_URL}{href}"
-                templates.append({"id": template_id, "href": href, "url": full_url, "slug": slug})
-
-            logger.info(f"[Templates] Found {len(templates)} templates from {len(matches)} matches")
+            templates = _parse_map_links(html)
+            logger.info(f"[Templates] Found {len(templates)} templates")
             return {"templates": templates}
+
     except httpx.HTTPStatusError as e:
         logger.error(f"HTTP Error: {e.response.status_code} - {e.response.text}")
-        raise HTTPException(status_code=e.response.status_code, detail=f"Error fetching uMap templates: {e.response.text}")
+        raise HTTPException(
+            status_code=e.response.status_code,
+            detail=f"Error fetching uMap templates: {e.response.text}",
+        )
     except httpx.RequestError as e:
         logger.error(f"Request Error: {str(e)}")
         raise HTTPException(status_code=503, detail=f"Connection error to uMap: {str(e)}")
+    except HTTPException:
+        raise
     except Exception as e:
         logger.error(f"Unexpected error: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=f"Unexpected error: {str(e)}")
 
 
-@router.get("/user/maps")
+@router.get("/user/maps", response_model=UserMapsResponse)
 async def get_user_maps(request: Request) -> dict:
     """Fetch the user's maps page from uMap and return a JSON list.
 
     Uses Hanko authentication cookie to authenticate with the uMap instance.
-    Parses the returned HTML for links to maps of the form `/es/map/{project}`
-    (where project can be anything like `umap-test-makeni_1813`).
     Returns JSON with an array under `maps` containing objects with
-    `project`, `href` and `url` keys.
+    `id`, `slug`, `href` and `url` keys.
     """
-    # Extract Hanko cookie from the incoming request
     hanko_cookie = request.cookies.get("hanko")
-
     logger.info(f"[Maps] Hanko cookie present: {bool(hanko_cookie)}")
 
     if not hanko_cookie:
         logger.warning("No Hanko cookie found in request")
         raise HTTPException(
             status_code=401,
-            detail="Hanko authentication cookie not found. Please log in."
+            detail="Hanko authentication cookie not found. Please log in.",
         )
 
-    url = f"{UMAP_BASE_URL}/es/me"
+    url = f"{UMAP_BASE_URL}/{UMAP_LOCALE}/me"
     logger.info(f"[Maps] Target URL: {url}")
 
     try:
         async with httpx.AsyncClient(
             timeout=30.0,
             verify=UMAP_VERIFY_SSL,
-            follow_redirects=True
+            follow_redirects=True,
         ) as client:
-            headers = {"User-Agent": "portal-umap-client/1.0"}
-            # Send hanko token as cookie (uMap's HankoAuthMiddleware reads from cookies)
-            cookies = {"hanko": hanko_cookie}
-            response = await client.get(url, headers=headers, cookies=cookies)
+            response = await client.get(
+                url,
+                headers={"User-Agent": "portal-umap-client/1.0"},
+                cookies={"hanko": hanko_cookie},
+            )
             response.raise_for_status()
             html = response.text
 
             logger.info(f"[Maps] Final URL: {response.url}")
             logger.info(f"[Maps] Response length: {len(html)} chars")
 
-            # Check if we were redirected to login page (auth failed)
-            is_login_page = "/login" in str(response.url) or "Iniciar sesión" in html
-            if is_login_page:
+            if _check_login_redirect(response, html):
                 logger.warning("[Maps] Auth failed - redirected to login page")
                 raise HTTPException(
                     status_code=401,
-                    detail="uMap authentication failed. Your session may have expired."
+                    detail="uMap authentication failed. Your session may have expired.",
                 )
 
-            # Find hrefs like /es/map/umap-test-makeni_1813 or /map/some-slug_123
-            # URL format: /<locale>/map/<slug>_<id> where slug can be any string
-            pattern = re.compile(r'href=["\'](?P<href>/(?:[a-z]{2}/)?map/(?P<slug>[^"\']+))["\']')
-            matches = pattern.findall(html)
-
-            maps = []
-            seen = set()
-            for href, slug in matches:
-                # Skip hrefs with ?share or ?edit query parameters
-                if "?share" in href or "?edit" in href:
-                    continue
-                # Extract ID from slug (format: "name_123" -> "123")
-                parts = slug.rsplit('_', 1)
-                map_id = parts[-1] if len(parts) > 1 and parts[-1].isdigit() else slug
-                if map_id in seen:
-                    continue
-                seen.add(map_id)
-                full_url = f"{UMAP_BASE_URL}{href}"
-                maps.append({"id": map_id, "slug": slug, "href": href, "url": full_url})
-
-            logger.info(f"[Maps] Found {len(maps)} maps from {len(matches)} matches")
+            maps = _parse_map_links(html)
+            logger.info(f"[Maps] Found {len(maps)} maps")
             return {"maps": maps}
+
     except httpx.HTTPStatusError as e:
         logger.error(f"HTTP Error: {e.response.status_code} - {e.response.text}")
-        raise HTTPException(status_code=e.response.status_code, detail=f"Error fetching uMap maps: {e.response.text}")
+        raise HTTPException(
+            status_code=e.response.status_code,
+            detail=f"Error fetching uMap maps: {e.response.text}",
+        )
     except httpx.RequestError as e:
         logger.error(f"Request Error: {str(e)}")
         raise HTTPException(status_code=503, detail=f"Connection error to uMap: {str(e)}")
+    except HTTPException:
+        raise
     except Exception as e:
         logger.error(f"Unexpected error: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=f"Unexpected error: {str(e)}")
 
 
-
 @router.get("/showcase", response_model=ShowcaseResponse)
 async def get_showcase() -> ShowcaseResponse:
     """Fetch the list of featured maps from the uMap showcase page.
@@ -263,6 +268,7 @@ async def get_showcase() -> ShowcaseResponse:
         }
         set_cached(cache_key, result, DEFAULT_TTL)
         return result
+
     except httpx.HTTPStatusError as e:
         logger.error(f"[Showcase] HTTP Error: {e.response.status_code}")
         raise HTTPException(
@@ -286,7 +292,7 @@ async def get_showcase() -> ShowcaseResponse:
 @router.get("/{location}/{project_id}", response_model=UMapFeatureCollection)
 async def get_umap_data(
     location: str = Path(..., description="Location identifier"),
-    project_id: str = Path(..., description="The project UUID to retrieve")
+    project_id: str = Path(..., description="The project UUID to retrieve"),
 ) -> dict:
     """
     Fetch GeoJSON data from uMap HOT OSM.
@@ -341,7 +347,7 @@ async def get_umap_data(
         async with httpx.AsyncClient(
             timeout=30.0,
             verify=UMAP_VERIFY_SSL,
-            follow_redirects=True
+            follow_redirects=True,
         ) as client:
             response = await client.get(url)
             response.raise_for_status()

backend/app/core/config.py

@@ -63,6 +63,8 @@ class Settings(BaseSettings):
     # Test: https://testlogin.umap.hotosm.org
     # Production: https://umap.hotosm.org
     umap_base_url: str = "https://umap.hotosm.test"
+    # uMap locale for user-facing HTML pages (e.g. /es/me, /en/me)
+    umap_locale: str = "es"
 
     # Drone-TM Backend URL
     # Local: https://dronetm.hotosm.test/api