From 98b01d12ea37ef966945d297578f211542a33953 Mon Sep 17 00:00:00 2001 From: Teemu Piippo Date: Sun, 5 Jul 2020 18:22:57 +0300 Subject: [PATCH] fix rendering of highway=secondary_link at z12 --- style/roads.mss | 68 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/style/roads.mss b/style/roads.mss index 817bce10b3..64e64469e3 100644 --- a/style/roads.mss +++ b/style/roads.mss @@ -1522,42 +1522,40 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ 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; } + [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; } + [link = 'yes'] { + line-width: @secondary-link-width-z12 - 2 * @casing-width-z12; + [zoom >= 13] { line-width: @secondary-link-width-z13 - 2 * @casing-width-z13; } + [zoom >= 15] { line-width: @secondary-link-width-z15 - 2 * @casing-width-z15; } + [zoom >= 17] { line-width: @secondary-link-width-z17 - 2 * @casing-width-z17; } + [zoom >= 18] { line-width: @secondary-link-width-z18 - 2 * @casing-width-z18; } + [zoom >= 19] { line-width: @secondary-link-width-z19 - 2 * @casing-width-z19; } + } + #tunnels { + line-color: @secondary-tunnel-fill; + } + #bridges { + 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; } [link = 'yes'] { - line-width: @secondary-link-width-z12 - 2 * @casing-width-z12; - [zoom >= 13] { line-width: @secondary-link-width-z13 - 2 * @casing-width-z13; } - [zoom >= 15] { line-width: @secondary-link-width-z15 - 2 * @casing-width-z15; } - [zoom >= 17] { line-width: @secondary-link-width-z17 - 2 * @casing-width-z17; } - [zoom >= 18] { line-width: @secondary-link-width-z18 - 2 * @casing-width-z18; } - [zoom >= 19] { line-width: @secondary-link-width-z19 - 2 * @casing-width-z19; } - } - #tunnels { - line-color: @secondary-tunnel-fill; - } - #bridges { - 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; } - [link = 'yes'] { - line-width: @secondary-link-width-z12 - 2 * @bridge-casing-width-z12; - [zoom >= 13] { line-width: @secondary-link-width-z13 - 2 * @bridge-casing-width-z13; } - [zoom >= 15] { line-width: @secondary-link-width-z15 - 2 * @bridge-casing-width-z15; } - [zoom >= 17] { line-width: @secondary-link-width-z17 - 2 * @bridge-casing-width-z17; } - [zoom >= 18] { line-width: @secondary-link-width-z18 - 2 * @bridge-casing-width-z18; } - [zoom >= 19] { line-width: @secondary-link-width-z19 - 2 * @bridge-casing-width-z19; } - } + line-width: @secondary-link-width-z12 - 2 * @bridge-casing-width-z12; + [zoom >= 13] { line-width: @secondary-link-width-z13 - 2 * @bridge-casing-width-z13; } + [zoom >= 15] { line-width: @secondary-link-width-z15 - 2 * @bridge-casing-width-z15; } + [zoom >= 17] { line-width: @secondary-link-width-z17 - 2 * @bridge-casing-width-z17; } + [zoom >= 18] { line-width: @secondary-link-width-z18 - 2 * @bridge-casing-width-z18; } + [zoom >= 19] { line-width: @secondary-link-width-z19 - 2 * @bridge-casing-width-z19; } } } }