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

restrict base results in near search by rank

Browse Source 
This avoids in particular that roads or POIs are used as base
for the near search when a place result is present.
This commit is contained in:
Sarah Hoffmann
2023-11-26 17:41:29 +01:00
parent 47ca56f21b
commit a8b023e57e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,9 +256,20 @@ class NearSearch(AbstractSearch):
base.sort(key=lambda r: (r.accuracy, r.rank_search)) base.sort(key=lambda r: (r.accuracy, r.rank_search))
max_accuracy = base[0].accuracy + 0.5 max_accuracy = base[0].accuracy + 0.5
if base[0].rank_address == 0:
min_rank = 0
max_rank = 0
elif base[0].rank_address < 26:
min_rank = 1
max_rank = min(25, base[0].rank_address + 4)
else:
min_rank = 26
max_rank = 30
base = nres.SearchResults(r for r in base if r.source_table == nres.SourceTable.PLACEX base = nres.SearchResults(r for r in base if r.source_table == nres.SourceTable.PLACEX
and r.accuracy <= max_accuracy and r.accuracy <= max_accuracy
and r.bbox and r.bbox.area < 20) and r.bbox and r.bbox.area < 20
and r.rank_address >= min_rank
and r.rank_address <= max_rank)
if base: if base:
baseids = [b.place_id for b in base[:5] if b.place_id] baseids = [b.place_id for b in base[:5] if b.place_id]