[styles] Draw international airport icon from on z7-9.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-10-17 10:52:34 +03:00
parent 419e740224
commit ad19702be3
4 changed files with 19 additions and 84 deletions

View file

@ -41,9 +41,7 @@ area[natural=glacier],
area[natural=beach],
area[natural=desert],
area[leisure=beach_resort],
area[aeroway=airport][aerodrome=international],
area[aeroway=aerodrome][aerodrome=international],
area[aeroway=airport],
area[aeroway=aerodrome],
area[landuse=education],
{z-index: 1;}
@ -460,9 +458,7 @@ line[waterway][tunnel]
/* 7.LANDUSE */
area|z10-[aeroway=airport][aerodrome=international],
area|z10-[aeroway=aerodrome][aerodrome=international],
area|z10-[aeroway=airport],
area|z10-[aeroway=aerodrome],
area|z14-[amenity=hospital],
area|z14-[amenity=doctors],
@ -564,34 +560,22 @@ area|z16-[area:highway=living_street],
/* 7.6 Airports */
area|z10[aeroway=airport][aerodrome=international],
area|z10[aeroway=aerodrome][aerodrome=international],
area|z10[aeroway=aerodrome],
area|z10[aeroway=airport]
{fill-color: @aerodrome0;}
area|z11[aeroway=airport][aerodrome=international],
area|z11[aeroway=aerodrome][aerodrome=international],
area|z11[aeroway=aerodrome],
area|z11[aeroway=airport],
{fill-color: @aerodrome1;}
area|z12-[aeroway=airport][aerodrome=international],
area|z12-[aeroway=aerodrome][aerodrome=international],
area|z12-[aeroway=airport],
area|z12-[aeroway=aerodrome]
{fill-color: @aerodrome2;}
area|z13[aeroway=airport][aerodrome=international],
area|z13[aeroway=aerodrome][aerodrome=international],
area|z13[aeroway=airport],
area|z13[aeroway=aerodrome]
{fill-color: @aerodrome3;}
area|z14[aeroway=airport][aerodrome=international],
area|z14[aeroway=aerodrome][aerodrome=international],
area|z14[aeroway=airport],
area|z14[aeroway=aerodrome]
{fill-color: @aerodrome4;}
area|z15-19[aeroway=airport][aerodrome=international],
area|z15-19[aeroway=aerodrome][aerodrome=international],
area|z15-19[aeroway=airport],
area|z15-19[aeroway=aerodrome]
{fill-color: @aerodrome5;}

View file

@ -730,9 +730,7 @@ node|z14-[amenity=bus_station]::int_name,
area|z14-[amenity=bus_station]::int_name
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
area|z10-[aeroway=airport],
area|z10-[aeroway=aerodrome],
node|z10-[aeroway=airport],
node|z10-[aeroway=aerodrome],
node|z15-[aerialway=station],
node|z15-[aerialway=cable_car],
@ -747,9 +745,7 @@ node|z15-[aerialway=platter],
node|z15-[aerialway=rope_tow],
node|z16-[amenity=ferry_terminal]
{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
area|z12-[aeroway=airport]::int_name,
area|z12-[aeroway=aerodrome]::int_name,
node|z12-[aeroway=airport]::int_name,
node|z12-[aeroway=aerodrome]::int_name,
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
@ -901,32 +897,25 @@ node|z17-[amenity=ferry_terminal]
/* 3.6 Airport */
area|z10[aeroway=airport][aerodrome=international],
/* Manually define priority to avoid city names displacement */
area|z7-9[aeroway=aerodrome][aerodrome=international],
node|z7-9[aeroway=aerodrome][aerodrome=international],
{ icon-image: airport-s.svg; -x-me-icon-priority: 10000 }
area|z10[aeroway=aerodrome][aerodrome=international],
node|z10[aeroway=airport][aerodrome=international],
node|z10[aeroway=aerodrome][aerodrome=international]
node|z10[aeroway=aerodrome][aerodrome=international],
{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;text-optional: true;}
area|z11-13[aeroway=airport][aerodrome=international],
area|z11-13[aeroway=aerodrome][aerodrome=international],
node|z11-13[aeroway=airport][aerodrome=international],
node|z11-13[aeroway=aerodrome][aerodrome=international],
area|z12-13[aeroway=airport][aerodrome=international],
node|z12-13[aeroway=airport][aerodrome=international],
area|z12-13[aeroway=aerodrome][aerodrome=international],
node|z12-13[aeroway=aerodrome][aerodrome=international]
{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;text-optional: true;}
area|z12-13[aeroway=airport]::int_name,
node|z12-13[aeroway=airport]::int_name,
area|z12-13[aeroway=aerodrome]::int_name,
node|z12-13[aeroway=aerodrome]::int_name,
{font-size: 10;text-optional: true;}
area|z14-[aeroway=airport],
node|z14-[aeroway=airport],
area|z14-[aeroway=aerodrome],
node|z14-[aeroway=aerodrome]
{icon-image: airport-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
area|z14-[aeroway=airport]::int_name,
node|z14-[aeroway=airport]::int_name,
area|z14-[aeroway=aerodrome]::int_name,
node|z14-[aeroway=aerodrome]::int_name,
{font-size: 11;text-optional: true;}

View file

@ -40,9 +40,7 @@ area[natural=beach],
area[natural=desert],
area[leisure=beach_resort],
area[amenity=university],
area[aeroway=airport][aerodrome=international],
area[aeroway=aerodrome][aerodrome=international],
area[aeroway=airport],
area[aeroway=aerodrome]
{z-index: 1;}
@ -233,6 +231,7 @@ line|z10-[boundary=administrative][admin_level=4]
area|z10-[landuse=forest],
area|z10-[leisure=park],
area|z10-[leisure=nature_reserve],
area|z12-[leisure=garden],
area|z14-[landuse=grass],
area|z14-[natural=grassland],
@ -248,12 +247,9 @@ area|z14-[landuse=village_green],
area|z14-[landuse=field],
{fill-position: background; fill-opacity: 1;}
area|z10-[leisure=nature_reserve]
{fill-position: background; fill-opacity: 1;}
area|z10[landuse=forest],
area|z10[leisure=nature_reserve],
{fill-color: @green1;fill-opacity: 1;}
{fill-color: @green1;}
area|z14-[landuse=grass],
area|z14-[natural=grassland],
@ -268,37 +264,37 @@ area|z14-[landuse=meadow],
area|z14-[landuse=recreation_ground],
area|z14-[landuse=village_green],
area|z14-[landuse=field],
{fill-color: @green1;fill-opacity: 1;}
{fill-color: @green1;}
area|z11-12[landuse=forest],
area|z11-12[leisure=nature_reserve],
area|z10-12[leisure=park],
area|z12[leisure=garden],
{fill-color: @green2;fill-opacity: 1;}
{fill-color: @green2;}
area|z13[landuse=forest],
area|z13[leisure=nature_reserve],
area|z13[leisure=park],
area|z13[leisure=garden]
{fill-color: @green3;fill-opacity: 1;}
{fill-color: @green3;}
area|z14[landuse=forest],
area|z14[leisure=nature_reserve],
area|z14[leisure=park],
area|z14[leisure=garden]
{fill-color: @green4;fill-opacity: 1;}
{fill-color: @green4;}
area|z15[landuse=forest],
area|z15[leisure=nature_reserve],
area|z15[leisure=park],
area|z15[leisure=garden]
{fill-color: @green5;fill-opacity: 1;}
{fill-color: @green5;}
area|z16-[landuse=forest],
area|z16-[leisure=nature_reserve],
area|z16-[leisure=park],
area|z16-[leisure=garden]
{fill-color: @forest;fill-opacity: 1;}
{fill-color: @forest;}
area|z12-[natural=bare_rock],
{fill-color: @barerock;}
@ -408,9 +404,7 @@ line[waterway][tunnel]
/* 7.LANDUSE */
area|z10-[aeroway=airport][aerodrome=international],
area|z10-[aeroway=aerodrome][aerodrome=international],
area|z10-[aeroway=airport],
area|z10-[aeroway=aerodrome],
area|z14-[amenity=hospital],
area|z14-[amenity=doctors],
@ -479,34 +473,22 @@ area|z16-[landuse=cemetery]
/* 7.6 Airports */
area|z10[aeroway=airport][aerodrome=international],
area|z10[aeroway=aerodrome][aerodrome=international],
area|z10[aeroway=aerodrome],
area|z10[aeroway=airport]
{fill-color: @aerodrome0;fill-opacity: 1;}
area|z11[aeroway=airport][aerodrome=international],
area|z11[aeroway=aerodrome][aerodrome=international],
area|z11[aeroway=aerodrome],
area|z11[aeroway=airport],
{fill-color: @aerodrome1;fill-opacity: 1;}
area|z12-[aeroway=airport][aerodrome=international],
area|z12-[aeroway=aerodrome][aerodrome=international],
area|z12-[aeroway=airport],
area|z12-[aeroway=aerodrome]
{fill-color: @aerodrome2;fill-opacity: 1;}
area|z13[aeroway=airport][aerodrome=international],
area|z13[aeroway=aerodrome][aerodrome=international],
area|z13[aeroway=airport],
area|z13[aeroway=aerodrome]
{fill-color: @aerodrome3;fill-opacity: 1;}
area|z14[aeroway=airport][aerodrome=international],
area|z14[aeroway=aerodrome][aerodrome=international],
area|z14[aeroway=airport],
area|z14[aeroway=aerodrome]
{fill-color: @aerodrome4;fill-opacity: 1;}
area|z15-19[aeroway=airport][aerodrome=international],
area|z15-19[aeroway=aerodrome][aerodrome=international],
area|z15-19[aeroway=airport],
area|z15-19[aeroway=aerodrome]
{fill-color: @aerodrome5; fill-opacity: 1;}

View file

@ -164,9 +164,7 @@ area[amenity=bus_station],
node[tourism=viewpoint]
{z-index: 3050;}
area[aeroway=airport],
area[aeroway=aerodrome],
node[aeroway=airport],
node[aeroway=aerodrome],
node[amenity=parking],
area[amenity=parking],
@ -263,14 +261,10 @@ node|z17-[railway=tram_stop]::int_name,
area|z17-[railway=tram_stop]::int_name
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
area|z10-[aeroway=airport],
area|z10-[aeroway=aerodrome],
node|z10-[aeroway=airport],
node|z10-[aeroway=aerodrome],
{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
area|z12-[aeroway=airport]::int_name,
area|z12-[aeroway=aerodrome]::int_name,
node|z12-[aeroway=airport]::int_name,
node|z12-[aeroway=aerodrome]::int_name,
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
@ -333,49 +327,35 @@ area|z18-[railway=tram_stop]
/* 3.6 Airport */
area|z10[aeroway=airport][aerodrome=international],
/* Manually define priority to avoid city names displacement */
area|z7-9[aeroway=aerodrome][aerodrome=international],
node|z7-9[aeroway=aerodrome][aerodrome=international],
{ icon-image: airport-s.svg; -x-me-icon-priority: 10000 }
area|z10[aeroway=aerodrome][aerodrome=international],
node|z10[aeroway=airport][aerodrome=international],
node|z10[aeroway=aerodrome][aerodrome=international],
{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;}
area|z11-14[aeroway=airport][aerodrome=international],
area|z11-14[aeroway=aerodrome][aerodrome=international],
node|z11-14[aeroway=airport][aerodrome=international],
node|z11-14[aeroway=aerodrome][aerodrome=international],
area|z12-14[aeroway=airport],
node|z12-14[aeroway=airport],
area|z12-14[aeroway=aerodrome],
node|z12-14[aeroway=aerodrome],
{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;}
area|z12-14[aeroway=airport]::int_name,
node|z12-14[aeroway=airport]::int_name,
area|z12-14[aeroway=aerodrome]::int_name,
node|z12-14[aeroway=aerodrome]::int_name,
{font-size: 10;}
area|z15-16[aeroway=airport],
node|z15-16[aeroway=airport],
area|z15-16[aeroway=aerodrome],
node|z15-16[aeroway=aerodrome],
{icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
area|z15-16[aeroway=airport]::int_name,
node|z15-16[aeroway=airport]::int_name,
area|z15-16[aeroway=aerodrome]::int_name,
node|z15-16[aeroway=aerodrome]::int_name,
{font-size: 11;}
area|z17-[aeroway=airport],
node|z17-[aeroway=airport],
area|z17-[aeroway=aerodrome],
node|z17-[aeroway=aerodrome],
{icon-image: airport-m.svg;text-offset: 1;font-size: 13;}
area|z17-[aeroway=airport]::int_name,
node|z17-[aeroway=airport]::int_name,
area|z17-[aeroway=aerodrome]::int_name,
node|z17-[aeroway=aerodrome]::int_name,
{font-size: 12;}
area|z17-[aeroway=heliport],
node|z17-[aeroway=heliport],
{icon-image: helipad-m.svg;text-offset: 1;font-size: 11;text: name;text-color: @poi_label;}