Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 4359)
+++ trunk/data/defaultpresets.xml	(revision 4361)
@@ -197,4 +197,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -215,4 +216,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -237,4 +239,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -258,4 +261,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -287,4 +291,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -308,4 +313,5 @@
                 <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" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -327,4 +333,5 @@
                 <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" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -346,4 +353,5 @@
                 <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" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -368,4 +376,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -402,4 +411,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -423,4 +433,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -478,4 +489,5 @@
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -494,4 +506,5 @@
                 <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -508,4 +521,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -535,4 +549,5 @@
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -572,4 +587,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -592,4 +608,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -613,4 +630,5 @@
                 <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" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -636,4 +654,5 @@
                 <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" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -660,4 +679,5 @@
                 <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" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -679,4 +699,5 @@
                 <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" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -800,10 +821,4 @@
         </item>
         <separator/>
-        <item name="Incline" icon="presets/incline.png" type="node,way">
-            <key key="highway" value="incline" />
-        </item>
-        <item name="Incline Steep" icon="presets/incline_steep.png" type="node,way">
-            <key key="highway" value="incline_steep" />
-        </item>
         <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
@@ -1374,4 +1389,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" default="" delete_if_empty="true" />
             </optional>
         </item>