Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18092)
+++ trunk/resources/data/defaultpresets.xml	(revision 18093)
@@ -489,19 +489,19 @@
     <chunk id="walking_routes_roles">
         <roles>
-            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
-            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
-            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
-            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
-            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
-            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
-            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
-            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
+            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry" />
+            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
+            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
+            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
+            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
+            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity" />
+            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality" />
+            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost" />
         </roles>
     </chunk>
     <chunk id="route_segment_roles">
-        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
-        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
-        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
-        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
+        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
+        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
+        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
+        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost" />
     </chunk>
     <chunk id="route_start_stop_roles">
@@ -2864,5 +2864,5 @@
                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
+                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway|route=ferry" />
             </roles>
         </item> <!-- Public Transport Route (Rail) -->
@@ -2885,5 +2885,5 @@
                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
+                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry" />
                 <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
             </roles>
@@ -3018,7 +3018,7 @@
             </optional>
             <roles>
-                <role key="" text="route segment" requisite="optional" type="way,closedway" />
-                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
-                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
+                <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
+                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
+                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
                 <role key="stop" text="halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
                 <role key="forward_stop" text="forward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
@@ -9010,5 +9010,5 @@
             <key key="type" value="network" />
             <key key="network:type" value="node_network" />
-            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,iwn,nwn,rwn,lwn" display_values="international cycling,national cycling,regional cycling,local cycling,international walking,national walking,regional walking,local walking" values_context="network" values_sort="false"/>
+            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,ihn,nhn,rhn,lhn,iwn,nwn,rwn,lwn" display_values="international cycling,national cycling,regional cycling,local cycling,international riding,national riding,regional riding,local riding,international walking,national walking,regional walking,local walking" values_context="network" values_sort="false"/>
             <optional>
                 <text key="name" text="Name" />