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 1e423cd3cbcff8f430ce62ecaa4a0dc5a4cf9a3d..2426a698f03c4dc3cb373ff793fa9e1eb364e6e7 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -60,14 +60,16 @@ BEGIN
   prevresult := '';
 
   FOR location IN
   prevresult := '';
 
   FOR location IN

-    SELECT * FROM get_addressdata(for_place_id, housenumber)
+    SELECT name,
+       CASE WHEN place_id = for_place_id THEN 99 ELSE rank_address END as rank_address
+    FROM get_addressdata(for_place_id, housenumber)

     WHERE isaddress order by rank_address desc
   LOOP
     currresult := trim(get_name_by_language(location.name, languagepref));
     IF currresult != prevresult AND currresult IS NOT NULL
        AND result[(100 - location.rank_address)] IS NULL
     THEN
     WHERE isaddress order by rank_address desc
   LOOP
     currresult := trim(get_name_by_language(location.name, languagepref));
     IF currresult != prevresult AND currresult IS NOT NULL
        AND result[(100 - location.rank_address)] IS NULL
     THEN

-      result[(100 - location.rank_address)] := trim(get_name_by_language(location.name, languagepref));
+      result[(100 - location.rank_address)] := currresult;

       prevresult := currresult;
     END IF;
   END LOOP;
       prevresult := currresult;
     END IF;
   END LOOP;


@@ -88,75 +90,78 @@ DECLARE
   for_place_id BIGINT;
   result TEXT[];
   search TEXT[];
   for_place_id BIGINT;
   result TEXT[];
   search TEXT[];

-  found INTEGER;
+  current_rank_address INTEGER;

   location RECORD;
   countrylocation RECORD;
   searchcountrycode varchar(2);
   searchhousenumber TEXT;
   searchhousename HSTORE;
   location RECORD;
   countrylocation RECORD;
   searchcountrycode varchar(2);
   searchhousenumber TEXT;
   searchhousename HSTORE;

-  searchrankaddress INTEGER;

   searchpostcode TEXT;
   searchpostcode TEXT;

-  postcode_isaddress BOOL;
+  postcode_isexact BOOL;

   searchclass TEXT;
   searchtype TEXT;
   searchclass TEXT;
   searchtype TEXT;

+  search_unlisted_place TEXT;

   countryname HSTORE;
 BEGIN
   countryname HSTORE;
 BEGIN

-  -- The place ein question might not have a direct entry in place_addressline.
+  -- The place in question might not have a direct entry in place_addressline.

   -- Look for the parent of such places then and save if in for_place_id.
 
   -- Look for the parent of such places then and save if in for_place_id.
 

-  postcode_isaddress := true;
+  postcode_isexact := false;

 
   -- first query osmline (interpolation lines)
   IF in_housenumber >= 0 THEN
 
   -- first query osmline (interpolation lines)
   IF in_housenumber >= 0 THEN

-    SELECT parent_place_id, country_code, in_housenumber::text, 30, postcode,
+    SELECT parent_place_id, country_code, in_housenumber::text, postcode,

            null, 'place', 'house'
       FROM location_property_osmline
       WHERE place_id = in_place_id AND in_housenumber>=startnumber
             AND in_housenumber <= endnumber
            null, 'place', 'house'
       FROM location_property_osmline
       WHERE place_id = in_place_id AND in_housenumber>=startnumber
             AND in_housenumber <= endnumber

-      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
+      INTO for_place_id, searchcountrycode, searchhousenumber,

            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
 
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
   IF for_place_id IS NULL AND in_housenumber >= 0 THEN
            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
 
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
   IF for_place_id IS NULL AND in_housenumber >= 0 THEN

-    SELECT parent_place_id, 'us', in_housenumber::text, 30, postcode, null,
+    SELECT parent_place_id, 'us', in_housenumber::text, postcode, null,

            'place', 'house'
       FROM location_property_tiger
       WHERE place_id = in_place_id AND in_housenumber >= startnumber
             AND in_housenumber <= endnumber
            'place', 'house'
       FROM location_property_tiger
       WHERE place_id = in_place_id AND in_housenumber >= startnumber
             AND in_housenumber <= endnumber

-      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
+      INTO for_place_id, searchcountrycode, searchhousenumber,

            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOTIGERDATA% END IF;
 
   -- %NOAUXDATA% IF 0 THEN
   IF for_place_id IS NULL THEN
            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOTIGERDATA% END IF;
 
   -- %NOAUXDATA% IF 0 THEN
   IF for_place_id IS NULL THEN

-    SELECT parent_place_id, 'us', housenumber, 30, postcode, null, 'place', 'house'
+    SELECT parent_place_id, 'us', housenumber, postcode, null, 'place', 'house'

       FROM location_property_aux
       WHERE place_id = in_place_id
       FROM location_property_aux
       WHERE place_id = in_place_id

-      INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress,
+      INTO for_place_id,searchcountrycode, searchhousenumber,

            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOAUXDATA% END IF;
 
   -- postcode table
   IF for_place_id IS NULL THEN
            searchpostcode, searchhousename, searchclass, searchtype;
   END IF;
   -- %NOAUXDATA% END IF;
 
   -- postcode table
   IF for_place_id IS NULL THEN

-    SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode'
+    SELECT parent_place_id, country_code, postcode, 'place', 'postcode'

       FROM location_postcode
       WHERE place_id = in_place_id
       FROM location_postcode
       WHERE place_id = in_place_id

-      INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,
+      INTO for_place_id, searchcountrycode, searchpostcode,

            searchclass, searchtype;
   END IF;
 
   -- POI objects in the placex table
   IF for_place_id IS NULL THEN
            searchclass, searchtype;
   END IF;
 
   -- POI objects in the placex table
   IF for_place_id IS NULL THEN

-    SELECT parent_place_id, country_code, housenumber, rank_search, postcode,
-           name, class, type
+    SELECT parent_place_id, country_code, housenumber,
+           postcode, address is not null and address ? 'postcode',
+           name, class, type,
+           address -> '_unlisted_place' as unlisted_place

       FROM placex
       WHERE place_id = in_place_id and rank_search > 27
       FROM placex
       WHERE place_id = in_place_id and rank_search > 27

-      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress,
-           searchpostcode, searchhousename, searchclass, searchtype;
+      INTO for_place_id, searchcountrycode, searchhousenumber,
+           searchpostcode, postcode_isexact, searchhousename, searchclass,
+           searchtype, search_unlisted_place;

   END IF;
 
   -- If for_place_id is still NULL at this point then the object has its own
   END IF;
 
   -- If for_place_id is still NULL at this point then the object has its own


@@ -164,18 +169,19 @@ BEGIN
   -- place we should be using instead.
   IF for_place_id IS NULL THEN
     select coalesce(linked_place_id, place_id),  country_code,
   -- place we should be using instead.
   IF for_place_id IS NULL THEN
     select coalesce(linked_place_id, place_id),  country_code,

-           housenumber, rank_search, postcode, null
+           housenumber, postcode,
+           address is not null and address ? 'postcode', null

       from placex where place_id = in_place_id
       from placex where place_id = in_place_id

-      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename;
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchpostcode, postcode_isexact, searchhousename;

   END IF;
 
   END IF;
 

---RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode;
+--RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchpostcode;

 
 

-  found := 1000; -- the lowest rank_address included
+  -- --- Return the record for the base entry.

 
 

-  -- Return the record for the base entry.

   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name,
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name,

+           coalesce(extratags->'linked_place', extratags->'place') as place_type,

            class, type, admin_level,
            type not in ('postcode', 'postal_code') as isaddress,
            CASE WHEN rank_address = 0 THEN 100
            class, type, admin_level,
            type not in ('postcode', 'postal_code') as isaddress,
            CASE WHEN rank_address = 0 THEN 100


@@ -194,53 +200,67 @@ BEGIN
       searchcountrycode := NULL;
     END IF;
     countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
       searchcountrycode := NULL;
     END IF;
     countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,

-                           location.name, location.class, location.type, NULL,
+                           location.name, location.class, location.type,
+                           location.place_type,

                            location.admin_level, true, location.isaddress,
                            location.rank_address, location.distance)::addressline;
     RETURN NEXT countrylocation;
                            location.admin_level, true, location.isaddress,
                            location.rank_address, location.distance)::addressline;
     RETURN NEXT countrylocation;

