Changeset 15641 in josm


Ignore:
Timestamp:
2020-01-05T22:14:16+01:00 (5 months ago)
Author:
Don-vip
Message:

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

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15634 r15641  
    463463         <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    464464     </roles>
     465  </chunk>
     466  <chunk id="route_segment_roles">
     467     <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     468     <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     469     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     470  </chunk>
     471  <chunk id="route_start_stop_roles">
     472     <role key="start" text="start endpoint" requisite="optional" type="node" />
     473     <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     474     <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    465475  </chunk>
    466476  <!-- Link chunks -->
     
    76177627                </optional>
    76187628                <roles>
    7619                     <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    7620                     <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    7621                     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     7629                    <reference ref="route_segment_roles" />
    76227630                </roles>
    76237631            </item> <!-- Bicycle Route -->
     
    76327640                </optional>
    76337641                <roles>
    7634                     <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    7635                     <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    7636                     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     7642                    <reference ref="route_segment_roles" />
    76377643                </roles>
    76387644            </item> <!-- Mountain Biking Route -->
     
    76617667                <reference ref="walking_routes_roles" />
    76627668            </item> <!-- Walking Route -->
     7669            <item name="Running Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     7670                <link wiki="Tag:route=running" />
     7671                <space/>
     7672                <key key="type" value="route"/>
     7673                <key key="route" value="running"/>
     7674                <text key="name" text="Name" />
     7675                <optional>
     7676                    <reference ref="route_hikebike_optionals" />
     7677                </optional>
     7678                <roles>
     7679                    <reference ref="route_segment_roles" />
     7680                    <reference ref="route_start_stop_roles" />
     7681                </roles>
     7682            </item> <!-- Running Route -->
     7683            <item name="Fitness Trail" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     7684                <link wiki="Tag:route=fitness_trail" />
     7685                <space/>
     7686                <key key="type" value="route"/>
     7687                <key key="route" value="fitness_trail"/>
     7688                <text key="name" text="Name" />
     7689                <optional>
     7690                    <reference ref="route_hikebike_optionals" />
     7691                </optional>
     7692                <roles>
     7693                    <reference ref="route_segment_roles" />
     7694                    <reference ref="route_start_stop_roles" />
     7695                    <role key="" text="fitness station" requisite="optional" type="node,way,closedway" member_expression="leisure=fitness_station" />
     7696                    <role key="station" text="fitness station" requisite="optional" type="node,way,closedway" member_expression="leisure=fitness_station" />
     7697                </roles>
     7698            </item> <!-- Fitness Trail -->
    76637699            <item name="Riding Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    76647700                <link wiki="Tag:route=horse" />
  • trunk/data/validator/geometry.mapcss

    r15454 r15641  
    292292way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi|toilets)$/],
    293293way[highway] > node[building][!entrance],
    294 way[highway] > node[leisure][!entrance][leisure!=slipway],
     294way[highway] > node[leisure][!entrance][leisure!=slipway][leisure!=fitness_station],
    295295way[highway] > node[office][!entrance],
    296296way[highway] > node[shop][!entrance],
Note: See TracChangeset for help on using the changeset viewer.