Index: defaultpresets.xml
===================================================================
--- defaultpresets.xml	(revision 14100)
+++ defaultpresets.xml	(working copy)
@@ -6592,7 +6592,8 @@
             <reference ref="name_operator" />
             <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 on natural structures" de.name="Klettern an natürlichen Strukturen" 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"
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
@@ -6601,8 +6602,89 @@
             <space />
             <key key="sport" value="climbing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre" />
-        </item> <!-- Climbing -->
+            <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>
+            
+            <space />
+            <combo key="climbing:bolted" text="Bolts (yes/no/distance)" values="yes,no,1 m,2 m,3 m,4 m,5 m,6 m" values_sort="false"/>
+            <text key="ele" text="Elevation of route bottom " />
+            <combo key="climbing:length" text="Usual route length (m)"  values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <combo key="climbing:length:min" text="Minimal climbing length (m)"  values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <combo key="climbing:length:max" text="Maximum climbing length (m)"  values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+            <space />
+            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_sort="false"/>
+            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid"
+                    display_values="fragile,medium,solid" de.display_values="brüchig,mittel,stabil"/>
+            <!-- maybe change combo for rock to multiselect, so multiple rock types can be selected? But multiselect consumes more display space -->
+            <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate"
+                   display_values="limestone,sandstone,granite,basalt,slate" de.display_values="Kalkstein,Sandstein,Granit,Basalt,Schiefer" />
+            <text key="climbing:routes" text="Amount of routes" />
+            <check key="climbing:summit_log" text="Summit/route log" />
+            <text key="climbing:grade:UIAA:min" text="UIAA: Simplest route" />
+            <text key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" />
+            <text key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" />
+            <text key="climbing:grade:french:min" text="French: Simplest route" />
+            <text key="climbing:grade:french:max" text="French: Most difficult route" />
+            <text key="climbing:grade:french:mean" text="French: Main difficulty" />
+            <check key="indoor" text="Climbing routes indoor" default="off" />
+            <check key="outdoor" text="Climbing routes outdoor" default="on" />            
+            <text key="website" text="Official web site (e.g. operator)" />
+            <text key="url" text="Unofficial web site (URL)" />
+            <combo key="opening_hours" text="Opening hours" 
+                   values="24/7,sunset-sunrise open; sunrise-sunset closed;,Mar-Jun: closed; Jul-Feb: open;"  default="24/7"  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" />
+        </item> <!-- Climbing on natural structures -->        
+        <item name="Climbing on artificial structures" de.name="Klettern an künstlichen Strukturen" 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"
+                  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" />
+            <key key="sport" value="climbing" /> 
+            <key key="leisure" value="sports_centre" />
+            <text key="name" text="Name" />
+            <checkgroup columns="2">
+                <check key="climbing:boulder" text="Boulders" />
+                <check key="climbing:sport" text="Sport climbing" />
+                <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>
+            <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"/>
+            <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"/>
+            <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"/>
+            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_sort="false"/>
+            <text key="climbing:routes" text="Amount of routes" />
+            <space />
+            <text key="climbing:grade:UIAA:min" text="UIAA: Simplest route" />
+            <text key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" />
+            <text key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" />
+            <text key="climbing:grade:french:min" text="French: Simplest route" />
+            <text key="climbing:grade:french:max" text="French: Most difficult route" />
+            <text key="climbing:grade:french:mean" text="French: Main difficulty" />
+            <checkgroup columns="2">
+                <check key="indoor" text="Climbing routes indoor" default="on" />
+                <check key="building" text="Building" /> 
+            </checkgroup>
+            <check key="outdoor" text="Climbing routes outdoor" default="off" />        
+            <text key="website" text="Official web site (e.g. operator)" />
+            <text key="url" text="Unofficial web site (URL)" />
+            <combo key="opening_hours" text="Opening hours" values="Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" />
+            <combo key="fee" text="Fee"  values="yes,no,Sa-Su 08:00-20:00"/>
+            <combo key="access" text="Access" values="yes,no,customers,private" />
+        </item> <!-- Climbing on artificial structures -->
         <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" />
             <space />