diff --git a/data/styles/default/dark/symbols/tree-special-m.svg b/data/styles/default/dark/symbols/tree-special-m.svg new file mode 100644 index 000000000..1246573c4 --- /dev/null +++ b/data/styles/default/dark/symbols/tree-special-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 3cc2a7b3e..f628c8a2b 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -70,6 +70,7 @@ node|z14-[natural=geyser], node|z16-[natural=beach], area|z14-[natural=bare_rock], node|z17-[natural=rock], +node|z17-[natural=tree], {text: name;text-color: @poi_label;text-position: center;text-offset: 1;} node|z13-[natural=peak][!name], @@ -206,7 +207,9 @@ node|z19-[man_made=water_well][drinking_water=not], node|z19-[amenity=water_point][drinking_water=not], {icon-image: drinking-water-no-m.svg;} -node|z18-[natural=tree], +node|z17-[natural=tree][name], +{icon-image: tree-special-m.svg;} +node|z18-[natural=tree][!name], {icon-image: tree-m.svg;} node|z18-[xmas:feature=tree], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 80d421626..72767b692 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2436,7 +2436,7 @@ emergency-life_ring # icon z19- (also has captio power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 -natural-tree # icon z18- +natural-tree # icon z17- (also has caption(optional) z17-) === -9991 # amenity-bench # caption(optional) z19- (also has icon z18-) @@ -2474,6 +2474,7 @@ entrance-service # icon z19- (also has captio # man_made-survey_point # caption(optional) z18- (also has icon z18-) # man_made-telescope # caption(optional) z18- (also has icon z18-) # man_made-telescope-optical # caption(optional) z17- (also has icon z17-) +# natural-tree # caption(optional) z17- (also has icon z17-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z16- (also has icon z16-) # tourism-information-board # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/default/light/symbols/tree-special-m.svg b/data/styles/default/light/symbols/tree-special-m.svg new file mode 100644 index 000000000..28df50864 --- /dev/null +++ b/data/styles/default/light/symbols/tree-special-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index cb27acfeb..e1e1f1cc8 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -31,6 +31,7 @@ node|z15-[natural=hot_spring], node|z12-[natural=geyser], node|z14-[natural=beach], area|z13-[natural=bare_rock][name], +node|z16-[natural=tree], {text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;} node|z11-[natural=peak][!name], area|z13-[natural=bare_rock][!name], @@ -148,6 +149,11 @@ node|z15-[man_made=water_well][drinking_water=not], node|z15-[amenity=water_point][drinking_water=not], {icon-image: drinking-water-no-m.svg;} +node|z16-[natural=tree][name], +{icon-image: tree-special-m.svg;} +node|z18-[natural=tree][!name], +{icon-image: tree-m.svg;} + /* 3.5 Ferry terminal & seamarks */ diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 520d9cab6..afbd13eb4 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2442,7 +2442,7 @@ emergency-life_ring # icon z19- (also has captio power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 -natural-tree # icon z18- +natural-tree # icon z16- (also has caption(optional) z16-) === -9991 # amenity-bench # caption(optional) z19- (also has icon z18-) @@ -2480,6 +2480,7 @@ entrance-service # icon z19- (also has captio # man_made-survey_point # caption(optional) z15- (also has icon z14-) # man_made-telescope # caption(optional) z18- (also has icon z18-) # man_made-telescope-optical # caption(optional) z17- (also has icon z17-) +# natural-tree # caption(optional) z16- (also has icon z16-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z15- (also has icon z15-) # tourism-information-board # caption(optional) z15- (also has icon z15-)