Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Sitemap fix

Russ Garrettdf45e8775ea4
diff --git a/web-backend/src/sitemap.py b/web-backend/src/sitemap.py
index 79c92e9..cb138e3 100644
--- a/web-backend/src/sitemap.py
+++ b/web-backend/src/sitemap.py
@@ -3,6 +3,8 @@ from urllib.parse import quote
import asgi_sitemaps
from starlette.requests import Request
+from . import Request as OIMRequest
+from . import get_db
from .data import get_countries
@@ -18,11 +20,13 @@ class StaticSitemap(asgi_sitemaps.Sitemap):
class CountryPageSitemap(asgi_sitemaps.Sitemap):
async def items(self):
- return [row[0] for row in await get_countries()]
+ request: OIMRequest = Request(scope=self.scope)
+ db = get_db(request)
+ return [row[0] for row in await get_countries(db)]
def location(self, item):
request = Request(scope=self.scope)
- url = request.url_for("country", country=quote(item))
+ url = request.url_for("area", region=quote(item))
return url.path
diff --git a/web-backend/src/views/area.py b/web-backend/src/views/area.py
index 77a3e61..a10fc20 100644
--- a/web-backend/src/views/area.py
+++ b/web-backend/src/views/area.py
@@ -227,7 +227,7 @@ async def plant_detail(request: Request, region) -> Response:
routes = [
- Route("/stats/area/{region}", endpoint=region),
+ Route("/stats/area/{region}", name="area", endpoint=region),
Route("/stats/area/{region}/plants", endpoint=plants_region),
Route("/stats/area/{region}/plants/construction", endpoint=plants_construction_region),
Route("/stats/object/plant/{id}", endpoint=stats_object),
diff --git a/web-backend/src/views/country.py b/web-backend/src/views/country.py
index 37fd25d..367b7f6 100644
--- a/web-backend/src/views/country.py
+++ b/web-backend/src/views/country.py
@@ -91,5 +91,5 @@ async def country(request: Request) -> Response:
routes = [
Route("/stats/country/{iso2}.json", endpoint=country_json),
- Route("/stats/country/{iso2}", endpoint=country),
+ Route("/stats/country/{iso2}", name="country", endpoint=country),
]