From 717853257e700b971aaa03fb5d384c165ed44374 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Fri, 8 May 2020 17:32:22 +0300 Subject: [PATCH] [styles] Add complementary conditions. Otherwise we'll have no default rule for selected zoomlevel. --- data/styles/clear/include/Icons.mapcss | 10 ++++++++-- data/styles/vehicle/include/Icons.mapcss | 10 +++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 66aa45ef9b..ae6813e4a5 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -765,6 +765,10 @@ 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|z12-[landuse=forest][!name], +area|z12-[landuse=forest][!name] +{} + node|z14[natural=spring], area|z14[natural=spring], node|z14[natural=hot_spring], @@ -1155,8 +1159,6 @@ area|z16[historic=castle] {icon-image: remains-m.svg;text-offset: 1;} node|z17-[historic=ruins][name], area|z17-[historic=ruins][name], -node|z19-[historic=ruins], -area|z19-[historic=ruins], node|z17-[historic=fort], area|z17-[historic=fort], node|z17-[historic=castle], @@ -1165,6 +1167,10 @@ node|z17-[historic=archaeological_site], area|z17-[historic=archaeological_site] {icon-image: remains-m.svg;} +node|z19-[historic=ruins][!name], +area|z19-[historic=ruins][!name], +{icon-image: remains-m.svg;} + node|z13-14[historic=monument], area|z13-14[historic=monument] {icon-image: monument-s.svg;text-offset: 1;icon-min-distance: 12;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 63bafd825e..c578cc27ad 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -240,7 +240,9 @@ node|z17-[leisure=nature_reserve], area|z17-[leisure=nature_reserve] {icon-image: nparkf-m.svg;text-offset: 1;font-size: 13.75;text-halo-opacity: 0.9;} - +node|z12-[landuse=forest][!name], +area|z12-[landuse=forest][!name], +{} /* 3. TRANSPORT */ @@ -511,8 +513,6 @@ area|z16[historic=castle] {icon-image: remains-m.svg;text-offset: 1;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} node|z17-[historic=ruins][name], area|z17-[historic=ruins][name], -node|z19-[historic=ruins], -area|z19-[historic=ruins], node|z17-[historic=fort], area|z17-[historic=fort], node|z17-[historic=castle], @@ -521,6 +521,10 @@ node|z17-[historic=archaeological_site], area|z17-[historic=archaeological_site] {icon-image: remains-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z19-[historic=ruins][!name], +area|z19-[historic=ruins][!name], +{icon-image: remains-m.svg;} + node|z13-14[historic=monument], area|z13-14[historic=monument] {icon-image: monument-m.svg;}