From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 13 Sep 2020 08:53:25 +0000 (+0200)
Subject: drop suport for is_in tag
X-Git-Tag: v3.6.0~68^2~1
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d04e87fb80e011126249afe335a6c646605d73b3?ds=sidebyside;hp=-c

drop suport for is_in tag
---

d04e87fb80e011126249afe335a6c646605d73b3
diff --git a/settings/import-extratags.style b/settings/import-extratags.style
index b90a07b1..63c4a7ae 100644
--- a/settings/import-extratags.style
+++ b/settings/import-extratags.style
@@ -211,7 +211,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
         "" : "address"
     }
diff --git a/settings/import-full.style b/settings/import-full.style
index c57c2c3a..c587a45c 100644
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -211,7 +211,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
         "" : "address"
     }
diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index d6a8f762..f494b612 100644
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -290,23 +290,6 @@ BEGIN
         END IF;
       END IF;
     END LOOP;
-
-    IF address ? 'is_in' THEN
-      -- is_in items need splitting
-      isin := regexp_split_to_array(address->'is_in', E'[;,]');
-      IF array_upper(isin, 1) IS NOT NULL THEN
-        FOR i IN 1..array_upper(isin, 1) LOOP
-          isin_tokens := array_merge(isin_tokens,
-                                     word_ids_from_name(isin[i]));
-
-          -- merge word into address vector
-          IF NOT %REVERSE-ONLY% THEN
-            nameaddress_vector := array_merge(nameaddress_vector,
-                                              addr_ids_from_name(isin[i]));
-          END IF;
-        END LOOP;
-      END IF;
-    END IF;
   END IF;
   IF NOT %REVERSE-ONLY% THEN
     nameaddress_vector := array_merge(nameaddress_vector, isin_tokens);