Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/nominatim_api/search/db_search_builder.py
index 0269cf1f57edd7699853d6eaf2ba9e5388dda425,1ac6db2b2a96d5ebc5095d81bd936b0002194600..b4346ee61acf1ef79b037fc8c20e54e0150e52fe
--- 1/src/nominatim_api/search/db_search_builder.py
--- 2/src/nominatim_api/search/db_search_builder.py
+++ b/src/nominatim_api/search/db_search_builder.py
@@@ -232,10 -229,8 +229,8 @@@ class SearchBuilder
          name_fulls = self.query.get_tokens(name, TokenType.WORD)
          if name_fulls:
              fulls_count = sum(t.count for t in name_fulls)
-             if partials_indexed:
-                 penalty += 1.2 * sum(t.penalty for t in addr_partials if not t.is_indexed)
  
 -            if fulls_count < 50000 or addr_count < 30000:
 +            if fulls_count < 80000 or addr_count < 50000:
                  yield penalty,fulls_count / (2**len(addr_tokens)), \
                      self.get_full_name_ranking(name_fulls, addr_partials,
                                                 fulls_count > 30000 / max(1, len(addr_tokens)))
@@@ -287,9 -280,14 +280,9 @@@
          # This might yield wrong results, nothing we can do about that.
          if use_lookup:
              addr_restrict_tokens = []
 -            addr_lookup_tokens = []
 -            for t in addr_partials:
 -                if t.addr_count > 20000:
 -                    addr_restrict_tokens.append(t.token)
 -                else:
 -                    addr_lookup_tokens.append(t.token)
 +            addr_lookup_tokens = [t.token for t in addr_partials if t.is_indexed]
          else:
-             addr_restrict_tokens = [t.token for t in addr_partials if t.is_indexed]
+             addr_restrict_tokens = [t.token for t in addr_partials]
              addr_lookup_tokens = []
  
          return dbf.lookup_by_any_name([t.token for t in name_fulls],

diff --cc src/nominatim_api/search/icu_tokenizer.py
Simple merge

diff --cc src/nominatim_db/tokenizer/icu_tokenizer.py
Simple merge