adapt php tests to new directory constants

[nominatim.git] / sql / tiger_import_start.sql

diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql
index c5246854cd740dc8331c0e9d9bda176e694ebfbe..4b9c33fcbcb5e7650729e1ea34102e056ddf0af4 100644 (file)
--- a/sql/tiger_import_start.sql
+++ b/sql/tiger_import_start.sql
@@ -58,20 +58,18 @@ BEGIN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN
 
   address_street_word_ids := word_ids_from_name(in_street);
   IF address_street_word_ids IS NOT NULL THEN

-    out_parent_place_id := getNearestNamedRoadFeature(out_partition, place_centroid,
+    out_parent_place_id := getNearestNamedRoadPlaceId(out_partition, place_centroid,

                                                       address_street_word_ids);
   END IF;
 
   IF out_parent_place_id IS NULL THEN
                                                       address_street_word_ids);
   END IF;
 
   IF out_parent_place_id IS NULL THEN

-    FOR location IN SELECT place_id FROM getNearestParellelRoadFeature(out_partition, linegeo) LOOP
-      out_parent_place_id := location.place_id;
-    END LOOP;    
+    SELECT getNearestParallelRoadFeature(out_partition, linegeo)
+      INTO out_parent_place_id;

   END IF;
 
   IF out_parent_place_id IS NULL THEN
   END IF;
 
   IF out_parent_place_id IS NULL THEN

-    FOR location IN SELECT place_id FROM getNearestRoadFeature(out_partition, place_centroid) LOOP
-      out_parent_place_id := location.place_id;
-    END LOOP;    
+    SELECT getNearestRoadPlaceId(out_partition, place_centroid)
+      INTO out_parent_place_id;

   END IF;
 
 --insert street(line) into import table
   END IF;
 
 --insert street(line) into import table