From ef92611012241f56763cef0b9c15805ea281cd38 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:21:37 +0100 Subject: [PATCH] [styles] Simplify color names Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/styles/clear/include/Basemap.mapcss | 16 +++++------ .../styles/clear/include/Basemap_label.mapcss | 2 +- data/styles/clear/include/Roads.mapcss | 28 +++++++++---------- data/styles/clear/style-clear/colors.mapcss | 26 ++++++++--------- data/styles/clear/style-night/colors.mapcss | 26 ++++++++--------- data/styles/vehicle/include/Basemap.mapcss | 12 ++++---- .../vehicle/include/Basemap_label.mapcss | 2 +- data/styles/vehicle/include/Roads.mapcss | 24 ++++++++-------- data/styles/vehicle/style-clear/colors.mapcss | 24 ++++++++-------- data/styles/vehicle/style-night/colors.mapcss | 24 ++++++++-------- 10 files changed, 92 insertions(+), 92 deletions(-) diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 52041d7638..bfb768befb 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -484,7 +484,7 @@ line|z14-[man_made=breakwater], line|z14-[waterway=dam], line|z14-[waterway=weir], -{width: 1.5;color: @building_dark; opacity: 0.5;} +{width: 1.5;color: @building1; opacity: 0.5;} line|z15[man_made=pier], line|z15[man_made=breakwater], @@ -534,23 +534,23 @@ line|z19-[man_made=cutline], area|z14[building], area|z14[waterway=dam], -{fill-color: @building;fill-opacity: 0.5;} +{fill-color: @building0;fill-opacity: 0.5;} area|z15[building], area|z15[waterway=dam], -{fill-color: @building;fill-opacity: 0.6;} +{fill-color: @building0;fill-opacity: 0.6;} area|z14-15[aeroway=terminal], area|z16[building], area|z16[building:part], area|z16[waterway=dam], -{fill-color: @building;fill-opacity: 0.8;casing-width: 1;casing-color: @building_border;} +{fill-color: @building0;fill-opacity: 0.8;casing-width: 1;casing-color: @building_border0;} area|z16-[aeroway=terminal], area|z17-[building], area|z17-[building:part], area|z17-[waterway=dam], -{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;} +{fill-color: @building1;casing-width: 1;casing-color: @building_border1;} /* 8.3 Barriers, cliffs */ @@ -587,13 +587,13 @@ line|z19-[barrier=hedge], line|z14-[barrier=city_wall], line|z14-[historic=citywalls], -{color: @building_dark; width: 2; opacity: 0.7;} +{color: @building1; width: 2; opacity: 0.7;} line|z15[barrier=city_wall], line|z15[historic=citywalls], {width: 2.8;} line|z16-[barrier=city_wall], line|z16-[historic=citywalls], -{color: @building; width: 4.5; dashes: 3,3,1.5,3;} +{color: @building0; width: 4.5; dashes: 3,3,1.5,3;} line|z17[barrier=city_wall], line|z17[historic=citywalls], {width: 5.9; dashes: 4,4,1.9,4;} @@ -638,7 +638,7 @@ line|z18-[barrier=retaining_wall], line|z16-[man_made=embankment], -{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;} +{color: @building1; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;} line|z17[man_made=embankment], {width: 5; dashes: 6,3,3,2;} line|z18-[man_made=embankment], diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index f172632b92..2ac407b047 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -710,7 +710,7 @@ node|z18-[entrance=main], /* 8.3 Airports */ area|z14-[aeroway=terminal] -{fill-color: @building;} +{fill-color: @building0;} area|z14[aeroway=terminal] {fill-opacity: 0.8;} diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index dbe718a561..21009791b9 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -53,7 +53,7 @@ line|z6-9[highway=world_towns_level], line|z4-9[highway=world_level], -{color: @trunk_orange_light;opacity: 1;} +{color: @trunk1;opacity: 1;} line|z4[highway=world_level] {width: 0.5;} @@ -75,14 +75,14 @@ line|z9[highway=world_level] line|z7-9[highway=trunk], line|z7-9[highway=motorway], -{color: @trunk_orange_medium; opacity: 0.7;} +{color: @trunk0; opacity: 0.7;} line|z10-[highway=trunk], line|z10-[highway=motorway], -{color: @trunk_orange_light; opacity: 0.7;} +{color: @trunk1; opacity: 0.7;} line|z10-[highway=motorway_link], line|z10-[highway=trunk_link], -{color: @primary_orange; opacity: 0.7;} +{color: @primary0; opacity: 0.7;} line|z13-14[highway=trunk], line|z13-14[highway=motorway], line|z14-15[highway=motorway_link], @@ -187,12 +187,12 @@ line|z19-[highway=trunk_link] line|z12[highway=motorway][tunnel?], line|z12[highway=trunk][tunnel?] -{color: @trunk_tunnel_orange; opacity: 0.7; casing-width: 0.5; casing-dashes: 2,2;} +{color: @trunk_tunnel; opacity: 0.7; casing-width: 0.5; casing-dashes: 2,2;} line|z13-14[highway=motorway][tunnel?], line|z13-14[highway=trunk][tunnel?], line|z13-14[highway=motorway_link][tunnel?], line|z13-14[highway=trunk_link][tunnel?] -{color: @trunk_tunnel_orange; opacity: 0.7; casing-dashes: 5,5;} +{color: @trunk_tunnel; opacity: 0.7; casing-dashes: 5,5;} line|z15-[highway=motorway][tunnel?], line|z15-[highway=trunk][tunnel?], line|z15-[highway=motorway_link][tunnel?], @@ -239,17 +239,17 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary_orange; opacity: 0.7;} +{color: @primary0; opacity: 0.7;} line|z11-12[highway=primary], line|z11-12[highway=primary_link] -{color: @primary_orange_medium; opacity: 0.7;} +{color: @primary1; opacity: 0.7;} line|z13-14[highway=primary], line|z13-14[highway=primary_link], -{color: @primary_orange_medium; opacity: 0.85;} +{color: @primary1; opacity: 0.85;} line|z15-[highway=primary], line|z15-[highway=primary_link], -{color: @primary_orange_light; opacity: 1;} +{color: @primary2; opacity: 1;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] @@ -311,7 +311,7 @@ line|z19-[highway=primary_link], line|z14[highway=primary][tunnel?], line|z14[highway=primary_link][tunnel?] -{color: @primary_tunnel_orange; casing-dashes: 5,5; opacity: 0.7;} +{color: @primary_tunnel; casing-dashes: 5,5; opacity: 0.7;} line|z15-[highway=primary][tunnel?], line|z15-[highway=primary_link][tunnel?] {casing-dashes: 5,5; opacity: 1;} @@ -341,13 +341,13 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack, /* 5.SECONDARY 10-22 ZOOM */ line|z10-12[highway=secondary], -{color: @secondary; opacity: 0.8;} +{color: @secondary0; opacity: 0.8;} line|z13-14[highway=secondary], line|z13-14[highway=secondary_link], -{color: @secondary_light; opacity: 0.9;} +{color: @secondary1; opacity: 0.9;} line|z15-[highway=secondary], line|z15-[highway=secondary_link], -{color: @secondary_light; opacity: 1;} +{color: @secondary1; opacity: 1;} line|z16-[highway=secondary][tunnel?], line|z16-[highway=secondary_link][tunnel?] diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index e0b8010822..65a7757030 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -90,21 +90,21 @@ /* 4.4 Buildings */ -@building: #C9C8BB; -@building_dark: #C2C0B3; -@building_border: #A1A096; -@building_dark_border: #9B9A8F; +@building0: #C9C8BB; +@building1: #C2C0B3; +@building_border0: #A1A096; +@building_border1: #9B9A8F; /* 5.ROADS */ /* 5.1 All roads */ -@trunk_orange_medium: #FF7326; -@trunk_orange_light: #FF7A26; -@primary_orange: #FF8726; -@primary_orange_medium: #FF9440; -@primary_orange_light: #FFA14C; -@secondary: #FFB226; -@secondary_light: #FFBF52; +@trunk0: #FF7326; +@trunk1: #FF7A26; +@primary0: #FF8726; +@primary1: #FF9440; +@primary2: #FFA14C; +@secondary0: #FFB226; +@secondary1: #FFBF52; @tertiary: #FFFFFF; @residential: #F8F8F8; @pedestrian: #F8F8F8; @@ -122,9 +122,9 @@ /* 5.3 Tunnels */ -@trunk_tunnel_orange: #FCA462; +@trunk_tunnel: #FCA462; @trunk_tunnel_casing: #808080; -@primary_tunnel_orange: #FCA462; +@primary_tunnel: #FCA462; @primary_tunnel_casing: #808080; @secondary_tunnel: #FFFFFF; @secondary_tunnel_casing: #808080; diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index ff9aa9ede4..0e9c887ad4 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -90,21 +90,21 @@ /* 4.4 Buildings */ -@building: #2A2A2A; -@building_dark: #3B3B3B; -@building_border: #303030; -@building_dark_border: #474747; +@building0: #2A2A2A; +@building1: #3B3B3B; +@building_border0: #303030; +@building_border1: #474747; /* 5.ROADS */ /* 5.1 All roads */ -@trunk_orange_medium: #49291B; -@trunk_orange_light: #49291B; -@primary_orange: #593323; -@primary_orange_medium: #593323; -@primary_orange_light: #593323; -@secondary: #573E33; -@secondary_light: #573E33; +@trunk0: #49291B; +@trunk1: #49291B; +@primary0: #593323; +@primary1: #593323; +@primary2: #593323; +@secondary0: #573E33; +@secondary1: #573E33; @tertiary: #4F4A47; @residential: #4B4643; @pedestrian: #4D4744; @@ -122,9 +122,9 @@ /* 5.3 Tunnels */ -@trunk_tunnel_orange: #381F14; +@trunk_tunnel: #381F14; @trunk_tunnel_casing: #000000; -@primary_tunnel_orange: #4C2A1B; +@primary_tunnel: #4C2A1B; @primary_tunnel_casing: #000000; @secondary_tunnel: #2B2827; @secondary_tunnel_casing: #000000; diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index bb4cb81f88..0c51613d02 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -411,7 +411,7 @@ line|z15-[man_made=breakwater], line|z15-[waterway=dam], line|z15-[waterway=weir], -{width: 2; color: @building_dark; opacity: 0.4;} +{width: 2; color: @building1; opacity: 0.4;} line|z16[man_made=pier], line|z16[man_made=breakwater], @@ -453,13 +453,13 @@ line|z19-[man_made=cutline], area|z15[building], area|z15[waterway=dam], -{fill-color: @building;fill-opacity: 0.65;casing-width: 1;casing-color: @building_border;} +{fill-color: @building0;fill-opacity: 0.65;casing-width: 1;casing-color: @building_border0;} area|z14-[aeroway=terminal], area|z16-[building], area|z16-[building:part], area|z16-[waterway=dam], -{fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;} +{fill-color: @building0;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border0;} /* 8.3 Barriers, cliffs */ @@ -489,13 +489,13 @@ line|z19-[barrier=hedge], line|z15-[barrier=city_wall], line|z15-[historic=citywalls], -{color: @building_dark; width: 2; opacity: 0.7;} +{color: @building1; width: 2; opacity: 0.7;} line|z16[barrier=city_wall], line|z16[historic=citywalls], {width: 2.8;} line|z17-[barrier=city_wall], line|z17-[historic=citywalls], -{color: @building; width: 4.5; dashes: 3,3,1.5,3;} +{color: @building0; width: 4.5; dashes: 3,3,1.5,3;} line|z18[barrier=city_wall], line|z18[historic=citywalls], {width: 5.9; dashes: 4,4,1.9,4;} @@ -529,6 +529,6 @@ line|z18-[barrier=retaining_wall], line|z17-[man_made=embankment], -{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.6;} +{color: @building1; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.6;} line|z18-[man_made=embankment], {width: 5; dashes: 6,3,3,2;} diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 4dbab1b672..7150cf0284 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -556,7 +556,7 @@ node|z18-[entrance=main], /* 8.3 Airports */ area|z14-[aeroway=terminal] -{fill-color: @building;} +{fill-color: @building0;} area|z14[aeroway=terminal] {fill-opacity: 0.8;} diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index e8e7f53852..10adb7f643 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -52,7 +52,7 @@ line|z6-9[highway=world_towns_level], line|z4-9[highway=world_level], -{color: @trunk_orange_light;opacity: 1;} +{color: @trunk1;opacity: 1;} line|z4[highway=world_level] {width: 0.85;} @@ -74,13 +74,13 @@ line|z9[highway=world_level] line|z7-[highway=trunk], line|z7-[highway=motorway], -{color: @trunk_orange_medium; opacity: 0.7;} +{color: @trunk0; opacity: 0.7;} line|z10-[highway=trunk], line|z10-[highway=motorway], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link] -{color: @trunk_orange_light; opacity: 0.7; casing-color:@casing_road; casing-opacity: 0.7;} +{color: @trunk1; opacity: 0.7; casing-color:@casing_road; casing-opacity: 0.7;} line|z12-[highway=motorway][tunnel?], line|z12-[highway=trunk][tunnel?], line|z12-[highway=motorway_link][tunnel?], @@ -113,7 +113,7 @@ line|z10-[highway=trunk], line|z10-[highway=motorway], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link], -{color: @trunk_orange_medium;} +{color: @trunk0;} line|z10[highway=trunk], line|z10[highway=motorway] @@ -180,12 +180,12 @@ line|z19-[highway=trunk_link] line|z12[highway=motorway][tunnel?], line|z12[highway=trunk][tunnel?] -{color: @trunk_tunnel_orange;opacity: 0.7;casing-width: 0.5;casing-dashes: 2,2;} +{color: @trunk_tunnel;opacity: 0.7;casing-width: 0.5;casing-dashes: 2,2;} line|z13-14[highway=motorway][tunnel?], line|z13-14[highway=trunk][tunnel?], line|z13-14[highway=motorway_link][tunnel?], line|z13-14[highway=trunk_link][tunnel?] -{color: @trunk_tunnel_orange;casing-dashes: 5,5; opacity: 1;} +{color: @trunk_tunnel;casing-dashes: 5,5; opacity: 1;} line|z15-[highway=motorway][tunnel?], line|z15-[highway=trunk][tunnel?], line|z15-[highway=motorway_link][tunnel?], @@ -232,16 +232,16 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack, /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary_orange;opacity: 0.7;casing-linecap: butt;} +{color: @primary0;opacity: 0.7;casing-linecap: butt;} line|z11-14[highway=primary], line|z11-14[highway=primary_link] -{color: @primary_orange_medium;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} +{color: @primary1;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z15-17[highway=primary], line|z15-17[highway=primary_link] -{color: @primary_orange_light;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} +{color: @primary1;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z18-[highway=primary], line|z18-[highway=primary_link] -{color: @primary_orange_light;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} +{color: @primary2;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] {casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing; casing-opacity: 0.7;} @@ -293,7 +293,7 @@ line|z19-[highway=primary_link] line|z14[highway=primary][tunnel?], line|z14[highway=primary_link][tunnel?] -{color: @primary_tunnel_orange;casing-dashes: 5,5; opacity: 0.7;} +{color: @primary_tunnel;casing-dashes: 5,5; opacity: 0.7;} line|z15-[highway=primary][tunnel?], line|z15-[highway=primary_link][tunnel?] {casing-dashes: 5,5; opacity: 1;} @@ -324,7 +324,7 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack, line|z10-[highway=secondary], line|z13-[highway=secondary_link], -{color: @secondary;opacity: 0.8;casing-linecap: butt; casing-color:@casing_road;} +{color: @secondary0;opacity: 0.8;casing-linecap: butt; casing-color:@casing_road;} line|z16-[highway=secondary][tunnel?], line|z16-[highway=secondary_link][tunnel?] {casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing; casing-opacity: 0.7;} diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index 95c0f7f080..28907fb5b2 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -12,12 +12,12 @@ /* ROADS */ -@trunk_orange_medium: #FF9140; -@trunk_orange_light: #FF8742; -@primary_orange: #FF8726; -@primary_orange_medium: #FFAD57; -@primary_orange_light: #FFAD57; -@secondary: #FFFFFF; +@trunk0: #FF9140; +@trunk1: #FF8742; +@primary0: #FF8726; +@primary1: #FFAD57; +@primary2: #FFAD57; +@secondary0: #FFFFFF; @residential: #FCFCFC; @unclassified: #FCFCFC; @pedestrian: #FCFCFC; @@ -36,8 +36,8 @@ /* tunnels */ -@primary_tunnel_orange: #FCA462; -@trunk_tunnel_orange: #FCA462; +@primary_tunnel: #FCA462; +@trunk_tunnel: #FCA462; @primary_tunnel_casing: #808080; @trunk_tunnel_casing: #808080; @secondary_tunnel: #FFFFFF; @@ -98,10 +98,10 @@ /* BUILDINGS */ @housenumber: #65655E; @building_label: #61615A; -@building: #D4D3CA;/*#C9C8BB;*/ -@building_dark: #C7C6BF;/*#C2C0B3;*/ -@building_border: #D4D3CA; -@building_dark_border: #D4D3CA; +@building0: #D4D3CA;/*#C9C8BB;*/ +@building1: #C7C6BF;/*#C2C0B3;*/ +@building_border0: #D4D3CA; +@building_border1: #D4D3CA; /* LANDUSE */ diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss index 48656a647b..8e3a744040 100644 --- a/data/styles/vehicle/style-night/colors.mapcss +++ b/data/styles/vehicle/style-night/colors.mapcss @@ -89,20 +89,20 @@ /* 4.4 Buildings */ -@building: #191919; -@building_dark: #1D1D1D; -@building_border: #1C1C1C; -@building_dark_border: #191919; +@building0: #191919; +@building1: #1D1D1D; +@building_border0: #1C1C1C; +@building_border1: #191919; /* 5.ROADS */ /* 5.1 All roads */ -@trunk_orange_medium: #4C2A19; -@trunk_orange_light: #4C2A17; -@primary_orange: #5E351D; -@primary_orange_medium: #5E351D; -@primary_orange_light: #5E351D; -@secondary: #3B3939; +@trunk0: #4C2A19; +@trunk1: #4C2A17; +@primary0: #5E351D; +@primary1: #5E351D; +@primary2: #5E351D; +@secondary0: #3B3939; @residential: #363434; @unclassified: #333131; @pedestrian: #4D4744; @@ -121,9 +121,9 @@ /* 5.3 Tunnels */ -@trunk_tunnel_orange: #381F14; +@trunk_tunnel: #381F14; @trunk_tunnel_casing: #000000; -@primary_tunnel_orange: #4C2A1B; +@primary_tunnel: #4C2A1B; @primary_tunnel_casing: #000000; @secondary_tunnel: #2B2827; @secondary_tunnel_casing: #000000;