safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

move ordering out of getNearFeatures

Browse Source 
The two places where the function is called have different ordering
requirement.
This commit is contained in:
Sarah Hoffmann
2020-10-13 14:57:11 +02:00
parent 4e7ec92d6f
commit 5ec48c66cb
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/partition-functions.src.sql
View File

@@ -32,7 +32,7 @@ BEGIN
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
@@ -46,13 +46,6 @@ BEGIN
AND is_relevant_geometry(ST_Relate(geometry, feature), ST_GeometryType(feature))
AND rank_address < maxrank
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;