Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Search backend updates
Russ Garrettf73fb879f7d0
diff --git a/schema/views.sql b/schema/views.sqlindex fb7985e..a080a4c 100644--- a/schema/views.sql+++ b/schema/views.sql@@ -1,9 +1,33 @@-- Indexes for typeahead search-CREATE INDEX CONCURRENTLY osm_power_substation_name ON osm_power_substation(substr(lower(tags->'name'), 1, 20) text_pattern_ops);-CREATE INDEX CONCURRENTLY power_substation_relation_name ON power_substation_relation(substr(lower(name), 1, 20) text_pattern_ops);+CREATE INDEX CONCURRENTLY osm_power_substation_name+ ON osm_power_substation(substr(lower(tags->'name'), 1, 20) text_pattern_ops)+ WHERE tags->'name' IS NOT NULL;+CREATE INDEX CONCURRENTLY osm_power_substation_name_en+ ON osm_power_substation(substr(lower(tags->'name:en'), 1, 20) text_pattern_ops)+ WHERE tags->'name:en' IS NOT NULL;-CREATE INDEX CONCURRENTLY osm_power_plant_name ON osm_power_plant(substr(lower(tags->'name'), 1, 20) text_pattern_ops);-CREATE INDEX CONCURRENTLY power_plant_relation_name ON power_plant_relation(substr(lower(name), 1, 20) text_pattern_ops);+CREATE INDEX CONCURRENTLY power_substation_relation_name+ ON power_substation_relation(substr(lower(name), 1, 20) text_pattern_ops)+ WHERE name IS NOT NULL;+CREATE INDEX CONCURRENTLY power_substation_relation_name_en+ ON power_substation_relation(substr(lower(tags->'name:en'), 1, 20) text_pattern_ops)+ WHERE tags->'name:en' IS NOT NULL;++CREATE INDEX CONCURRENTLY osm_power_plant_name+ ON osm_power_plant(substr(lower(tags->'name'), 1, 20) text_pattern_ops)+ WHERE tags->'name' IS NOT NULL;+CREATE INDEX CONCURRENTLY osm_power_plant_name_en+ ON osm_power_plant(substr(lower(tags->'name:en'), 1, 20) text_pattern_ops)+ WHERE tags->'name:en' IS NOT NULL;++CREATE INDEX CONCURRENTLY power_plant_relation_name+ ON power_plant_relation(substr(lower(name), 1, 20) text_pattern_ops)+ WHERE name IS NOT NULL;+CREATE INDEX CONCURRENTLY power_plant_relation_name_en+ ON power_plant_relation(substr(lower(tags->'name:en'), 1, 20) text_pattern_ops)+ WHERE tags->'name:en' IS NOT NULL;++---------------------------------------------------------CREATE MATERIALIZED VIEW power_substation_relation ASSELECT rel.osm_id, ST_ConvexHull(ST_Union(mem.geometry))::geometry(Geometry,3857) AS geometry, rel.tags -> 'name' AS name,diff --git a/web-backend/search.py b/web-backend/search.pyindex 40b1ad1..1744185 100644--- a/web-backend/search.py+++ b/web-backend/search.py@@ -1,6 +1,7 @@import asyncioimport jsonimport time+from typing import Optionalfrom starlette.exceptions import HTTPExceptionfrom starlette.responses import JSONResponse@@ -8,28 +9,36 @@ from main import appfrom config import databasefrom util import cache_for+# Ensure languages in this list have an index in the database.+SEARCH_LANGUAGES = {"en"}-async def search_substations(query: str) -> list[dict]:++async def search_substations(+ query: str, language: str, limit: Optional[int] = 10+) -> list[dict]:results = await database.fetch_all(- """+ f"""SELECTosm_id,name,+ tags->'name:{language}' AS loc_name,tags->'operator' AS operator,convert_voltage(voltage) AS voltage,ST_AsGeoJSON(ST_Transform(ST_Centroid(geometry), 4326)) AS geometryFROM substation- WHERE substr(lower(name), 1, 20) LIKE lower(:query)+ WHERE (substr(lower(name), 1, 20) LIKE lower(:query))+ OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))ORDER BY convert_voltage(voltage) DESC NULLS LAST, name ASC NULLS LAST- LIMIT 10+ LIMIT :limit""",- {"query": f"{query}%"},+ {"query": f"{query}%", "limit": limit},)return [{"type": "substation","id": row["osm_id"],- "name": row["name"],+ "name": row["loc_name"] or row["name"],+ "local_name": row["name"],"operator": row["operator"],"voltage": int(row["voltage"]) if row["voltage"] else None,"geometry": json.loads(row["geometry"]),@@ -38,28 +47,33 @@ async def search_substations(query: str) -> list[dict]:]-async def search_plants(query: str) -> list[dict]:+async def search_plants(+ query: str, language: str, limit: Optional[int] = 10+) -> list[dict]:result = await database.fetch_all(- """+ f"""SELECTosm_id,name,+ tags->'name:{language}' AS loc_name,convert_power(output) as output,source,tags -> 'operator' AS operator,ST_AsGeoJSON(ST_Transform(ST_Centroid(geometry), 4326)) AS geometryFROM power_plant- WHERE substr(lower(name), 1, 20) LIKE lower(:query)+ WHERE substr(lower(name), 1, 20) LIKE lower(:query)+ OR (substr(lower(tags->'name:{language}'), 1, 20) LIKE lower(:query))ORDER BY output DESC NULLS LAST, name ASC NULLS LAST- LIMIT 10+ LIMIT :limit""",- {"query": f"{query}%"},+ {"query": f"{query}%", "limit": limit},)return [{"type": "plant","id": row["osm_id"],- "name": row["name"],+ "name": row["loc_name"] or row["name"],+ "local_name": row["name"],"output": int(row["output"]) if row["output"] else None,"source": row["source"],"operator": row["operator"],@@ -83,13 +97,17 @@ def sort_key(row: dict) -> int:@cache_for(86400)async def search(request):query = request.query_params.get("q")+ language = request.query_params.get("lang", "en")+ if language not in SEARCH_LANGUAGES:+ language = "en"+if not query:raise HTTPException(400, "No query provided")start = time.monotonic_ns()async with asyncio.TaskGroup() as tg:- substations = tg.create_task(search_substations(query))- plants = tg.create_task(search_plants(query))+ substations = tg.create_task(search_substations(query, language))+ plants = tg.create_task(search_plants(query, language))results = sorted(await substations + await plants, key=sort_key, reverse=True)end = time.monotonic_ns()