Changeset 15641 in josm

Timestamp:

2020-01-05T22:14:16+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18421 - add route=running and route=fitness_trail

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (4 diffs)
• validator/geometry.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -463 +463 @@
          <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" />
+  </chunk>
+  <chunk id="route_start_stop_roles">
+     <role key="start" text="start endpoint" requisite="optional" type="node" />
+     <role key="stop" text="stop endpoint" requisite="optional" type="node" />
+     <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
   </chunk>
   <!-- Link chunks -->
@@ -7617 +7627 @@
                 </optional>
                 <roles>
-                    <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
-                    <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
-                    <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
+                    <reference ref="route_segment_roles" />
                 </roles>
             </item> <!-- Bicycle Route -->
@@ -7632 +7640 @@
                 </optional>
                 <roles>
-                    <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
-                    <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
-                    <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
+                    <reference ref="route_segment_roles" />
                 </roles>
             </item> <!-- Mountain Biking Route -->
@@ -7661 +7667 @@
                 <reference ref="walking_routes_roles" />
             </item> <!-- Walking Route -->
+            <item name="Running Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+                <link wiki="Tag:route=running" />
+                <space/>
+                <key key="type" value="route"/>
+                <key key="route" value="running"/>
+                <text key="name" text="Name" />
+                <optional>
+                    <reference ref="route_hikebike_optionals" />
+                </optional>
+                <roles>
+                    <reference ref="route_segment_roles" />
+                    <reference ref="route_start_stop_roles" />
+                </roles>
+            </item> <!-- Running Route -->
+            <item name="Fitness Trail" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+                <link wiki="Tag:route=fitness_trail" />
+                <space/>
+                <key key="type" value="route"/>
+                <key key="route" value="fitness_trail"/>
+                <text key="name" text="Name" />
+                <optional>
+                    <reference ref="route_hikebike_optionals" />
+                </optional>
+                <roles>
+                    <reference ref="route_segment_roles" />
+                    <reference ref="route_start_stop_roles" />
+                    <role key="" text="fitness station" requisite="optional" type="node,way,closedway" member_expression="leisure=fitness_station" />
+                    <role key="station" text="fitness station" requisite="optional" type="node,way,closedway" member_expression="leisure=fitness_station" />
+                </roles>
+            </item> <!-- Fitness Trail -->
             <item name="Riding Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
                 <link wiki="Tag:route=horse" />

trunk/data/validator/geometry.mapcss

@@ -292 +292 @@
 way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi|toilets)$/],
 way[highway] > node[building][!entrance],
-way[highway] > node[leisure][!entrance][leisure!=slipway],
+way[highway] > node[leisure][!entrance][leisure!=slipway][leisure!=fitness_station],
 way[highway] > node[office][!entrance],
 way[highway] > node[shop][!entrance],