X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e0b1e3b66d54c4fe9907edb1ff993f33e6739d46..45383ee291e4b28dd249691d6e14f1b49fdd121a:/sql/partition-functions.src.sql diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql index 235e21a2..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