update osm2pgsql (deletion and address updates)

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

diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql
index 20f71584c281c8ef28aa163dc00b97d260adab3b..f770e83e3d52143bacb0316ecff00bb359376b50 100644 (file)
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -95,7 +95,7 @@ BEGIN
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
           WHERE name_vector && isin_token
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
           WHERE name_vector && isin_token

-          AND ST_DWithin(centroid, point, 0.015)
+          AND centroid && ST_Expand(point, 0.015)

           AND search_rank between 26 and 27
       ORDER BY distance ASC limit 1
     LOOP
           AND search_rank between 26 and 27
       ORDER BY distance ASC limit 1
     LOOP


@@ -123,7 +123,7 @@ BEGIN
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
           WHERE name_vector && isin_token
           ST_Distance(centroid, point) as distance, null as isguess
           FROM search_name_-partition-
           WHERE name_vector && isin_token

-          AND ST_DWithin(centroid, point, 0.04)
+          AND centroid && ST_Expand(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