From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 23 Sep 2020 07:20:35 +0000 (+0200)
Subject: Merge pull request #1971 from lonvia/drop-support-for-isin
X-Git-Tag: v3.6.0~68
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f2ff351da4f961734d47e027ca1f27758e6b2c81?hp=248d6b413a245beb070ee4fda5518ae0344a346e

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 16f2e929..a2708086 100644
--- 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 c587a45c..6728bd57 100644
--- 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 d2f0ae65..7f0c03b9 100644
--- 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 f494b612..2bc7efad 100644
--- 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'