Merge pull request #2090 from lonvia/avoid-contains-operator

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

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index 1194022a7789d5e128814e3e9ec3e3df9f4e1949..34ef7ca75b6cf1dbb669313d8eee5e577caa9e16 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -93,15 +93,15 @@ DECLARE
   location_isaddress BOOLEAN;
 BEGIN
   -- The place in question might not have a direct entry in place_addressline.
   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,
            in_housenumber::text as housenumber, postcode,
            'place' as class, 'house' as type,
 
   -- 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,
            'place' as class, 'house' as type,

-           null as name, null::hstore as address,
-           centroid
+           null::hstore as name, null::hstore 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


@@ -111,10 +111,10 @@ BEGIN
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
   IF place IS NULL AND in_housenumber >= 0 THEN
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
   IF place IS NULL AND in_housenumber >= 0 THEN

-    SELECT parent_place_id as place_id, 'us' as country_code,
+    SELECT parent_place_id as place_id, 'us'::varchar(2) as country_code,

            in_housenumber::text as housenumber, postcode,
            'place' as class, 'house' as type,
            in_housenumber::text as housenumber, postcode,
            'place' as class, 'house' as type,

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

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


@@ -125,10 +125,10 @@ BEGIN
 
   -- %NOAUXDATA% IF 0 THEN
   IF place IS NULL THEN
 
   -- %NOAUXDATA% IF 0 THEN
   IF place IS NULL THEN

-    SELECT parent_place_id as place_id, 'us' as country_code,
+    SELECT parent_place_id as place_id, 'us'::varchar(2) as country_code,

            housenumber, postcode,
            'place' as class, 'house' as type,
            housenumber, postcode,
            'place' as class, 'house' as type,

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

            centroid
       INTO place
       FROM location_property_aux
            centroid
       INTO place
       FROM location_property_aux


@@ -139,10 +139,10 @@ 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 centroid
+           null::hstore as name, null::hstore as address,
+           null::geometry as centroid

       INTO place
       FROM location_postcode
       WHERE place_id = in_place_id;
       INTO place
       FROM location_postcode
       WHERE place_id = in_place_id;


@@ -160,15 +160,15 @@ 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
     select coalesce(linked_place_id, place_id) as place_id,  country_code,
            housenumber, postcode,
            class, type,
   -- entry in place_address line. However, still check if there is not linked
   -- place we should be using instead.
   IF place IS NULL THEN
     select coalesce(linked_place_id, place_id) as place_id,  country_code,
            housenumber, postcode,
            class, type,

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

       INTO place
       FROM placex where place_id = in_place_id;
   END IF;
       INTO place
       FROM placex where place_id = in_place_id;
   END IF;


@@ -191,7 +191,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;