Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / partition-functions.src.sql

diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql
index cc11cf960ace6d373c1892eb5cfaddb6e33733e4..efb595426fe8d86f9f62bd14568fe0dd7f810627 100644 (file)
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -96,7 +96,7 @@ BEGIN
       SELECT place_id, name_vector, address_rank, search_rank,
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
       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 @> isin_token
+          WHERE name_vector && isin_token

           AND ST_DWithin(centroid, point, 0.015)
           AND search_rank between 26 and 27
       ORDER BY distance ASC limit 1
           AND ST_DWithin(centroid, point, 0.015)
           AND search_rank between 26 and 27
       ORDER BY distance ASC limit 1


@@ -124,8 +124,8 @@ BEGIN
       SELECT place_id, name_vector, address_rank, search_rank,
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
       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 @> isin_token
-          AND ST_DWithin(centroid, point, 0.03) 
+          WHERE name_vector && isin_token
+          AND ST_DWithin(centroid, point, 0.04)

           AND search_rank between 16 and 22
       ORDER BY distance ASC limit 1
     LOOP
           AND search_rank between 16 and 22
       ORDER BY distance ASC limit 1
     LOOP