From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 19 Oct 2019 16:12:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~276
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/0b755473bfa03610541c260e628b5d567b627b16?ds=inline;hp=-c

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

0b755473bfa03610541c260e628b5d567b627b16
diff --combined sql/functions.sql
index 039c03a3,f3bff89c..c7d96cdc
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2386,7 -2386,7 +2386,7 @@@ BEGI
  
    -- postcode table
    IF for_place_id IS NULL THEN
-     SELECT parent_place_id, country_code, rank_address, postcode, 'place', 'postcode'
+     SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode'
        FROM location_postcode
        WHERE place_id = in_place_id
        INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,
@@@ -2449,7 -2449,7 +2449,7 @@@
      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)