Merge remote-tracking branch 'upstream/master'

diff --combined lib-sql/functions/address_lookup.sql
index 03b0ea54d9f68105027e22ab3725f936b74fe1c3,45e497507a8b21915280c2da8de2835293e7e2e2..b6c552c492421a66d5254f5d1970ea72831ed1f4
--- 1/lib-sql/functions/address_lookup.sql
--- 2/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@@ -135,20 -135,6 +135,6 @@@ BEGI
    END IF;
    {% endif %}
  
-   -- then additional data
-   {% if config.get_bool('USE_AUX_LOCATION_DATA') %}
-   IF place IS NULL THEN
-     SELECT parent_place_id as place_id, 'us' as country_code,
-            housenumber, postcode,
-            'place' as class, 'house' as type,
-            null as name, null as address,
-            centroid
-       INTO place
-       FROM location_property_aux
-       WHERE place_id = in_place_id;
-   END IF;
-   {% endif %}
- 
    -- postcode table
    IF place IS NULL THEN
      SELECT parent_place_id as place_id, country_code,
@@@ -227,7 -213,7 +213,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)