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

stop treating capital cities as villages, memory leak on deadlock

Browse Source
This commit is contained in:
Brian Quinion
2011-02-08 12:09:11 +00:00
parent 3ea1b35b32
commit c71cb63f38
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/partitions.src.sql
View File

@@ -61,7 +61,13 @@ BEGIN
UNION ALL
SELECT * FROM location_area_country WHERE ST_Contains(geometry, point) and rank_search < maxrank
) as location_area
ORDER BY rank_address desc, isin_tokens && keywords desc, isguess asc, ST_Distance(point, centroid) * CASE WHEN rank_address = 16 AND rank_search = 16 THEN 0.25 WHEN rank_address = 16 AND rank_search = 17 THEN 0.5 ELSE 1 END ASC
ORDER BY rank_address desc, isin_tokens && keywords desc, isguess asc,
ST_Distance(point, 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;