From dbaf215feacb6ca82ec8c1bf3821ba5ebf218778 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 22 Feb 2022 14:34:30 +0100 Subject: [PATCH] disable country name updates --- lib-sql/functions/placex_triggers.sql | 16 ++++++++-------- nominatim/tokenizer/icu_tokenizer.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index 6ab73a3b..3755a11f 100644 --- 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 f5addd3e..56bdd686 100644 --- 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) -- 2.39.5