Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7380)
+++ trunk/data/defaultpresets.xml	(revision 7381)
@@ -1186,9 +1186,9 @@
             <key key="highway" value="traffic_signals" />
             <optional text="Optional crossing attributes:">
-                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
-                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
-                 <check key="supervised" text="Crossing attendant" />
-                 <check key="bicycle" text="Cross by bicycle" />
-                 <check key="horse" text="Cross on horseback" />
+                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                <check key="supervised" text="Crossing attendant" />
+                <check key="bicycle" text="Cross by bicycle" />
+                <check key="horse" text="Cross on horseback" />
             </optional>
         </item>
@@ -1714,6 +1714,6 @@
             </optional>
         </item>
-    </group>
-  </group> <!-- Passageways -->
+    </group> <!-- Passageways -->
+  </group>
   <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
@@ -1799,8 +1799,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
+            <label text="A point where groundwater naturally flows to the surface of the earth from underground." />
             <space />
             <key key="natural" value="spring" />
             <text key="name" text="Name" />
-        </item>
+            <check key="drinking_water" text="Drinking Water" />
+        </item> <!-- Spring -->
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall" />
@@ -1909,16 +1911,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
+            <label text="A body of standing water, such as a lake or pond." />
             <space />
             <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" />
-        </item>
-        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=land" />
-            <space />
-            <key key="natural" value="land" />
-            <text key="name" text="Name" />
-        </item>
-        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
+            <check key="salt" text="Salt Water" disable_off="true" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+        </item> <!-- Water -->
+        <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
@@ -1928,8 +1927,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
+            <label text="Line between the sea and land (with the water on the right side of the way)." />
             <space />
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Coastline -->
         <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
@@ -1948,5 +1948,5 @@
         </item>
         <separator/>
-        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
@@ -1959,17 +1959,19 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
+            <label text="Waterlogged area, either permanently or seasonally with vegetation." />
             <space />
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
-        </item>
-        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
+        </item> <!-- Wetland -->
+        <item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=mud"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=mud" />
+            <label text="Large area covered with mud." />
+            <space />
             <key key="natural" value="mud" />
-            <space />
-            <text key="name" text="Name" />
-        </item>
+            <text key="name" text="Name" />
+        </item> <!-- Mud -->
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
@@ -1979,8 +1981,16 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
+            <label text="A flat area of sand, gravel or pebble next to water." />
             <space />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name_wikipedia" />
+            <optional>
+                <combo key="supervised" text="Supervised" values="yes,no,interval" />
+                <reference ref="oh" />
+                <reference ref="general_access" />
+                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
+                <combo key="sport" text="Sport" values="swimming,surfing" />
+            </optional>
+        </item> <!-- Beach -->
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
@@ -1989,8 +1999,9 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bay"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=bay" />
+            <label text="A large body of water partially enclosed by land but with a wide mouth." />
             <space />
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Bay -->
         <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
@@ -2000,9 +2011,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
+            <label text="A steep rock face exposure, with a significant vertical, or near vertical (leave the lower face to the right of the way)." />
             <space />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
-        </item>
-      </group> <!-- Water -->
+        </item> <!-- Cliff -->
+    </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
         <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway" preset_name_label="true">
@@ -2027,5 +2039,5 @@
             <key key="route" value="ferry" />
             <optional>
-              <text key="name" text="Name" />
+                <text key="name" text="Name" />
             </optional>
         </item>
@@ -3411,4 +3423,5 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <label text="An office where you can get information about a town or region." />
             <space />
             <key key="tourism" value="information" />
@@ -3451,8 +3464,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
             <space />
+            <label text="A board with information." />
             <key key="tourism" value="information" />
             <key key="information" value="board" />
             <text key="name" text="Name" />
-            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" />
+            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants,geology" />
             <text key="description" text="Closer Description" />
         </item>
@@ -3462,8 +3476,9 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:information=guidepost"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
+            <label text="A Signpost/Guidepost to indicate the directions to different destinations." />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
-            <text key="name" text="Name" />
+            <reference ref="name_ref_operator" />
             <text key="ele" text="Elevation" />
             <optional text="Routes shown for:">
@@ -6781,9 +6796,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
+            <label text="The top (summit) of a mountain or hill." />
             <space />
             <key key="natural" value="peak" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-        </item>
+        </item> <!-- Peak -->
         <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
