Skip to content

Commit

Permalink
display missing surface specially and display unpaved footways more p…
Browse files Browse the repository at this point in the history 
…rominently

fixes gravitystorm#1765 and gravitystorm#1766
  • Loading branch information
@matkoniecz
matkoniecz committed Aug 26, 2015
1 parent 978e999 commit 5a4089f
Showing 1 changed file with 121 additions and 16 deletions.
137 changes: 121 additions & 16 deletions roads.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
@living-street-width-z15: 6;
@pedestrian-width-z15: 6;
@bridleway-width-z15: 1.2;
@footway-width-z15: 1.5;
@cycleway-width-z15: 1.3;
@footway-width-z15: 1;
@cycleway-width-z15: 0.9;
@path-width-z15: 0.5;
@track-width-z15: 1.5;
@track-grade1-width-z15: 0.75;
Expand All @@ -111,6 +111,8 @@
@pedestrian-width-z16: 9;
@service-width-z16: 6;
@minor-service-width-z16: 4;
@footway-width-z16: 1.3;
@cycleway-width-z16: 0.9;

@motorway-width-z17: 18;
@motorway-link-width-z17: 11.5;
Expand All @@ -123,8 +125,11 @@
@pedestrian-width-z17: 14;
@service-width-z17: 7;

@footway-width-z19: 1.8;
@cycleway-width-z19: 1.6;
@footway-width-z18: 1.3;
@cycleway-width-z18: 1;

@footway-width-z19: 1.6;
@cycleway-width-z19: 1.3;

