From 9ed0fcb83f24dfd6201f076351ba97f8bab96201 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Mon, 25 Sep 2023 10:53:41 +0300 Subject: [PATCH] [styles] Comment/remove unused lines/mappings - add some missing commas - fix minor font bugs Signed-off-by: Konstantin Pastbin --- data/styles/clear/include/Basemap.mapcss | 8 ++-- .../styles/clear/include/Basemap_label.mapcss | 16 ++++++-- data/styles/clear/include/Icons.mapcss | 18 +-------- data/styles/clear/include/Roads.mapcss | 36 +++-------------- data/styles/clear/include/Roads_label.mapcss | 12 ------ data/styles/clear/include/Subways.mapcss | 2 + .../styles/clear/include/common_colors.mapcss | 2 - data/styles/clear/include/defaults_new.mapcss | 39 ------------------- data/styles/clear/style-clear/style.mapcss | 14 +------ data/styles/clear/style-night/style.mapcss | 14 +------ data/styles/vehicle/include/Basemap.mapcss | 4 +- .../vehicle/include/Basemap_label.mapcss | 10 +++-- data/styles/vehicle/include/Icons.mapcss | 16 ++------ data/styles/vehicle/include/Roads.mapcss | 24 +----------- .../styles/vehicle/include/Roads_label.mapcss | 2 - data/styles/vehicle/include/Subways.mapcss | 2 + .../vehicle/include/common_colors.mapcss | 2 - .../vehicle/include/defaults_new.mapcss | 39 ------------------- data/styles/vehicle/style-clear/style.mapcss | 13 +------ data/styles/vehicle/style-night/style.mapcss | 13 +------ 20 files changed, 49 insertions(+), 237 deletions(-) delete mode 100644 data/styles/clear/include/common_colors.mapcss delete mode 100644 data/styles/vehicle/include/common_colors.mapcss diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index d5bdb75f99..c783d66e1f 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -202,7 +202,7 @@ area|z0-[natural=desert], /* 6.WATER */ -area|z0-[natural=water][!tunnel], +area|z0-[natural=water], area|z0-[waterway=dock], area|z0-[waterway=riverbank], area|z0-[landuse=salt_pond], @@ -318,7 +318,7 @@ area|z14-[amenity=doctors], area|z14-[healthcare=laboratory], area|z14-[highway=pedestrian][area?], area|z14-[area:highway=pedestrian], -area|z14-[highway=footway][area?][!sac_scale], +area|z14-[highway=footway][area?], area|z14-[area:highway=footway], area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], @@ -396,7 +396,7 @@ area|z16-[landuse=cemetery] area|z14-[highway=pedestrian][area?], area|z14-[area:highway=pedestrian], -area|z14-[highway=footway][area?][!sac_scale], +area|z14-[highway=footway][area?], area|z14-[area:highway=footway], area|z14-[area:highway=living_street], area|z16-[public_transport=platform], @@ -406,7 +406,7 @@ area|z16-[amenity=place_of_worship] area|z16-[highway=pedestrian][area?], area|z16-[area:highway=pedestrian], -area|z16-[highway=footway][area?][!sac_scale], +area|z16-[highway=footway][area?], area|z16-[area:highway=footway], area|z16-[area:highway=living_street], {fill-color: @pedestrian_area_light;} diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 45f1b6ac16..8c1fac077c 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -37,8 +37,10 @@ {text-position: center;} node|z1-2[place=continent], +/* TODO: add to mapping node|z9-[place=archipelago], area|z9-[place=archipelago], +*/ node|z9-[place=island], area|z9-[place=island], node|z14-[natural=cape], @@ -50,28 +52,36 @@ area|z14-[place=islet], node|z1-2[place=continent] {font-size: 12;text-color: @country_label;max-width: 5;} +/* node|z9-[place=archipelago], area|z9-[place=archipelago], +*/ node|z9-[place=island], area|z9-[place=island], {font-size: 8;text-color: @district_label;} +/* node|z12-[place=archipelago], area|z12-[place=archipelago], +*/ node|z12-[place=island], area|z12-[place=island] {font-size: 9;text-color: @district_label;} +/* node|z14-[place=archipelago], area|z14-[place=archipelago], +*/ node|z14-[place=island], area|z14-[place=island], node|z14-[place=islet], area|z14-[place=islet], {font-size: 10;text-color: @district_label;} +/* node|z16-[place=archipelago], area|z16-[place=archipelago], +*/ node|z16-[place=island], area|z16-[place=island], node|z16-[place=islet], @@ -422,7 +432,7 @@ area|z18-[leisure=garden][garden:type!=residential][name], {font-size: 13;} area|z18-[leisure=park][name]::int_name, area|z18-[leisure=garden][name]::int_name, -area|z18-[leisure=forest][name]::int_name, +area|z18-[landuse=forest][name]::int_name, {font-size: 11;} area|z18-[landuse=forest][!name] @@ -582,7 +592,7 @@ area|z17-[cemetery=grave], area|z15-[highway=pedestrian][area?], area|z15-[area:highway=pedestrian], -area|z15-[highway=footway][area?][!sac_scale], +area|z15-[highway=footway][area?], area|z15-[area:highway=footway], area|z16-[place=square], {text: name;font-size: 11;text-color: @city_label;text-position: center;} @@ -639,7 +649,7 @@ node|z19-[entrance=exit]::flats, area|z15-[waterway=dam], line|z15-[waterway=dam], line|z15-[waterway=weir], -node|z15-[waterway=weir] +node|z15-[waterway=weir], area|z17-[man_made=pier], area|z17-[man_made=breakwater], line|z17-[man_made=pier], diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 6d951049ad..f96251f165 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -223,15 +223,11 @@ 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;} node|z17-[highway=bus_stop], area|z17-[highway=bus_stop], -node|z17-[public_transport=station], -area|z17-[public_transport=station], node|z14-[amenity=bus_station], area|z14-[amenity=bus_station] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;} node|z17-[highway=bus_stop]::int_name, area|z17-[highway=bus_stop]::int_name, -node|z17-[public_transport=station]::int_name, -area|z17-[public_transport=station]::int_name, 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;} @@ -375,13 +371,9 @@ area|z16[highway=bus_stop] {icon-image: bus-m.svg;} node|z17-[highway=bus_stop], area|z17-[highway=bus_stop], -node|z18-[public_transport=station], -area|z18-[public_transport=station] {icon-image: bus-m.svg;text-offset: 1;font-size: 11;} node|z18-19[highway=bus_stop]::int_name, area|z18-19[highway=bus_stop]::int_name, -node|z18-19[public_transport=station]::int_name, -area|z18-19[public_transport=station]::int_name {icon-image: bus-m.svg;text-offset: 1;font-size: 9;} /* 3.5 Ferry terminal */ @@ -416,9 +408,7 @@ area|z14-[aeroway=aerodrome]::int_name, node|z14-[aeroway=aerodrome]::int_name, {font-size: 11;} -area|z16-[aeroway=heliport], area|z16-[aeroway=helipad], -node|z16-[aeroway=heliport], node|z16-[aeroway=helipad] {icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;} @@ -907,8 +897,6 @@ area|z15-[landuse=quarry], node|z15-[landuse=industrial][industrial=mine], area|z15-[landuse=industrial][industrial=mine], node|z15-[barrier=border_control], -node|z16-[building=hospital], -area|z16-[building=hospital], node|z16-[amenity=veterinary], area|z16-[amenity=veterinary], node|z16-[amenity=fountain], @@ -1113,8 +1101,6 @@ area|z14[amenity=hospital] node|z15[amenity=hospital] {icon-image: hospital-m.svg;icon-min-distance: 6;} node|z16-[amenity=hospital], -node|z16-[building=hospital], -area|z16-[building=hospital] {icon-image: hospital-m.svg;icon-min-distance: 4;} node|z17[amenity=clinic], area|z17[amenity=clinic], @@ -1122,8 +1108,6 @@ node|z17[amenity=doctors], area|z17[amenity=doctors], {icon-image: hospital-m.svg;icon-min-distance: 4;} node|z18-[amenity=hospital], -node|z18-[building=hospital], -area|z18-[building=hospital], node|z18-[amenity=clinic], area|z18-[amenity=clinic], node|z18-[amenity=doctors], @@ -1875,7 +1859,7 @@ area|z16-[shop=tattoo], node|z16-[shop=erotic], area|z16-[shop=erotic], node|z16-[shop=funeral_directors], -area|z16-[shop=funeral_directors] +area|z16-[shop=funeral_directors], node|z16-[shop=confectionery], area|z16-[shop=confectionery], node|z16-[shop=chocolate], diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 4308841560..0a1363b982 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -49,9 +49,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -line[highway] -{casing-width: 0;} - /* 2.WORLD LEVEL ROAD 4-9 ZOOM */ line|z6-9[highway=world_towns_level], @@ -393,13 +390,11 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack line|z12-[highway=residential], line|z11-[highway=tertiary], -line|z15-[highway=residential_link], line|z14-[highway=tertiary_link], {color: @residential; opacity: 1;} line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -line|z16-[highway=residential_link][tunnel?] {color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} line|z14-[highway=tertiary][bridge?]::bridgewhite, line|z14-[highway=residential][bridge?]::bridgewhite, @@ -423,27 +418,22 @@ line|z15[highway=tertiary_link] {width: 1.8;} line|z15[highway=residential], line|z15[highway=tertiary], -line|z15[highway=residential_link], line|z15[highway=tertiary_link] {width: 3.2;} line|z16[highway=residential], line|z16[highway=tertiary], -line|z16[highway=residential_link], line|z16[highway=tertiary_link] {width: 4.4;} line|z17[highway=residential], line|z17[highway=tertiary], -line|z17[highway=residential_link], line|z17[highway=tertiary_link] {width: 6;} line|z18[highway=residential], line|z18[highway=tertiary], -line|z18[highway=residential_link], line|z18[highway=tertiary_link] {width: 9;} line|z19-[highway=residential], line|z19-[highway=tertiary], -line|z19-[highway=residential_link], line|z19-[highway=tertiary_link] {width: 12;} @@ -452,7 +442,6 @@ line|z19-[highway=tertiary_link] line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -line|z16-[highway=residential_link][tunnel?] {casing-dashes: 5,5;} /* 6.3 Residential & Tertiary bridge 14-22 ZOOM */ @@ -593,7 +582,6 @@ line|z13-[highway=ford] line|z13-[highway=cycleway] {color: @cycleway;opacity: 1;} line|z13-[highway=construction], -line|z13-[highway=proposed] {color: @construction;opacity: 1;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, line|z15-[highway=footway][bridge?]::bridgewhite, @@ -621,7 +609,6 @@ line|z14-[highway=raceway], line|z15-[leisure=track][!area], {color: @sport;opacity: 1;} line|z14-[highway=path], -line|z14-[route=hiking], line|z14-[highway=footway][sac_scale], {color: @path;opacity: 1;} line|z14-[highway=bridleway] @@ -744,25 +731,18 @@ line|z19-[highway=cycleway][bridge?]::bridgeblack /* 8.5 Construction & Proposed 13-22 ZOOM */ line|z13[highway=construction], -line|z13[highway=proposed] {width: 1.2;dashes: 3.6,1.8;} line|z14[highway=construction], -line|z14[highway=proposed] {width: 1.4;dashes: 4.5,1.8;} line|z15[highway=construction], -line|z15[highway=proposed] {width: 2;dashes: 7.2,2.7;} line|z16[highway=construction], -line|z16[highway=proposed] {width: 2.6;dashes: 9,3.6;} line|z17[highway=construction], -line|z17[highway=proposed] {width: 3;dashes: 10.8,4.5;} line|z18[highway=construction], -line|z18[highway=proposed] {width: 4;dashes: 13.5,5.4;} line|z19-[highway=construction], -line|z19-[highway=proposed] {width: 6;dashes: 18,6.2;} /* 8.6 Track & Path 14-22 ZOOM */ @@ -801,27 +781,21 @@ line|z19-[highway=track], {width: 4.5; dashes: 12,3.5;} line|z14[highway=path], -line|z14[route=hiking], line|z14[highway=footway][sac_scale], {width: 0.9; dashes: 3.5,2;} line|z15[highway=path], -line|z15[route=hiking], line|z15[highway=footway][sac_scale], {width: 1.1; dashes: 3.5,2;} line|z16[highway=path], -line|z16[route=hiking], line|z16[highway=footway][sac_scale], {width: 1.5; dashes: 4,2.5;} line|z17[highway=path], -line|z17[route=hiking], line|z17[highway=footway][sac_scale], {width: 2; dashes: 4,2.5;} line|z18[highway=path], -line|z18[route=hiking], line|z18[highway=footway][sac_scale], {width: 3; dashes: 6,3.5;} line|z19-[highway=path], -line|z19-[route=hiking], line|z19-[highway=footway][sac_scale], {width: 4; dashes: 8,4.5;} @@ -1386,9 +1360,9 @@ line|z14-[piste:type=downhill][piste:difficulty=freeride] line|z14[piste:type=downhill], line|z14[piste:type=nordic], line|z14[piste:type=sled], -{width: 0.8;} -line|z14[route=ski], +/* line|z14[leisure=skiing] +*/ {width: 0.8;} line|z14-[piste:type=downhill][piste:difficulty=novice], line|z14-[piste:type=downhill][piste:difficulty=easy], @@ -1407,8 +1381,9 @@ line|z15-[piste:type=downhill][piste:difficulty=freeride], line|z15-[piste:type=downhill], line|z15-[piste:type=sled], line|z15-[piste:type=nordic], -line|z15-[route=ski], +/* line|z15-[leisure=skiing] +*/ {width: 1.1;} line|z17-[piste:type=downhill][piste:difficulty=novice], line|z17-[piste:type=downhill][piste:difficulty=easy], @@ -1420,8 +1395,9 @@ line|z17-[piste:type=downhill][piste:difficulty=freeride], line|z17-[piste:type=downhill], line|z17-[piste:type=sled], line|z17-[piste:type=nordic], -line|z17-[route=ski], +/* line|z17-[leisure=skiing] +*/ {width: 1.5;} /* 11. FERRY */ diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index 1e323b7780..d64d5b9c9a 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -211,7 +211,6 @@ line|z16-[railway=rail][usage=tourism], line|z13-[highway=residential], line|z12-[highway=tertiary], -line|z18-[highway=residential_link], 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;} @@ -228,7 +227,6 @@ 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=residential_link], line|z18-[highway=tertiary], line|z18-[highway=tertiary_link] {font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;} @@ -278,20 +276,17 @@ line|z18-[highway=road], line|z15-[highway=cycleway], line|z15-[highway=construction], -line|z15-[highway=proposed], line|z15-[highway=track], line|z15-[highway=path], line|z15-[highway=bridleway], line|z15-[highway=footway], line|z16-[leisure=track], -line|z16-[route=hiking], line|z16-[highway=steps], line|z16-[highway=ford], line|z16-[highway=raceway], {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} line|z15[highway=construction], -line|z15[highway=proposed], line|z15[highway=bridleway], line|z15[highway=path], line|z15[highway=footway], @@ -301,24 +296,20 @@ line|z15[highway=track] line|z16-17[highway=ford], line|z16-17[highway=cycleway], line|z16-17[highway=construction], -line|z16-17[highway=proposed], line|z16-17[highway=track], line|z16-17[highway=raceway], line|z16-17[leisure=track], line|z16-17[highway=path], -line|z16-17[route=hiking], line|z16-17[highway=bridleway], line|z16-17[highway=footway], {font-size: 9;} line|z18-[highway=ford], line|z18-[highway=cycleway], line|z18-[highway=construction], -line|z18-[highway=proposed], line|z18-[highway=track], line|z18-[highway=raceway], line|z18-[leisure=track], line|z18-[highway=path], -line|z18-[route=hiking], line|z18-[highway=bridleway], line|z18-[highway=footway], {font-size: 10;} @@ -350,14 +341,11 @@ line|z14[leisure=skiing] /* 11. FERRY */ line|z10-[route=ferry], -line|z10-[route=ferry_motorcar] {text: name;text-color: @water_label;text-position: line;} line|z10-16[route=ferry], -line|z10-16[route=ferry_motorcar] {font-size: 9;} line|z17-[route=ferry], -line|z17-[route=ferry_motorcar] {font-size: 10;} /* 12. ONEWAY ARROWS */ diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss index 000350b9ee..987cd0ae66 100644 --- a/data/styles/clear/include/Subways.mapcss +++ b/data/styles/clear/include/Subways.mapcss @@ -95,11 +95,13 @@ node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-ub node|z16-[railway=subway_entrance][city=berlin] {icon-image: subway-ubahn-s.svg;} /* Boston Subway Station*/ +/* TODO: add a mapping and a city bbox if missing node|z12-13[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;} node|z15-16[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;} node|z17-[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;} node|z16-[railway=subway_entrance][city=boston] {icon-image: subway-massachusetts-m.svg;} +*/ /* Bengaluru Subway Station*/ node|z13[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;icon-min-distance: 1;} diff --git a/data/styles/clear/include/common_colors.mapcss b/data/styles/clear/include/common_colors.mapcss deleted file mode 100644 index c5b65865a0..0000000000 --- a/data/styles/clear/include/common_colors.mapcss +++ /dev/null @@ -1,2 +0,0 @@ -@traffic_arrow_light: 1.0; -@traffic_arrow_dark: 0.0; diff --git a/data/styles/clear/include/defaults_new.mapcss b/data/styles/clear/include/defaults_new.mapcss index 9a73631bbf..b8a843af6a 100644 --- a/data/styles/clear/include/defaults_new.mapcss +++ b/data/styles/clear/include/defaults_new.mapcss @@ -1,8 +1,3 @@ -way::* -{ - text-position: line; -} - way|z1-12::* { linejoin: bevel; @@ -23,41 +18,7 @@ way|z16-::* linecap: round; } -*::* -{ - text-halo-color: @white; - text-anchor-horizontal: center; - text-anchor-vertical: center; - icon-width: 16; - icon-height: 16; -} - *::int_name { text-offset: 1; } - -node::* { - text-anchor-vertical: top; -} - -area::* { - text-position: center; - text-anchor-vertical: center; -} - - -*[amenity], -*[office], -*[historic], -*[tourism], -*[leisure], -*[man_made], -*[natural], -*[power], -*[landuse], -*[craft], -*[internet_access], -{ - text-position: center; -} diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss index b4ac9186ea..6a3afb8798 100644 --- a/data/styles/clear/style-clear/style.mapcss +++ b/data/styles/clear/style-clear/style.mapcss @@ -1,5 +1,4 @@ @import("colors.mapcss"); -@import("../include/common_colors.mapcss"); @import("../include/defaults_new.mapcss"); @import("../include/Basemap.mapcss"); @import("../include/Basemap_label.mapcss"); @@ -8,15 +7,6 @@ @import("../include/Icons.mapcss"); @import("../include/Subways.mapcss"); - -canvas -{ - background-color: @background; - fill-color: @water; - default-lines: false; - default-points: false; -} - colors { GuiText-color: #4D4D4D; @@ -31,7 +21,7 @@ colors RouteTrafficG1-color: #E82705; RouteTrafficG2-color: #E82705; RouteTrafficG3-color: #FFE500; - RouteTrafficG3-opacity: @traffic_arrow_dark; + RouteTrafficG3-opacity: 0.0; RoutePedestrian-color: #1D339E; RoutePedestrian-opacity: 0.8; RouteBicycle-color: #9C27B0; @@ -70,7 +60,7 @@ colors TrafficG1-color: #E42300; TrafficG2-color: #E42300; TrafficG3-color: #FCDE00; - TrafficG3-opacity: @traffic_arrow_dark; + TrafficG3-opacity: 0.0; TrafficG4-color: #39962E; TrafficG5-color: #39962E; TrafficTempBlock-color: #525252; diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss index a66b39e474..edfa6fe9e3 100644 --- a/data/styles/clear/style-night/style.mapcss +++ b/data/styles/clear/style-night/style.mapcss @@ -1,5 +1,4 @@ @import("colors.mapcss"); -@import("../include/common_colors.mapcss"); @import("../include/defaults_new.mapcss"); @import("../include/Basemap.mapcss"); @import("../include/Basemap_label.mapcss"); @@ -8,15 +7,6 @@ @import("../include/Icons.mapcss"); @import("../include/Subways.mapcss"); - -canvas -{ - background-color: @background; - fill-color: @water; - default-lines: false; - default-points: false; -} - colors { GuiText-color: #FFFFFF; @@ -31,7 +21,7 @@ colors RouteTrafficG1-color: #7F1311; RouteTrafficG2-color: #7F1311; RouteTrafficG3-color: #9E8216; - RouteTrafficG3-opacity: @traffic_arrow_dark; + RouteTrafficG3-opacity: 0.0; RoutePedestrian-color: #FFB94B; RoutePedestrian-opacity: 0.7; RouteBicycle-color: #FF4B8C; @@ -70,7 +60,7 @@ colors TrafficG1-color: #731816; TrafficG2-color: #731816; TrafficG3-color: #8C7012; - TrafficG3-opacity: @traffic_arrow_dark; + TrafficG3-opacity: 0.0; TrafficG4-color: #376222; TrafficG5-color: #376222; TrafficTempBlock-color: #232323; diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 46fa9583f2..6ad17cb6c8 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -177,7 +177,7 @@ area|z0-[natural=desert], /* 6.WATER */ -area|z0-[natural=water][!tunnel], +area|z0-[natural=water], area|z0-[waterway=dock], area|z0-[waterway=riverbank], area|z0-[landuse=salt_pond], @@ -277,7 +277,7 @@ area|z14-[amenity=doctors], area|z14-[healthcare=laboratory], area|z14-[highway=pedestrian][area?], area|z14-[area:highway=pedestrian], -area|z14-[highway=footway][area?][!sac_scale], +area|z14-[highway=footway][area?], area|z14-[area:highway=footway], area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 00e5975fad..f776428aac 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -35,8 +35,10 @@ {text-position: center;} node|z1-2[place=continent], +/* node|z12-[place=archipelago], area|z12-[place=archipelago], +*/ node|z12-14[place=island], area|z12-14[place=island], node|z14-[natural=cape], @@ -46,8 +48,10 @@ area|z14-[natural=cape] node|z1-2[place=continent] {font-size: 12;text-color: @country_label;max-width: 5;} +/* node|z12-[place=archipelago], area|z12-[place=archipelago], +*/ node|z12-14[place=island], area|z12-14[place=island] {font-size: 9;text-color: @district_label;} @@ -334,6 +338,9 @@ node|z14-[place=farm]::int_name, area|z14-[leisure=park][name], area|z14-[landuse=forest][name], {text: name; text-color: @park_label; text-halo-color: @halo_park_label; text-halo-radius: 0.5; text-halo-opacity: 0.8; icon-min-distance: 8; text-offset: 1; font-size: 11;} +area|z18-[leisure=park][name]::int_name, +area|z18-[landuse=forest][name]::int_name, +{text: int_name; text-color: @park_label; text-halo-color: @halo_park_label; text-halo-radius: 0.5; text-halo-opacity: 0.8; text-offset: 1; font-size: 11;} /* If we define [name] styles, we should also define at least empty [!name] stub. */ area|z14-[leisure=park][!name], @@ -356,9 +363,6 @@ area|z16-[leisure=park][name], area|z18-[landuse=forest][name], area|z18-[leisure=park][name], {font-size: 13.5;} -area|z18-[leisure=park][name]::int_name, -area|z18-[landuse=forest][name]::int_name, -{text: int_name; text-offset: 1; font-size: 11;} area|z18-[landuse=forest][!name] {text: none; icon-image: nparkf-m.svg;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index ce880fc793..d3f787fa6d 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -203,9 +203,11 @@ area|z14-[aeroway=aerodrome]::int_name, node|z14-[aeroway=aerodrome]::int_name, {font-size: 11;} +/* 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;} +*/ /* 3.7 Aerialway */ @@ -502,10 +504,6 @@ area|z13-[leisure=stadium],*/ area|z15-[amenity=university], node|z15-[amenity=university], node|z15-[amenity=hospital], -node|z15-[building=hospital], -area|z15-[building=hospital], - - node|z14-[barrier=toll_booth], area|z14-[barrier=toll_booth], node|z15-[barrier=border_control], @@ -530,20 +528,12 @@ area|z17-[amenity=post_office], /* 5.1 Hospital */ node|z15[amenity=hospital], -node|z15[building=hospital], -area|z15[building=hospital] {icon-image: hospital-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z16[amenity=hospital], -node|z16[building=hospital], -area|z16[building=hospital] {icon-image: hospital-m.svg;icon-min-distance: 8;font-size: 12.75;} node|z17[amenity=hospital], -node|z17[building=hospital], -area|z17[building=hospital] {icon-image: hospital-m.svg;icon-min-distance: 14;font-size: 13.75;} node|z18-[amenity=hospital], -node|z18-[building=hospital], -area|z18-[building=hospital], {icon-image: hospital-m.svg;font-size: 14.5;} @@ -867,7 +857,7 @@ node|z17[amenity=car_wash], area|z17[amenity=car_wash] {icon-image: car-wash-m.svg;font-size: 13.75;icon-min-distance: 24;} node|z18-[amenity=car_wash], -area|z18-[amenity=car_wash ] +area|z18-[amenity=car_wash], {icon-image: car-wash-m.svg;text-offset: 1;font-size: 14.5;} node|z18-[amenity=car_rental], diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 5d88f5821f..8d8d117b03 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -48,9 +48,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -line[highway] -{casing-width: 0;} - /* 2.WORLD LEVEL ROAD 4-9 ZOOM */ line|z6-9[highway=world_towns_level], @@ -109,7 +106,7 @@ line|z9[highway=motorway] {width: 1.4;} line|z10-[highway=trunk], -line|z10-[highway=motorway] +line|z10-[highway=motorway], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link], {color: @trunk_orange_medium;} @@ -397,13 +394,11 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack line|z12-[highway=residential], line|z11-[highway=tertiary], -line|z15-[highway=residential_link], line|z14-[highway=tertiary_link], {color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;} line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -line|z16-[highway=residential_link][tunnel?], {color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} line|z14-[highway=tertiary][bridge?]::bridgewhite, line|z14-[highway=residential][bridge?]::bridgewhite, @@ -449,19 +444,14 @@ line|z13[highway=residential], line|z14[highway=residential], {width: 2.2;} line|z15[highway=residential], -line|z15[highway=residential_link], {width: 4.8;casing-width: 0.45;} line|z16[highway=residential], -line|z16[highway=residential_link], {width: 7;casing-width: 0.55;} line|z17[highway=residential], -line|z17[highway=residential_link], {width: 13;casing-width: 0.75;} line|z18[highway=residential], -line|z18[highway=residential_link], {width: 17;casing-width: 0.9;} line|z19-[highway=residential], -line|z19-[highway=residential_link], {width: 22;casing-width: 1.1;} /* 6.2 Residential & Tertiary tunnel 16-22 ZOOM */ @@ -469,7 +459,6 @@ line|z19-[highway=residential_link], line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -line|z16-[highway=residential_link][tunnel?], {casing-dashes: 5,5;} /* 6.3 Residential & Tertiary bridge 14-22 ZOOM */ @@ -598,7 +587,6 @@ line|z19-[highway=service] /* 8.OTHERS ROADS 13-22 ZOOM */ line|z13-[highway=construction], -line|z13-[highway=proposed] {color: @construction;opacity: 1;} line|z18-[highway=pedestrian][bridge?]::bridgewhite, line|z18-[highway=footway][bridge?]::bridgewhite, @@ -656,25 +644,18 @@ line|z18-[highway=cycleway][tunnel?], /* 8.5 Construction & Proposed 13-22 ZOOM */ line|z13[highway=construction], -line|z13[highway=proposed] {width: 1.2;dashes: 3.6,1.8;} line|z14[highway=construction], -line|z14[highway=proposed] {width: 1.4;dashes: 4.5,1.8;} line|z15[highway=construction], -line|z15[highway=proposed] {width: 2;dashes: 7.2,2.7;} line|z16[highway=construction], -line|z16[highway=proposed] {width: 2.6;dashes: 9,3.6;} line|z17[highway=construction], -line|z17[highway=proposed] {width: 3;dashes: 10.8,4.5;} line|z18[highway=construction], -line|z18[highway=proposed] {width: 4;dashes: 13.5,5.4;} line|z19-[highway=construction], -line|z19-[highway=proposed] {width: 6;dashes: 18,6.2;} /* 8.6 Track & Path 16-22 ZOOM */ @@ -718,15 +699,12 @@ line|z16-[highway=track][tunnel?], {width: 0;} line|z17-[highway=path], -line|z17-[route=hiking], line|z17-[highway=footway][sac_scale], {color: @path; opacity: 1; width: 0.9; dashes: 3.5,2;} line|z18[highway=path], -line|z18[route=hiking], line|z18[highway=footway][sac_scale], {width: 1.1; dashes: 3.5,2;} line|z19-[highway=path], -line|z19-[route=hiking], line|z19-[highway=footway][sac_scale], {width: 1.5; dashes: 4,2.5;} line|z17-[highway=path][tunnel?], diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss index d1121d5af8..03818856b0 100644 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -234,7 +234,6 @@ line|z16-[railway=rail][usage=tourism], line|z12-[highway=residential], line|z12-[highway=tertiary], -line|z18-[highway=residential_link], 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;} @@ -254,7 +253,6 @@ line|z17[highway=residential], line|z17[highway=tertiary], {font-size: 16.25;text-halo-color: @label_halo_light;} line|z18-[highway=residential], -line|z18-[highway=residential_link], line|z18-[highway=tertiary], line|z18-[highway=tertiary_link] {font-size: 17;text-halo-opacity: 1;text-halo-color: @label_halo_light;} diff --git a/data/styles/vehicle/include/Subways.mapcss b/data/styles/vehicle/include/Subways.mapcss index a5d69165f6..3ef1e61907 100644 --- a/data/styles/vehicle/include/Subways.mapcss +++ b/data/styles/vehicle/include/Subways.mapcss @@ -416,12 +416,14 @@ node|z16-17[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-s.s node|z18-[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-m.svg;} /* Lisbon Subway Station */ +/* TODO: add a mapping and a city bbox if missing node|z13[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-s.svg;} node|z15-16[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-m.svg;} node|z17-[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-m.svg;} node|z16-17[railway=subway_entrance][city=lisbon] {icon-image: subway-lisboa-s.svg;} node|z18-[railway=subway_entrance][city=lisbon] {icon-image: subway-lisboa-m.svg;} +*/ /* London Subway Station */ node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;icon-min-distance: 1;} diff --git a/data/styles/vehicle/include/common_colors.mapcss b/data/styles/vehicle/include/common_colors.mapcss deleted file mode 100644 index c5b65865a0..0000000000 --- a/data/styles/vehicle/include/common_colors.mapcss +++ /dev/null @@ -1,2 +0,0 @@ -@traffic_arrow_light: 1.0; -@traffic_arrow_dark: 0.0; diff --git a/data/styles/vehicle/include/defaults_new.mapcss b/data/styles/vehicle/include/defaults_new.mapcss index 9a73631bbf..b8a843af6a 100644 --- a/data/styles/vehicle/include/defaults_new.mapcss +++ b/data/styles/vehicle/include/defaults_new.mapcss @@ -1,8 +1,3 @@ -way::* -{ - text-position: line; -} - way|z1-12::* { linejoin: bevel; @@ -23,41 +18,7 @@ way|z16-::* linecap: round; } -*::* -{ - text-halo-color: @white; - text-anchor-horizontal: center; - text-anchor-vertical: center; - icon-width: 16; - icon-height: 16; -} - *::int_name { text-offset: 1; } - -node::* { - text-anchor-vertical: top; -} - -area::* { - text-position: center; - text-anchor-vertical: center; -} - - -*[amenity], -*[office], -*[historic], -*[tourism], -*[leisure], -*[man_made], -*[natural], -*[power], -*[landuse], -*[craft], -*[internet_access], -{ - text-position: center; -} diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/style-clear/style.mapcss index 1ea44c0a29..41455f9b1e 100644 --- a/data/styles/vehicle/style-clear/style.mapcss +++ b/data/styles/vehicle/style-clear/style.mapcss @@ -1,5 +1,4 @@ @import("colors.mapcss"); -@import("../include/common_colors.mapcss"); @import("../include/defaults_new.mapcss"); @import("../include/Basemap.mapcss"); @import("../include/Basemap_label.mapcss"); @@ -9,14 +8,6 @@ @import("../include/Subways.mapcss"); -canvas -{ - background-color: @background; - fill-color: @water; - default-lines: false; - default-points: false; -} - colors { GuiText-color: #4D4D4D; @@ -31,7 +22,7 @@ colors RouteTrafficG1-color: #E82705; RouteTrafficG2-color: #E82705; RouteTrafficG3-color: #FFE500; - RouteTrafficG3-opacity: @traffic_arrow_dark; + RouteTrafficG3-opacity: 0.0; RoutePedestrian-color: #1D339E; RoutePedestrian-opacity: 0.8; RouteBicycle-color: #9C27B0; @@ -70,7 +61,7 @@ colors TrafficG1-color: #E42300; TrafficG2-color: #E42300; TrafficG3-color: #FCDE00; - TrafficG3-opacity: @traffic_arrow_dark; + TrafficG3-opacity: 0.0; TrafficG4-color: #39962E; TrafficG5-color: #39962E; TrafficTempBlock-color: #464646; diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss index 15f4579130..f8ffb73680 100644 --- a/data/styles/vehicle/style-night/style.mapcss +++ b/data/styles/vehicle/style-night/style.mapcss @@ -1,5 +1,4 @@ @import("colors.mapcss"); -@import("../include/common_colors.mapcss"); @import("../include/defaults_new.mapcss"); @import("../include/Basemap.mapcss"); @import("../include/Basemap_label.mapcss"); @@ -9,14 +8,6 @@ @import("../include/Subways.mapcss"); -canvas -{ - background-color: @background; - fill-color: @water; - default-lines: false; - default-points: false; -} - colors { GuiText-color: #FFFFFF; @@ -31,7 +22,7 @@ colors RouteTrafficG1-color: #7F1311; RouteTrafficG2-color: #7F1311; RouteTrafficG3-color: #9E8216; - RouteTrafficG3-opacity: @traffic_arrow_dark; + RouteTrafficG3-opacity: 0.0; RoutePedestrian-color: #FFB94B; RoutePedestrian-opacity: 0.7; RouteBicycle-color: #FF4B8C; @@ -70,7 +61,7 @@ colors TrafficG1-color: #731816; TrafficG2-color: #731816; TrafficG3-color: #8C7012; - TrafficG3-opacity: @traffic_arrow_dark; + TrafficG3-opacity: 0.0; TrafficG4-color: #376222; TrafficG5-color: #376222; TrafficTempBlock-color: #232323;