Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
Simple merge

diff --cc sql/functions/address_lookup.sql
index dd096728124d1f4e5d13dae849e893d1ec091eda,1e423cd3cbcff8f430ce62ecaa4a0dc5a4cf9a3d..ccc982b8e6eaf404d73e517a09cabaf16b768728
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -201,11 -202,9 +202,9 @@@ BEGI
    END LOOP;
  
    FOR location IN
-     SELECT placex.place_id, osm_type, osm_id, name,
-            CASE WHEN extratags ? 'place' or extratags ? 'linked_place'
-                 THEN 'place' ELSE class END as class,
-            coalesce(extratags->'place', extratags->'linked_place', type) as type,
+     SELECT placex.place_id, osm_type, osm_id, name, class, type,
+            coalesce(extratags->'place', extratags->'linked_place') as place_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)