Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 14580)
+++ trunk/data/defaultpresets.xml	(revision 14591)
@@ -204,5 +204,5 @@
     </chunk>
     <chunk id="sport">
-            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
+        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     </chunk>
     <chunk id="fee">
@@ -466,4 +466,32 @@
     <text key="description" text="Description" />
     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
+  </chunk>
+  <chunk id="climbing_styles">
+    <label text="Climbing styles:" />
+    <checkgroup columns="2">
+      <check key="climbing:boulder" text="Boulders" />
+      <check key="climbing:sport" text="Sport climbing" />
+         <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
+         <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
+      <check key="climbing:multipitch" text="Multi-pitch climbing" />
+      <check key="climbing:ice" text="Ice climbing" />
+      <check key="climbing:mixed" text="Mixed climbing" />
+      <check key="climbing:deepwater" text="Deep Water Soloing" />
+    </checkgroup>
+  </chunk>
+  <chunk id="climbing_optional_attributes">
+    <optional>
+      <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
+      <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
+      <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
+      <check key="climbing:summit_log" text="Summit/route log/register" />
+      <check key="indoor" text="Climbing routes indoor" />
+      <check key="outdoor" text="Climbing routes outdoor" />           
+      <text key="website" text="Official web site (e.g. operator)" />
+      <text key="url" text="Unofficial web site" />
+      <combo key="opening_hours" text="Opening hours" values="24/7,sunset-sunrise open; sunrise-sunset closed,Mar-Jun: closed; Jul-Feb: open,Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true"/>
+      <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
+      <combo key="access" text="Access" values="yes,no,customers,private" />
+    </optional>
   </chunk>
   <!--  Groups -->
@@ -6952,5 +6980,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Running -->
-        <item name="Climbing" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
@@ -6962,5 +6990,46 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre" />
-        </item> <!-- Climbing -->
+              <reference ref="climbing_styles" />
+            <text key="climbing:routes" text="Number of routes" />
+            <text key="ele" text="Usual elevation at the bottom of the routes" />
+            <space />
+            <combo key="climbing:length" text="Usual route length (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <space />
+            <combo key="climbing:grade:UIAA:min" text="UIAA: Simplest route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" />
+            <combo key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" />
+            <combo key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" />
+            <space />
+            <combo key="climbing:grade:french:min" text="French: Simplest route" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" />
+            <combo key="climbing:grade:french:max" text="French: Most difficult route" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" />
+            <combo key="climbing:grade:french:mean" text="French: Main difficulty" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" />
+            <space />
+            <combo key="climbing:grade:saxon:min" text="Saxon: Simplest route" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" />
+            <combo key="climbing:grade:saxon:max" text="Saxon: Most difficult route" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" />
+            <combo key="climbing:grade:saxon:mean" text="Saxon: Main difficulty" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" />
+            <reference ref="climbing_optional_attributes" />
+            <space />
+        </item> <!-- Climbing site -->
+        <item name="Climbing route" icon="presets/sport/climbing.svg" type="node,way" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
+                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
+                  it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:sport=climbing"
+                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
+            <space />
+            <key key="sport" value="climbing" />
+            <key key="climbing" value="route" />
+            <text key="name" text="Name" />
+               <reference ref="climbing_styles" />
+            <combo key="climbing:bolted" text="Bolts" values="yes,no,1 m,2 m,3 m,4 m,5 m,6 m" values_sort="false"/>
+            <combo key="climbing:pitches" values="1,2,3,4,5,6,7,8" default="1" />
+            <combo key="climbing:length" text="Route length (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <space />
+            <combo key="climbing:grade:UIAA" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" />
+            <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" />
+            <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" />
+            <reference ref="climbing_optional_attributes" />
+        </item> <!-- Climbing route -->
         <item name="Canoeing/Kayaking" icon="presets/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />