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

apply adjusted counts only to final result

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-08-24 21:37:02 +02:00
parent fd85483ce3
commit 2762c45569
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/db_search_builder.py
View File

@@ -214,14 +214,14 @@ class SearchBuilder:
# Partial term to frequent. Try looking up by rare full names first. # Partial term to frequent. Try looking up by rare full names first.
name_fulls = self.query.get_tokens(name, TokenType.WORD) name_fulls = self.query.get_tokens(name, TokenType.WORD)
fulls_count = sum(t.count for t in name_fulls) / (2**len(addr_partials)) fulls_count = sum(t.count for t in name_fulls)
# At this point drop unindexed partials from the address. # At this point drop unindexed partials from the address.
# This might yield wrong results, nothing we can do about that. # This might yield wrong results, nothing we can do about that.
if not partials_indexed: if not partials_indexed:
addr_tokens = [t.token for t in addr_partials if t.is_indexed] addr_tokens = [t.token for t in addr_partials if t.is_indexed]
penalty += 1.2 * sum(t.penalty for t in addr_partials if not t.is_indexed) penalty += 1.2 * sum(t.penalty for t in addr_partials if not t.is_indexed)
# Any of the full names applies with all of the partials from the address # Any of the full names applies with all of the partials from the address
yield penalty, fulls_count,\ yield penalty, fulls_count / (2**len(addr_partials)),\
dbf.lookup_by_any_name([t.token for t in name_fulls], addr_tokens, dbf.lookup_by_any_name([t.token for t in name_fulls], addr_tokens,
'restrict' if fulls_count < 10000 else 'lookup_all') 'restrict' if fulls_count < 10000 else 'lookup_all')