Merge remote-tracking branch 'upstream/master'

diff --combined lib-sql/functions/address_lookup.sql
index 3206e8dbe4ba3f2f7832621a53f16168afb6946c,5ec977d17552d7434bde9dc7fe88db9555b12c6c..03b0ea54d9f68105027e22ab3725f936b74fe1c3
--- 1/lib-sql/functions/address_lookup.sql
--- 2/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@@ -164,7 -164,10 +164,10 @@@ BEGI
    -- POI objects in the placex table
    IF place IS NULL THEN
      SELECT parent_place_id as place_id, country_code,
-            housenumber, postcode,
+            coalesce(address->'housenumber',
+                     address->'streetnumber',
+                     address->'conscriptionnumber')::text as housenumber,
+            postcode,
             class, type,
             name, address,
             centroid
@@@ -178,7 -181,7 +181,7 @@@
    -- place we should be using instead.
    IF place IS NULL THEN
      select coalesce(linked_place_id, place_id) as place_id,  country_code,
-            housenumber, postcode,
+            null::text as housenumber, postcode,
             class, type,
             null as name, address,
             null as centroid
@@@ -224,7 -227,7 +227,7 @@@
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
             coalesce(extratags->'linked_place', extratags->'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)