From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Mar 2020 07:18:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~244
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/6b52e3765c7de9fa4831470d5f079b37e45d92bf

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

6b52e3765c7de9fa4831470d5f079b37e45d92bf
diff --cc sql/functions/address_lookup.sql
index 585c22c8,8436fdb1..dd096728
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -202,9 -202,10 +202,10 @@@ BEGI
  
    FOR location IN
      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,
+            CASE WHEN extratags ? 'place' or extratags ? 'linked_place'
+                 THEN 'place' ELSE class END as class,
+            coalesce(extratags->'place', extratags->'linked_place', type) 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)