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

allow terms with frequent searches together with viewbox

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-08-24 09:21:09 +02:00
parent dcdda314e2
commit 0a2d0c3b5c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,6 +627,11 @@ class PlaceSearch(AbstractSearch):
sql = sql.where(tsearch.c.centroid.intersects(VIEWBOX_PARAM)) sql = sql.where(tsearch.c.centroid.intersects(VIEWBOX_PARAM))
else: else:
sql = sql.where(tsearch.c.centroid.ST_Intersects_no_index(VIEWBOX_PARAM)) sql = sql.where(tsearch.c.centroid.ST_Intersects_no_index(VIEWBOX_PARAM))
elif self.expected_count >= 10000:
if details.viewbox.area < 0.5:
sql = sql.where(tsearch.c.centroid.intersects(VIEWBOX2_PARAM))
else:
sql = sql.where(tsearch.c.centroid.ST_Intersects_no_index(VIEWBOX2_PARAM))
else: else:
penalty += sa.case((t.c.geometry.intersects(VIEWBOX_PARAM), 0.0), penalty += sa.case((t.c.geometry.intersects(VIEWBOX_PARAM), 0.0),
(t.c.geometry.intersects(VIEWBOX2_PARAM), 1.0), (t.c.geometry.intersects(VIEWBOX2_PARAM), 1.0),
@@ -643,9 +648,11 @@ class PlaceSearch(AbstractSearch):
.label('importance')) .label('importance'))
sql = sql.order_by(sa.desc(sa.text('importance'))) sql = sql.order_by(sa.desc(sa.text('importance')))
else: else:
if self.expected_count < 10000: if self.expected_count < 10000\
sql = sql.order_by(penalty - sa.case((tsearch.c.importance > 0, tsearch.c.importance), or (details.viewbox is not None and details.viewbox.area < 0.5):
else_=0.75001-(sa.cast(tsearch.c.search_rank, sa.Float())/40))) sql = sql.order_by(
penalty - sa.case((tsearch.c.importance > 0, tsearch.c.importance),
else_=0.75001-(sa.cast(tsearch.c.search_rank, sa.Float())/40)))
sql = sql.add_columns(t.c.importance) sql = sql.add_columns(t.c.importance)