Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / functions / address_lookup.sql

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index b1b4c4da2281ee06e1947808366c1c8805451604..dd096728124d1f4e5d13dae849e893d1ec091eda 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -202,9 +202,10 @@ BEGIN
 
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name,
 
   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,
-           admin_level, fromarea, isaddress,
+           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 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)
            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)