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

skip lookup with full names when there are none

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-12-01 12:11:58 +01:00
parent d60a45715a
commit 8a2c6067a2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nominatim/api/search/db_search_builder.py
View File

@@ -223,16 +223,17 @@ 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) if name_fulls:
# At this point drop unindexed partials from the address. fulls_count = sum(t.count for t in name_fulls)
# This might yield wrong results, nothing we can do about that. # At this point drop unindexed partials from the address.
if not partials_indexed: # This might yield wrong results, nothing we can do about that.
addr_tokens = [t.token for t in addr_partials if t.is_indexed] if not partials_indexed:
penalty += 1.2 * sum(t.penalty for t in addr_partials if not t.is_indexed) addr_tokens = [t.token for t in addr_partials if t.is_indexed]
# Any of the full names applies with all of the partials from the address penalty += 1.2 * sum(t.penalty for t in addr_partials if not t.is_indexed)
yield penalty, fulls_count / (2**len(addr_partials)),\ # Any of the full names applies with all of the partials from the address
dbf.lookup_by_any_name([t.token for t in name_fulls], addr_tokens, yield penalty, fulls_count / (2**len(addr_partials)),\
'restrict' if fulls_count < 10000 else 'lookup_all') dbf.lookup_by_any_name([t.token for t in name_fulls], addr_tokens,
'restrict' if fulls_count < 10000 else 'lookup_all')
# To catch remaining results, lookup by name and address # To catch remaining results, lookup by name and address
# We only do this if there is a reasonable number of results expected. # We only do this if there is a reasonable number of results expected.