Changeset 15828 in josm for trunk

Timestamp:

2020-02-08T16:48:38+01:00 (5 years ago)

Author:

Klumbumbus

Message:

• Fix #18642, see #11330 - Don't warn about the key to on route=ferry ways
• Add vehicle combo to highway=track preset

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (1 diff)
• validator/deprecated.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -949 +949 @@
                 <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" />

trunk/data/validator/deprecated.mapcss

@@ -690 +690 @@
 }
 
-/* see #11330 */
+/* see #11330, #18642 */
 *[/^.$/],
 node[/^..$/],
-way[/^..$/],
+way[/^..$/][route=ferry][!to],
+way[/^..$/][route!=ferry],
 relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
@@ -699 +700 @@
   assertMatch: "relation fo=bar";
   assertMatch: "way to=bar";
+  assertNoMatch: "way to=Zuidschermer;Akersloot route=ferry";
   assertMatch: "node fo=bar";
   assertMatch: "node f=b";