From 03656b6609fa462c4a034ba1dcb8252a1c8435b4 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 30 Aug 2019 23:42:48 +0900 Subject: [PATCH 1/3] Change initial and final aerodrome zlevel, check waypixels Change initial zoom level to z11 for airports, z13 for minor aerodromes, change last zoom level to <17 or waypixels<768000 Airport z10-17 icon z11-17 text, minor aerodrome z12-18 icon z13-18 text, and waypixels <768000 --- amenity-points.mss | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index b10aee55d0..e2b747d80d 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -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 <= 768000], + [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] { @@ -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'][zoom >= 13][zoom < 18]['access' = 'private'], + [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 18]['icao' = null], + [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 18]['iata' = null] { + [way_pixels <= 768000], + [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; From a0eb31b802434a162c03847494a9776fd54a33a1 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Sun, 1 Sep 2019 23:57:09 +0900 Subject: [PATCH 2/3] Change aerodrome final zlevel and waypixels limit Final zoom level z15 for airports with IATA code, z16 for other aerodromes, or if `way_pixels > 192000` --- amenity-points.mss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index e2b747d80d..41d2c499e7 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1488,11 +1488,11 @@ 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 <= 768000], + [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 16], + [feature = 'aeroway_aerodrome']['access' = 'private'][zoom >= 12][zoom < 17], + [feature = 'aeroway_aerodrome']['icao' = null][zoom >= 12][zoom < 17], + [feature = 'aeroway_aerodrome']['iata' = null][zoom >= 12][zoom < 17] { + [way_pixels <= 192000], [way_pixels = null] { marker-file: url('symbols/aerodrome.12.svg'); marker-placement: interior; @@ -3116,11 +3116,11 @@ text-placement: interior; } - [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 11][zoom < 17], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 18]['access' = 'private'], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 18]['icao' = null], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 18]['iata' = null] { - [way_pixels <= 768000], + [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 11][zoom < 16], + [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['access' = 'private'], + [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['icao' = null], + [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['iata' = null] { + [way_pixels <= 192000], [way_pixels = null] { text-name: "[name]"; text-size: @standard-font-size; From 2adc846d719c94e1c8e641b2a405f9be2366be0c Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Mon, 9 Sep 2019 18:51:02 +0900 Subject: [PATCH 3/3] Change final zoom level to z17/z18 for airport nodes --- amenity-points.mss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 41d2c499e7..5304a304a9 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1488,10 +1488,10 @@ marker-fill: @airtransport; } - [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 16], - [feature = 'aeroway_aerodrome']['access' = 'private'][zoom >= 12][zoom < 17], - [feature = 'aeroway_aerodrome']['icao' = null][zoom >= 12][zoom < 17], - [feature = 'aeroway_aerodrome']['iata' = null][zoom >= 12][zoom < 17] { + [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'); @@ -3116,10 +3116,10 @@ text-placement: interior; } - [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 11][zoom < 16], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['access' = 'private'], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['icao' = null], - [feature = 'aeroway_aerodrome'][zoom >= 13][zoom < 17]['iata' = null] { + [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]";