X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6be2077d922098d65f069557dea55542c15a5c98..75a77810d1248d21f40f6207d31e032694410b7a:/lib-sql/functions/address_lookup.sql?ds=sidebyside

diff --git a/lib-sql/functions/address_lookup.sql b/lib-sql/functions/address_lookup.sql
index eded2f7c..a32bfe71 100644
--- a/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@ -43,8 +43,7 @@ BEGIN
     END IF;
   END LOOP;
 
-  -- change this code below
-  -- anything will do as a fallback - just take the first name type thing there is
+  -- as a fallback - take the last element since it is the default name
   RETURN trim((avals(name))[array_length(avals(name), 1)]);
 END;
 $$
@@ -57,7 +56,6 @@ CREATE OR REPLACE FUNCTION get_address_by_language(for_place_id BIGINT,
                                                    languagepref TEXT[])
   RETURNS TEXT
   AS $$
-  -- ARRAY['zh','default','brand','official_name:zh','short_name:zh','official_name','short_name','ref','type']
 DECLARE
   result TEXT[];
   currresult TEXT;
@@ -189,6 +187,7 @@ BEGIN
 
   -- --- 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,
@@ -233,7 +232,7 @@ BEGIN
   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)
@@ -322,6 +321,11 @@ BEGIN
     location := ROW(null, null, null, hstore('ref', place.postcode), 'place',
                     'postcode', null, null, false, true, 5, 0)::addressline;
     RETURN NEXT location;
+  ELSEIF place.address is not null and place.address ? 'postcode'
+         and not place.address->'postcode' SIMILAR TO '%(,|;)%' THEN
+    location := ROW(null, null, null, hstore('ref', place.address->'postcode'), 'place',
+                    'postcode', null, null, false, true, 5, 0)::addressline;
+    RETURN NEXT location;
   END IF;
 
   RETURN;