Changeset 18687 in josm for trunk/resources

Timestamp:

2023-03-08T20:40:34+01:00 (21 months ago)

Author:

taylor.smock

Message:

Fix #22792: Add natural=shrubbery (icons from JeroenHoek, patch by JeroenHoek, modified)

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• data/validator/geometry.mapcss (modified) (1 diff)
• images/presets/landmark/shrubbery (added)
• images/presets/landmark/shrubbery.svg (added)
• images/presets/landmark/shrubbery/shrubbery_density_dense.svg (added)
• images/presets/landmark/shrubbery/shrubbery_density_medium.svg (added)
• images/presets/landmark/shrubbery/shrubbery_density_sparse.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/resources/data/defaultpresets.xml

@@ -8771 +8771 @@
                 <text key="start_date" text="Start date" />
             </optional>
+            <preset_link preset_name="Shrubbery" text="Similar but different tags:" />
         </item> <!-- Shrub -->
         <item name="Tree" icon="presets/landmark/trees.svg" type="node" preset_name_label="true">
@@ -8809 +8810 @@
             </optional>
         </item> <!-- Tree Row -->
+        <item name="Shrubbery" icon="presets/landmark/shrubbery.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:natural=shrubbery" />
+            <space />
+            <label text="An area of shrubbery that is actively maintained or pruned by humans." />
+            <space />
+            <key key="natural" value="shrubbery" />
+            <optional>
+                <combo key="shrubbery:density" text="Effective density" values_searchable="true" values_sort="false">
+                    <list_entry value="sparse" icon="presets/landmark/shrubbery/shrubbery_density_sparse.svg" short_description="Sparsely planted shrubbery. Generally speaking able-bodied persons could walk through them (although this is usually not desirable)." />
+                    <list_entry value="medium" icon="presets/landmark/shrubbery/shrubbery_density_medium.svg" short_description="Shrubbery with a medium density. Able-bodied persons might be able to barge through it, but it takes some effort and might result in scratches or soiled clothing." />
+                    <list_entry value="dense" icon="presets/landmark/shrubbery/shrubbery_density_dense.svg" short_description="Densely planted shrubbery. Effectively impassible without damaging the shrubbery (which at this point often acts as a hedge) and getting your clothes torn." />
+                </combo>
+                <text key="height" text="(Average) height" length="7" />
+                <text key="shrubbery:shape" text="Shape (useful for hedges etc.)" />
+                <space />
+                <reference ref="genus_species_taxon"/>
+                <space />
+                <reference ref="leaf"/>
+            </optional>
+            <preset_link preset_name="Shrub" text="Similar but different tags:" />
+        </item> <!-- Shrubbery -->
         <separator />
         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" name_context="natural" preset_name_label="true">

trunk/resources/data/validator/geometry.mapcss

@@ -70 +70 @@
 node[natural=scree],
 node[natural=scrub],
+node[natural=shrubbery],
 node[natural=water],
 node[natural=wetland],

trunk/resources/styles/standard/elemstyles.mapcss

@@ -4978 +4978 @@
     fill-color: scrub#007000;
 }
+area[natural=shrubbery] {
+    fill-color: shrubbery#399a4e;
+}
 area[natural=fell] {
     fill-color: natural#002f00;
@@ -5123 +5126 @@
 node[natural=shingle],
 node[natural=scrub],
+node[natural=shrubbery],
 node[natural=fell],
 node[natural=heath],