From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 31 Mar 2025 15:14:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/acf4a74f8ae821ef0893be3a823f6fecaed3cad9

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

acf4a74f8ae821ef0893be3a823f6fecaed3cad9
diff --cc src/nominatim_db/tokenizer/icu_tokenizer.py
index 858cb64c,297c9ef9..19b83863
--- a/src/nominatim_db/tokenizer/icu_tokenizer.py
+++ b/src/nominatim_db/tokenizer/icu_tokenizer.py
@@@ -134,12 -134,12 +134,13 @@@ class ICUTokenizer(AbstractTokenizer)
                  drop_tables(conn, 'tmp_word')
                  cur.execute("""CREATE TABLE tmp_word AS
                                  SELECT word_id, word_token, type, word,
-                                        (CASE WHEN wf.info is null THEN word.info
-                                         ELSE coalesce(word.info, '{}'::jsonb) || wf.info
-                                         END) as info
+                                        coalesce(word.info, '{}'::jsonb)
+                                        - 'count' - 'addr_count' ||
+                                        coalesce(wf.info, '{}'::jsonb)
+                                        as info
                                  FROM word LEFT JOIN word_frequencies wf
                                       ON word.word_id = wf.id
 +                                ORDER BY word_id
                              """)
                  drop_tables(conn, 'word_frequencies')