From 733e8b9958efa6776154917ad9322fc910ad9e0c Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:41:08 +0200 Subject: [PATCH] [styles] Change natural=cave_entrance icon and removed from z11 Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/styles/clear/include/Icons.mapcss | 7 ++----- data/styles/clear/include/priorities_4_overlays.prio.txt | 4 ++-- data/styles/clear/style-clear/symbols/cave-m.svg | 4 ++-- data/styles/clear/style-clear/symbols/cave-s.svg | 4 ++-- data/styles/clear/style-night/symbols/cave-m.svg | 4 ++-- data/styles/clear/style-night/symbols/cave-s.svg | 4 ++-- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index f96251f165..dac2e99d82 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -29,10 +29,10 @@ node|z10-[natural=volcano], area|z10-[natural=volcano], -node|z11-[natural=cave_entrance], -area|z11-[natural=cave_entrance], node|z11-[waterway=waterfall], area|z11-[waterway=waterfall], +node|z12-[natural=cave_entrance], +area|z12-[natural=cave_entrance], node|z13-[natural=peak][name], node|z14-[natural=saddle], area|z14-[natural=saddle], @@ -61,9 +61,6 @@ node|z12-[leisure=nature_reserve], area|z12-[leisure=nature_reserve] {text: name;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;} -node|z11[natural=cave_entrance], -area|z11[natural=cave_entrance] -{icon-image: cave-s.svg;icon-min-distance: 20;} node|z12-[natural=cave_entrance], area|z12-[natural=cave_entrance] {icon-image: cave-s.svg;text-offset: 1;font-size: 10;} diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index dfc2e4e30c..5f07b6e648 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -362,7 +362,7 @@ amenity-university # icon z14- (also has captio leisure-park # icon z14- (also has caption(optional) z14-, area z10-) leisure-park-permissive # icon z14- (also has caption(optional) z14-, area z10-) -natural-cave_entrance # icon z11- (also has caption(optional) z11-) +natural-cave_entrance # icon z12- (also has caption(optional) z12-) === 5050 historic-aircraft # icon z16- (also has caption(optional) z16-) @@ -1516,7 +1516,7 @@ amenity-parking-private # icon z18- (also has captio # leisure-park # caption(optional) z14- (also has icon z14-, area z10-) # leisure-park-permissive # caption(optional) z14- (also has icon z14-, area z10-) -# natural-cave_entrance # caption(optional) z11- (also has icon z11-) +# natural-cave_entrance # caption(optional) z12- (also has icon z12-) # === -4950 # historic-aircraft # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg index 50ef07049c..7304392d2d 100644 --- a/data/styles/clear/style-clear/symbols/cave-m.svg +++ b/data/styles/clear/style-clear/symbols/cave-m.svg @@ -1,4 +1,4 @@ - - + + diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg index bc765d4c7d..27cf22d489 100644 --- a/data/styles/clear/style-clear/symbols/cave-s.svg +++ b/data/styles/clear/style-clear/symbols/cave-s.svg @@ -1,4 +1,4 @@ - - + + diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg index fbf9479fc4..866e9b2c35 100644 --- a/data/styles/clear/style-night/symbols/cave-m.svg +++ b/data/styles/clear/style-night/symbols/cave-m.svg @@ -1,4 +1,4 @@ - - + + diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg index d6f1dfd2b6..d085360216 100644 --- a/data/styles/clear/style-night/symbols/cave-s.svg +++ b/data/styles/clear/style-night/symbols/cave-s.svg @@ -1,4 +1,4 @@ - - + +