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

Drop support for is_in tag

diff --combined settings/import-full.style
index 8660090173e5a2705f33ef0232a0028816542ec3,c587a45c336c891d67a7e5c70698721668a115ed..6728bd57ee1cd457db640320dc9fb0e373ba41bb
--- 1/settings/import-full.style
--- 2/settings/import-full.style
+++ b/settings/import-full.style
@@@ -211,7 -211,7 +211,7 @@@
      }
  },
  {
-     "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+     "keys" : ["addr:*", "is_in:*", "tiger:county"],
      "values" : {
          "" : "address"
      }
@@@ -237,8 -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 --combined sql/functions/placex_triggers.sql
index 0faa80201f4bf5ee6092236f851602e301c99349,f494b6122f91be27e3c2f01ea7d0847bad38e98a..2bc7efad826e9ab8461c05a4debd7c0aca8d523d
--- 1/sql/functions/placex_triggers.sql
--- 2/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@@ -290,23 -290,6 +290,6 @@@ BEGI
          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);
@@@ -426,12 -409,7 +409,12 @@@ BEGI
  
        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'