From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Apr 2017 20:26:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~397
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6867b240d5d23c22ae04c57d65881d54d793da73

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

6867b240d5d23c22ae04c57d65881d54d793da73
diff --cc sql/functions.sql
index 54b28ce7,f4be01e2..1c39c1fc
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2424,9 -2370,9 +2370,9 @@@ BEGI
        CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as 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 address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
-       distance,calculated_country_code,postcode
+       distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id) 
        where place_addressline.place_id = for_place_id 
        and (cached_rank_address > 0 AND cached_rank_address < searchrankaddress)