From: Sarah Hoffmann Date: Thu, 24 Aug 2023 07:21:09 +0000 (+0200) Subject: allow terms with frequent searches together with viewbox X-Git-Tag: v4.3.0~17^2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/0a2d0c3b5c9253e124d387486fdf4f26ccf75572?ds=sidebyside;hp=--cc allow terms with frequent searches together with viewbox --- 0a2d0c3b5c9253e124d387486fdf4f26ccf75572 diff --git a/nominatim/api/search/db_searches.py b/nominatim/api/search/db_searches.py index d4b9c018..4d893962 100644 --- a/nominatim/api/search/db_searches.py +++ b/nominatim/api/search/db_searches.py @@ -627,6 +627,11 @@ class PlaceSearch(AbstractSearch): sql = sql.where(tsearch.c.centroid.intersects(VIEWBOX_PARAM)) else: 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: penalty += sa.case((t.c.geometry.intersects(VIEWBOX_PARAM), 0.0), (t.c.geometry.intersects(VIEWBOX2_PARAM), 1.0), @@ -643,9 +648,11 @@ class PlaceSearch(AbstractSearch): .label('importance')) sql = sql.order_by(sa.desc(sa.text('importance'))) else: - if self.expected_count < 10000: - 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))) + if self.expected_count < 10000\ + or (details.viewbox is not None and details.viewbox.area < 0.5): + 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)