Merge pull request #1971 from lonvia/drop-support-for-isin

Drop support for is_in tag

diff --git a/settings/import-address.style b/settings/import-address.style
index 16f2e929b311d11e15b78432c94cf0bb54295119..a2708086a1a2ee22dc490f530a7e3ea0da7e4398 100644 (file)
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -5,7 +5,7 @@
         "no" : "skip"
     }
 },
-{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
     "values" : {
         "" : "extra"
     }

diff --git a/settings/import-full.style b/settings/import-full.style
index c587a45c336c891d67a7e5c70698721668a115ed..6728bd57ee1cd457db640320dc9fb0e373ba41bb 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -237,7 +237,8 @@
               "population", "description", "image", "attribution", "fax",
               "email", "url", "website", "phone", "real_ale", "smoking",
               "food", "camera", "brewery", "locality", "wikipedia",
-              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*"],
+              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*",
+              "area"],
     "values" : {
         "" : "extra"
     }

diff --git a/settings/import-street.style b/settings/import-street.style
index d2f0ae65c45e4938debb34bbc8d334fd144763f7..7f0c03b9739acc6d93ca586552503ffbd186f251 100644 (file)
--- a/settings/import-street.style
+++ b/settings/import-street.style
@@ -1,5 +1,5 @@
 [
-{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
     "values" : {
         "" : "extra"
     }

diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index f494b6122f91be27e3c2f01ea7d0847bad38e98a..2bc7efad826e9ab8461c05a4debd7c0aca8d523d 100644 (file)
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -409,7 +409,12 @@ BEGIN
 
       NEW.name := hstore('ref', NEW.address->'postcode');
 
-    ELSEIF NEW.class = 'boundary' AND NOT is_area THEN
+    ELSEIF NEW.class = 'highway' AND is_area AND NEW.name is null
+           AND NEW.extratags ? 'area' AND NEW.extratags->'area' = 'yes'
+    THEN
+        RETURN NULL;
+    ELSEIF NEW.class = 'boundary' AND NOT is_area
+    THEN
         RETURN NULL;
     ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative'
            AND NEW.admin_level <= 4 AND NEW.osm_type = 'W'