Merge branch 'master' into feature/changed-place-layer

Conflicts: layers/place/mapping.yaml
2016-12-01 09:57:58 +00:00
parent 3f5b1371e9 e1fc9481b7
commit 3fd28778cc
53 changed files with 674 additions and 570 deletions
--- a/layers/place/city.sql
+++ b/layers/place/city.sql
@@ -9,7 +9,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, place c
    FROM osm_city_point
    WHERE geometry && bbox
      AND ((zoom_level = 2 AND "rank" = 1)
-        OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level)
+        OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level + 1)
      )
    UNION ALL
    SELECT osm_id, geometry, name,