Merge pull request #3466 from mtmail/apple-silicon-parallels

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

diff --git a/lib-sql/functions/address_lookup.sql b/lib-sql/functions/address_lookup.sql
index eded2f7c468bcc1cf624bf2c30418cba6cd444b2..26ce20738d301d4e3b33c43ff1571fd52a4e9a45 100644 (file)
--- a/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@ -43,8 +43,7 @@ BEGIN
     END IF;
   END LOOP;
 
     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;
 $$
   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 $$
                                                    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;
 DECLARE
   result TEXT[];
   currresult TEXT;


@@ -189,6 +187,7 @@ BEGIN
 
   -- --- Return the record for the base entry.
 
 
   -- --- 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,
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name,
            coalesce(extratags->'linked_place', extratags->'place') as place_type,


@@ -263,7 +262,7 @@ BEGIN
       -- If the place had a postcode assigned, take this one only
       -- into consideration when it is an area and the place does not have
       -- a postcode itself.
       -- If the place had a postcode assigned, take this one only
       -- into consideration when it is an area and the place does not have
       -- a postcode itself.

-      IF location.fromarea AND location.isaddress
+      IF location.fromarea AND location_isaddress

          AND (place.address is null or not place.address ? 'postcode')
       THEN
         place.postcode := null; -- remove the less exact postcode
          AND (place.address is null or not place.address ? 'postcode')
       THEN
         place.postcode := null; -- remove the less exact postcode


@@ -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;
     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;
   END IF;
 
   RETURN;