Skip to content

Commit

Permalink
Merge pull request #4177 from crimsondusk/master
Browse files Browse the repository at this point in the history 
Fix rendering of highway=secondary_link at z12
  • Loading branch information
@jeisenbe
jeisenbe authored Sep 6, 2020
2 parents 50bef73 + 98b01d1 commit 8e4cb4f
Showing 1 changed file with 33 additions and 35 deletions.
68 changes: 33 additions & 35 deletions style/roads.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
}
Expand Down

0 comments on commit 8e4cb4f

Please sign in to comment.