Skip to content

Commit

Permalink
Adjust aerodrome zoom levels (#3879)
Browse files Browse the repository at this point in the history
Change aerodrome initial & final zlevel and check waypixels

Change initial zoom level to z11 for airports, z13 for minor aerodromes, change last zoom level to <17 or waypixels<192000
After this PR, the icon for airports (with an IATA code) renders from z10 to z17 on points, and the text label from z11-17. Minor aerodromes (lacking IATA or ICAO codes) render the icon from z12-18 and text labels from z13-18. But in both cases, the icon and label are no longer shown if the area is greater than way_pixels 192000 (for example, 192 x 1000 pixels)
  • Loading branch information
jeisenbe authored Sep 20, 2019
1 parent eae0909 commit e3b7dd1
Showing 1 changed file with 30 additions and 8 deletions.
38 changes: 30 additions & 8 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1488,12 +1488,17 @@
marker-fill: @airtransport;
}

[feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 14],
[feature = 'aeroway_aerodrome'][zoom >= 11][zoom < 14] {
marker-file: url('symbols/aerodrome.12.svg');
marker-placement: interior;
marker-clip: false;
marker-fill: @airtransport;
[feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 17],
[feature = 'aeroway_aerodrome']['access' = 'private'][zoom >= 12][zoom < 18],
[feature = 'aeroway_aerodrome']['icao' = null][zoom >= 12][zoom < 18],
[feature = 'aeroway_aerodrome']['iata' = null][zoom >= 12][zoom < 18] {
[way_pixels <= 192000],
[way_pixels = null] {
marker-file: url('symbols/aerodrome.12.svg');
marker-placement: interior;
marker-clip: false;
marker-fill: @airtransport;
}
}

[feature = 'amenity_ferry_terminal'][zoom >= 15] {
Expand Down Expand Up @@ -3111,8 +3116,25 @@
text-placement: interior;
}

[feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 14],
[feature = 'aeroway_aerodrome'][zoom >= 11][zoom < 14],
[feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 11][zoom < 17],
[feature = 'aeroway_aerodrome']['access' = 'private'][zoom >= 13][zoom < 18],
[feature = 'aeroway_aerodrome']['icao' = null][zoom >= 13][zoom < 18],
[feature = 'aeroway_aerodrome']['iata' = null][zoom >= 13][zoom < 18] {
[way_pixels <= 192000],
[way_pixels = null] {
text-name: "[name]";
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
text-line-spacing: @standard-line-spacing-size;
text-fill: darken(@airtransport, 15%);
text-dy: 10;
text-face-name: @oblique-fonts;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
}
}

[feature = 'amenity_ferry_terminal'][zoom >= 15] {
text-name: "[name]";
text-size: @standard-font-size;
Expand Down

0 comments on commit e3b7dd1

Please sign in to comment.