forked from organicmaps/organicmaps
[styles] Fix styles for place=city and place=town: runtime selector ignores rules without capital and population.
This commit is contained in:
tatiana-yan
Daria Volvenkova
parent
465feecd44
commit
4e73d685f4
2 changed files with 96 additions and 96 deletions
|
|
@ -76,18 +76,18 @@ node[place=village]
|
|||
node[place=town]
|
||||
{z-index: 1100;}
|
||||
|
||||
node[place=city]
|
||||
node[place=city][capital!=2][population<40000]
|
||||
{z-index: 1200;}
|
||||
|
||||
node[place=city][capital=3],
|
||||
node[place=city][capital=4]
|
||||
node[place=city][capital=3][population<40000],
|
||||
node[place=city][capital=4][population<40000]
|
||||
{z-index: 1300;}
|
||||
|
||||
node[place=city][capital!=2][population>=40000],
|
||||
node[place=city][capital!=2][population>=40000]::int_name
|
||||
{z-index: 1400;}
|
||||
|
||||
node[place=city][capital=2]
|
||||
node[place=city][capital=2][population>=0]
|
||||
{z-index: 1450;}
|
||||
|
||||
node[place=ocean],
|
||||
|
|
@ -210,15 +210,15 @@ node|z4[place=city][capital!=2][population>=1000000],
|
|||
node|z5[place=city][capital!=2][population>=150000],
|
||||
node|z6[place=city][capital!=2][population>=50000],
|
||||
node|z7-8[place=city][capital!=2][population>=40000],
|
||||
node|z4-[place=city][capital=2],
|
||||
node|z9-[place=city]
|
||||
node|z9-[place=city][capital!=2][population<40000],
|
||||
node|z4-[place=city][capital=2][population>=0],
|
||||
{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
|
||||
node|z4[place=city][capital!=2][population>=1000000]::int_name,
|
||||
node|z5[place=city][capital!=2][population>=150000]::int_name,
|
||||
node|z6[place=city][capital!=2][population>=50000]::int_name,
|
||||
node|z7-8[place=city][capital!=2][population>=40000]::int_name,
|
||||
node|z4-[place=city][capital=2]::int_name,
|
||||
node|z9-[place=city]::int_name
|
||||
node|z4-[place=city][capital=2][population<40000]::int_name,
|
||||
node|z9-[place=city][capital!=2][population<40000]::int_name
|
||||
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
|
||||
|
||||
node|z4[place=city][capital!=2][population>=1000000],
|
||||
|
|
@ -226,90 +226,90 @@ node|z4[place=city][capital!=2][population>=1000000],
|
|||
node|z4[place=city][capital!=2][population>=1000000]::int_name
|
||||
{font-size: 8;text-halo-opacity: 0.7;}
|
||||
|
||||
node|z4[place=city][capital=2],
|
||||
node|z4[place=city][capital=2][population>=0],
|
||||
{icon-image: star-s.svg;text-offset: 1;font-size: 10;}
|
||||
node|z4[place=city][capital=2]::int_name
|
||||
node|z4[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 9;}
|
||||
|
||||
node|z5[place=city][capital!=2][population>=150000],
|
||||
{font-size: 10;text-halo-opacity: 0.6;}
|
||||
node|z5[place=city][capital!=2][population>=150000]::int_name
|
||||
{font-size: 9;text-halo-opacity: 0.6;}
|
||||
node|z5[place=city][capital=2]
|
||||
node|z5[place=city][capital=2][population>=0]
|
||||
{icon-image: star-m.svg;text-offset: 1;font-size: 10.4;}
|
||||
node|z5[place=city][capital=2]::int_name
|
||||
node|z5[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 9.4;}
|
||||
|
||||
node|z6[place=city][capital!=2][population>=50000]
|
||||
{font-size: 10.4;text-halo-opacity: 0.6;}
|
||||
node|z6[place=city][capital!=2][population>=50000]::int_name
|
||||
{font-size: 9.4;text-halo-opacity: 0.6;}
|
||||
node|z6[place=city][capital=2]
|
||||
node|z6[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11.6;}
|
||||
node|z6[place=city][capital=2]::int_name
|
||||
node|z6[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10.6;}
|
||||
|
||||
node|z7[place=city][capital!=2][population>=40000]
|
||||
{font-size: 10;text-halo-opacity: 0.8;}
|
||||
node|z7[place=city][capital!=2][population>=40000]::int_name
|
||||
{font-size: 9;text-halo-opacity: 0.8;}
|
||||
node|z7[place=city][capital=2]
|
||||
node|z7[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11;}
|
||||
node|z7[place=city][capital=2]::int_name
|
||||
node|z7[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10;}
|
||||
|
||||
node|z8[place=city][capital!=2][population>=40000]
|
||||
{font-size: 10.5;}
|
||||
node|z8[place=city][capital!=2][population>=40000]::int_name
|
||||
{font-size: 9.5;}
|
||||
node|z8[place=city][capital=2]
|
||||
node|z8[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11.5;}
|
||||
node|z8[place=city][capital=2]::int_name
|
||||
node|z8[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10.5;}
|
||||
|
||||
node|z9[place=city][capital=2]
|
||||
node|z9[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13; text-halo-radius: 0.5;}
|
||||
node|z9[place=city][capital=2]::int_name
|
||||
node|z9[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 12;text-halo-radius: 0.5;}
|
||||
node|z9[place=city],
|
||||
node|z9[place=city][capital!=2][population>=0],
|
||||
{font-size: 11;text-halo-radius: 0.5;}
|
||||
node|z9[place=city]::int_name
|
||||
node|z9[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 10;text-halo-radius: 0.5;}
|
||||
|
||||
node|z10[place=city][capital=2]
|
||||
node|z10[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13;}
|
||||
node|z10[place=city][capital=2]::int_name
|
||||
node|z10[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 12;}
|
||||
node|z10[place=city],
|
||||
node|z10[place=city][capital!=2][population>=0],
|
||||
{font-size: 11;text-halo-radius: 0.9;}
|
||||
node|z10[place=city]::int_name
|
||||
node|z10[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 10;text-halo-radius: 0.9;}
|
||||
|
||||
node|z11[place=city][capital=2]
|
||||
node|z11[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 12;}
|
||||
node|z11[place=city][capital=2]::int_name
|
||||
node|z11[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;}
|
||||
node|z11[place=city],
|
||||
node|z11[place=city][capital!=2][population>=0],
|
||||
{font-size: 12;}
|
||||
node|z11[place=city]::int_name
|
||||
node|z11[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 11;}
|
||||
|
||||
node|z12[place=city][capital=2]
|
||||
node|z12[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13;}
|
||||
node|z12[place=city][capital=2]::int_name
|
||||
node|z12[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;}
|
||||
node|z12[place=city],
|
||||
node|z12[place=city][capital!=2][population>=0],
|
||||
{font-size: 13;text-color: @label_medium;}
|
||||
node|z12[place=city]::int_name
|
||||
node|z12[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 11;text-color: @label_medium;}
|
||||
|
||||
node|z13-[place=city][capital=2]
|
||||
node|z13-[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 14;text-color: @label_medium;}
|
||||
node|z13-[place=city][capital=2]::int_name
|
||||
node|z13-[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;text-color: @label_medium;}
|
||||
node|z13-[place=city],
|
||||
node|z13-[place=city][capital!=2][population>=0],
|
||||
{font-size: 14;text-color: @label_medium;}
|
||||
node|z13-[place=city]::int_name
|
||||
node|z13-[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 12;text-color: @label_medium;}
|
||||
|
||||
/* 4.2 Town */
|
||||
|
|
@ -320,9 +320,9 @@ node|z9[place=town][population>=20000]
|
|||
node|z8[place=town][population>=40000]::int_name,
|
||||
node|z9[place=town][population>=20000]::int_name
|
||||
{text:int_name;text-color: @city_label;}
|
||||
node|z10-[place=town],
|
||||
node|z10-[place=town][population<20000],
|
||||
{text: name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
|
||||
node|z10-[place=town]::int_name
|
||||
node|z10-[place=town][population<20000]::int_name
|
||||
{text:int_name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
|
||||
|
||||
node|z8[place=town][population>=40000]
|
||||
|
|
@ -335,24 +335,24 @@ node|z9[place=town][population>=20000]
|
|||
node|z9[place=town][population>=20000]::int_name
|
||||
{font-size: 9;}
|
||||
|
||||
node|z10[place=town]
|
||||
node|z10[place=town][population<20000]
|
||||
{font-size: 10;text-color: @city_label;text-halo-opacity: 0.7;}
|
||||
node|z10[place=town]::int_name
|
||||
node|z10[place=town][population<20000]::int_name
|
||||
{font-size: 9;text-color: @city_label;text-halo-opacity: 0.7;}
|
||||
|
||||
node|z11[place=town]
|
||||
node|z11[place=town][population>=0]
|
||||
{font-size: 11;}
|
||||
node|z11[place=town]::int_name
|
||||
node|z11[place=town][population>=0]::int_name
|
||||
{font-size: 10;}
|
||||
|
||||
node|z12[place=town]
|
||||
node|z12[place=town][population>=0]
|
||||
{font-size: 12;text-halo-opacity: 1;}
|
||||
node|z12[place=town]::int_name
|
||||
node|z12[place=town][population>=0]::int_name
|
||||
{font-size: 10;text-halo-opacity: 1;}
|
||||
|
||||
node|z13-[place=town]
|
||||
node|z13-[place=town][population>=0]
|
||||
{font-size: 14;}
|
||||
node|z13-[place=town]::int_name
|
||||
node|z13-[place=town][population>=0]::int_name
|
||||
{font-size: 12;}
|
||||
|
||||
/* 4.3 Village */
|
||||
|
|
|
|||
|
|
@ -77,18 +77,18 @@ node[place=village]
|
|||
node[place=town]
|
||||
{z-index: 1100;}
|
||||
|
||||
node[place=city]
|
||||
node[place=city][capital!=2][population<40000]
|
||||
{z-index: 1200;}
|
||||
|
||||
node[place=city][capital=3],
|
||||
node[place=city][capital=4]
|
||||
node[place=city][capital=3][population<40000],
|
||||
node[place=city][capital=4][population<40000]
|
||||
{z-index: 1300;}
|
||||
|
||||
node[place=city][capital!=2][population>=40000],
|
||||
node[place=city][capital!=2][population>=40000]::int_name
|
||||
{z-index: 1400;}
|
||||
|
||||
node[place=city][capital=2]
|
||||
node[place=city][capital=2][population>=0]
|
||||
{z-index: 1450;}
|
||||
|
||||
node[place=ocean],
|
||||
|
|
@ -192,105 +192,105 @@ node|z4[place=city][capital!=2][population>=1000000],
|
|||
node|z5[place=city][capital!=2][population>=150000],
|
||||
node|z6[place=city][capital!=2][population>=50000],
|
||||
node|z7-8[place=city][capital!=2][population>=40000],
|
||||
node|z4-[place=city][capital=2],
|
||||
node|z9-[place=city]
|
||||
node|z9-[place=city][capital!=2][population<40000]
|
||||
node|z4-[place=city][capital=2][population>=0],
|
||||
{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
|
||||
node|z4[place=city][capital!=2][population>=1000000]::int_name,
|
||||
node|z5[place=city][capital!=2][population>=150000]::int_name,
|
||||
node|z6[place=city][capital!=2][population>=50000]::int_name,
|
||||
node|z7-8[place=city][capital!=2][population>=40000]::int_name,
|
||||
node|z4-[place=city][capital=2]::int_name,
|
||||
node|z9-[place=city]::int_name
|
||||
node|z4-[place=city][capital=2][population<40000]::int_name,
|
||||
node|z9-[place=city][capital!=2][population<40000]::int_name
|
||||
{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
|
||||
|
||||
node|z4[place=city][capital!=2][population>=1000000],
|
||||
{font-size: 9;text-halo-opacity: 0.7;}
|
||||
node|z4[place=city][capital!=2][population>=1000000]::int_name
|
||||
{font-size: 8;text-halo-opacity: 0.7;}
|
||||
node|z4[place=city][capital=2],
|
||||
node|z4[place=city][capital=2][population>=0],
|
||||
{icon-image: star-s.svg;text-offset: 1;font-size: 10;}
|
||||
node|z4[place=city][capital=2]::int_name
|
||||
node|z4[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 9;}
|
||||
|
||||
node|z5[place=city][capital!=2][population>=150000],
|
||||
{font-size: 10;text-halo-opacity: 0.6;}
|
||||
node|z5[place=city][capital!=2][population>=150000]::int_name
|
||||
{font-size: 9;text-halo-opacity: 0.6;}
|
||||
node|z5[place=city][capital=2]
|
||||
node|z5[place=city][capital=2][population>=0]
|
||||
{icon-image: star-m.svg;text-offset: 1;font-size: 10.4;}
|
||||
node|z5[place=city][capital=2]::int_name
|
||||
node|z5[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 9.4;}
|
||||
|
||||
node|z6[place=city][capital!=2][population>=40000]
|
||||
{font-size: 10.4;text-halo-opacity: 0.6;}
|
||||
node|z6[place=city][capital!=2][population>=40000]::int_name
|
||||
{font-size: 9.4;text-halo-opacity: 0.6;}
|
||||
node|z6[place=city][capital=2]
|
||||
node|z6[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11.6;}
|
||||
node|z6[place=city][capital=2]::int_name
|
||||
node|z6[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10.6;}
|
||||
|
||||
node|z7[place=city][capital!=2][population>=20000]
|
||||
{font-size: 10;text-halo-opacity: 0.8;}
|
||||
node|z7[place=city][capital!=2][population>=20000]::int_name
|
||||
{font-size: 9;text-halo-opacity: 0.8;}
|
||||
node|z7[place=city][capital=2]
|
||||
node|z7[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11;}
|
||||
node|z7[place=city][capital=2]::int_name
|
||||
node|z7[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10;}
|
||||
|
||||
node|z8[place=city][capital!=2][population>=40000]
|
||||
{font-size: 10.5;}
|
||||
node|z8[place=city][capital!=2][population>=40000]::int_name
|
||||
{font-size: 9.5;}
|
||||
node|z8[place=city][capital=2]
|
||||
node|z8[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 11.5;}
|
||||
node|z8[place=city][capital=2]::int_name
|
||||
node|z8[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 10.5;}
|
||||
|
||||
node|z9[place=city][capital=2]
|
||||
node|z9[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13; text-halo-radius: 0.5;}
|
||||
node|z9[place=city][capital=2]::int_name
|
||||
node|z9[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 12;text-halo-radius: 0.5;}
|
||||
node|z9[place=city],
|
||||
node|z9[place=city][capital!=2][population>=0],
|
||||
{font-size: 11;text-halo-radius: 0.5;}
|
||||
node|z9[place=city]::int_name
|
||||
node|z9[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 10;text-halo-radius: 0.5;}
|
||||
|
||||
node|z10[place=city][capital=2]
|
||||
node|z10[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13;}
|
||||
node|z10[place=city][capital=2]::int_name
|
||||
node|z10[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 12;}
|
||||
node|z10[place=city],
|
||||
node|z10[place=city][capital!=2][population>=0],
|
||||
{font-size: 11;text-halo-radius: 0.9;}
|
||||
node|z10[place=city]::int_name
|
||||
node|z10[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 10;text-halo-radius: 0.9;}
|
||||
|
||||
node|z11[place=city][capital=2]
|
||||
node|z11[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 12;}
|
||||
node|z11[place=city][capital=2]::int_name
|
||||
node|z11[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;}
|
||||
node|z11[place=city],
|
||||
node|z11[place=city][capital!=2][population>=0],
|
||||
{font-size: 12;}
|
||||
node|z11[place=city]::int_name
|
||||
node|z11[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 11;}
|
||||
|
||||
node|z12[place=city][capital=2]
|
||||
node|z12[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 13;}
|
||||
node|z12[place=city][capital=2]::int_name
|
||||
node|z12[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;}
|
||||
node|z12[place=city],
|
||||
node|z12[place=city][capital!=2][population>=0],
|
||||
{font-size: 13;text-color: @label_medium;}
|
||||
node|z12[place=city]::int_name
|
||||
node|z12[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 11;text-color: @label_medium;}
|
||||
|
||||
node|z13-[place=city][capital=2]
|
||||
node|z13-[place=city][capital=2][population>=0]
|
||||
{icon-image: star-l.svg;text-offset: 1;font-size: 14;text-color: @label_medium;}
|
||||
node|z13-[place=city][capital=2]::int_name
|
||||
node|z13-[place=city][capital=2][population>=0]::int_name
|
||||
{text-offset: 1;font-size: 11;text-color: @label_medium;}
|
||||
node|z13-[place=city],
|
||||
node|z13-[place=city][capital!=2][population>=0],
|
||||
{font-size: 14;text-color: @label_medium;}
|
||||
node|z13-[place=city]::int_name
|
||||
node|z13-[place=city][capital!=2][population>=0]::int_name
|
||||
{font-size: 12;text-color: @label_medium;}
|
||||
|
||||
/* 4.2 Town */
|
||||
|
|
@ -301,9 +301,9 @@ node|z9[place=town][population>=20000]
|
|||
node|z8[place=town][population>=30000]::int_name,
|
||||
node|z9[place=town][population>=20000]::int_name
|
||||
{text:int_name;text-color: @city_label;}
|
||||
node|z10-[place=town],
|
||||
node|z10-[place=town][population<20000],
|
||||
{text: name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
|
||||
node|z10-[place=town]::int_name
|
||||
node|z10-[place=town][population<20000]::int_name
|
||||
{text:int_name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
|
||||
|
||||
node|z8[place=town][population>=40000]
|
||||
|
|
@ -316,24 +316,24 @@ node|z9[place=town][population>=20000]
|
|||
node|z9[place=town][population>=20000]::int_name
|
||||
{font-size: 9;}
|
||||
|
||||
node|z10[place=town]
|
||||
node|z10[place=town][population<20000]
|
||||
{font-size: 10;text-color: @city_label;text-halo-opacity: 0.7;}
|
||||
node|z10[place=town]::int_name
|
||||
node|z10[place=town][population<20000]::int_name
|
||||
{font-size: 9;text-color: @city_label;text-halo-opacity: 0.7;}
|
||||
|
||||
node|z11[place=town]
|
||||
node|z11[place=town][population>=0]
|
||||
{font-size: 11;}
|
||||
node|z11[place=town]::int_name
|
||||
node|z11[place=town][population>=0]::int_name
|
||||
{font-size: 10;}
|
||||
|
||||
node|z12[place=town]
|
||||
node|z12[place=town][population>=0]
|
||||
{font-size: 12;text-halo-opacity: 1;}
|
||||
node|z12[place=town]::int_name
|
||||
node|z12[place=town][population>=0]::int_name
|
||||
{font-size: 10;text-halo-opacity: 1;}
|
||||
|
||||
node|z13-[place=town]
|
||||
node|z13-[place=town][population>=0]
|
||||
{font-size: 14;}
|
||||
node|z13-[place=town]::int_name
|
||||
node|z13-[place=town][population>=0]::int_name
|
||||
{font-size: 12;}
|
||||
|
||||
/* 4.3 Village */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue