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 17db9c1681060ab8f1d2fc2f667b8e595990d3d9..97520f99b8441d5fec6f61248afa3572a4d3cb00 100644 (file)
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -32,7 +32,7 @@ BEGIN
 END
 $$ LANGUAGE plpgsql IMMUTABLE;
 
 END
 $$ LANGUAGE plpgsql IMMUTABLE;
 

-create or replace function getNearFeatures(in_partition INTEGER, feature GEOMETRY, maxrank INTEGER, isin_tokens INT[]) RETURNS setof nearfeaturecentr AS $$
+create or replace function getNearFeatures(in_partition INTEGER, feature GEOMETRY, maxrank INTEGER) RETURNS setof nearfeaturecentr AS $$

 DECLARE
   r nearfeaturecentr%rowtype;
 BEGIN
 DECLARE
   r nearfeaturecentr%rowtype;
 BEGIN


@@ -44,15 +44,8 @@ BEGIN
       FROM location_area_large_-partition-
       WHERE geometry && feature
         AND is_relevant_geometry(ST_Relate(geometry, feature), ST_GeometryType(feature))
       FROM location_area_large_-partition-
       WHERE geometry && feature
         AND is_relevant_geometry(ST_Relate(geometry, feature), ST_GeometryType(feature))

-        AND rank_search < maxrank AND rank_address < maxrank
+        AND rank_address < maxrank

       GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid
       GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid

-      ORDER BY rank_address, isin_tokens && keywords desc, isguess asc,
-        ST_Distance(feature, centroid) *
-          CASE 
-               WHEN rank_address = 16 AND rank_search = 15 THEN 0.2 -- capital city
-               WHEN rank_address = 16 AND rank_search = 16 THEN 0.25 -- city
-               WHEN rank_address = 16 AND rank_search = 17 THEN 0.5 -- town
-               ELSE 1 END ASC -- everything else

     LOOP
       RETURN NEXT r;
     END LOOP;
     LOOP
       RETURN NEXT r;
     END LOOP;


@@ -160,7 +153,7 @@ BEGIN
       FROM search_name_-partition-
       WHERE name_vector && isin_token
             AND centroid && ST_Expand(point, 0.04)
       FROM search_name_-partition-
       WHERE name_vector && isin_token
             AND centroid && ST_Expand(point, 0.04)

-            AND search_rank between 16 and 22
+            AND search_rank between 16 and 25

       ORDER BY ST_Distance(centroid, point) ASC limit 1;
     RETURN parent;
   END IF;
       ORDER BY ST_Distance(centroid, point) ASC limit 1;
     RETURN parent;
   END IF;