Changeset 15522 in josm

Timestamp:

2019-11-16T13:43:45+01:00 (5 years ago)

Author:

Klumbumbus

Message:

• fix #18324 - allow the role hail_and_ride in route=bus|trolleybus relations
• remove unuseful name in turn restriction preset

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -2451 +2451 @@
                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
+                <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
             </roles>
         </item> <!-- Public Transport Route (Bus) -->
@@ -7519 +7520 @@
             <key key="type" value="restriction" />
             <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
-            <optional>
-                <text key="name" text="Name" />
-            </optional>
             <roles>
                 <role key="from" text="from way" requisite="required" count="1" type="way" />

trunk/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java

@@ -52 +52 @@
                         .build());
                 return;
-            } else if (member.hasRole("") && OsmPrimitiveType.WAY == member.getType()) {
+            } else if (member.hasRole("", "hail_and_ride") && OsmPrimitiveType.WAY == member.getType()) {
                 membersToCheck.add(member);
                 routeNodes.addAll(member.getWay().getNodes());