Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up z13 #3467

Merged
merged 5 commits into from
Nov 3, 2018
Merged

Clean up z13 #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a90ea4
Clean up z13 and z14
Oct 7, 2018
d07b2bf
Drop buildings up to z13 instead of z13
Oct 28, 2018
94df321
Correctly drop minor waterways from z13
Oct 28, 2018
f1b4bdb
Render intermittent streams/ditches/drains from z15
Oct 28, 2018
9645dab
Reduce lightening of tramways
Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildings.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@entrance-normal: @building-line;

#buildings {
[zoom >= 13] {
[zoom >= 14] {
polygon-fill: @building-low-zoom;
polygon-clip: false;
line-width: 0;
Expand Down
6 changes: 4 additions & 2 deletions landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@
[feature = 'leisure_playground'][zoom >= 13],
[feature = 'leisure_fitness_station'][zoom >= 13] {
polygon-fill: @leisure;
line-color: darken(@leisure, 60%);
line-width: 0.3;
[zoom >= 15] {
line-color: darken(@leisure, 60%);
line-width: 0.3;
}
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
Expand Down
4 changes: 2 additions & 2 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ Layer:
ORDER BY COALESCE(layer,0), way_area DESC
) AS buildings
properties:
minzoom: 13
minzoom: 14
- id: tunnels
class: access
geometry: linestring
Expand Down Expand Up @@ -2063,7 +2063,7 @@ Layer:
'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist',
'atm', 'bicycle_rental', 'bureau_de_change', 'car_rental', 'car_wash', 'post_box', 'post_office',
'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'internet_cafe', 'public_bookcase',
'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre',
'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre',
'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school',
'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END,
'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
Expand Down
63 changes: 26 additions & 37 deletions roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,9 @@
@secondary-link-width-z13: 4;
@tertiary-width-z13: 4;
@residential-width-z13: 2.5;
@service-width-z13: 0.8;
@living-street-width-z13: 2;
@pedestrian-width-z13: 2;
@bridleway-width-z13: 0.3;
@footway-width-z13: 0.7;
@footway-width-z14: 0.7;
@cycleway-width-z13: 0.7;
@track-width-z13: 0.5;
@track-grade1-width-z13: 0.5;
Expand Down Expand Up @@ -556,10 +554,9 @@
}

[feature = 'highway_pedestrian'] {
[zoom >= 13] {
[zoom >= 14] {
line-color: @pedestrian-casing;
line-width: @pedestrian-width-z13;
[zoom >= 14] { line-width: @pedestrian-width-z14; }
line-width: @pedestrian-width-z14;
[zoom >= 15] { line-width: @pedestrian-width-z15; }
[zoom >= 16] { line-width: @pedestrian-width-z16; }
[zoom >= 17] { line-width: @pedestrian-width-z17; }
Expand All @@ -573,19 +570,20 @@
line-dasharray: 4,2;
}
#bridges {
[zoom >= 14] {
line-color: @bridge-casing;
line-join: round;
}
line-color: @bridge-casing;
line-join: round;
}
}
}

[feature = 'highway_living_street'] {
[zoom >= 13] {
line-color: @living-street-casing;
line-color: @residential-casing;
line-width: @living-street-width-z13;
[zoom >= 14] { line-width: @living-street-width-z14; }
[zoom >= 14] {
line-color: @living-street-casing;
line-width: @living-street-width-z14;
}
[zoom >= 15] { line-width: @living-street-width-z15; }
[zoom >= 16] { line-width: @living-street-width-z16; }
[zoom >= 17] { line-width: @living-street-width-z17; }
Expand Down Expand Up @@ -655,7 +653,7 @@
#bridges {
[zoom >= 14][access != 'no'],
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * (@paths-background-width + @paths-bridge-casing-width);
line-width: @footway-width-z14 + 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); }
Expand All @@ -667,7 +665,7 @@
#tunnels {
[zoom >= 14][access != 'no'],
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * (@paths-background-width + @paths-tunnel-casing-width);
line-width: @footway-width-z14 + 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); }
Expand Down Expand Up @@ -859,7 +857,7 @@
#bridges {
[zoom >= 14][access != 'no'],
[zoom >= 15] {
line-width: @footway-width-z13 + 2 * @paths-background-width;
line-width: @footway-width-z14 + 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; }
Expand All @@ -869,12 +867,12 @@
}
}
#tunnels {
[zoom >= 13][access != 'no'],
[zoom >= 14][access != 'no'],
[zoom >= 15] {
line-color: @footway-casing;
line-cap: round;
line-join: round;
line-width: @footway-width-z13 + 2 * @paths-background-width;
line-width: @footway-width-z14 + 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; }
Expand Down Expand Up @@ -1558,10 +1556,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}

