cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use classes from ClearTables and add continents

Browse Source
This commit is contained in:
Lukas Martinelli
2016-11-28 15:42:13 +00:00
parent aed323bb99
commit 2f35ab3ee1
8 changed files with 88 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layers/place/city.sql
View File

@@ -3,9 +3,9 @@
-- etldoc: label="layer_city | <z2_7> z2-z7 | <z8_14_> z8_z14_ " ] ;
CREATE OR REPLACE FUNCTION layer_city(bbox geometry, zoom_level int, pixel_width numeric)
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class city_class, "rank" int) AS $$
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, place city_place, "rank" int, capital int) AS $$
-- etldoc: osm_city_point -> layer_city:z2_7
SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place AS class, "rank"
SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place, "rank", normalize_capital_level(capital) AS capital
FROM osm_city_point
WHERE geometry && bbox
AND ((zoom_level = 2 AND "rank" = 1)
@@ -14,10 +14,11 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class c
UNION ALL
SELECT osm_id, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
place AS class,
COALESCE("rank", gridrank + 10)
place,
COALESCE("rank", gridrank + 10),
normalize_capital_level(capital) AS capital
FROM (
SELECT osm_id, geometry, name, name_en, place, "rank",
SELECT osm_id, geometry, name, name_en, place, "rank", capital,
row_number() OVER (
PARTITION BY LabelGrid(geometry, 128 * pixel_width)
ORDER BY "rank" ASC NULLS LAST,
@@ -28,11 +29,12 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class c
-- etldoc: osm_city_point -> layer_city:z8_14_
FROM osm_city_point
WHERE geometry && bbox
AND ((zoom_level = 8 AND place <= 'town'::city_class)
OR (zoom_level BETWEEN 9 AND 10 AND place <= 'village'::city_class)
OR (zoom_level BETWEEN 11 AND 13 AND place <= 'suburb'::city_class)
AND ((zoom_level = 8 AND place <= 'town'::city_place
OR (zoom_level BETWEEN 9 AND 10 AND place <= 'village'::city_place)
OR (zoom_level BETWEEN 11 AND 13 AND place <= 'suburb'::city_place)
OR (zoom_level >= 14)
)
))
) AS ranked_places
WHERE (zoom_level = 8 AND (gridrank <= 4 OR "rank" IS NOT NULL))
OR (zoom_level = 9 AND (gridrank <= 8 OR "rank" IS NOT NULL))