X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/95c0f2a97b2dedc2bede01eed3824a325809d74a..163b488591181e05a1ca0f80923ff7d5d309c71b:/sql/partition-functions.src.sql?ds=sidebyside diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql index d9da9b42..8857e766 100644 --- a/sql/partition-functions.src.sql +++ b/sql/partition-functions.src.sql @@ -111,7 +111,7 @@ END $$ LANGUAGE plpgsql; -create or replace function getNearestNamedRoadFeature(in_partition INTEGER, point GEOMETRY, isin_token INTEGER) +create or replace function getNearestNamedRoadFeature(in_partition INTEGER, point GEOMETRY, isin_token INTEGER[]) RETURNS setof nearfeature AS $$ DECLARE r nearfeature%rowtype; @@ -123,7 +123,7 @@ BEGIN SELECT place_id, name_vector, address_rank, search_rank, ST_Distance(centroid, point) as distance, null as isguess FROM search_name_-partition- - WHERE name_vector @> ARRAY[isin_token] + WHERE name_vector @> isin_token AND ST_DWithin(centroid, point, 0.01) AND search_rank between 26 and 27 ORDER BY distance ASC limit 1 @@ -139,7 +139,7 @@ END $$ LANGUAGE plpgsql; -create or replace function getNearestNamedPlaceFeature(in_partition INTEGER, point GEOMETRY, isin_token INTEGER) +create or replace function getNearestNamedPlaceFeature(in_partition INTEGER, point GEOMETRY, isin_token INTEGER[]) RETURNS setof nearfeature AS $$ DECLARE r nearfeature%rowtype; @@ -151,7 +151,7 @@ BEGIN SELECT place_id, name_vector, address_rank, search_rank, ST_Distance(centroid, point) as distance, null as isguess FROM search_name_-partition- - WHERE name_vector @> ARRAY[isin_token] + WHERE name_vector @> isin_token AND ST_DWithin(centroid, point, 0.03) AND search_rank between 16 and 22 ORDER BY distance ASC limit 1 @@ -327,9 +327,9 @@ BEGIN RETURN; END IF; - p1 := ST_Line_Interpolate_Point(line,0); - p2 := ST_Line_Interpolate_Point(line,0.5); - p3 := ST_Line_Interpolate_Point(line,1); + p1 := ST_LineInterpolatePoint(line,0); + p2 := ST_LineInterpolatePoint(line,0.5); + p3 := ST_LineInterpolatePoint(line,1); -- start IF in_partition = -partition- THEN