From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Apr 2024 13:05:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~11
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/50352c634da0b44bd595a278406cd9654ce94d86?hp=f2b2b2b92ca87fdf6ae8fcd7062db76ff4c42f51

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

diff --git a/nominatim/api/search/icu_tokenizer.py b/nominatim/api/search/icu_tokenizer.py
index 23cfa5a1..f6590f5b 100644
--- a/nominatim/api/search/icu_tokenizer.py
+++ b/nominatim/api/search/icu_tokenizer.py
@@ -122,10 +122,10 @@ class ICUToken(qmod.Token):
         else:
             lookup_word = row.word_token
 
-        return ICUToken(penalty=penalty, token=row.word_id, count=count,
+        return ICUToken(penalty=penalty, token=row.word_id, count=max(1, count),
                         lookup_word=lookup_word, is_indexed=True,
                         word_token=row.word_token, info=row.info,
-                        addr_count=addr_count)
+                        addr_count=max(1, addr_count))
 
 
 
diff --git a/nominatim/api/search/legacy_tokenizer.py b/nominatim/api/search/legacy_tokenizer.py
index bd17706e..031f2456 100644
--- a/nominatim/api/search/legacy_tokenizer.py
+++ b/nominatim/api/search/legacy_tokenizer.py
@@ -209,7 +209,7 @@ class LegacyQueryAnalyzer(AbstractQueryAnalyzer):
                 is_indexed = False
 
         return LegacyToken(penalty=penalty, token=row.word_id,
-                           count=row.search_name_count or 1,
+                           count=max(1, row.search_name_count or 1),
                            addr_count=1, # not supported
                            lookup_word=lookup_word,
                            word_token=row.word_token.strip(),
diff --git a/settings/taginfo.lua b/settings/taginfo.lua
index dba395e9..ef2ad2a6 100644
--- a/settings/taginfo.lua
+++ b/settings/taginfo.lua
@@ -35,7 +35,7 @@ function print_taginfo()
     for _, k in ipairs(flex.TAGINFO_MAIN.keys) do
         local desc = get_key_description(k, 'POI/feature in the search database')
         if flex.TAGINFO_MAIN.delete_tags[k] ~= nil then
-            desc.description = string.format('%s(except for values: %s).', desc.description,
+            desc.description = string.format('%s (except for values: %s).', desc.description,
                                 table.concat(flex.TAGINFO_MAIN.delete_tags[k], ', '))
         end
         table.insert(tags, desc)