Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Return country code and add limit parameter

Russ Garrett87379c729c72
diff --git a/web-backend/pyproject.toml b/web-backend/pyproject.toml
index 3814691..617fe9f 100644
--- a/web-backend/pyproject.toml
+++ b/web-backend/pyproject.toml
@@ -16,6 +16,7 @@ dependencies = [
"async_lru",
"pandas>=2.2.3",
"bokeh==3.7.0",
+ "pycountry>=24.6.1",
]
[tool.ruff]
diff --git a/web-backend/search.py b/web-backend/search.py
index 1744185..6e17e9a 100644
--- a/web-backend/search.py
+++ b/web-backend/search.py
@@ -1,6 +1,7 @@
import asyncio
import json
import time
+import pycountry
from typing import Optional
from starlette.exceptions import HTTPException
from starlette.responses import JSONResponse
@@ -24,10 +25,14 @@ async def search_substations(
tags->'name:{language}' AS loc_name,
tags->'operator' AS operator,
convert_voltage(voltage) AS voltage,
+ country.iso_sov1 AS country,
ST_AsGeoJSON(ST_Transform(ST_Centroid(geometry), 4326)) AS geometry
- FROM substation
- WHERE (substr(lower(name), 1, 20) LIKE lower(:query))
- OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))
+ FROM substation, countries.country_eez_sub AS country
+ WHERE (
+ (substr(lower(name), 1, 20) LIKE lower(:query))
+ OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))
+ )
+ AND ST_Intersects(substation.geometry, country.geom)
ORDER BY convert_voltage(voltage) DESC NULLS LAST, name ASC NULLS LAST
LIMIT :limit
""",
@@ -41,6 +46,7 @@ async def search_substations(
"local_name": row["name"],
"operator": row["operator"],
"voltage": int(row["voltage"]) if row["voltage"] else None,
+ "country": pycountry.countries.get(alpha_3=row["country"]).alpha_2,
"geometry": json.loads(row["geometry"]),
}
for row in results
@@ -59,10 +65,13 @@ async def search_plants(
convert_power(output) as output,
source,
tags -> 'operator' AS operator,
+ country.iso_sov1 AS country,
ST_AsGeoJSON(ST_Transform(ST_Centroid(geometry), 4326)) AS geometry
- FROM power_plant
- WHERE substr(lower(name), 1, 20) LIKE lower(:query)
- OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))
+ FROM power_plant, countries.country_eez_sub AS country
+ WHERE (substr(lower(name), 1, 20) LIKE lower(:query)
+ OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))
+ )
+ AND ST_Intersects(power_plant.geometry, country.geom)
ORDER BY output DESC NULLS LAST, name ASC NULLS LAST
LIMIT :limit
""",
@@ -77,6 +86,7 @@ async def search_plants(
"output": int(row["output"]) if row["output"] else None,
"source": row["source"],
"operator": row["operator"],
+ "country": pycountry.countries.get(alpha_3=row["country"]).alpha_2,
"geometry": json.loads(row["geometry"]),
}
for row in result
@@ -101,6 +111,12 @@ async def search(request):
if language not in SEARCH_LANGUAGES:
language = "en"
+ limit = request.query_params.get("limit", "10")
+ try:
+ limit = min(int(limit), 100)
+ except ValueError:
+ raise HTTPException(400, "Invalid limit")
+
if not query:
raise HTTPException(400, "No query provided")
@@ -112,5 +128,7 @@ async def search(request):
results = sorted(await substations + await plants, key=sort_key, reverse=True)
end = time.monotonic_ns()
+ results = results[:limit]
+
response = {"time": (end - start) / 1e9, "results": results}
return JSONResponse(response)
diff --git a/web-backend/uv.lock b/web-backend/uv.lock
index e6b06f3..6f3981d 100644
--- a/web-backend/uv.lock
+++ b/web-backend/uv.lock
@@ -444,6 +444,7 @@ dependencies = [
{ name = "jinja2" },
{ name = "more-itertools" },
{ name = "pandas" },
+ { name = "pycountry" },
{ name = "starlette" },
{ name = "uvicorn" },
]
@@ -470,6 +471,7 @@ requires-dist = [
{ name = "jinja2" },
{ name = "more-itertools" },
{ name = "pandas", specifier = ">=2.2.3" },
+ { name = "pycountry", specifier = ">=24.6.1" },
{ name = "starlette" },
{ name = "uvicorn" },
]
@@ -620,6 +622,15 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842 },
]
+[[package]]
+name = "pycountry"
+version = "24.6.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/76/57/c389fa68c50590881a75b7883eeb3dc15e9e73a0fdc001cdd45c13290c92/pycountry-24.6.1.tar.gz", hash = "sha256:b61b3faccea67f87d10c1f2b0fc0be714409e8fcdcc1315613174f6466c10221", size = 6043910 }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/b1/ec/1fb891d8a2660716aadb2143235481d15ed1cbfe3ad669194690b0604492/pycountry-24.6.1-py3-none-any.whl", hash = "sha256:f1a4fb391cd7214f8eefd39556d740adcc233c778a27f8942c8dca351d6ce06f", size = 6335189 },
+]
+
[[package]]
name = "pygments"
version = "2.19.1"