Revert "disable country name updates"

This reverts commit dbaf215feacb6ca82ec8c1bf3821ba5ebf218778.

diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql
index 3755a11f60e8b0b2194f7258e7f83730ffacc69a..6ab73a3b4143dea539d7304ce8cc464d2109e7a5 100644 (file)
--- a/lib-sql/functions/placex_triggers.sql
+++ b/lib-sql/functions/placex_triggers.sql
@@ -1047,14 +1047,14 @@ BEGIN
     -- Update the list of country names. Adding an additional sanity
     -- check here: make sure the country does overlap with the area where
     -- we expect it to be as per static country grid.
-    -- FOR location IN
-    --  SELECT country_code FROM country_osm_grid
-    --   WHERE ST_Covers(geometry, NEW.centroid) and country_code = NEW.country_code
-    --   LIMIT 1
-    -- LOOP
-    --  {% if debug %}RAISE WARNING 'Updating names for country '%' with: %', NEW.country_code, NEW.name;{% endif %}
-    --  UPDATE country_name SET name = name || NEW.name WHERE country_code = NEW.country_code;
-    -- END LOOP;
+    FOR location IN
+      SELECT country_code FROM country_osm_grid
+       WHERE ST_Covers(geometry, NEW.centroid) and country_code = NEW.country_code
+       LIMIT 1
+    LOOP
+      {% if debug %}RAISE WARNING 'Updating names for country '%' with: %', NEW.country_code, NEW.name;{% endif %}
+      UPDATE country_name SET name = name || NEW.name WHERE country_code = NEW.country_code;
+    END LOOP;
   END IF;
 
   -- For linear features we need the full geometry for determining the address

diff --git a/nominatim/tokenizer/icu_tokenizer.py b/nominatim/tokenizer/icu_tokenizer.py
index 56bdd6866c0a90bf7d8664ad656fcf50c00b9345..f5addd3e4ff84b0bd6d8f0a4da35a995eb609b18 100644 (file)
--- a/nominatim/tokenizer/icu_tokenizer.py
+++ b/nominatim/tokenizer/icu_tokenizer.py
@@ -444,8 +444,8 @@ class LegacyICUNameAnalyzer(AbstractAnalyzer):
 
             token_info.add_names(fulls, partials)
 
-            #if place.is_country():
-            #    self._add_country_full_names(place.country_code, names)
+            if place.is_country():
+                self._add_country_full_names(place.country_code, names)
 
         if address:
             self._process_place_address(token_info, address)