Merge remote-tracking branch 'upstream/master'

diff --cc lib/lib.php
Simple merge

diff --cc sql/functions.sql
index 94a0323157f5f83f9fcc657339c988d9e13db8b6,73790353059a683cdfec0db2f101e1dbc5935f4e..54e2a8d36d25ab3015cd2cbe4c296359f958676a
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2408,19 -2420,21 +2420,21 @@@ BEGI
      found := location.rank_address;
    END LOOP;
  
-   FOR location IN 
-     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 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) 
-       where place_addressline.place_id = for_place_id 
-       and (cached_rank_address > 0 AND cached_rank_address < searchrankaddress)
-       and address_place_id != for_place_id and linked_place_id is null
-       and (placex.country_code IS NULL OR searchcountrycode IS NULL OR placex.country_code = searchcountrycode)
-       order by rank_address desc,isaddress desc,fromarea desc,distance asc,rank_search desc
+   FOR location IN
+     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)
+       WHERE place_addressline.place_id = for_place_id
+             AND (cached_rank_address >= 4 AND cached_rank_address < searchrankaddress)
+             AND linked_place_id is null
+             AND (placex.country_code IS NULL OR searchcountrycode IS NULL
+                  OR placex.country_code = searchcountrycode)
+       ORDER BY rank_address desc, isaddress desc, fromarea desc,
+                distance asc, rank_search desc
    LOOP
  --RAISE WARNING '%',location;
      IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN

diff --cc utils/update.php
Simple merge