Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8134)
+++ /trunk/data/defaultpresets.xml	(revision 8135)
@@ -1674,4 +1674,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item> <!-- Drain -->
         <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1685,4 +1686,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item> <!-- Ditch -->
         <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1701,12 +1703,6 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item> <!-- Stream -->
-        <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
-            <space />
-            <key key="waterway" value="wadi" />
-            <text key="name" text="Name" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item> <!-- Wadi -->
         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
@@ -1736,4 +1732,5 @@
             <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item> <!-- River -->
         <separator/>
@@ -1894,4 +1891,5 @@
             <key key="waterway" value="riverbank" />
             <text key="name" text="Name" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item> <!-- Riverbank -->
         <separator/>
@@ -7204,4 +7202,23 @@
             </optional>
         </item> <!-- Volcano -->
+        <item name="Ridge" icon="presets/ridge.svg" type="way,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
+            <label text="A mountain or hill ridge." />
+            <space />
+            <key key="natural" value="ridge" />
+            <reference ref="name_wikipedia" />
+            <text key="ele" text="Elevation" />
+        </item> <!-- Ridge -->
+        <item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley" />
+            <label text="A low area between hills." />
+            <space />
+            <key key="natural" value="valley" />
+            <reference ref="name_wikipedia" />
+        </item> <!-- Valley -->
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
@@ -7240,16 +7257,4 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Islet -->
-        <item name="Ridge" icon="presets/empty.png" type="way,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
-            <label text="A mountain or hill ridge." />
-            <space />
-            <key key="natural" value="ridge" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
-        </item> <!-- Ridge -->
     </group> <!-- Geography -->
     <group name="Nature" icon="styles/standard/misc/landmark/trees.png">
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 8134)
+++ /trunk/data/validator/deprecated.mapcss	(revision 8135)
@@ -398,2 +398,9 @@
   suggestAlternative: {1.key};
 }
+
+/* see #11223 */
+*[waterway=wadi] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{0.key}=* + intermittent=yes";
+  suggestAlternative: "natural=valley";
+}
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 8134)
+++ /trunk/data/validator/geometry.mapcss	(revision 8135)
@@ -30,5 +30,4 @@
 node[waterway=river],
 node[waterway=canal],
-node[waterway=wadi],
 node[waterway=stream],
 node[waterway=ditch],
@@ -36,4 +35,5 @@
 node[natural=coastline],
 node[natural=ridge],
+node[natural=valley],
 node[natural=tree_row] {
   throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
Index: /trunk/images/presets/ridge.svg
===================================================================
--- /trunk/images/presets/ridge.svg	(revision 8135)
+++ /trunk/images/presets/ridge.svg	(revision 8135)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="peak.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="-81.092565"
+     inkscape:cy="202.02508"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:snap-global="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="848"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.125,2.75)">
+    <path
+       style="fill:#5c7515;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364117px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 199.92412,110.62652 2.0903838,396.45845 398.24849,396.45629 z"
+       id="rect2985"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/valley.svg
===================================================================
--- /trunk/images/presets/valley.svg	(revision 8135)
+++ /trunk/images/presets/valley.svg	(revision 8135)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="saddle.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="103.57162"
+     inkscape:cy="153.96921"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:snap-global="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="848"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     borderlayer="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.0625,-52.5)">
+    <path
+       style="fill:#5c7515;fill-rule:evenodd;stroke:#000000;stroke-width:1.12357688px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.45279466,253.35932 199.97641,396.81907 399.38023,253.59533 l 0.0109,198.33894 -398.81205628,0.12911 z"
+       id="rect2985"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 8134)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 8135)
@@ -3909,4 +3909,8 @@
     color: natural#002f00;
 }
+way[natural=valley] {
+    width: 1;
+    color: natural#002f00;
+}
 area[natural=scree] {
     fill-color: natural#002f00;
@@ -4020,5 +4024,6 @@
 node[natural=land],
 node[natural=bare_rock],
-node[natural=ridge] {
+node[natural=ridge],
+node[natural=valley] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
@@ -4038,5 +4043,5 @@
     color: riverbank#0000cf;
 }
-way[waterway=canal], way[waterway=wadi] {
+way[waterway=canal] {
     width: 2;
     color: water#0000ff;
@@ -4094,13 +4099,4 @@
 node[waterway=weir] {
     icon-image: "nautical/weir.png";
-    set icon_z17;
-    text: auto;
-}
-way[waterway=rapids] {
-    width: 2;
-    color: rapids#8080ff;
-}
-node[waterway=rapids] {
-    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;