hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix use of subquery in reverse

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-05-18 20:27:07 +02:00
parent 32dbf83747
commit 7f1a0ce94a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nominatim/api/reverse.py
View File

@@ -235,7 +235,7 @@ class ReverseGeocoder:
if parent_place_id is not None: if parent_place_id is not None:
sql = sql.where(t.c.parent_place_id == parent_place_id) sql = sql.where(t.c.parent_place_id == parent_place_id)
inner = sql.subquery() inner = sql.subquery('ipol')
sql = sa.select(inner.c.place_id, inner.c.osm_id, sql = sa.select(inner.c.place_id, inner.c.osm_id,
inner.c.parent_place_id, inner.c.address, inner.c.parent_place_id, inner.c.address,
@@ -245,8 +245,8 @@ class ReverseGeocoder:
inner.c.distance) inner.c.distance)
if self.has_geometries(): if self.has_geometries():
sub = sql.subquery() sub = sql.subquery('geom')
sql = self._add_geometry_columns(sql, sub.c.centroid) sql = self._add_geometry_columns(sa.select(sub), sub.c.centroid)
return (await self.conn.execute(sql)).one_or_none() return (await self.conn.execute(sql)).one_or_none()
@@ -263,7 +263,7 @@ class ReverseGeocoder:
.where(t.c.parent_place_id == parent_place_id)\ .where(t.c.parent_place_id == parent_place_id)\
.order_by('distance')\ .order_by('distance')\
.limit(1)\ .limit(1)\
.subquery() .subquery('tiger')
sql = sa.select(inner.c.place_id, sql = sa.select(inner.c.place_id,
inner.c.parent_place_id, inner.c.parent_place_id,
@@ -275,8 +275,8 @@ class ReverseGeocoder:
inner.c.distance) inner.c.distance)
if self.has_geometries(): if self.has_geometries():
sub = sql.subquery() sub = sql.subquery('geom')
sql = self._add_geometry_columns(sql, sub.c.centroid) sql = self._add_geometry_columns(sa.select(sub), sub.c.centroid)
return (await self.conn.execute(sql)).one_or_none() return (await self.conn.execute(sql)).one_or_none()
@@ -356,7 +356,7 @@ class ReverseGeocoder:
.where(t.c.type != 'postcode')\ .where(t.c.type != 'postcode')\
.order_by(sa.desc(t.c.rank_search))\ .order_by(sa.desc(t.c.rank_search))\
.limit(50)\ .limit(50)\
.subquery() .subquery('area')
sql = _select_from_placex(inner)\ sql = _select_from_placex(inner)\
.where(inner.c.geometry.ST_Contains(wkt))\ .where(inner.c.geometry.ST_Contains(wkt))\
@@ -385,7 +385,7 @@ class ReverseGeocoder:
.intersects(wkt))\ .intersects(wkt))\
.order_by(sa.desc(t.c.rank_search))\ .order_by(sa.desc(t.c.rank_search))\
.limit(50)\ .limit(50)\
.subquery() .subquery('places')
touter = self.conn.t.placex.alias('outer') touter = self.conn.t.placex.alias('outer')
sql = _select_from_placex(inner)\ sql = _select_from_placex(inner)\