Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml    (revision 19679)
+++ trunk/resources/data/defaultpresets.xml    (working copy)
@@ -27,6 +27,12 @@
     <chunk id="riding_surface">
         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted,woodchips" />
     </chunk>
+    <chunk id="material">
+        <combo key="material" text="Material" values="concrete,metal,plastic,sandstone,steel,stone,wood" />
+    </chunk>
+    <chunk id="material_building"
+        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,sandstone,steel,stone,wood" />
+    </chunk>
     <chunk id="highway_base">
         <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
         <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
@@ -473,7 +479,7 @@
     </chunk>
     <chunk id="pole">
         <text key="height" text="Height (meters)" length="7" />
-        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+        <reference ref="material" />
         <reference ref="ref_operator" />
     </chunk>
     <chunk id="power_pole">
@@ -1762,7 +1768,7 @@
             <link wiki="Tag:barrier=block" />
             <key key="barrier" value="block" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -1775,7 +1781,7 @@
             <space />
             <combo key="bollard" text="Bollard type" values="rising,removable,foldable,fixed" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <label text="Tags which are implied and do not need to be set are:" />
             <label text="`access=no`, `foot=yes` and `bicycle=yes`" />
@@ -1789,7 +1795,7 @@
             <link wiki="Tag:barrier=cycle_barrier" />
             <key key="barrier" value="cycle_barrier" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <optional text="Non-motorized traffic:">
@@ -1808,7 +1814,7 @@
             <link wiki="Tag:barrier=cattle_grid" />
             <key key="barrier" value="cattle_grid" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -1819,7 +1825,7 @@
             <link wiki="Tag:barrier=bus_trap" />
             <key key="barrier" value="bus_trap" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <label text="Tags which are implied and do not need to be set are:" />
             <label text="`motor_vehicle=no`, `psv=yes`, `foot=yes` and `bicycle=yes`" />
@@ -1832,7 +1838,7 @@
             <link wiki="Tag:barrier=spikes" />
             <key key="barrier" value="spikes" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -1896,7 +1902,7 @@
             <link wiki="Tag:barrier=handrail" />
             <key key="barrier" value="handrail" />
             <optional>
-                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+                <reference ref="material" />
                 <reference ref="color" />
             </optional>
         </item> <!-- Handrail -->
@@ -1915,20 +1921,20 @@
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
             <combo key="wall" text="Type" values="brick,castle_wall,concrete,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
-            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+            <reference ref="material_building" />
         </item> <!-- Wall -->
         <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
             <check key="two_sided" text="Two-sided" disable_off="true" />
-            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+            <reference ref="material_building" />
         </item> <!-- City Wall -->
         <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=retaining_wall" />
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
-            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+            <reference ref="material_building" />
         </item> <!-- Retaining Wall -->
         <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=jersey_barrier" />
@@ -1963,7 +1969,7 @@
             <link wiki="Tag:barrier=entrance" />
             <key key="barrier" value="entrance" />
             <reference ref="optional_maxheight_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -1974,7 +1980,7 @@
             <link wiki="Tag:barrier=gate" />
             <key key="barrier" value="gate" />
             <reference ref="optional_maxheight_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -1988,7 +1994,7 @@
             <space />
             <combo key="lift_gate:type" text="Type" values="single,double" values_context="lift_gate" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2002,7 +2008,7 @@
             <space />
             <combo key="swing_gate:type" text="Type" values="single,double" values_context="swing_gate" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2015,7 +2021,7 @@
             <key key="barrier" value="hampshire_gate" />
             <reference ref="optional_maxwidth" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2028,7 +2034,7 @@
             <key key="barrier" value="bump_gate" />
             <reference ref="optional_maxheight_maxwidth" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2040,7 +2046,7 @@
             <link wiki="Tag:barrier=kissing_gate" />
             <key key="barrier" value="kissing_gate" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <label text="The tag `foot=yes` is implied and does not need to be set." />
             <space />
@@ -2054,7 +2060,7 @@
             <link wiki="Tag:barrier=wicket_gate" />
             <key key="barrier" value="wicket_gate" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <label text="The tag `foot=yes` is implied and does not need to be set." />
             <space />
@@ -2067,7 +2073,7 @@
             <link wiki="Tag:barrier=height_restrictor" />
             <key key="barrier" value="height_restrictor" />
             <reference ref="optional_maxheight_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2078,7 +2084,7 @@
             <link wiki="Tag:barrier=chain" />
             <key key="barrier" value="chain" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2092,7 +2098,7 @@
             <key key="barrier" value="stile" />
             <combo key="stile" text="Type" values="ladder,squeezer,stepover" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2103,7 +2109,7 @@
             <key key="barrier" value="turnstile" />
             <reference ref="optional_maxwidth" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2114,7 +2120,7 @@
             <key key="barrier" value="full-height_turnstile" />
             <reference ref="optional_maxheight_maxwidth" />
             <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -2126,7 +2132,7 @@
             <key key="barrier" value="sally_port" />
             <text key="maxheight" text="Max. height (meters)" match="key" />
             <text key="maxwidth" text="Max. width (meters)" match="key" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
