From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 31 Mar 2020 17:55:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~244
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/503baf46d58e414eca0ec19cdafd2229b372485f?hp=-c

Merge remote-tracking branch 'upstream/master'
---

503baf46d58e414eca0ec19cdafd2229b372485f
diff --combined sql/functions/address_lookup.sql
index 5f73ac9f,9a4c630c..c8c63092
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -206,7 -206,7 +206,7 @@@ BEGI
    FOR location IN
      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)
@@@ -277,7 -277,7 +277,7 @@@
  
    IF searchpostcode IS NOT NULL THEN
      location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',
-                     'postcodes', null, null, false, true, 5, 0)::addressline;
+                     'postcode', null, null, false, true, 5, 0)::addressline;
      RETURN NEXT location;
    END IF;