Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10859)
+++ /trunk/data/defaultpresets.xml	(revision 10860)
@@ -2174,4 +2174,5 @@
             <key key="landuse" value="basin" />
             <text key="name" text="Name" />
+            <combo key="basin" text="Type" values="retention,infiltration,detention" />
         </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2185,4 +2186,5 @@
             <key key="landuse" value="reservoir" />
             <text key="name" text="Name" />
+            <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
         </item> <!-- Reservoir -->
         <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2212,5 +2214,5 @@
             <key key="natural" value="water" />
             <text key="name" text="Name" />
-            <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
+            <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" />
             <check key="salt" text="Salt Water" disable_off="true" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 10859)
+++ /trunk/data/validator/deprecated.mapcss	(revision 10860)
@@ -279,6 +279,5 @@
 }
 
-/* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
-*[wood=deciduous],
+/* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
 *[type=broad_leaved],
 *[type=broad_leafed] {
@@ -319,4 +318,9 @@
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
+}
+
+*[wood=deciduous] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type + leaf_cycle";
 }