@@ -4346,7 +4352,7 @@
             <combo key="playground" text="Type" values="activitypanel,aerialrotator,balancebeam,basketrotator,basketswing,climbingframe,climbingwall,cushion,exercise,hopscotch,horizontal_bar,map,playhouse,roundabout,sandpit,seesaw,sledding,slide,splash_pad,springy,structure,swing,teenshelter,trampoline,water,youth_bench,zipwire" values_searchable="true" values_context="playground" match="key!" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="max_age" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+            <reference ref="material" />
         </item> <!-- Playground device -->
         <item name="Picnic Site" icon="presets/leisure/picnic.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=picnic_site" />
@@ -4543,7 +4549,7 @@
             <text key="name" text="Name" />
             <text key="artwork_subject" text="Subject" />
             <text key="artist_name" text="Artist Name" />
-            <combo key="material" text="Material" values="aluminium,brass,bronze,ceramic,concrete,copper,glass,gold,granite,iron,marble,metal,plastic,steel,stone,wood" />
+            <combo key="material" text="Material" values="aluminium,brass,bronze,ceramic,concrete,copper,glass,gold,granite,iron,marble,metal,plastic,sandstone,steel,stone,wood" />
             <text key="start_date" text="Start date" />
         </item> <!-- Artwork -->
         <item name="Studio" icon="presets/service/studio.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5024,7 +5030,7 @@
             <key key="indication:emergency" value="fire_hydrant" match="keyvalue!" />
             <optional>
                 <reference ref="ref_operator" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+                <reference ref="material" />
                 <reference ref="color" />
                 <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
                 <space />
@@ -5392,7 +5398,7 @@
             <space />
             <key key="amenity" value="bench" />
             <check key="backrest" text="Backrest" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <reference ref="material" />
             <reference ref="color" />
             <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
@@ -6474,7 +6480,7 @@
                 <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="material_building" />
                 <reference ref="POI_access" />
             </optional>
             <preset_link preset_name="Antenna" text="Similar but different tags:" />
@@ -6488,7 +6494,7 @@
             <key key="man_made" value="survey_point" />
             <reference ref="name_ref" />
             <text key="ele" text="Elevation (meters)" length="10" />
-            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
+            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,sandstone,steel,stone" />
         </item> <!-- Survey Point -->
         <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=surveillance" />
@@ -6544,7 +6550,7 @@
                 <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="material_building" />
                 <reference ref="communication" />
             </optional>
             <preset_link preset_name="Mast" text="Similar but different tags:" />
@@ -6568,7 +6574,7 @@
                 <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="material_building" />
                 <reference ref="communication" />
             </optional>
             <preset_link preset_name="Antenna" text="Similar but different tags:" />
@@ -6596,7 +6602,7 @@
                 <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="material_building" />
                 <reference ref="communication" />
                 <space />
                 <reference ref="POI_access" />
@@ -6621,7 +6627,7 @@
                 <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="material_building" />
                 <reference ref="communication" />
                 <space />
                 <reference ref="POI_access" />
@@ -6674,7 +6680,7 @@
             <reference ref="utilities" />
             <optional>
                 <reference ref="ref_operator" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+                <reference ref="material" />
                 <reference ref="color" />
                 <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
                 <space />
@@ -7286,7 +7292,7 @@
             <key key="power" value="portal" />
             <text key="height" text="Height (meters)" length="7" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+            <reference ref="material" />
             <reference ref="color" />
             <reference ref="ref_operator" />
             <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
@@ -7298,7 +7304,7 @@
             <key key="power" value="tower" />
             <text key="height" text="Height (meters)" length="7" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+            <reference ref="material" />
             <reference ref="color" />
             <reference ref="ref_operator" />
             <optional>
@@ -7416,7 +7422,7 @@
             <key key="utility" value="power" match="keyvalue!"/>
             <optional>
                 <reference ref="ref_operator" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+                <reference ref="material" />
                 <reference ref="color" />
                 <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
                 <space />
@@ -7635,7 +7641,7 @@
             <optional>
                 <text key="inscription" text="Inscription" multiline="true" />
                 <text key="artist_name" text="Artist Name" />
-                <combo key="material" text="Material" values="concrete,granite,metal,plastic,steel,stone,wood" />
+                <combo key="material" text="Material" values="concrete,granite,metal,plastic,sandstone,steel,stone,wood" />
                 <text key="start_date" text="Start date" />
                 <reference ref="wikipedia_wikidata" />
             </optional>
@@ -9073,7 +9079,7 @@
             <optional>
                 <reference ref="name_ref" />
                 <text key="inscription" text="Inscription" multiline="true" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+                <reference ref="material" />
             </optional>
             <preset_link preset_name="Boundary Stone" text="Similar but different tags:" />
         </item> <!-- Boundary Marker -->