From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 16 Sep 2017 14:14:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~373
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/115c909fdf65966774940ef957cf0bd63ba844f2

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

115c909fdf65966774940ef957cf0bd63ba844f2
diff --cc sql/functions.sql
index e00c97a2,a9bca542..820bdbf8
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2432,11 -2500,10 +2500,10 @@@ BEGI
    END LOOP;
  
    FOR location IN 
-     select placex.place_id, osm_type, osm_id,
-       CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as name,
+     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 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,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id)