Ticket #25000: bench-preset-v2.patch

resources/data/defaultpresets.xml

@@ -5387 +5387 @@
             <combo key="opening_hours" text="Operation times" delimiter="|" values="24/7|Mo-Su 08:00-22:00" values_no_i18n="true" />
         </item> <!-- Sanitary Dump Station -->
         <separator/>
-        <item name="Bench" icon="presets/leisure/bench.svg" type="node,way" preset_name_label="true">
+        <item name="Bench" icon="presets/leisure/bench.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=bench" />
             <space />
             <key key="amenity" value="bench" />
             <check key="backrest" text="Backrest" />
+            <check key="armrest" text="Armrest" />
+            <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
+            <combo key="bench:type" text="Type" values="seated,stand_up,block,lounger,platform,swing,log,dangle_bench" values_searchable="true" />
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <reference ref="color" />
-            <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
+            <check key="area" text="Area" />
+            <optional>
+                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270" values_sort="false" />
+                <check key="covered" text="Covered" />
+                <check key="lit" text="Lit" />
+            </optional>
         </item> <!-- Bench -->
         <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:amenity=shelter" />

resources/data/validator/geometry.mapcss

@@ -154 +154 @@
   throwWarning: tr("{0} on a closed way. Should be used on an unclosed way.", "{1.tag}"); 
 }
 
+/* amenity=bench on a closed way is ambiguous (linear loop vs seating platform area) */
+way:closed[amenity=bench][area!=yes][area!=no] {
+  throwWarning: tr("amenity=bench on a closed way is ambiguous. Specify area=yes for a seating platform area or area=no for a linear bench loop.");
+}
+
 /* #20902 */
 relation[area?] {
   throwWarning: tr("{0} on a relation", "{0.key}");

resources/data/validator/unnecessary.mapcss

@@ -24 +24 @@
 way:closed[indoor  ][area?][!highway][indoor!=no],
 way:closed[office  ][area?],
 way:closed[place   ][area?][!highway],
-way:closed[amenity ][area?][!highway],
+way:closed[amenity ][area?][!highway][amenity!=bench],
 way:closed[building][area?],
 way:closed[landuse ][area?][!highway],
 way:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],