Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 75ccfd689669dcf7c1673dd9ad8beee7f1c7d216,0cfeaf0cff0ad9cf2f0414764625c31804c8df2d..97f78d2432bab2db25b1699c8bb3bd930c7417b7
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -887,11 -887,7 +887,7 @@@ BEGI
      END IF;
  
      -- some postcorrections
-     IF NEW.class = 'place' THEN
-       IF NEW.type in ('continent', 'sea', 'country', 'state') AND NEW.osm_type = 'N' THEN
-         NEW.rank_address := 0;
-       END IF;
-     ELSEIF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
+     IF NEW.class = 'waterway' AND NEW.osm_type = 'R' THEN
          -- Slightly promote waterway relations so that they are processed
          -- before their members.
          NEW.rank_search := NEW.rank_search - 1;
@@@ -908,11 -904,6 +904,6 @@@
      NEW.country_code := NULL;
    END IF;
  
- -- Block import below rank 22
- --  IF NEW.rank_search > 22 THEN
- --    RETURN NULL;
- --  END IF;
- 
    --DEBUG: RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
  
    RETURN NEW; -- %DIFFUPDATES% The following is not needed until doing diff updates, and slows the main index process down
@@@ -2430,7 -2421,7 +2421,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 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)