@casing-width-z12: 0.5;
@casing-width-z13: 0.5;
Expand Down Expand Up @@ -414,6 +419,8 @@
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * (@paths-background-width + @paths-bridge-casing-width);
[zoom >= 15] { line-width: @footway-width-z15 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 16] { line-width: @footway-width-z16 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 18] { line-width: @footway-width-z18 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 19] { line-width: @footway-width-z19 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
line-color: @bridge-casing;
line-join: round;
Expand All @@ -424,6 +431,8 @@
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * (@paths-background-width + @paths-tunnel-casing-width);
[zoom >= 15] { line-width: @footway-width-z15 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 16] { line-width: @footway-width-z16 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 18] { line-width: @footway-width-z18 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 19] { line-width: @footway-width-z19 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
line-color: @tunnel-casing;
line-dasharray: 4,2;
Expand All @@ -438,6 +447,8 @@
[zoom >= 15] {
line-width: @cycleway-width-z13 + 2 * (@paths-background-width + @paths-bridge-casing-width);
[zoom >= 15] { line-width: @cycleway-width-z15 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 16] { line-width: @cycleway-width-z16 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 18] { line-width: @cycleway-width-z18 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
[zoom >= 19] { line-width: @cycleway-width-z19 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
line-color: @bridge-casing;
line-join: round;
Expand All @@ -448,6 +459,8 @@
[zoom >= 15] {
line-width: @cycleway-width-z13 + 2 * (@paths-background-width + @paths-tunnel-casing-width);
[zoom >= 15] { line-width: @cycleway-width-z15 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 16] { line-width: @cycleway-width-z16 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 18] { line-width: @cycleway-width-z18 + 2 * (@paths-background-width + @paths-tunnel-casing-width); }
[zoom >= 19] { line-width: @cycleway-width-z19 + 2 * (@paths-background-width + @paths-bridge-casing-width); }
line-color: @tunnel-casing;
line-dasharray: 4,2;
Expand Down Expand Up @@ -630,6 +643,8 @@
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * @paths-background-width;
[zoom >= 15] { line-width: @footway-width-z15 + 2 * @paths-background-width; }
[zoom >= 16] { line-width: @footway-width-z16 + 2 * @paths-background-width; }
[zoom >= 18] { line-width: @footway-width-z18 + 2 * @paths-background-width; }
[zoom >= 19] { line-width: @footway-width-z19 + 2 * @paths-background-width; }
line-color: @footway-casing;
line-join: round;
Expand All @@ -643,6 +658,8 @@
line-join: round;
line-width: @footway-width-z13 + 2 * @paths-background-width;
[zoom >= 15] { line-width: @footway-width-z15 + 2 * @paths-background-width; }
[zoom >= 16] { line-width: @footway-width-z16 + 2 * @paths-background-width; }
[zoom >= 18] { line-width: @footway-width-z18 + 2 * @paths-background-width; }
[zoom >= 19] { line-width: @footway-width-z19 + 2 * @paths-background-width; }
}
}
Expand All @@ -655,6 +672,8 @@
[zoom >= 15] {
line-width: @cycleway-width-z13 + 2 * @paths-background-width;
[zoom >= 15] { line-width: @cycleway-width-z15 + 2 * @paths-background-width; }
[zoom >= 16] { line-width: @cycleway-width-z16 + 2 * @paths-background-width; }
[zoom >= 18] { line-width: @cycleway-width-z18 + 2 * @paths-background-width; }
[zoom >= 19] { line-width: @cycleway-width-z19 + 2 * @paths-background-width; }
line-color: @cycleway-casing;
line-join: round;
Expand All @@ -668,6 +687,8 @@
line-join: round;
line-width: @cycleway-width-z13 + 2 * @paths-background-width;
[zoom >= 15] { line-width: @cycleway-width-z15 + 2 * @paths-background-width; }
[zoom >= 16] { line-width: @cycleway-width-z16 + 2 * @paths-background-width; }
[zoom >= 18] { line-width: @cycleway-width-z18 + 2 * @paths-background-width; }
[zoom >= 19] { line-width: @cycleway-width-z19 + 2 * @paths-background-width; }
}
}
Expand Down Expand Up @@ -1292,6 +1313,12 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
background/line-join: round;
background/line-width: @footway-width-z15 + 2 * @paths-background-width;
background/line-opacity: 0.4;
[zoom >= 16] {
background/line-width: @footway-width-z16 + 2 * @paths-background-width;
}
[zoom >= 18] {
background/line-width: @footway-width-z18 + 2 * @paths-background-width;
}
[zoom >= 19] {
background/line-width: @footway-width-z19 + 2 * @paths-background-width;
}
Expand All @@ -1302,17 +1329,53 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line/line-cap: round;
line/line-width: @footway-width-z13;
[zoom >= 15][int_surface = 'paved'] {
line/line-width: @footway-width-z15;
line/line-dasharray: 2,3.5;
line/line-width: @footway-width-z15;
[zoom >= 16] {
line/line-dasharray: 3,3.5;
line/line-width: @footway-width-z16;
}
[zoom >= 17] {
line/line-dasharray: 3,3;
}
[zoom >= 18] {
line/line-width: @footway-width-z18;
}
[zoom >= 19] {
line/line-width: @footway-width-z19;
}
}
[zoom >= 15][int_surface = null] {
line/line-color: @footway-fill;
line/line-dasharray: 1,3,2,4;
line/line-join: round;
line/line-cap: round;
line/line-width: @footway-width-z15;
[zoom >= 16] {
line/line-dasharray: 1,4,2,3;
line/line-width: @footway-width-z16;
}
[zoom >= 18] {
line/line-width: @footway-width-z18;
}
[zoom >= 19] {
line/line-width: @footway-width-z19;
line/line-width: @footway-width-z19;
}
}
[zoom >= 15][int_surface = 'unpaved'] {
line/line-dasharray: 0.5,2.5;
line/line-width: @footway-width-z15/1.7;
line/line-color: @footway-fill;
line/line-dasharray: 1,4;
line/line-join: round;
line/line-cap: round;
line/line-width: @footway-width-z15;
[zoom >= 16] {
line/line-width: @footway-width-z16;
}
[zoom >= 18] {
line/line-width: @footway-width-z18;
}
[zoom >= 19] {
line/line-dasharray: 0.8,2.5;
line/line-width: @footway-width-z19/1.7;
line/line-width: @footway-width-z19;
}
}
}
Expand All @@ -1328,6 +1391,12 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
background/line-join: round;
background/line-width: @cycleway-width-z15 + 2 * @paths-background-width;
background/line-opacity: 0.4;
[zoom >= 16] {
background/line-width: @cycleway-width-z16 + 2 * @paths-background-width;
}
[zoom >= 18] {
background/line-width: @cycleway-width-z18 + 2 * @paths-background-width;
}
[zoom >= 19] {
background/line-width: @cycleway-width-z19 + 2 * @paths-background-width;
}
Expand All @@ -1338,17 +1407,53 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line/line-cap: round;
line/line-width: @cycleway-width-z13;
[zoom >= 15][int_surface = 'paved'] {
line/line-width: @cycleway-width-z15;
line/line-dasharray: 2,3.5;
line/line-width: @cycleway-width-z15;
[zoom >= 16] {
line/line-dasharray: 3,3.5;
line/line-width: @cycleway-width-z16;
}
[zoom >= 17] {
line/line-dasharray: 3,3;
}
[zoom >= 18] {
line/line-width: @cycleway-width-z18;
}
[zoom >= 19] {
line/line-width: @cycleway-width-z19;
line/line-width: @cycleway-width-z19;
}
}
[zoom >= 15][int_surface = null] {
line/line-color: @cycleway-fill;
line/line-dasharray: 1,3,2,4;
line/line-join: round;
line/line-cap: round;
line/line-width: @cycleway-width-z15;
[zoom >= 16] {
line/line-dasharray: 1,4,2,3;
line/line-width: @cycleway-width-z16;
}
[zoom >= 18] {
line/line-width: @cycleway-width-z18;
}
[zoom >= 19] {
line/line-width: @cycleway-width-z19;
}
}
[zoom >= 15][int_surface = 'unpaved'] {
line/line-dasharray: 0.5,2.5;
line/line-width: @cycleway-width-z15/1.7;
line/line-color: @cycleway-fill;
line/line-dasharray: 1,4;
line/line-join: round;
line/line-cap: round;
line/line-width: @cycleway-width-z15;
[zoom >= 16] {
line/line-width: @cycleway-width-z16;
}
[zoom >= 18] {
line/line-width: @cycleway-width-z18;
}
[zoom >= 19] {
line/line-dasharray: 0.8,2.5;
line/line-width: @cycleway-width-z19/1.7;
line/line-width: @cycleway-width-z19;
}
}
}
Expand Down

0 comments on commit 5a4089f

Please sign in to comment.