@@ -6791,20 +6807,22 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
+            <label text="A saddle point between mountains or hills." />
             <space/>
             <key key="natural" value="saddle" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-        </item>
-        <item name="Glacier" icon="presets/glacier.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Saddle -->
+        <item name="Glacier" icon="presets/glacier.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
+            <label text="A persistent body of dense ice that is constantly moving under its own weight." />
             <space />
             <key key="natural" value="glacier" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-        </item>
-        <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Glacier -->
+        <item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=volcano"
@@ -6812,18 +6830,27 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
+            <label text="A volcano, either dormant, extinct or active." />
             <space />
             <key key="natural" value="volcano" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-        </item>
-        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
+            <optional>
+                <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
+                <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
+            </optional>
+        </item> <!-- Volcano -->
+        <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cave_entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=cave_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
+            <label text="The entrance to a cave." />
             <space />
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
-        </item>
+            <reference ref="oh" />
+            <reference ref="general_access" />
+            <combo key="fee" text="Fee" values="yes,no" />
+        </item> <!-- Cave Entrance -->
         <separator/>
         <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
@@ -6846,4 +6873,14 @@
             <reference ref="name_wikipedia" />
         </item>
+        <item name="Ridge" icon="presets/empty.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE: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="presets/tree.png">
@@ -6859,4 +6896,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=tree" />
+            <label text="A single tree." />
             <space />
             <key key="natural" value="tree" />
@@ -6870,5 +6908,5 @@
                 <reference ref="leaf" />
             </optional>
-        </item>
+        </item> <!-- Tree -->
         <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
@@ -6880,9 +6918,12 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree_row"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
+            <label text="A line of trees." />
+            <space />
             <key key="natural" value="tree_row" />
+            <text key="height" text="Height in meter (m)" />
             <optional>
                 <reference ref="leaf" />
             </optional>
-        </item>
+        </item> <!-- Tree Row -->
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
@@ -6892,9 +6933,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
+            <label text="Woodland where timber production does not dominate use." />
             <space />
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
             <reference ref="leaf" />
-        </item>
+        </item> <!-- Wood -->
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
@@ -6909,6 +6951,6 @@
             <text key="name" text="Name" />
             <reference ref="leaf" />
-        </item>
-        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        </item> <!-- Forest -->
+        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
@@ -6919,9 +6961,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
+            <label text="Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-woody) plants. Excludes cultivated areas and wetlands." />
             <space />
             <key key="natural" value="grassland" />
             <text key="name" text="Name" />
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
-        </item>
+        </item> <!-- Grassland -->
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=nature_reserve"
@@ -6934,5 +6977,5 @@
             <key key="leisure" value="nature_reserve" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Nature Reserve -->
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
@@ -6943,8 +6986,9 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scree"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree" />
+            <label text="An accumulation of loose rocks." />
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Scree -->
         <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
@@ -6953,8 +6997,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
+            <label text="Bare upper lying uncultivated land principally covered with grass and often grazed." />
             <space />
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Fell -->
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
@@ -6965,8 +7010,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scrub"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=scrub" />
+            <label text="Bare lower lying uncultivated land with bushes but little or no tree cover." />
             <space />
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
-        </item>
+            <optional>
+                <reference ref="leaf" />
+            </optional>
+        </item> <!-- Scrub -->
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
@@ -6976,16 +7025,41 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
+            <label text="Bare lower lying uncultivated land with a shrubland habitat found mainly on free-draining infertile, acidic soils, and is characterised by open, low-growing woody vegetation." />
             <space />
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Heath -->
         <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
+            <label text="Large area covered with sand." />
             <space />
             <key key="natural" value="sand" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Sand -->
+        <item name="Bare Rock" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bare_rock"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bare_rock" />
+            <label text="For areas of solid visible rock that is sparsely vegetated or not vegetated at all." />
+            <space />
+            <key key="natural" value="bare_rock" />
+            <text key="name" text="Name" />
+        </item> <!-- Bare Rock -->
+        <item name="Stone" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=stone"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=stone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=stone"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=stone" />
+            <label text="A single notable free-standing rock, which may differ from the composition of the terrain it lies in." />
+            <space />
+            <key key="natural" value="stone" />
+            <reference ref="name_wikipedia" />
+            <optional>
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+        </item> <!-- Stone -->
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">