diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 224039c42e..3115746cf0 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -170,12 +170,12 @@ area|z12-13[natural=scrub], {fill-color: @green0;} /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */ -area|z10-[leisure=nature_reserve], -area|z10-[boundary=national_park], -area|z10-[boundary=protected_area][protect_class=1], +area|z10-17[leisure=nature_reserve], +area|z10-17[boundary=national_park], +area|z10-17[boundary=protected_area][protect_class=1], {fill-opacity: 0.2; fill-color: @green6;} -area|z10-[boundary=aboriginal_lands] +area|z10-16[boundary=aboriginal_lands], {fill-opacity: 0.07; fill-color: @indigenous_lands;} area|z10-[landuse=military][military=danger_area], diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 3e9381eb2e..70120eb80c 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -80,18 +80,16 @@ node|z13-[natural=peak][!name], {text: none;} -node|z12-[boundary=national_park], -area|z12-[boundary=national_park], -node|z12-[boundary=protected_area], -area|z12-[boundary=protected_area], -node|z12-[leisure=nature_reserve], -area|z12-[leisure=nature_reserve] +node|z12-17[boundary=national_park], +area|z12-17[boundary=national_park], +node|z12-17[boundary=protected_area], +area|z12-17[boundary=protected_area], +node|z12-17[leisure=nature_reserve], +area|z12-17[leisure=nature_reserve], {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;} -area|z10-[boundary=aboriginal_lands], +area|z10-16[boundary=aboriginal_lands], {text: name;font-size: 10;text-color: @indigenous_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;} -area|z17-[boundary=aboriginal_lands], -{font-size: 11;} node|z14[natural=cave_entrance], {icon-image: cave-s.svg;} @@ -155,12 +153,12 @@ area|z12-14[boundary=protected_area], node|z12-14[leisure=nature_reserve], area|z12-14[leisure=nature_reserve], {icon-image: nparkf-outline-s.svg; font-size: 10; icon-min-distance: 12;} -node|z15-[boundary=national_park], -area|z15-[boundary=national_park], -node|z15-[boundary=protected_area], -area|z15-[boundary=protected_area], -node|z15-[leisure=nature_reserve], -area|z15-[leisure=nature_reserve] +node|z15-17[boundary=national_park], +area|z15-17[boundary=national_park], +node|z15-17[boundary=protected_area], +area|z15-17[boundary=protected_area], +node|z15-17[leisure=nature_reserve], +area|z15-17[leisure=nature_reserve], {icon-image: nparkf-outline-m.svg; font-size: 11; text-halo-opacity: 0.9;} area|z13[landuse=forest][name], diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 8215d6c527..9fd59c0a20 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -37,12 +37,12 @@ node|z11-[natural=peak][!name], area|z13-[natural=bare_rock][!name], {text: none;} -node|z11-[boundary=national_park], -area|z11-[boundary=national_park], -node|z11-[boundary=protected_area], -area|z11-[boundary=protected_area], -node|z11-[leisure=nature_reserve], -area|z11-[leisure=nature_reserve], +node|z11-17[boundary=national_park], +area|z11-17[boundary=national_park], +node|z11-17[boundary=protected_area], +area|z11-17[boundary=protected_area], +node|z11-17[leisure=nature_reserve], +area|z11-17[leisure=nature_reserve], area|z13-[landuse=forest][name], {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;} @@ -64,20 +64,20 @@ node|z10-12[leisure=nature_reserve], area|z10-12[leisure=nature_reserve], area|z12[landuse=forest][name], {icon-image: nparkf-outline-s.svg;} -node|z13-[boundary=national_park], -area|z13-[boundary=national_park], -node|z13-[boundary=protected_area], -area|z13-[boundary=protected_area], -node|z13-[leisure=nature_reserve], -area|z13-[leisure=nature_reserve], +node|z13-17[boundary=national_park], +area|z13-17[boundary=national_park], +node|z13-17[boundary=protected_area], +area|z13-17[boundary=protected_area], +node|z13-17[leisure=nature_reserve], +area|z13-17[leisure=nature_reserve], area|z13-[landuse=forest][name], {icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;} -node|z17-[boundary=national_park], -area|z17-[boundary=national_park], -node|z17-[boundary=protected_area], -area|z17-[boundary=protected_area], -node|z17-[leisure=nature_reserve], -area|z17-[leisure=nature_reserve], +node|z17[boundary=national_park], +area|z17[boundary=national_park], +node|z17[boundary=protected_area], +area|z17[boundary=protected_area], +node|z17[leisure=nature_reserve], +area|z17[leisure=nature_reserve], area|z17-[landuse=forest][name], {font-size: 12;}