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

further restrict stop search criterion

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-11-29 11:19:06 +01:00
parent 0c72a434e0
commit 3c7a28dab0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nominatim/api/search/geocoder.py
View File

@@ -79,7 +79,7 @@ class ForwardGeocoder:
end_time = dt.datetime.now() + self.timeout end_time = dt.datetime.now() + self.timeout
min_ranking = 1000.0 min_ranking = searches[0].penalty + 2.0
prev_penalty = 0.0 prev_penalty = 0.0
for i, search in enumerate(searches): for i, search in enumerate(searches):
if search.penalty > prev_penalty and (search.penalty > min_ranking or i > 20): if search.penalty > prev_penalty and (search.penalty > min_ranking or i > 20):
@@ -94,7 +94,7 @@ class ForwardGeocoder:
prevresult.accuracy = min(prevresult.accuracy, result.accuracy) prevresult.accuracy = min(prevresult.accuracy, result.accuracy)
else: else:
results[rhash] = result results[rhash] = result
min_ranking = min(min_ranking, result.ranking + 0.5, search.penalty + 0.3) min_ranking = min(min_ranking, result.accuracy * 1.2)
log().result_dump('Results', ((r.accuracy, r) for r in lookup_results)) log().result_dump('Results', ((r.accuracy, r) for r in lookup_results))
prev_penalty = search.penalty prev_penalty = search.penalty
if dt.datetime.now() >= end_time: if dt.datetime.now() >= end_time: