use a typed record for place info in get_addressdata

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

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index 1194022a7789d5e128814e3e9ec3e3df9f4e1949..4d7cc789e9a59acffc9b65246ce405cf56620377 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -79,6 +79,18 @@ END;
 $$
 LANGUAGE plpgsql STABLE;
 
 $$
 LANGUAGE plpgsql STABLE;
 

+DROP TYPE IF EXISTS addressdata_place;
+CREATE TYPE addressdata_place AS (
+  place_id BIGINT,
+  country_code VARCHAR(2),
+  housenumber TEXT,
+  postcode TEXT,
+  class TEXT,
+  type TEXT,
+  name HSTORE,
+  address HSTORE,
+  centroid GEOMETRY
+);

 
 -- Compute the list of address parts for the given place.
 --
 
 -- Compute the list of address parts for the given place.
 --


@@ -87,21 +99,21 @@ CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT, in_housenumber IN
   RETURNS setof addressline
   AS $$
 DECLARE
   RETURNS setof addressline
   AS $$
 DECLARE

-  place RECORD;
+  place addressdata_place;

   location RECORD;
   current_rank_address INTEGER;
   location_isaddress BOOLEAN;
 BEGIN
   -- The place in question might not have a direct entry in place_addressline.
   location RECORD;
   current_rank_address INTEGER;
   location_isaddress BOOLEAN;
 BEGIN
   -- 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 it in place.

 
   -- first query osmline (interpolation lines)
   IF in_housenumber >= 0 THEN
     SELECT parent_place_id as place_id, country_code,
 
   -- first query osmline (interpolation lines)
   IF in_housenumber >= 0 THEN
     SELECT parent_place_id as place_id, country_code,

-           in_housenumber::text as housenumber, postcode,
+           in_housenumber as housenumber, postcode,

            'place' as class, 'house' as type,
            'place' as class, 'house' as type,

-           null as name, null::hstore as address,
-           centroid
+           null as name, null as address,
+           ST_Centroid(linegeo) as centroid

       INTO place
       FROM location_property_osmline
       WHERE place_id = in_place_id
       INTO place
       FROM location_property_osmline
       WHERE place_id = in_place_id


@@ -112,9 +124,9 @@ BEGIN
   -- %NOTIGERDATA% IF 0 THEN
   IF place IS NULL AND in_housenumber >= 0 THEN
     SELECT parent_place_id as place_id, 'us' as country_code,
   -- %NOTIGERDATA% IF 0 THEN
   IF place IS NULL AND in_housenumber >= 0 THEN
     SELECT parent_place_id as place_id, 'us' as country_code,

-           in_housenumber::text as housenumber, postcode,
+           in_housenumber as housenumber, postcode,

            'place' as class, 'house' as type,
            'place' as class, 'house' as type,

-           null as name, null::hstore as address,
+           null as name, null as address,

            ST_Centroid(linegeo) as centroid
       INTO place
       FROM location_property_tiger
            ST_Centroid(linegeo) as centroid
       INTO place
       FROM location_property_tiger


@@ -128,7 +140,7 @@ BEGIN
     SELECT parent_place_id as place_id, 'us' as country_code,
            housenumber, postcode,
            'place' as class, 'house' as type,
     SELECT parent_place_id as place_id, 'us' as country_code,
            housenumber, postcode,
            'place' as class, 'house' as type,

-           null as name, null::hstore as address,
+           null as name, null as address,

            centroid
       INTO place
       FROM location_property_aux
            centroid
       INTO place
       FROM location_property_aux


@@ -139,9 +151,9 @@ BEGIN
   -- postcode table
   IF place IS NULL THEN
     SELECT parent_place_id as place_id, country_code,
   -- postcode table
   IF place IS NULL THEN
     SELECT parent_place_id as place_id, country_code,

-           null as housenumber, postcode,
+           null::text as housenumber, postcode,

            'place' as class, 'postcode' as type,
            'place' as class, 'postcode' as type,

-           null as name, null::hstore as address,
+           null as name, null as address,

            null as centroid
       INTO place
       FROM location_postcode
            null as centroid
       INTO place
       FROM location_postcode


@@ -160,7 +172,7 @@ BEGIN
       WHERE place_id = in_place_id and rank_search > 27;
   END IF;
 
       WHERE place_id = in_place_id and rank_search > 27;
   END IF;
 

-  -- If for_place_id is still NULL at this point then the object has its own
+  -- If place is still NULL at this point then the object has its own

   -- entry in place_address line. However, still check if there is not linked
   -- place we should be using instead.
   IF place IS NULL THEN
   -- entry in place_address line. However, still check if there is not linked
   -- place we should be using instead.
   IF place IS NULL THEN


@@ -191,7 +203,7 @@ BEGIN
 --RAISE WARNING '%',location;
     IF location.rank_address < 4 THEN
       -- no country locations for ranks higher than country
 --RAISE WARNING '%',location;
     IF location.rank_address < 4 THEN
       -- no country locations for ranks higher than country

-      place.country_code := NULL;
+      place.country_code := NULL::varchar(2);

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