link against place nodes by place type

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

diff --git a/sql/functions/utils.sql b/sql/functions/utils.sql
index 80eb12c566200ae889e96553dc30d76f6d9b0553..6371e9adb739f3fdb7e868219fed02ca9804c7dd 100644 (file)
--- a/sql/functions/utils.sql
+++ b/sql/functions/utils.sql
@@ -248,7 +248,6 @@ LANGUAGE plpgsql STABLE;
 -- \param centroid   Location of the address.
 --
 -- \return Place ID of the parent if one was found, NULL otherwise.
---         The returned parent is always a street (rank 26/27 and a way).
 CREATE OR REPLACE FUNCTION find_parent_for_address(street TEXT, place TEXT,
                                                    partition SMALLINT,
                                                    centroid GEOMETRY)
@@ -263,9 +262,7 @@ BEGIN
     -- Note that addr:street links can only be indexed, once the street itself is indexed
     word_ids := word_ids_from_name(street);
     IF word_ids is not null THEN
-      SELECT place_id
-        FROM getNearestNamedRoadFeature(partition, centroid, word_ids)
-        INTO parent_place_id;
+      parent_place_id := getNearestNamedRoadPlaceId(partition, centroid, word_ids);
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id;
         RETURN parent_place_id;
@@ -277,9 +274,7 @@ BEGIN
   IF place is not null THEN
     word_ids := word_ids_from_name(place);
     IF word_ids is not null THEN
-      SELECT place_id
-        FROM getNearestNamedPlaceFeature(partition, centroid, word_ids)
-        INTO parent_place_id;
+      parent_place_id := getNearestNamedPlacePlaceId(partition, centroid, word_ids);
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id;
         RETURN parent_place_id;