From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 24 Feb 2025 15:51:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2aba0ad4bc0a924337a2541e983d61a26cf67ce6?hp=--cc

Merge remote-tracking branch 'upstream/master'
---

2aba0ad4bc0a924337a2541e983d61a26cf67ce6
diff --cc packaging/nominatim-db/pyproject.toml
index 454f07ce,3c99fd2a..0d783ea3
--- a/packaging/nominatim-db/pyproject.toml
+++ b/packaging/nominatim-db/pyproject.toml
@@@ -16,15 -15,14 +16,14 @@@ classifiers = 
      "Operating System :: OS Independent",
  ]
  dependencies = [
 -    "psycopg",
 -    "python-dotenv",
 -    "jinja2",
 -    "pyYAML>=5.1",
 -    "psutil",
 -    "PyICU"
 +    "psycopg[binary]==3.2.4",
 +    "python-dotenv==1.0.1",
 +    "jinja2==3.1.5",
 +    "pyYAML==6.0.2",
-     "datrie==0.8.2",
 +    "psutil==7.0.0",
 +    "PyICU==2.14",
 +    "osmium==4.0.2",
  ]
 -dynamic = ["version"]
  
  [project.urls]
  Homepage = "https://nominatim.org"
diff --cc src/nominatim_api/search/db_search_builder.py
index 411e8878,2c5d0d18..4987f156
--- a/src/nominatim_api/search/db_search_builder.py
+++ b/src/nominatim_api/search/db_search_builder.py
@@@ -214,9 -214,9 +214,9 @@@ class SearchBuilder
              yield penalty, exp_count, dbf.lookup_by_names(list(name_partials.keys()), addr_tokens)
              return
  
 -        addr_count = min(t.addr_count for t in addr_partials) if addr_partials else 30000
 +        addr_count = min(t.addr_count for t in addr_partials) if addr_partials else 50000
          # 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, qmod.TOKEN_WORD)
          if name_fulls:
              fulls_count = sum(t.count for t in name_fulls)