Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 4e77e633b54711b43024d4bb1c3c1ccb596b4fee,89c1f936529e41493d1b3a33693f0a22e8c72616..94a0323157f5f83f9fcc657339c988d9e13db8b6
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -853,6 -853,9 +853,9 @@@ BEGI
        END IF;
      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' THEN
+         return NULL;
      ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
          return NULL;
      ELSEIF NEW.osm_type = 'N' AND NEW.class = 'highway' THEN
@@@ -2409,7 -2412,7 +2412,7 @@@ BEGI
      select placex.place_id, osm_type, osm_id, name,
        CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
        CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
 -      admin_level, fromarea, isaddress,
 +      admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
        CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
        distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id)