organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[styles] Fix road labels inconsistencies

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-03-01 10:23:26 +02:00 • committed by Viktor Govako
parent aa095b006c
commit 5c0e991e77
6 changed files with 79 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
data/styles/clear/include/Roads_label.mapcss
View file

@ -126,83 +126,63 @@ line|z19-[highway=tertiary]::shield,
line|z10-[highway=trunk],
line|z10-[highway=motorway],
line|z10-[highway=motorway_link],
line|z10-[highway=trunk_link]
{text: name;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-radius: 1;text-halo-color: @label_halo_light;}
line|z10-[highway=trunk_link],
{text: name; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
line|z10-11[highway=motorway],
line|z10-11[highway=trunk],
line|z10-11[highway=motorway_link],
line|z10-11[highway=trunk_link]
{font-size: 10;text-color: @label_dark;text-halo-opacity: 0.8;text-halo-color: @label_halo_medium;}
{font-size: 11; text-color: @label_medium; text-halo-opacity: 0.9;}
line|z12-13[highway=motorway],
line|z12-13[highway=trunk],
line|z12-13[highway=motorway_link],
line|z12-13[highway=trunk_link]
{font-size: 12;text-halo-color: @label_halo_medium;}
line|z14-15[highway=motorway],
line|z14-15[highway=trunk],
{font-size: 13;text-color: @label_dark;text-halo-opacity: 0.8;}
line|z14[highway=motorway_link],
line|z14[highway=trunk_link]
{font-size: 10;text-halo-color: @label_halo_medium;}
line|z15[highway=motorway_link],
line|z15[highway=trunk_link]
{font-size: 11;text-halo-color: @label_halo_medium;}
line|z16-17[highway=trunk],
line|z16-17[highway=motorway],
{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.8;}
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1;}
line|z14-[highway=trunk],
line|z14-[highway=motorway],
{font-size: 14; text-color: @label_dark; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
line|z10-13[highway=motorway_link],
line|z10-13[highway=trunk_link],
{font-size: 10; text-color: @label_medium; text-halo-opacity: 0.7;}
line|z14-15[highway=motorway_link],
line|z14-15[highway=trunk_link],
{font-size: 11; text-color: @label_medium; text-halo-opacity: 0.9;}
line|z16-[highway=motorway_link],
line|z16-[highway=trunk_link]
{font-size: 12;text-halo-opacity: 1;}
line|z18-[highway=trunk],
line|z18-[highway=motorway],
{font-size: 14;text-color: @label_dark;text-halo-opacity: 1;}
line|z16-[highway=trunk_link],
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
/* 4.PRIMARY 10-22 ZOOM */
line|z10-[highway=primary],
line|z11-[highway=primary_link],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
{text: name; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
line|z10-11[highway=primary],
line|z11[highway=primary_link]
{font-size: 10;text-halo-color: @label_halo_medium;}
line|z12-13[highway=primary],
line|z12-13[highway=primary_link]
{font-size: 10;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
line|z10-13[highway=primary],
line|z11-13[highway=primary_link],
{font-size: 10; text-color: @label_medium; text-halo-opacity: 0.7;}
line|z14-15[highway=primary],
{font-size: 13;text-color: @label_dark;}
line|z14[highway=primary_link]
{font-size: 10;text-halo-color: @label_halo_medium;}
line|z15[highway=primary_link]
{font-size: 11;text-halo-color: @label_halo_medium;}
{font-size: 13; text-color: @label_dark; text-halo-opacity: 0.9;}
line|z16-[highway=primary],
{font-size: 14;text-color: @label_dark;}
line|z16-17[highway=primary_link],
{font-size: 12;}
line|z18-[highway=primary_link],
{font-size: 12;text-halo-opacity: 1;}
{font-size: 14; text-color: @label_dark; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
line|z14-15[highway=primary_link],
{font-size: 10; text-color: @label_medium; text-halo-opacity: 0.9;}
line|z16-[highway=primary_link],
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
/* 5.SECONDARY 10-22 ZOOM */
line|z10-[highway=secondary],
line|z16-[highway=secondary_link]
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
line|z16-[highway=secondary_link],
{text: name; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
line|z10-11[highway=secondary]
{font-size: 10;text-color: @label_light;}
line|z12-13[highway=secondary]
{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
line|z14[highway=secondary],
{font-size: 10;}
line|z15[highway=secondary],
{font-size: 11;}
line|z16-17[highway=secondary],
line|z16-17[highway=secondary_link]
{font-size: 14;text-color: @label_dark;text-halo-color: @label_halo_light;}
line|z18-[highway=secondary],
line|z18-[highway=secondary_link]
{font-size: 14;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
line|z10-13[highway=secondary],
{font-size: 10; text-color: @label_light; text-halo-opacity: 0.7;}
line|z14-15[highway=secondary],
{font-size: 11; text-color: @label_medium; text-halo-opacity: 0.9;}
line|z16-[highway=secondary],
{font-size: 14; text-color: @label_dark; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
line|z16-[highway=secondary_link],
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
/* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */
@ -214,68 +194,53 @@ line|z16-[railway=rail][usage=tourism],
{font-size: 12; text-halo-color: @label_halo_light;}
line|z13-[highway=residential],
line|z12-[highway=tertiary],
line|z18-[highway=tertiary_link]
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
line|z13[highway=residential],
line|z12-13[highway=tertiary]
{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
line|z14[highway=residential],
line|z14[highway=tertiary],
{font-size: 10;}
line|z15[highway=residential],
line|z15[highway=tertiary],
{font-size: 11;}
line|z16-17[highway=residential],
line|z16-17[highway=tertiary],
{font-size: 12;text-halo-color: @label_halo_light;}
line|z18-[highway=residential],
line|z18-[highway=tertiary],
line|z18-[highway=tertiary_link]
{font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
/* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */
line|z13-[highway=unclassified],
line|z13-[highway=residential],
line|z14-[highway=road],
line|z18-[highway=tertiary_link],
{text: name; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
line|z12-13[highway=tertiary],
line|z13[highway=unclassified],
line|z13[highway=residential],
{font-size: 10; text-color: @label_light; text-halo-opacity: 0.7;}
line|z14-15[highway=tertiary],
line|z14-15[highway=unclassified],
line|z14-15[highway=residential],
line|z14-15[highway=road],
{font-size: 10; text-color: @label_medium; text-halo-opacity: 0.9;}
line|z16-[highway=tertiary],
line|z16-[highway=unclassified],
line|z16-[highway=residential],
line|z16-[highway=road],
line|z18-[highway=tertiary_link],
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
/* 7.STREETS & SERVICE 14-22 ZOOM */
line|z14-[highway=living_street],
line|z14-[highway=pedestrian],
line|z16-[highway=service],
line|z16-[highway=service][service=busway],
line|z16-[highway=busway],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
{text: name; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
line|z13[highway=unclassified]
{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
line|z14[highway=unclassified],
line|z14[highway=living_street],
line|z14[highway=pedestrian],
line|z14[highway=road],
{font-size: 10;}
line|z15[highway=unclassified],
line|z15[highway=living_street],
line|z15[highway=pedestrian],
line|z15[highway=road],
{font-size: 11;}
line|z16-17[highway=unclassified],
line|z14-15[highway=living_street],
line|z14-15[highway=pedestrian],
{font-size: 10; text-color: @label_light; text-halo-opacity: 0.9;}
line|z16-17[highway=living_street],
{font-size: 12;text-halo-color: @label_halo_light;}
line|z16-17[highway=pedestrian],
line|z16-17[highway=service],
line|z16-17[highway=service][service=busway],
line|z16-17[highway=busway],
line|z16-17[highway=road],
{font-size: 10;text-halo-color: @label_halo_light;}
line|z18-[highway=unclassified],
{font-size: 10; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
line|z18-[highway=living_street],
line|z18-[highway=pedestrian],
line|z18-[highway=service],
line|z18-[highway=service][service=busway],
line|z18-[highway=busway],
line|z18-[highway=road],
{font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
{font-size: 12; text-color: @label_medium; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
/* 8.OTHERS ROADS 15-22 ZOOM */

1
data/styles/clear/style-clear/colors.mapcss
View file

@ -185,7 +185,6 @@
/* 6.4 Road labels */
@road_label_halo: #FFFFFF;
@shield_text: #000000;
@shield_text_halo: #000000;
@shield: #FFFFFF;

3
data/styles/clear/style-night/colors.mapcss
View file

@ -164,7 +164,7 @@
@label_medium: #777777;
@label_light: #666666;
@label_halo_medium: #111100;
@label_halo_light: #111100;
@label_halo_light: #060600;
/* 6.2 Natural labels */
@ -186,7 +186,6 @@
/* 6.4 Road labels */
@road_label_halo: #000000;
@shield_text: #b2b2b2;
@shield_text_halo: #000000;
@shield: #000000;

22
data/styles/vehicle/include/Roads_label.mapcss
View file

@ -140,15 +140,15 @@ line|z10-11[highway=motorway],
line|z10-11[highway=trunk],
line|z10-11[highway=motorway_link],
line|z10-11[highway=trunk_link]
{font-size: 13;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
{font-size: 13;}
line|z12-13[highway=motorway],
line|z12-13[highway=trunk],
line|z12-13[highway=motorway_link],
line|z12-13[highway=trunk_link]
{font-size: 15;text-halo-color: @label_halo_light;}
{font-size: 15;}
line|z14-15[highway=motorway],
line|z14-15[highway=trunk],
{font-size: 16;text-color: @label_dark;text-halo-opacity: 0.9;}
{font-size: 16;text-color: @label_dark;}
line|z14[highway=motorway_link],
line|z14[highway=trunk_link]
{font-size: 13.5;text-halo-color: @label_halo_medium;}
@ -157,16 +157,16 @@ line|z15[highway=trunk_link]
{font-size: 14;text-halo-color: @label_halo_medium;}
line|z16[highway=trunk],
line|z16[highway=motorway],
{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 0.9;}
{font-size: 18.5;text-color: @label_dark;}
line|z16[highway=motorway_link],
line|z16[highway=trunk_link]
{font-size: 15.75;text-halo-opacity: 0.9;}
{font-size: 15.75;}
line|z17[highway=trunk],
line|z17[highway=motorway],
{font-size: 19.5;text-color: @label_dark;text-halo-opacity: 0.99;}
{font-size: 19.5;text-color: @label_dark;text-halo-opacity: 1;}
line|z17[highway=motorway_link],
line|z17[highway=trunk_link]
{font-size: 16;text-halo-opacity: 0.99;}
{font-size: 16;text-halo-opacity: 1;}
line|z18-[highway=trunk],
line|z18-[highway=motorway],
{font-size: 20.5;text-color: @label_dark;text-halo-opacity: 1;}
@ -187,7 +187,7 @@ line|z11[highway=primary_link]
{font-size: 13.5;text-halo-color: @label_halo_medium;}
line|z12-13[highway=primary],
line|z12-13[highway=primary_link]
{font-size: 14.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
{font-size: 14.75;text-halo-color: @label_halo_medium;}
line|z14-15[highway=primary],
{font-size: 15.5;text-color: @label_dark;}
line|z14[highway=primary_link]
@ -203,7 +203,7 @@ line|z17[highway=primary],
line|z17[highway=primary_link],
{font-size: 15.5;}
line|z18-[highway=primary],
{font-size: 19;text-color: @label_dark;}
{font-size: 19;text-color: @label_dark;text-halo-opacity: 1;}
line|z18-[highway=primary_link],
{font-size: 16.5;text-halo-opacity: 1;}
@ -216,7 +216,7 @@ line|z16-[highway=secondary_link]
line|z10-11[highway=secondary]
{font-size: 12;text-color: @label_light;}
line|z12-13[highway=secondary]
{font-size: 14;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
{font-size: 14;text-color: @label_light;}
line|z14[highway=secondary],
{font-size: 14.75;}
line|z15[highway=secondary],
@ -244,7 +244,7 @@ line|z18-[highway=tertiary_link]
line|z12-13[highway=residential],
line|z12-13[highway=tertiary]
{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
{font-size: 12;text-color: @label_light;}
line|z14[highway=residential],
line|z14[highway=tertiary],
{font-size: 13;}

1
data/styles/vehicle/style-clear/colors.mapcss
View file

@ -171,7 +171,6 @@
/* ROADS LABELS */
@primary_road_label: #2E2E2E;
@secondary_road_label: #333333;
@road_label_halo: #FFFFFF;
@shield_text: #000000;
@shield_text_halo: #000000;
@shield: #FFFFFF;

3
data/styles/vehicle/style-night/colors.mapcss
View file

@ -161,7 +161,7 @@
@label_medium: #8C8C8C;
@label_light: #666666;
@label_halo_medium: #111100;
@label_halo_light: #111100;
@label_halo_light: #060600;
/* 6.2 Natural labels */
@ -184,7 +184,6 @@
/* 6.4 Road labels */
@road_label_halo: #000000;
@shield_text: #303030;
@shield_text_halo: #000000;
@shield: #999999;