X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/638ed15ada6c62d34bf5ac82e99255611b90c7d8..aa0057a29a42d77406a02fbaa87961b69f94230d:/lib-sql/functions/place_triggers.sql

diff --git a/lib-sql/functions/place_triggers.sql b/lib-sql/functions/place_triggers.sql
index a472d26d..9b968c3e 100644
--- a/lib-sql/functions/place_triggers.sql
+++ b/lib-sql/functions/place_triggers.sql
@@ -117,16 +117,6 @@ BEGIN
 
   -- ---- All other place types.
 
-  -- Patch in additional country names
-  IF NEW.admin_level = 2 and NEW.type = 'administrative' and NEW.address ? 'country'
-  THEN
-    FOR country IN
-      SELECT name FROM country_name WHERE country_code = lower(NEW.address->'country')
-    LOOP
-      NEW.name = country.name || NEW.name;
-    END LOOP;
-  END IF;
-
   -- When an area is changed from large to small: log and discard change
   IF existing.geometry is not null AND ST_IsValid(existing.geometry)
     AND ST_Area(existing.geometry) > 0.02
@@ -156,6 +146,7 @@ BEGIN
         SELECT DISTINCT osm_id, address, geometry FROM place, planet_osm_ways w
         WHERE NEW.geometry && place.geometry
               and place.osm_type = 'W'
+              and place.address ? 'interpolation'
               and exists (SELECT * FROM location_property_osmline
                           WHERE osm_id = place.osm_id
                                 and indexed_status in (0, 2))