Merge remote-tracking branch 'upstream/master'

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

diff --git a/sql/functions/utils.sql b/sql/functions/utils.sql
index 741a3969e37f1732fc248a102a535bd00588c0ec..6371e9adb739f3fdb7e868219fed02ca9804c7dd 100644 (file)
--- a/sql/functions/utils.sql
+++ b/sql/functions/utils.sql
@@ -262,7 +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
     -- 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

-      parent_place_id := getNearestNamedRoadFeature(partition, centroid, word_ids);
+      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;
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id;
         RETURN parent_place_id;


@@ -274,7 +274,7 @@ BEGIN
   IF place is not null THEN
     word_ids := word_ids_from_name(place);
     IF word_ids is not null THEN
   IF place is not null THEN
     word_ids := word_ids_from_name(place);
     IF word_ids is not null THEN

-      parent_place_id := getNearestNamedPlaceFeature(partition, centroid, word_ids);
+      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;
       IF parent_place_id is not null THEN
         --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id;
         RETURN parent_place_id;