X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dcdda314e21fae2bcafb5c0a2883a1a921cb0300..c164efc5b886020be5594faa887e999d01cf4541:/nominatim/api/search/db_search_builder.py diff --git a/nominatim/api/search/db_search_builder.py b/nominatim/api/search/db_search_builder.py index c9e48b0f..66e7efaf 100644 --- a/nominatim/api/search/db_search_builder.py +++ b/nominatim/api/search/db_search_builder.py @@ -206,7 +206,7 @@ class SearchBuilder: partials_indexed = all(t.is_indexed for t in name_partials) \ and all(t.is_indexed for t in addr_partials) - exp_count = min(t.count for t in name_partials) + exp_count = min(t.count for t in name_partials) / (2**(len(name_partials) - 1)) if (len(name_partials) > 3 or exp_count < 3000) and partials_indexed: yield penalty, exp_count, dbf.lookup_by_names(name_tokens, addr_tokens) @@ -214,14 +214,14 @@ class SearchBuilder: # Partial term to frequent. Try looking up by rare full names first. 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. # This might yield wrong results, nothing we can do about that. if not partials_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) # 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, 'restrict' if fulls_count < 10000 else 'lookup_all')