drop suport for is_in tag

diff --git a/settings/import-extratags.style b/settings/import-extratags.style
index b90a07b164bb2f53a880ff6934ca91b1af3e9730..63c4a7ae86ba9f8e60d18e14005aec0f320bbfe4 100644 (file)
--- 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"
     }
     "values" : {
         "" : "address"
     }

diff --git a/settings/import-full.style b/settings/import-full.style
index c57c2c3a82ce6444398deb97c6bdf7d8ee14be8a..c587a45c336c891d67a7e5c70698721668a115ed 100644 (file)
--- 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"
     }
     "values" : {
         "" : "address"
     }

diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index d6a8f76228b0c77d201dcf291ed141dffb428aa8..f494b6122f91be27e3c2f01ea7d0847bad38e98a 100644 (file)
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -290,23 +290,6 @@ BEGIN
         END IF;
       END IF;
     END LOOP;
         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);
   END IF;
   IF NOT %REVERSE-ONLY% THEN
     nameaddress_vector := array_merge(nameaddress_vector, isin_tokens);