From 0ab18337e5de474305d9a415dc48dcd35d69a46b Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Tue, 28 Jan 2020 15:47:13 +0300 Subject: [PATCH] [styles] Do not show icon for unnamed forest at zoomlevels < 18. --- .../styles/clear/include/Basemap_label.mapcss | 15 ++++++++---- data/styles/clear/include/Icons.mapcss | 20 ++++++++-------- .../vehicle/include/Basemap_label.mapcss | 15 ++++++++---- data/styles/vehicle/include/Icons.mapcss | 24 +++++++++---------- 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 99206553a2..903d0d7586 100755 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -435,8 +435,9 @@ area|z14-[landuse=forest][name]::int_name, area|z16-[leisure=garden][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;} -area|z14-[leisure=park][name], area|z14-[landuse=forest][name] +{icon-image: nparkf-s.svg;text-offset: 1;font-size: 10;} +area|z14-[leisure=park][name], {icon-image: park-s.svg;text-offset: 1;font-size: 10;} area|z14-[leisure=park][name]::int_name, area|z14-[landuse=forest][name]::int_name @@ -445,8 +446,9 @@ area|z14-[leisure=park][!name], area|z14-[landuse=forest][!name] {}/*check*/ -area|z15-[leisure=park][name], area|z15-[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 11;} +area|z15-[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 11;} area|z15-17[leisure=park][name]::int_name, area|z15-17[landuse=forest][name]::int_name, @@ -456,8 +458,9 @@ area|z15[leisure=park][!name], area|z15[landuse=forest][!name] {}/*check*/ -area|z16[leisure=park][name], area|z16[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 11;} +area|z16[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 11;} area|z16[leisure=garden][name] {icon-image: garden-m.svg;text-offset: 1;font-size: 11;} @@ -469,8 +472,9 @@ area|z16[leisure=garden][!name]::int_name, area|z16[landuse=forest][!name]::int_name {}/*check*/ -area|z17[leisure=park][name], area|z17[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;} +area|z17[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 12;} area|z17[leisure=garden][name] {icon-image: garden-m.svg;text-offset: 1;font-size: 12;} @@ -482,8 +486,9 @@ area|z17[leisure=garden][!name]::int_name, area|z17[leisure=forest][!name]::int_name {} -area|z18-[leisure=park], area|z18-[landuse=forest] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 13;} +area|z18-[leisure=park] {icon-image: park-m.svg;text-offset: 1;font-size: 13;} area|z18-[leisure=garden] {icon-image: garden-m.svg;text-offset: 1;font-size: 13;} diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 7aef900c93..e63e1807ec 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -768,20 +768,20 @@ node|z15-[leisure=nature_reserve], area|z15-[leisure=nature_reserve] {icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;} -node|z12-[landuse=forest], -area|z12-[landuse=forest] +node|z12-[landuse=forest][name], +area|z12-[landuse=forest][name] {fill-color: @green2;text: name;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;} -node|z13[landuse=forest], -area|z13[landuse=forest] +node|z13[landuse=forest][name], +area|z13[landuse=forest][name] {fill-color: @green3;icon-image: nparkf-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 12;} -node|z14[landuse=forest], -area|z14[landuse=forest] +node|z14[landuse=forest][name], +area|z14[landuse=forest][name] {fill-color: @green4;icon-image: nparkf-s.svg;text-offset: 1;font-size: 11;} -node|z15[landuse=forest], -area|z15[landuse=forest] +node|z15[landuse=forest][name], +area|z15[landuse=forest][name] {fill-color: @green5;icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;} -node|z16-[landuse=forest], -area|z16-[landuse=forest] +node|z16-[landuse=forest][name], +area|z16-[landuse=forest][name] {fill-color: @forest;icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;} node|z14[natural=spring], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index d9c008619f..6340605fb1 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -406,8 +406,9 @@ 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: 10;} -area|z14-[leisure=park][name], area|z14-[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 11;} +area|z14-[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 11;} area|z14-[leisure=park][name]::int_name, area|z14-[landuse=forest][name]::int_name @@ -416,8 +417,9 @@ area|z14-[leisure=park][!name], area|z14-[landuse=forest][!name] {}/*check*/ -area|z15-[leisure=park][name], area|z15-[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;} +area|z15-[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 12;} area|z15-17[leisure=park][name]::int_name, area|z15-17[landuse=forest][name]::int_name, @@ -427,8 +429,9 @@ area|z15[leisure=park][!name], area|z15[landuse=forest][!name] {}/*check*/ -area|z16[leisure=park][name], area|z16[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 12.5;} +area|z16[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 12.5;} area|z16[leisure=park][!name], area|z16[landuse=forest][!name], @@ -436,16 +439,18 @@ area|z16[leisure=park][!name]::int_name, area|z16[landuse=forest][!name]::int_name {}/*check*/ -area|z18-[leisure=park][name], area|z18-[landuse=forest][name] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 13.5;} +area|z18-[leisure=park][name], {icon-image: park-m.svg;text-offset: 1;font-size: 13.5;} area|z18-[leisure=park][name], area|z18-[landuse=forest][name] {} -area|z18-[leisure=park], area|z18-[landuse=forest] +{icon-image: nparkf-m.svg;text-offset: 1;font-size: 13.5;} +area|z18-[leisure=park], {icon-image: park-m.svg;text-offset: 1;font-size: 13.5;} area|z18-[leisure=park]::int_name, area|z18-[leisure=forest]::int_name diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 7cba50da69..e4fcbf0417 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -211,8 +211,8 @@ node[highway=speed_camera], /* 2. NATURAL */ -node|z12-[landuse=forest][boundary=national_park], -area|z12-[landuse=forest][boundary=national_park], +node|z12-[landuse=forest][name], +area|z12-[landuse=forest][name], node|z12-[boundary=national_park], area|z12-[boundary=national_park], node|z12-[leisure=nature_reserve], @@ -223,36 +223,36 @@ area|z12-[leisure=nature_reserve] node|z14-[highway=ford] {icon-image: dot-m.svg;icon-min-distance: 20;} -/*node|z11[landuse=forest][boundary=national_park], -area|z11[landuse=forest][boundary=national_park], +/*node|z11[landuse=forest][name], +area|z11[landuse=forest][name], node|z11[boundary=national_park], area|z11[boundary=national_park], node|z11[leisure=nature_reserve], area|z11[leisure=nature_reserve] {icon-image: nparkf-s.svg;icon-min-distance: 20;}*/ -node|z12-13[landuse=forest][boundary=national_park], -area|z12-13[landuse=forest][boundary=national_park], +node|z12-13[landuse=forest][name], +area|z12-13[landuse=forest][name], node|z12-13[boundary=national_park], area|z12-13[boundary=national_park], node|z12-13[leisure=nature_reserve], area|z12-13[leisure=nature_reserve] {icon-image: nparkf-s.svg;text-offset: 1;font-size: 11;icon-min-distance: 12;} -node|z14[landuse=forest][boundary=national_park], -area|z14[landuse=forest][boundary=national_park], +node|z14[landuse=forest][name], +area|z14[landuse=forest][name], node|z14[boundary=national_park], area|z14[boundary=national_park], node|z14[leisure=nature_reserve], area|z14[leisure=nature_reserve] {icon-image: nparkf-m.svg;text-offset: 1;font-size: 12.25;} -node|z15-16[landuse=forest][boundary=national_park], -area|z15-16[landuse=forest][boundary=national_park], +node|z15-16[landuse=forest][name], +area|z15-16[landuse=forest][name], node|z15-16[boundary=national_park], area|z15-16[boundary=national_park], node|z15-16[leisure=nature_reserve], area|z15-16[leisure=nature_reserve] {icon-image: nparkf-m.svg;text-offset: 1;font-size: 12.5;text-halo-opacity: 0.85;} -node|z17-[landuse=forest][boundary=national_park], -area|z17-[landuse=forest][boundary=national_park], +node|z17-[landuse=forest][name], +area|z17-[landuse=forest][name], node|z17-[boundary=national_park], area|z17-[boundary=national_park], node|z17-[leisure=nature_reserve],