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 7885d0a960348ac346605a01861a56a7fccd5a13..88b3a741f3d5e85099263d3b954f072c00ede472 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -207,8 +207,8 @@ BEGIN
 
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name, class, type,
 
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name, class, type,

-           coalesce(extratags->'place', extratags->'linked_place') as place_type,
-           admin_level, fromarea, isaddress,
+           coalesce(extratags->'linked_place', extratags->'place') as place_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)


@@ -272,7 +272,7 @@ BEGIN
   END IF;
 
   IF searchhousenumber IS NOT NULL THEN
   END IF;
 
   IF searchhousenumber IS NOT NULL THEN

-    location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber),
+    location := ROW(null, null, null, hstore('ref', searchhousenumber),

                     'place', 'house_number', null, null, true, true, 28, 0)::addressline;
     RETURN NEXT location;
   END IF;
                     'place', 'house_number', null, null, true, true, 28, 0)::addressline;
     RETURN NEXT location;
   END IF;