Adjust zoom levels of transportation layer, stop using ne_10m_roads source

This commit is contained in:
jirik
2017-03-15 11:05:16 +01:00
parent 4dcbb40ef1
commit ca1b9a95a8
3 changed files with 31 additions and 21 deletions

View File

@@ -20,18 +20,26 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
brunnel(is_bridge, is_tunnel, is_ford) AS brunnel,
NULLIF(service, '') AS service
FROM (
-- etldoc: ne_10m_roads -> layer_transportation:z4z6
-- etldoc: osm_highway_linestring_gen6 -> layer_transportation:z4
SELECT
NULL::bigint AS osm_id, geometry,
ne_highway(type) AS highway, NULL AS railway, NULL AS service,
osm_id, geometry, highway, NULL AS railway, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
0 AS z_order
FROM ne_10m_roads
WHERE featurecla = 'Road'
AND type IN ('Major Highway', 'Secondary Highway', 'Road')
AND zoom_level BETWEEN 4 AND 6 AND scalerank <= 1 + zoom_level
z_order
FROM osm_highway_linestring_gen6
WHERE zoom_level = 4
UNION ALL
-- etldoc: osm_highway_linestring_gen5 -> layer_transportation:z5z6
SELECT
osm_id, geometry, highway, NULL AS railway, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
z_order
FROM osm_highway_linestring_gen5
WHERE zoom_level BETWEEN 5 AND 6
UNION ALL
-- etldoc: osm_highway_linestring_gen4 -> layer_transportation:z7z8
@@ -42,7 +50,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
z_order
FROM osm_highway_linestring_gen4
WHERE zoom_level BETWEEN 7 AND 8
WHERE zoom_level = 7
UNION ALL
-- etldoc: osm_highway_linestring_gen3 -> layer_transportation:z9
@@ -53,7 +61,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
z_order
FROM osm_highway_linestring_gen3
WHERE zoom_level = 9
WHERE zoom_level = 8
UNION ALL
-- etldoc: osm_highway_linestring_gen2 -> layer_transportation:z10
@@ -64,7 +72,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
z_order
FROM osm_highway_linestring_gen2
WHERE zoom_level = 10
WHERE zoom_level BETWEEN 9 AND 10
UNION ALL
-- etldoc: osm_highway_linestring_gen1 -> layer_transportation:z11