safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge pull request #3128 from lonvia/fix-classtype-lookup

Browse Source 
Fix query over classtype tables
This commit is contained in:
Sarah Hoffmann
2023-07-31 10:20:58 +02:00
committed by GitHub
parent d97ca9fcb2 8fc3dd9457
commit c29ffc38e6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nominatim/api/search/db_searches.py
View File

@@ -287,10 +287,11 @@ class NearSearch(AbstractSearch):
# radius for the lookup. # radius for the lookup.
sql = sql.join(table, t.c.place_id == table.c.place_id)\ sql = sql.join(table, t.c.place_id == table.c.place_id)\
.join(tgeom, .join(tgeom,
sa.case((sa.and_(tgeom.c.rank_address < 9, table.c.centroid.ST_CoveredBy(
tgeom.c.geometry.is_area()), sa.case((sa.and_(tgeom.c.rank_address < 9,
tgeom.c.geometry.ST_Contains(table.c.centroid)), tgeom.c.geometry.is_area()),
else_ = tgeom.c.centroid.ST_DWithin(table.c.centroid, 0.05)))\ tgeom.c.geometry),
else_ = tgeom.c.centroid.ST_Expand(0.05))))\
.order_by(tgeom.c.centroid.ST_Distance(table.c.centroid)) .order_by(tgeom.c.centroid.ST_Distance(table.c.centroid))
sql = sql.where(t.c.rank_address.between(MIN_RANK_PARAM, MAX_RANK_PARAM)) sql = sql.where(t.c.rank_address.between(MIN_RANK_PARAM, MAX_RANK_PARAM))

6
nominatim/db/sqlalchemy_types.py
View File

@@ -74,7 +74,11 @@ class Geometry(types.UserDefinedType): # type: ignore[type-arg]
def ST_Contains(self, other: SaColumn) -> SaColumn: def ST_Contains(self, other: SaColumn) -> SaColumn:
return sa.func.ST_Contains(self, other, type_=sa.Float) return sa.func.ST_Contains(self, other, type_=sa.Boolean)
def ST_CoveredBy(self, other: SaColumn) -> SaColumn:
return sa.func.ST_CoveredBy(self, other, type_=sa.Boolean)
def ST_ClosestPoint(self, other: SaColumn) -> SaColumn: def ST_ClosestPoint(self, other: SaColumn) -> SaColumn: