[styles] Airports fixes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-02-13 13:58:34 +00:00 committed by Viktor Govako
parent dd8ec3bde7
commit e5f9cdac0f
3 changed files with 36 additions and 48 deletions

View file

@ -743,8 +743,10 @@ 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=aerodrome],
node|z10-[aeroway=aerodrome],
area|z10-[aeroway=aerodrome][aerodrome=international],
node|z10-[aeroway=aerodrome][aerodrome=international],
area|z14-[aeroway=aerodrome],
node|z14-[aeroway=aerodrome],
node|z15-[aerialway=station],
node|z15-[aerialway=cable_car],
node|z15-[aerialway=chair_lift],
@ -758,8 +760,10 @@ 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=aerodrome]::int_name,
node|z12-[aeroway=aerodrome]::int_name,
area|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
area|z14-[aeroway=aerodrome]::int_name,
node|z14-[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;}
/* 3.1 Train Station */
@ -910,28 +914,22 @@ node|z17-[amenity=ferry_terminal]
/* 3.6 Airport */
/* 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 }
{icon-image: airport-s.svg;}
area|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;}
{icon-image: airport-s.svg;text-offset: 1;font-size: 10;}
area|z11-13[aeroway=aerodrome][aerodrome=international],
node|z11-13[aeroway=aerodrome][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=aerodrome]::int_name,
node|z12-13[aeroway=aerodrome]::int_name,
{font-size: 10;text-optional: true;}
{icon-image: airport-m.svg; text-offset: 1; font-size: 11;}
area|z14-[aeroway=aerodrome],
node|z14-[aeroway=aerodrome]
{icon-image: airport-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
{icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
area|z14-[aeroway=aerodrome]::int_name,
node|z14-[aeroway=aerodrome]::int_name,
{font-size: 11;text-optional: true;}
{font-size: 11;}
area|z16-[aeroway=heliport],
area|z16-[aeroway=helipad],

View file

@ -475,22 +475,22 @@ area|z16-[landuse=cemetery]
area|z10[aeroway=aerodrome][aerodrome=international],
area|z10[aeroway=aerodrome],
{fill-color: @aerodrome0;fill-opacity: 1;}
{fill-color: @aerodrome0;}
area|z11[aeroway=aerodrome][aerodrome=international],
area|z11[aeroway=aerodrome],
{fill-color: @aerodrome1;fill-opacity: 1;}
{fill-color: @aerodrome1;}
area|z12-[aeroway=aerodrome][aerodrome=international],
area|z12-[aeroway=aerodrome]
{fill-color: @aerodrome2;fill-opacity: 1;}
{fill-color: @aerodrome2;}
area|z13[aeroway=aerodrome][aerodrome=international],
area|z13[aeroway=aerodrome]
{fill-color: @aerodrome3;fill-opacity: 1;}
{fill-color: @aerodrome3;}
area|z14[aeroway=aerodrome][aerodrome=international],
area|z14[aeroway=aerodrome]
{fill-color: @aerodrome4;fill-opacity: 1;}
{fill-color: @aerodrome4;}
area|z15-19[aeroway=aerodrome][aerodrome=international],
area|z15-19[aeroway=aerodrome]
{fill-color: @aerodrome5; fill-opacity: 1;}
{fill-color: @aerodrome5;}
/* 7.7 Religion */
area|z15-[landuse=churchyard]

View file

@ -153,8 +153,6 @@ area[amenity=bus_station],
node[tourism=viewpoint]
{z-index: 3050;}
area[aeroway=aerodrome],
node[aeroway=aerodrome],
node[amenity=parking],
area[amenity=parking],
node[railway=station],
@ -250,11 +248,15 @@ 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=aerodrome],
node|z10-[aeroway=aerodrome],
area|z10-[aeroway=aerodrome][aerodrome=international],
node|z10-[aeroway=aerodrome][aerodrome=international],
area|z14-[aeroway=aerodrome],
node|z14-[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=aerodrome]::int_name,
node|z12-[aeroway=aerodrome]::int_name,
area|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
area|z14-[aeroway=aerodrome]::int_name,
node|z14-[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;}
/* 3.1 Train Station */
@ -316,34 +318,22 @@ area|z18-[railway=tram_stop]
/* 3.6 Airport */
/* 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 }
{icon-image: airport-s.svg;}
area|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;}
area|z11-14[aeroway=aerodrome][aerodrome=international],
node|z11-14[aeroway=aerodrome][aerodrome=international],
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=aerodrome]::int_name,
node|z12-14[aeroway=aerodrome]::int_name,
{font-size: 10;}
area|z15-16[aeroway=aerodrome],
node|z15-16[aeroway=aerodrome],
{icon-image: airport-s.svg;text-offset: 1;font-size: 10;}
area|z11-13[aeroway=aerodrome][aerodrome=international],
node|z11-13[aeroway=aerodrome][aerodrome=international],
{icon-image: airport-m.svg; text-offset: 1; font-size: 11;}
area|z14-[aeroway=aerodrome],
node|z14-[aeroway=aerodrome]
{icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
area|z15-16[aeroway=aerodrome]::int_name,
node|z15-16[aeroway=aerodrome]::int_name,
area|z14-[aeroway=aerodrome]::int_name,
node|z14-[aeroway=aerodrome]::int_name,
{font-size: 11;}
area|z17-[aeroway=aerodrome],
node|z17-[aeroway=aerodrome],
{icon-image: airport-m.svg;text-offset: 1;font-size: 13;}
area|z17-[aeroway=aerodrome]::int_name,
node|z17-[aeroway=aerodrome]::int_name,
{font-size: 12;}
area|z17-[aeroway=heliport],
node|z17-[aeroway=heliport],