From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 26 Sep 2023 19:29:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~41
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e604b9d130a1b1b2241121a9016617429b6b1c49?ds=inline;hp=-c

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

e604b9d130a1b1b2241121a9016617429b6b1c49
diff --combined lib-sql/functions/address_lookup.sql
index 312aa9b2,5d2cb94d..a32bfe71
--- a/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@@ -187,6 -187,7 +187,7 @@@ BEGI
  
    -- --- Return the record for the base entry.
  
+   current_rank_address := 1000;
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name,
             coalesce(extratags->'linked_place', extratags->'place') as place_type,
@@@ -231,7 -232,7 +232,7 @@@
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, 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)