Merge remote-tracking branch 'upstream/master'

diff --git a/sql/functions.sql b/sql/functions.sql
index 028a72b4e405eecc7697b0fef032dea245d4ec09..6c9e092e1f3afac9d782dcc4b5f5dc526ff4b157 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -2115,7 +2115,7 @@ BEGIN
 
   -- To paraphrase, if there isn't an existing item, OR if the admin level has changed
   IF existingplacex.osm_type IS NULL OR
-     coalesce(existingplacex.admin_level, 15) != coalesce(NEW.admin_level, 15)
+    (coalesce(existingplacex.admin_level, 15) != coalesce(NEW.admin_level, 15) AND existingplacex.class = 'boundary' AND existingplacex.type = 'administrative')
   THEN
 
     IF existingplacex.osm_type IS NOT NULL THEN