[feature = 'highway_service'] {
[zoom >= 13][service = 'INT-normal'] {
line-width: @service-width-z13;
line-color: @unimportant-road;
}
[zoom >= 14][service = 'INT-normal'],
[zoom >= 16][service = 'INT-minor'] {
line-color: @service-fill;
Expand Down Expand Up @@ -1602,18 +1596,16 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}

[feature = 'highway_pedestrian'] {
[zoom >= 13] {
line-width: @living-street-width-z13 - 2 * @casing-width-z13;
[zoom >= 14] { line-width: @pedestrian-width-z14 - 2 * @casing-width-z14; }
[zoom >= 14] {
line-width: @pedestrian-width-z14 - 2 * @casing-width-z14;
[zoom >= 15] { line-width: @pedestrian-width-z15 - 2 * @casing-width-z15; }
[zoom >= 16] { line-width: @pedestrian-width-z16 - 2 * @casing-width-z16; }
[zoom >= 17] { line-width: @pedestrian-width-z17 - 2 * @casing-width-z17; }
[zoom >= 18] { line-width: @pedestrian-width-z18 - 2 * @casing-width-z18; }
[zoom >= 19] { line-width: @pedestrian-width-z19 - 2 * @casing-width-z19; }
line-color: @pedestrian-fill;
#bridges {
line-width: @pedestrian-width-z13 - 2 * @casing-width-z13;
[zoom >= 14] { line-width: @pedestrian-width-z14 - 2 * @bridge-casing-width-z14; }
line-width: @pedestrian-width-z14 - 2 * @bridge-casing-width-z14;
[zoom >= 15] { line-width: @pedestrian-width-z15 - 2 * @bridge-casing-width-z15; }
[zoom >= 16] { line-width: @pedestrian-width-z16 - 2 * @bridge-casing-width-z16; }
[zoom >= 17] { line-width: @pedestrian-width-z17 - 2 * @bridge-casing-width-z17; }
Expand Down Expand Up @@ -1696,7 +1688,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */

[feature = 'highway_footway'],
[feature = 'highway_path'][bicycle != 'designated'][horse != 'designated'] {
[zoom >= 13][access != 'no'],
[zoom >= 14][access != 'no'],
[zoom >= 15] {
#roads-fill[zoom >= 15] {
background/line-color: @footway-casing;
Expand All @@ -1719,7 +1711,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line/line-dasharray: 1,3;
line/line-join: round;
line/line-cap: round;
line/line-width: @footway-width-z13;
line/line-width: @footway-width-z14;
[zoom >= 15][int_surface = 'paved'] {
line/line-dasharray: 2,3.5;
line/line-width: @footway-width-z15;
Expand Down Expand Up @@ -2015,9 +2007,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 12] {
line-color: #6E6E6E;
line-width: 0.75;
[zoom >= 13] {
line-color: #444;
}
[zoom >= 14] {
line-width: 1;
}
Expand Down Expand Up @@ -2400,25 +2389,25 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */

#highway-area-casing {
[feature = 'highway_residential'],
[feature = 'highway_unclassified'] {
[feature = 'highway_unclassified'],
[feature = 'highway_service'] {
[zoom >= 14] {
line-color: #999;
line-width: 1;
}
}

[feature = 'highway_pedestrian'],
[feature = 'highway_service'],
[feature = 'highway_footway'],
[feature = 'highway_cycleway'],
[feature = 'highway_path'] {
[zoom >= 14] {
[zoom >= 15] {
line-color: grey;
line-width: 1;
}
}

[feature = 'highway_track'][zoom >= 14] {
[feature = 'highway_track'][zoom >= 15] {
line-color: @track-fill;
line-width: 1;
line-dasharray: 5,4,2,4;
Expand Down Expand Up @@ -2454,12 +2443,12 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[feature = 'highway_footway'],
[feature = 'highway_cycleway'],
[feature = 'highway_path'] {
[zoom >= 14] {
[zoom >= 15] {
polygon-fill: @pedestrian-fill;
}
}

[feature = 'highway_track'][zoom >= 14] {
[feature = 'highway_track'][zoom >= 15] {
polygon-fill: #cdbea0;
}

Expand Down
24 changes: 12 additions & 12 deletions water.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
[waterway = 'ditch'],
[waterway = 'drain'] {
[int_tunnel = 'no'] {
[zoom >= 13] {
[int_intermittent != 'yes'][zoom >= 14],
[zoom >= 15] {
line-width: 2.5;
line-color: white;
[waterway = 'stream'][zoom >= 15] {
Expand Down Expand Up @@ -193,7 +194,8 @@
[waterway = 'stream'],
[waterway = 'ditch'],
[waterway = 'drain'] {
[zoom >= 13] {
[int_intermittent != 'yes'][zoom >= 14],
[zoom >= 15] {
// the additional line of land color is used to provide a background for dashed casings
[int_tunnel = 'yes'] {
background/line-width: 2;
Expand All @@ -203,16 +205,14 @@
water/line-color: @water-color;

[bridge = 'yes'] {
[zoom >= 14] {
bridgecasing/line-color: black;
bridgecasing/line-join: round;
bridgecasing/line-width: 4;
[waterway = 'stream'][zoom >= 15] { bridgecasing/line-width: 4; }
bridgeglow/line-color: white;
bridgeglow/line-join: round;
bridgeglow/line-width: 3;
[waterway = 'stream'][zoom >= 15] { bridgeglow/line-width: 3; }
}
bridgecasing/line-color: black;
bridgecasing/line-join: round;
bridgecasing/line-width: 4;
[waterway = 'stream'][zoom >= 15] { bridgecasing/line-width: 4; }
bridgeglow/line-color: white;
bridgeglow/line-join: round;
bridgeglow/line-width: 3;
[waterway = 'stream'][zoom >= 15] { bridgeglow/line-width: 3; }
}

[int_intermittent = 'yes'] {
Expand Down