From d833b4056f79451652eb7d052d9aae84e7df7f5e Mon Sep 17 00:00:00 2001 From: Anton Makouski Date: Thu, 1 Sep 2022 15:12:01 +0300 Subject: [PATCH] [styles] Tweaks for leisure=track 1. Added support for leisure=track with area (visible from z15). 2. Linear leisure=track is visible from z15 (was from z14). Color changed to @sport. Signed-off-by: Anton Makouski --- data/mapcss-mapping.csv | 2 +- data/styles/clear/include/Basemap.mapcss | 3 +++ data/styles/clear/include/Roads.mapcss | 14 +++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 94a1324152..745816c37e 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -405,7 +405,7 @@ leisure|dog_park;404; aerialway|gondola;405; historic|museum;[historic=museum];x;name;int_name;406;tourism|museum highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407; -deprecated|deprecated;408;x +leisure|track|area;[leisure=track][area?];;name;int_name;408; railway|monorail;409; deprecated|deprecated;410;x deprecated|deprecated;411;x diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index bf6ef0d73b..c0453dd28d 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -66,6 +66,7 @@ area[landuse=quarry] area[leisure=pitch], area[leisure=stadium], +area[leisure=track][area?] area[leisure=playground], area[sport=multi], area[sport=soccer], @@ -476,6 +477,7 @@ area|z15-[landuse=railway], area|z15-[landuse=quarry], area|z15-[leisure=pitch], area|z15-[leisure=stadium], +area|z15-[leisure=track][area?], area|z15-[amenity=parking], area|z16-[public_transport=platform], area|z16-[amenity=place_of_worship], @@ -515,6 +517,7 @@ area|z17-[landuse=education], area|z15-[leisure=pitch], area|z15-[leisure=stadium], +area|z15-[leisure=track][area?], area|z17-[leisure=playground], area|z17-[sport=multi], area|z16-[sport=soccer], diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index c511cbd062..a6c42fe75d 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -164,7 +164,7 @@ line[highway=bridleway] line[highway=track], line[highway=raceway], -line[leisure=track], +line[leisure=track][!area], line[highway=path], line[route=hiking], line[highway=footway] @@ -816,8 +816,9 @@ line|z16-[highway=service][bridge?]::bridgeblack {casing-linecap: butt;casing-color:@bridge_casing;} line|z14-[highway=track], line|z14-[highway=raceway], -line|z14-[leisure=track], {color: @track;opacity: 1;} +line|z15-[leisure=track][!area], +{color: @sport;opacity: 1;} line|z14-[highway=path], line|z14-[route=hiking], line|z14-[highway=footway][sac_scale], @@ -929,23 +930,22 @@ line|z19-[highway=proposed] line|z14[highway=track][tracktype=grade1], line|z14[highway=raceway], -line|z14[leisure=track] {width: 1;} line|z15[highway=track][tracktype=grade1], line|z15[highway=raceway], -line|z15[leisure=track] +line|z15[leisure=track][!area] {width: 1.5;} line|z16[highway=track][tracktype=grade1], line|z16[highway=raceway], -line|z16[leisure=track] +line|z16[leisure=track][!area] {width: 1.8;} line|z17-18[highway=track][tracktype=grade1], line|z17-18[highway=raceway], -line|z17-18[leisure=track] +line|z17-18[leisure=track][!area] {width:3;} line|z19-[highway=track][tracktype=grade1], line|z19-[highway=raceway], -line|z19-[leisure=track] +line|z19-[leisure=track][!area] {width:4;} line|z14[highway=track],