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 0e26849d5e93d5ab964666a6e1d315d2eae57d3e..d9da9b4258b803db620cca07106cb682eec35ecc 100644 (file)
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -125,7 +125,7 @@ BEGIN
           FROM search_name_-partition-
           WHERE name_vector @> ARRAY[isin_token]
           AND ST_DWithin(centroid, point, 0.01) 
           FROM search_name_-partition-
           WHERE name_vector @> ARRAY[isin_token]
           AND ST_DWithin(centroid, point, 0.01) 

-          AND search_rank between 22 and 27
+          AND search_rank between 26 and 27

       ORDER BY distance ASC limit 1
     LOOP
       RETURN NEXT r;
       ORDER BY distance ASC limit 1
     LOOP
       RETURN NEXT r;


@@ -139,6 +139,35 @@ END
 $$
 LANGUAGE plpgsql;
 
 $$
 LANGUAGE plpgsql;
 

+create or replace function getNearestNamedPlaceFeature(in_partition INTEGER, point GEOMETRY, isin_token INTEGER) 
+  RETURNS setof nearfeature AS $$
+DECLARE
+  r nearfeature%rowtype;
+BEGIN
+
+-- start
+  IF in_partition = -partition- THEN
+    FOR r IN 
+      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]
+          AND ST_DWithin(centroid, point, 0.03) 
+          AND search_rank between 16 and 22
+      ORDER BY distance ASC limit 1
+    LOOP
+      RETURN NEXT r;
+    END LOOP;
+    RETURN;
+  END IF;
+-- end
+
+  RAISE EXCEPTION 'Unknown partition %', in_partition;
+END
+$$
+LANGUAGE plpgsql;
+
+

 create or replace function getNearestPostcode(in_partition INTEGER, point GEOMETRY) 
   RETURNS TEXT AS $$
 DECLARE
 create or replace function getNearestPostcode(in_partition INTEGER, point GEOMETRY) 
   RETURNS TEXT AS $$
 DECLARE


@@ -166,7 +195,7 @@ create or replace function insertSearchName(
   in_partition INTEGER, in_place_id BIGINT, in_country_code VARCHAR(2), 
   in_name_vector INTEGER[], in_nameaddress_vector INTEGER[],
   in_rank_search INTEGER, in_rank_address INTEGER, in_importance FLOAT,
   in_partition INTEGER, in_place_id BIGINT, in_country_code VARCHAR(2), 
   in_name_vector INTEGER[], in_nameaddress_vector INTEGER[],
   in_rank_search INTEGER, in_rank_address INTEGER, in_importance FLOAT,

-  in_centroid GEOMETRY) RETURNS BOOLEAN AS $$
+  in_centroid GEOMETRY, in_geometry GEOMETRY) RETURNS BOOLEAN AS $$

 DECLARE
 BEGIN
 
 DECLARE
 BEGIN
 


@@ -176,16 +205,16 @@ BEGIN
 
   IF in_rank_search <= 4 THEN
     DELETE FROM search_name_country WHERE place_id = in_place_id;
 
   IF in_rank_search <= 4 THEN
     DELETE FROM search_name_country WHERE place_id = in_place_id;

-    INSERT INTO search_name_country values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, 
-      in_name_vector, in_nameaddress_vector, in_centroid);
+    INSERT INTO search_name_country values (in_place_id, in_rank_search, in_rank_address, 
+      in_name_vector, in_geometry);

     RETURN TRUE;
   END IF;
 
 -- start
   IF in_partition = -partition- THEN
     DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;
     RETURN TRUE;
   END IF;
 
 -- start
   IF in_partition = -partition- THEN
     DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;

-    INSERT INTO search_name_-partition- values (in_place_id, in_rank_search, in_rank_address, 0, in_country_code, 
-      in_name_vector, in_nameaddress_vector, in_centroid);
+    INSERT INTO search_name_-partition- values (in_place_id, in_rank_search, in_rank_address, 
+      in_name_vector, in_geometry);

     RETURN TRUE;
   END IF;
 -- end
     RETURN TRUE;
   END IF;
 -- end