diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0d6c4d8eed..94a1324152 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -134,7 +134,7 @@ sport|tennis;133; landuse|vineyard;134; aeroway|taxiway;135; aeroway|aerodrome;136; -deprecated|deprecated;137;x +leisure|garden|residential;[leisure=garden][garden:type=residential];;name;int_name;137; amenity|fire_station;138; landuse|retail;139; leisure|nature_reserve;140; diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 53870e98f9..b6de4b0a69 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -453,11 +453,11 @@ node|z17-[landuse=residential]::int_name, area|z14-[leisure=park][name], area|z14-[landuse=forest][name], -area|z16-[leisure=garden][name] +area|z16-[leisure=garden][garden:type!=residential][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]::int_name, area|z14-[landuse=forest][name]::int_name, -area|z16-[leisure=garden][name]::int_name +area|z16-[leisure=garden][garden:type!=residential][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;} /* @@ -489,21 +489,21 @@ 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] +area|z16[leisure=garden][garden:type!=residential][name] {icon-image: garden-m.svg;text-offset: 1;font-size: 11;} 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] +area|z17[leisure=garden][garden:type!=residential][name] {icon-image: garden-m.svg;text-offset: 1;font-size: 12;} 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] +area|z18-[leisure=garden][garden:type!=residential] {icon-image: garden-m.svg;text-offset: 1;font-size: 13;} area|z18-[leisure=park]::int_name, area|z18-[leisure=garden]::int_name,