Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 9a1f228d2cb370d5722a6805e7af0eca51450a02,024d1caa9857574358e4601b416c040eef8f9af7..33a5e6b9709647959b1abe45c988dd9388f45454
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -864,6 -864,10 +864,10 @@@ BEGI
          SELECT * FROM get_postcode_rank(NEW.country_code, NEW.address->'postcode')
            INTO NEW.rank_search, NEW.rank_address;
  
+         IF NOT ST_GeometryType(NEW.geometry) IN ('ST_Polygon','ST_MultiPolygon') THEN
+             NEW.rank_address := 0;
+         END IF;
+ 
      ELSEIF NEW.class = 'place' THEN
        IF NEW.type in ('continent') THEN
          NEW.rank_search := 2;
@@@ -2457,7 -2461,7 +2461,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)