Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15827)
+++ /trunk/data/defaultpresets.xml	(revision 15828)
@@ -949,4 +949,5 @@
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <reference ref="general_access" />
+                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 15827)
+++ /trunk/data/validator/deprecated.mapcss	(revision 15828)
@@ -690,8 +690,9 @@
 }
 
-/* see #11330 */
+/* see #11330, #18642 */
 *[/^.$/],
 node[/^..$/],
-way[/^..$/],
+way[/^..$/][route=ferry][!to],
+way[/^..$/][route!=ferry],
 relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
@@ -699,4 +700,5 @@
   assertMatch: "relation fo=bar";
   assertMatch: "way to=bar";
+  assertNoMatch: "way to=Zuidschermer;Akersloot route=ferry";
   assertMatch: "node fo=bar";
   assertMatch: "node f=b";