From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 27 May 2020 19:30:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~232
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c70b6ccc6dd6f69e371dbf0bc9c40126a9a65e75

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

c70b6ccc6dd6f69e371dbf0bc9c40126a9a65e75
diff --cc sql/functions/address_lookup.sql
index daed3a8b,55fa23f2..7e8a9ecd
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -207,8 -207,8 +207,8 @@@ BEGI
  
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
-            coalesce(extratags->'place', extratags->'linked_place') as place_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)