From 42fd6277d13a332103126c37bf84376ad0b1ec6d Mon Sep 17 00:00:00 2001 From: math1985 Date: Wed, 16 Aug 2017 09:27:41 +0200 Subject: [PATCH] Revert "Merge branch 'link-lowzoom'" This reverts commit 1c94de253d8f2be6933c2a7eee864eb30c5e24f7, reversing changes made to e723f2f12901191da8713f616f086da7573c7c1b. --- roads.mss | 307 +++++++++++++++++++++++++++--------------------------- 1 file changed, 151 insertions(+), 156 deletions(-) diff --git a/roads.mss b/roads.mss index 95e69bad2d..bd51434ccd 100644 --- a/roads.mss +++ b/roads.mss @@ -1164,196 +1164,191 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ } [feature = 'highway_motorway'] { - [zoom >= 5][link != 'yes'], - [zoom >= 11] { + [zoom >= 5] { line-color: @motorway-low-zoom; line-width: @motorway-width-z5; - [zoom >= 7] { line-width: @motorway-width-z7; } - [zoom >= 8] { line-width: @motorway-width-z8; } - [zoom >= 9] { line-width: @motorway-width-z9; } - [zoom >= 10] { line-width: @motorway-width-z10; } - [zoom >= 11] { line-width: @motorway-width-z11; } - [zoom >= 12] { - line-color: @motorway-fill; - line-width: @motorway-width-z12 - 2 * @major-casing-width-z12; - [zoom >= 13] { line-width: @motorway-width-z13 - 2 * @major-casing-width-z13; } - [zoom >= 15] { line-width: @motorway-width-z15 - 2 * @major-casing-width-z15; } - [zoom >= 17] { line-width: @motorway-width-z17 - 2 * @major-casing-width-z17; } - [zoom >= 18] { line-width: @motorway-width-z18 - 2 * @major-casing-width-z18; } - [zoom >= 19] { line-width: @motorway-width-z19 - 2 * @major-casing-width-z19; } + } + [zoom >= 7] { line-width: @motorway-width-z7; } + [zoom >= 8] { line-width: @motorway-width-z8; } + [zoom >= 9] { line-width: @motorway-width-z9; } + [zoom >= 10] { line-width: @motorway-width-z10; } + [zoom >= 11] { line-width: @motorway-width-z11; } + [zoom >= 12] { + line-color: @motorway-fill; + line-width: @motorway-width-z12 - 2 * @major-casing-width-z12; + [zoom >= 13] { line-width: @motorway-width-z13 - 2 * @major-casing-width-z13; } + [zoom >= 15] { line-width: @motorway-width-z15 - 2 * @major-casing-width-z15; } + [zoom >= 17] { line-width: @motorway-width-z17 - 2 * @major-casing-width-z17; } + [zoom >= 18] { line-width: @motorway-width-z18 - 2 * @major-casing-width-z18; } + [zoom >= 19] { line-width: @motorway-width-z19 - 2 * @major-casing-width-z19; } + [link = 'yes'] { + line-width: @motorway-link-width-z12 - 2 * @casing-width-z12; + [zoom >= 13] { line-width: @motorway-link-width-z13 - 2 * @casing-width-z13; } + [zoom >= 15] { line-width: @motorway-link-width-z15 - 2 * @casing-width-z15; } + [zoom >= 17] { line-width: @motorway-link-width-z17 - 2 * @casing-width-z17; } + [zoom >= 18] { line-width: @motorway-link-width-z18 - 2 * @casing-width-z18; } + [zoom >= 19] { line-width: @motorway-link-width-z19 - 2 * @casing-width-z19; } + } + .tunnels-fill { + line-color: @motorway-tunnel-fill; + } + .bridges-fill { + line-width: @motorway-width-z12 - 2 * @major-bridge-casing-width-z12; + [zoom >= 13] { line-width: @motorway-width-z13 - 2 * @major-bridge-casing-width-z13; } + [zoom >= 15] { line-width: @motorway-width-z15 - 2 * @major-bridge-casing-width-z15; } + [zoom >= 17] { line-width: @motorway-width-z17 - 2 * @major-bridge-casing-width-z17; } + [zoom >= 18] { line-width: @motorway-width-z18 - 2 * @major-bridge-casing-width-z18; } + [zoom >= 19] { line-width: @motorway-width-z19 - 2 * @major-bridge-casing-width-z19; } [link = 'yes'] { - line-width: @motorway-link-width-z12 - 2 * @casing-width-z12; - [zoom >= 13] { line-width: @motorway-link-width-z13 - 2 * @casing-width-z13; } - [zoom >= 15] { line-width: @motorway-link-width-z15 - 2 * @casing-width-z15; } - [zoom >= 17] { line-width: @motorway-link-width-z17 - 2 * @casing-width-z17; } - [zoom >= 18] { line-width: @motorway-link-width-z18 - 2 * @casing-width-z18; } - [zoom >= 19] { line-width: @motorway-link-width-z19 - 2 * @casing-width-z19; } - } - .tunnels-fill { - line-color: @motorway-tunnel-fill; + line-width: @motorway-link-width-z12 - 2 * @bridge-casing-width-z12; + [zoom >= 13] { line-width: @motorway-link-width-z13 - 2 * @bridge-casing-width-z13; } + [zoom >= 15] { line-width: @motorway-link-width-z15 - 2 * @bridge-casing-width-z15; } + [zoom >= 17] { line-width: @motorway-link-width-z17 - 2 * @bridge-casing-width-z17; } + [zoom >= 18] { line-width: @motorway-link-width-z18 - 2 * @bridge-casing-width-z18; } + [zoom >= 19] { line-width: @motorway-link-width-z19 - 2 * @bridge-casing-width-z19; } } - .bridges-fill { - line-width: @motorway-width-z12 - 2 * @major-bridge-casing-width-z12; - [zoom >= 13] { line-width: @motorway-width-z13 - 2 * @major-bridge-casing-width-z13; } - [zoom >= 15] { line-width: @motorway-width-z15 - 2 * @major-bridge-casing-width-z15; } - [zoom >= 17] { line-width: @motorway-width-z17 - 2 * @major-bridge-casing-width-z17; } - [zoom >= 18] { line-width: @motorway-width-z18 - 2 * @major-bridge-casing-width-z18; } - [zoom >= 19] { line-width: @motorway-width-z19 - 2 * @major-bridge-casing-width-z19; } - [link = 'yes'] { - line-width: @motorway-link-width-z12 - 2 * @bridge-casing-width-z12; - [zoom >= 13] { line-width: @motorway-link-width-z13 - 2 * @bridge-casing-width-z13; } - [zoom >= 15] { line-width: @motorway-link-width-z15 - 2 * @bridge-casing-width-z15; } - [zoom >= 17] { line-width: @motorway-link-width-z17 - 2 * @bridge-casing-width-z17; } - [zoom >= 18] { line-width: @motorway-link-width-z18 - 2 * @bridge-casing-width-z18; } - [zoom >= 19] { line-width: @motorway-link-width-z19 - 2 * @bridge-casing-width-z19; } - } - } - line-cap: round; - line-join: round; } + line-cap: round; + line-join: round; } } [feature = 'highway_trunk'] { - [zoom >= 5][link != 'yes'], - [zoom >= 11] { + [zoom >= 5] { line-width: @trunk-width-z5; line-color: @trunk-low-zoom; - [zoom >= 7] { line-width: @trunk-width-z7; } - [zoom >= 8] { line-width: @trunk-width-z8; } - [zoom >= 9] { line-width: @trunk-width-z9; } - [zoom >= 10] { line-width: @trunk-width-z10; } - [zoom >= 11] { line-width: @trunk-width-z11; } - [zoom >= 12] { - line-color: @trunk-fill; - line-width: @trunk-width-z12 - 2 * @major-casing-width-z12; - [zoom >= 13] { line-width: @trunk-width-z13 - 2 * @major-casing-width-z13; } - [zoom >= 15] { line-width: @trunk-width-z15 - 2 * @major-casing-width-z15; } - [zoom >= 17] { line-width: @trunk-width-z17 - 2 * @major-casing-width-z17; } - [zoom >= 18] { line-width: @trunk-width-z18 - 2 * @major-casing-width-z18; } - [zoom >= 19] { line-width: @trunk-width-z19 - 2 * @major-casing-width-z19; } - .tunnels-fill { - line-color: @trunk-tunnel-fill; - } - .bridges-fill { - line-width: @trunk-width-z12 - 2 * @major-bridge-casing-width-z12; - [zoom >= 13] { line-width: @trunk-width-z13 - 2 * @major-bridge-casing-width-z13; } - [zoom >= 15] { line-width: @trunk-width-z15 - 2 * @major-bridge-casing-width-z15; } - [zoom >= 17] { line-width: @trunk-width-z17 - 2 * @major-bridge-casing-width-z17; } - [zoom >= 18] { line-width: @trunk-width-z18 - 2 * @major-bridge-casing-width-z18; } - [zoom >= 19] { line-width: @trunk-width-z19 - 2 * @major-bridge-casing-width-z19; } - } - line-cap: round; - line-join: round; + } + [zoom >= 7] { line-width: @trunk-width-z7; } + [zoom >= 8] { line-width: @trunk-width-z8; } + [zoom >= 9] { line-width: @trunk-width-z9; } + [zoom >= 10] { line-width: @trunk-width-z10; } + [zoom >= 11] { line-width: @trunk-width-z11; } + [zoom >= 12] { + line-color: @trunk-fill; + line-width: @trunk-width-z12 - 2 * @major-casing-width-z12; + [zoom >= 13] { line-width: @trunk-width-z13 - 2 * @major-casing-width-z13; } + [zoom >= 15] { line-width: @trunk-width-z15 - 2 * @major-casing-width-z15; } + [zoom >= 17] { line-width: @trunk-width-z17 - 2 * @major-casing-width-z17; } + [zoom >= 18] { line-width: @trunk-width-z18 - 2 * @major-casing-width-z18; } + [zoom >= 19] { line-width: @trunk-width-z19 - 2 * @major-casing-width-z19; } + .tunnels-fill { + line-color: @trunk-tunnel-fill; + } + .bridges-fill { + line-width: @trunk-width-z12 - 2 * @major-bridge-casing-width-z12; + [zoom >= 13] { line-width: @trunk-width-z13 - 2 * @major-bridge-casing-width-z13; } + [zoom >= 15] { line-width: @trunk-width-z15 - 2 * @major-bridge-casing-width-z15; } + [zoom >= 17] { line-width: @trunk-width-z17 - 2 * @major-bridge-casing-width-z17; } + [zoom >= 18] { line-width: @trunk-width-z18 - 2 * @major-bridge-casing-width-z18; } + [zoom >= 19] { line-width: @trunk-width-z19 - 2 * @major-bridge-casing-width-z19; } } + line-cap: round; + line-join: round; } } [feature = 'highway_primary'] { - [zoom >= 8][link != 'yes'], - [zoom >= 11] { + [zoom >= 8] { line-width: @primary-width-z8; line-color: @primary-low-zoom; - [zoom >= 9] { line-width: @primary-width-z9; } - [zoom >= 10] { line-width: @primary-width-z10; } - [zoom >= 11] { line-width: @primary-width-z11; } - [zoom >= 12] { - line-color: @primary-fill; - line-width: @primary-width-z12 - 2 * @major-casing-width-z12; - [zoom >= 13] { line-width: @primary-width-z13 - 2 * @major-casing-width-z13; } - [zoom >= 15] { line-width: @primary-width-z15 - 2 * @major-casing-width-z15; } - [zoom >= 17] { line-width: @primary-width-z17 - 2 * @major-casing-width-z17; } - [zoom >= 18] { line-width: @primary-width-z18 - 2 * @major-casing-width-z18; } - [zoom >= 19] { line-width: @primary-width-z19 - 2 * @major-casing-width-z19; } - .tunnels-fill { - line-color: @primary-tunnel-fill; - } - .bridges-fill { - line-width: @primary-width-z12 - 2 * @major-bridge-casing-width-z12; - [zoom >= 13] { line-width: @primary-width-z13 - 2 * @major-bridge-casing-width-z13; } - [zoom >= 15] { line-width: @primary-width-z15 - 2 * @major-bridge-casing-width-z15; } - [zoom >= 17] { line-width: @primary-width-z17 - 2 * @major-bridge-casing-width-z17; } - [zoom >= 18] { line-width: @primary-width-z18 - 2 * @major-bridge-casing-width-z18; } - [zoom >= 19] { line-width: @primary-width-z19 - 2 * @major-bridge-casing-width-z19; } - } - line-cap: round; - line-join: round; + } + [zoom >= 9] { line-width: @primary-width-z9; } + [zoom >= 10] { line-width: @primary-width-z10; } + [zoom >= 11] { line-width: @primary-width-z11; } + [zoom >= 12] { + line-color: @primary-fill; + line-width: @primary-width-z12 - 2 * @major-casing-width-z12; + [zoom >= 13] { line-width: @primary-width-z13 - 2 * @major-casing-width-z13; } + [zoom >= 15] { line-width: @primary-width-z15 - 2 * @major-casing-width-z15; } + [zoom >= 17] { line-width: @primary-width-z17 - 2 * @major-casing-width-z17; } + [zoom >= 18] { line-width: @primary-width-z18 - 2 * @major-casing-width-z18; } + [zoom >= 19] { line-width: @primary-width-z19 - 2 * @major-casing-width-z19; } + .tunnels-fill { + line-color: @primary-tunnel-fill; } + .bridges-fill { + line-width: @primary-width-z12 - 2 * @major-bridge-casing-width-z12; + [zoom >= 13] { line-width: @primary-width-z13 - 2 * @major-bridge-casing-width-z13; } + [zoom >= 15] { line-width: @primary-width-z15 - 2 * @major-bridge-casing-width-z15; } + [zoom >= 17] { line-width: @primary-width-z17 - 2 * @major-bridge-casing-width-z17; } + [zoom >= 18] { line-width: @primary-width-z18 - 2 * @major-bridge-casing-width-z18; } + [zoom >= 19] { line-width: @primary-width-z19 - 2 * @major-bridge-casing-width-z19; } + } + line-cap: round; + line-join: round; } } [feature = 'highway_secondary'] { - [zoom >= 9][link != 'yes'], - [zoom >= 11] { + [zoom >= 9] { line-color: @unimportant-road; line-width: @secondary-width-z9; - [zoom >= 10] { line-width: @secondary-width-z10; } - [zoom >= 11] { line-width: @secondary-width-z11; } - [zoom >= 12] { - line-color: @secondary-fill; - line-width: @secondary-width-z12 - 2 * @secondary-casing-width-z12; - line-cap: round; - line-join: round; - [zoom >= 13] { - [zoom >= 13] { line-width: @secondary-width-z13 - 2 * @secondary-casing-width-z13; } - [zoom >= 14] { line-width: @secondary-width-z14 - 2 * @secondary-casing-width-z14; } - [zoom >= 15] { line-width: @secondary-width-z15 - 2 * @secondary-casing-width-z15; } - [zoom >= 16] { line-width: @secondary-width-z16 - 2 * @secondary-casing-width-z16; } - [zoom >= 17] { line-width: @secondary-width-z17 - 2 * @secondary-casing-width-z17; } - [zoom >= 18] { line-width: @secondary-width-z18 - 2 * @secondary-casing-width-z18; } - [zoom >= 19] { line-width: @secondary-width-z19 - 2 * @secondary-casing-width-z19; } - .tunnels-fill { - line-color: @secondary-tunnel-fill; - } - .bridges-fill { - line-width: @secondary-width-z12 - 2 * @bridge-casing-width-z12; - [zoom >= 13] { line-width: @secondary-width-z13 - 2 * @major-bridge-casing-width-z13; } - [zoom >= 14] { line-width: @secondary-width-z14 - 2 * @major-bridge-casing-width-z14; } - [zoom >= 15] { line-width: @secondary-width-z15 - 2 * @major-bridge-casing-width-z15; } - [zoom >= 16] { line-width: @secondary-width-z16 - 2 * @major-bridge-casing-width-z16; } - [zoom >= 17] { line-width: @secondary-width-z17 - 2 * @major-bridge-casing-width-z17; } - [zoom >= 18] { line-width: @secondary-width-z18 - 2 * @major-bridge-casing-width-z18; } - [zoom >= 19] { line-width: @secondary-width-z19 - 2 * @major-bridge-casing-width-z19; } - } + } + [zoom >= 10] { line-width: @secondary-width-z10; } + [zoom >= 11] { line-width: @secondary-width-z11; } + [zoom >= 12] { + line-color: @secondary-fill; + line-width: @secondary-width-z12 - 2 * @secondary-casing-width-z12; + line-cap: round; + line-join: round; + [zoom >= 13] { + [zoom >= 13] { line-width: @secondary-width-z13 - 2 * @secondary-casing-width-z13; } + [zoom >= 14] { line-width: @secondary-width-z14 - 2 * @secondary-casing-width-z14; } + [zoom >= 15] { line-width: @secondary-width-z15 - 2 * @secondary-casing-width-z15; } + [zoom >= 16] { line-width: @secondary-width-z16 - 2 * @secondary-casing-width-z16; } + [zoom >= 17] { line-width: @secondary-width-z17 - 2 * @secondary-casing-width-z17; } + [zoom >= 18] { line-width: @secondary-width-z18 - 2 * @secondary-casing-width-z18; } + [zoom >= 19] { line-width: @secondary-width-z19 - 2 * @secondary-casing-width-z19; } + .tunnels-fill { + line-color: @secondary-tunnel-fill; + } + .bridges-fill { + line-width: @secondary-width-z12 - 2 * @bridge-casing-width-z12; + [zoom >= 13] { line-width: @secondary-width-z13 - 2 * @major-bridge-casing-width-z13; } + [zoom >= 14] { line-width: @secondary-width-z14 - 2 * @major-bridge-casing-width-z14; } + [zoom >= 15] { line-width: @secondary-width-z15 - 2 * @major-bridge-casing-width-z15; } + [zoom >= 16] { line-width: @secondary-width-z16 - 2 * @major-bridge-casing-width-z16; } + [zoom >= 17] { line-width: @secondary-width-z17 - 2 * @major-bridge-casing-width-z17; } + [zoom >= 18] { line-width: @secondary-width-z18 - 2 * @major-bridge-casing-width-z18; } + [zoom >= 19] { line-width: @secondary-width-z19 - 2 * @major-bridge-casing-width-z19; } } } } } [feature = 'highway_tertiary'] { - [zoom >= 10][link != 'yes'], - [zoom >= 11] { + [zoom >= 10] { line-color: @unimportant-road; line-width: @tertiary-width-z10; - [zoom >= 11] { - line-width: @tertiary-width-z11; - } - [zoom >= 12] { - line-color: @tertiary-fill; - line-width: @tertiary-width-z12 - 2 * @casing-width-z12; - [zoom >= 13] { line-width: @tertiary-width-z13 - 2 * @casing-width-z13; } - [zoom >= 14] { line-width: @tertiary-width-z14 - 2 * @casing-width-z14; } - [zoom >= 15] { line-width: @tertiary-width-z15 - 2 * @casing-width-z15; } - [zoom >= 16] { line-width: @tertiary-width-z16 - 2 * @casing-width-z16; } - [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @casing-width-z17; } - [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @casing-width-z18; } - [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @casing-width-z19; } - .tunnels-fill { - line-color: @tertiary-tunnel-fill; - } - .bridges-fill { - line-width: @tertiary-width-z12 - 2 * @bridge-casing-width-z12; - [zoom >= 13] { line-width: @tertiary-width-z13 - 2 * @bridge-casing-width-z13; } - [zoom >= 14] { line-width: @tertiary-width-z14 - 2 * @bridge-casing-width-z14; } - [zoom >= 15] { line-width: @tertiary-width-z15 - 2 * @bridge-casing-width-z15; } - [zoom >= 16] { line-width: @tertiary-width-z16 - 2 * @bridge-casing-width-z16; } - [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @bridge-casing-width-z17; } - [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @bridge-casing-width-z18; } - [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @bridge-casing-width-z19; } - } - line-cap: round; - line-join: round; + } + [zoom >= 11] { + line-width: @tertiary-width-z11; + } + [zoom >= 12] { + line-color: @tertiary-fill; + line-width: @tertiary-width-z12 - 2 * @casing-width-z12; + [zoom >= 13] { line-width: @tertiary-width-z13 - 2 * @casing-width-z13; } + [zoom >= 14] { line-width: @tertiary-width-z14 - 2 * @casing-width-z14; } + [zoom >= 15] { line-width: @tertiary-width-z15 - 2 * @casing-width-z15; } + [zoom >= 16] { line-width: @tertiary-width-z16 - 2 * @casing-width-z16; } + [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @casing-width-z17; } + [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @casing-width-z18; } + [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @casing-width-z19; } + .tunnels-fill { + line-color: @tertiary-tunnel-fill; + } + .bridges-fill { + line-width: @tertiary-width-z12 - 2 * @bridge-casing-width-z12; + [zoom >= 13] { line-width: @tertiary-width-z13 - 2 * @bridge-casing-width-z13; } + [zoom >= 14] { line-width: @tertiary-width-z14 - 2 * @bridge-casing-width-z14; } + [zoom >= 15] { line-width: @tertiary-width-z15 - 2 * @bridge-casing-width-z15; } + [zoom >= 16] { line-width: @tertiary-width-z16 - 2 * @bridge-casing-width-z16; } + [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @bridge-casing-width-z17; } + [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @bridge-casing-width-z18; } + [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @bridge-casing-width-z19; } } + line-cap: round; + line-join: round; } }