diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml index 8ca9e881a..b7204ccd6 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -750,6 +750,7 @@ Quelle Quelle Meerenge + Baum Baumreihe Weinberg Vulkan diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 00cc2b3d8..b29abb250 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -800,6 +800,7 @@ Natural Spring Natural Spring Strait + Tree Tree Row Vineyard Volcano diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 00711f1c4..286c1586b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -95,7 +95,7 @@ railway|rail;28; highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29; place|hamlet;30; moved:highway|road:05.2024;31;highway|road -deprecated:highway|track|grade2:04.2024;[highway=track][tracktype=grade2];x;name;int_name;32;highway|track +natural|tree;32; # ~1.5M usages w/o a more specific wetland=* natural|wetland;33; deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track diff --git a/data/styles/default/dark/symbols/tree-m.svg b/data/styles/default/dark/symbols/tree-m.svg new file mode 100644 index 000000000..ed25b5bbb --- /dev/null +++ b/data/styles/default/dark/symbols/tree-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 312ef4cee..0516c24ec 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -206,6 +206,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], +{icon-image: tree-m.svg;} + /* 3. TRANSPORT */ node|z12-[railway=station], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 0bf630ea3..826aeca79 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2376,6 +2376,9 @@ emergency-life_ring # icon z19- (also has captio power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 +natural-tree # icon z18- +=== -9991 + # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) # amenity-food_sharing # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/default/light/symbols/tree-m.svg b/data/styles/default/light/symbols/tree-m.svg new file mode 100644 index 000000000..d8be5d343 --- /dev/null +++ b/data/styles/default/light/symbols/tree-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index ece873eff..edea93835 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2382,6 +2382,9 @@ emergency-life_ring # icon z19- (also has captio power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 +natural-tree # icon z18- +=== -9991 + # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) # amenity-food_sharing # caption(optional) z18- (also has icon z18-) diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index 6a90f2c3c..1b93b5a9f 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -843,6 +843,7 @@ "type.natural.spring" = "Quelle"; "type.natural.spring.drinking_water_no" = "Quelle"; "type.natural.strait" = "Meerenge"; +"type.natural.tree" = "Baum"; "type.natural.tree_row" = "Baumreihe"; "type.natural.vineyard" = "Weinberg"; "type.natural.volcano" = "Vulkan"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index cdfcbb245..24bee9574 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -853,6 +853,7 @@ "type.natural.spring" = "Natural Spring"; "type.natural.spring.drinking_water_no" = "Natural Spring"; "type.natural.strait" = "Strait"; +"type.natural.tree" = "Tree"; "type.natural.tree_row" = "Tree Row"; "type.natural.vineyard" = "Vineyard"; "type.natural.volcano" = "Volcano"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index db53d98ab..a27ef2b6a 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -886,6 +886,7 @@ "type.natural.spring" = "Natural Spring"; "type.natural.spring.drinking_water_no" = "Natural Spring"; "type.natural.strait" = "Strait"; +"type.natural.tree" = "Tree"; "type.natural.tree_row" = "Tree Row"; "type.natural.vineyard" = "Vineyard"; "type.natural.volcano" = "Volcano";