-    found := location.rank_address;
+
+    current_rank_address := location.rank_address;

   END LOOP;
 
   END LOOP;
 

+  -- --- Return records for address parts.
+

   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)

-      WHERE place_addressline.place_id = for_place_id
-            AND (cached_rank_address >= 4 AND cached_rank_address < searchrankaddress)
+      WHERE place_addressline.place_id IN (for_place_id, in_place_id)

             AND linked_place_id is null
             AND (placex.country_code IS NULL OR searchcountrycode IS NULL
                  OR placex.country_code = searchcountrycode)
             AND linked_place_id is null
             AND (placex.country_code IS NULL OR searchcountrycode IS NULL
                  OR placex.country_code = searchcountrycode)

-      ORDER BY rank_address desc, isaddress desc, fromarea desc,
+      ORDER BY rank_address desc, (place_addressline.place_id = in_place_id) desc,
+               isaddress desc, fromarea desc,

                distance asc, rank_search desc
   LOOP
                distance asc, rank_search desc
   LOOP

---RAISE WARNING '%',location;
+    -- RAISE WARNING '%',location;

     IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
       searchcountrycode := location.country_code;
     END IF;
     IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
       searchcountrycode := location.country_code;
     END IF;

-    IF location.type in ('postcode', 'postal_code') THEN
-      postcode_isaddress := false;
-      IF location.osm_type != 'R' THEN
-        location.isaddress := FALSE;
+    IF location.type in ('postcode', 'postal_code')
+       AND searchpostcode is not null
+    THEN
+      -- 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 not postcode_isexact AND location.isaddress THEN
+        searchpostcode := null; -- remove the less exact postcode
+      ELSE
+        location.isaddress := false;

       END IF;
     END IF;
     countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
                            location.name, location.class, location.type,
                            location.place_type,
                            location.admin_level, location.fromarea,
       END IF;
     END IF;
     countrylocation := ROW(location.place_id, location.osm_type, location.osm_id,
                            location.name, location.class, location.type,
                            location.place_type,
                            location.admin_level, location.fromarea,

-                           location.isaddress, location.rank_address,
+                           location.isaddress and location.rank_address != current_rank_address,
+                           location.rank_address,

                            location.distance)::addressline;
     RETURN NEXT countrylocation;
                            location.distance)::addressline;
     RETURN NEXT countrylocation;

-    found := location.rank_address;
+
+    IF location.isaddress THEN
+      current_rank_address := location.rank_address;
+    END IF;

   END LOOP;
 
   -- If no country was included yet, add the name information from country_name.
   END LOOP;
 
   -- If no country was included yet, add the name information from country_name.

-  IF found > 4 THEN
+  IF current_rank_address > 4 THEN

     SELECT name FROM country_name
       WHERE country_code = searchcountrycode LIMIT 1 INTO countryname;
     SELECT name FROM country_name
       WHERE country_code = searchcountrycode LIMIT 1 INTO countryname;

---RAISE WARNING '% % %',found,searchcountrycode,countryname;
+--RAISE WARNING '% % %',current_rank_address,searchcountrycode,countryname;

     IF countryname IS NOT NULL THEN
       location := ROW(null, null, null, countryname, 'place', 'country', NULL,
                       null, true, true, 4, 0)::addressline;
     IF countryname IS NOT NULL THEN
       location := ROW(null, null, null, countryname, 'place', 'country', NULL,
                       null, true, true, 4, 0)::addressline;


@@ -262,14 +282,19 @@ 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;
 

+  IF search_unlisted_place is not null THEN
+    RETURN NEXT ROW(null, null, null, hstore('name', search_unlisted_place),
+                    'place', 'locality', null, null, true, true, 25, 0)::addressline;
+  END IF;
+

   IF searchpostcode IS NOT NULL THEN
     location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',
   IF searchpostcode IS NOT NULL THEN
     location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',

-                    'postcode', null, null, false, postcode_isaddress, 5, 0)::addressline;
+                    'postcode', null, null, false, true, 5, 0)::addressline;

     RETURN NEXT location;
   END IF;
 
     RETURN NEXT location;
   END IF;