hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

take token_assignment penalty into account

Browse Source 
Also computes the expected count differently when addresses are
involved. Address token counts do not bare a direct relation to
real counts.
This commit is contained in:
Sarah Hoffmann
2023-08-12 15:33:50 +02:00
parent 38b2b8a143
commit 95d1048789
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,9 +111,11 @@ class SearchBuilder:
penalty = min(categories.penalties) penalty = min(categories.penalties)
categories.penalties = [p - penalty for p in categories.penalties] categories.penalties = [p - penalty for p in categories.penalties]
for search in builder: for search in builder:
yield dbs.NearSearch(penalty, categories, search) yield dbs.NearSearch(penalty + assignment.penalty, categories, search)
else: else:
yield from builder for search in builder:
search.penalty += assignment.penalty
yield search
def build_poi_search(self, sdata: dbf.SearchData) -> Iterator[dbs.AbstractSearch]: def build_poi_search(self, sdata: dbf.SearchData) -> Iterator[dbs.AbstractSearch]:
@@ -210,8 +212,7 @@ class SearchBuilder:
yield penalty, exp_count, dbf.lookup_by_names(name_tokens, addr_tokens) yield penalty, exp_count, dbf.lookup_by_names(name_tokens, addr_tokens)
return return
exp_count = min(exp_count, min(t.count for t in addr_partials)) \ exp_count = exp_count / (2**len(addr_partials)) if addr_partials else exp_count
if addr_partials else exp_count
# 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)