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.

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

Made military area rendering less prominent. #3057

Merged
merged 7 commits into from
Feb 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,7 @@
text-wrap-width: @landcover-wrap-width-size-bigger;
text-line-spacing: @landcover-line-spacing-size-bigger;
}
text-fill: darken(@danger_area, 40%);
text-fill: darken(@military, 40%);
text-face-name: @bold-fonts;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
Expand Down
38 changes: 17 additions & 21 deletions landcover.mss
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
@campsite: #def6c0; // also caravan_site, picnic_site
@cemetery: #aacbaf; // also grave_yard
@construction: #c7c7b4; // also brownfield
@danger_area: pink;
@danger_background: #fcd8db;
@heath: #d6d99f;
@mud: rgba(203,177,154,0.3); // produces #e6dcd1 over @land
@place_of_worship: #cdccc9;
Expand Down Expand Up @@ -237,19 +235,13 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'military_danger_area'] {
[zoom >= 9][zoom < 11] {
polygon-fill: @danger_area;
polygon-opacity: 0.3;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
[zoom >= 11] {
polygon-fill: @danger_background;
polygon-pattern-file: url('symbols/danger.svg');
[way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
[way_pixels >= 64] { polygon-pattern-gamma: 0.3; }
}
[feature = 'military_danger_area'][zoom >= 9] {
polygon-pattern-file: url('symbols/danger_red_hatch.png');
polygon-pattern-alignment: global;
line-color: @military;
line-width: 2.0;
line-offset: -1.0;
line-opacity: 0.2;
}

[feature = 'leisure_park'],
Expand Down Expand Up @@ -710,14 +702,18 @@
}

#landuse-overlay {
[landuse = 'military'][zoom >= 7][way_pixels > 900],
[landuse = 'military'][zoom >= 8][way_pixels > 100],
[landuse = 'military'][zoom >= 10][way_pixels > 75] {
[landuse = 'military'][zoom >= 8][way_pixels > 900],
[landuse = 'military'][zoom >= 13] {
polygon-pattern-file: url('symbols/military_red_hatch.png');
polygon-pattern-alignment: global;
line-color: @military;
line-width: 3;
line-opacity: 0.329;
line-color: @military;
line-opacity: 0.24;
line-width: 1.0;
line-offset: -0.5;
[zoom >= 15] {
line-width: 2;
line-offset: -1.0;
}
}
}

Expand Down
38 changes: 0 additions & 38 deletions symbols/danger.svg

This file was deleted.

Binary file added symbols/danger_red_hatch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified symbols/military_red_hatch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.