Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 2860)
+++ data/defaultpresets.xml	(working copy)
@@ -403,14 +403,45 @@
         </item>
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
-        <item name="Construction" icon="presets/construction.png" type="way">
-            <label text="Edit Highway Under Construction" />
-<!--     FIXME: no entry in the Wiki
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
--->
             <space />
-            <key key="highway" value="construction" />
+        <item name="Track" icon="presets/track1.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+            <label text="Edit Track" />
+            <key key="highway" value="track" />
+                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+				<combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+				<space />
+                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+				<combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+				<combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,official,unknown,no" default="" delete_if_empty="true" />
+				<combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+				<space />
+				<combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" default="" delete_if_empty="true" />
+				<combo key="sac_scale" text="Sac_scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" />
+				<combo key="incline" text="Incline (value in +- %)" values="up,down" default="" delete_if_empty="true" />
+				<combo key="mtb:scale" text="Mtb:scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
+				<combo key="mtb:scale:uphill" text="Mtb:scale:uphill" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
+        </item>
+		<item name="Path" icon="presets/path.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+            <label text="Edit Path" />
+            <key key="highway" value="path" />
+            <label text="Type" />
+            <combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" />
+            <combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" />
+            <combo key="horse" text="Horse" values="yes,designated,no" default="" delete_if_empty="true" />
+            <combo key="ski" text="Ski" values="yes,designated,no" default="" delete_if_empty="true" />
+            <combo key="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
+            <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -418,11 +449,14 @@
                 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
                 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
                 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
-                <combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" />
-                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+				<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+				<space />
+				<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
+				<combo key="sac_scale" text="Sac_scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" />
+				<combo key="incline" text="Incline (up/down or value in +- %)" values="up,down" default="" delete_if_empty="true" />				
+				<combo key="mtb:scale" text="Mtb:scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
+				<combo key="mtb:scale:uphill" text="Mtb:scale:uphill" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
             </optional>
         </item>
         <separator/>
@@ -524,150 +558,14 @@
             </optional>
         </item>
         <separator/>
-        <item name="Track" icon="presets/track1.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-            <label text="Edit Track" />
-            <space />
-            <key key="highway" value="track" />
+		<item name="Construction" icon="presets/construction.png" type="way">
+            <label text="Edit Highway Under Construction" />
+<!--     FIXME: no entry in the Wiki
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+-->			<key key="highway" value="construction" />
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Track Grade 1" icon="presets/track1.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-            <label text="Edit Track of grade 1" />
-            <space />
-            <key key="highway" value="track" />
-            <key key="tracktype" value="grade1" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="paved,concrete,cobblestone" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Track Grade 2" icon="presets/track2.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-            <label text="Edit Track of grade 2" />
-            <space />
-            <key key="highway" value="track" />
-            <key key="tracktype" value="grade2" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="cobblestone,gravel,ground,sand" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Track Grade 3" icon="presets/track3.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-            <label text="Edit Track of grade 3" />
-            <space />
-            <key key="highway" value="track" />
-            <key key="tracktype" value="grade3" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="cobblestone,gravel,ground,sand" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Track Grade 4" icon="presets/track4.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-            <label text="Edit Track of grade 4" />
-            <space />
-            <key key="highway" value="track" />
-            <key key="tracktype" value="grade4" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="ground,grass,sand" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Track Grade 5" icon="presets/track5.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-            <label text="Edit Track of grade 5" />
-            <space />
-            <key key="highway" value="track" />
-            <key key="tracktype" value="grade5" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-                <combo key="surface" text="Surface" values="ground,grass,sand" default="" delete_if_empty="true" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <separator/>
-        <item name="Path" icon="presets/path.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-            <label text="Edit Path" />
-            <space />
-            <key key="highway" value="path" />
-            <space />
-            <label text="Type" />
-            <combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" />
-            <combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" />
-            <combo key="horse" text="Horse" values="yes,designated,no" default="" delete_if_empty="true" />
-            <combo key="ski" text="Ski" values="yes,designated,no" default="" delete_if_empty="true" />
-            <combo key="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
-            <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
-
-
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
                 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
                 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
@@ -675,88 +573,12 @@
                 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
+                <combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
-        <item name="Hiking" icon="presets/hiking_grade1.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Mountain Hiking" icon="presets/hiking_grade2.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Mountain Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="mountain_hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Demanding Mountain Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="demanding_mountain_hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Alpine Hiking" icon="presets/hiking_grade4.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Alpine Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="alpine_hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Demanding Alpine Hiking" icon="presets/hiking_grade5.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Demanding Alpine Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="demanding_alpine_hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Difficult Alpine Hiking" icon="presets/hiking_grade6.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-            <label text="Edit Difficult Alpine Hiking" />
-            <space />
-            <key key="highway" value="path" />
-            <key key="sac_scale" value="difficult_alpine_hiking" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
-            </optional>
-        </item>
+        <separator/>
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
         <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node">
@@ -3187,7 +3009,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
             <label text="Edit Route" />
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" default="" delete_if_empty="true" />
+            <combo key="route" text="Route type" values="bicycle,mtb,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" default="" delete_if_empty="true" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <text key="ref" text="Reference" default="" delete_if_empty="true" />
             <text key="symbol" text="Symbol description" default="" delete_if_empty="true" />