Ticket #21161: josm_21161.patch

File josm_21161.patch, 8.2 KB (added by skyper, 5 years ago)

patch file

  • resources/data/defaultpresets.xml

     
    493493    </chunk>
    494494    <chunk id="walking_routes_roles">
    495495        <roles>
    496             <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
    497             <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
    498             <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
    499             <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
    500             <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
    501             <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    502             <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    503             <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     496            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry" />
     497            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
     498            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
     499            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
     500            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
     501            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity" />
     502            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality" />
     503            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost" />
    504504        </roles>
    505505    </chunk>
    506506    <chunk id="route_segment_roles">
    507         <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    508         <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    509         <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    510         <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     507        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
     508        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
     509        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track" />
     510        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost" />
    511511    </chunk>
    512512    <chunk id="route_start_stop_roles">
    513513        <role key="start" text="start endpoint" requisite="optional" type="node" />
    … …  
    28682868                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    28692869                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    28702870                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    2871                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
     2871                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway|route=ferry" />
    28722872            </roles>
    28732873        </item> <!-- Public Transport Route (Rail) -->
    28742874        <item name="Public Transport Route (Bus)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    … …  
    28892889                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    28902890                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    28912891                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    2892                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
     2892                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry" />
    28932893                <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
    28942894            </roles>
    28952895        </item> <!-- Public Transport Route (Bus) -->
    … …  
    30223022                <text key="website" text="Website" />
    30233023            </optional>
    30243024            <roles>
    3025                 <role key="" text="route segment" requisite="optional" type="way,closedway" />
    3026                 <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    3027                 <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     3025                <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
     3026                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
     3027                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
    30283028                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
    30293029                <role key="forward_stop" text="forward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
    30303030                <role key="backward_stop" text="backward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
    … …  
    90069006            <space />
    90079007            <key key="type" value="network" />
    90089008            <key key="network:type" value="node_network" />
    9009             <combo key="network" text="Network" values="icn,ncn,rcn,lcn,iwn,nwn,rwn,lwn" display_values="international cycling,national cycling,regional cycling,local cycling,international walking,national walking,regional walking,local walking" values_context="network" values_sort="false"/>
     9009            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,ihn,nhn,rhn,lhn,iwn,nwn,rwn,lwn" display_values="international cycling,national cycling,regional cycling,local cycling,international riding,national riding,regional riding,local riding,international walking,national walking,regional walking,local walking" values_context="network" values_sort="false"/>
    90109010            <optional>
    90119011                <text key="name" text="Name" />
    90129012                <text key="operator" text="Operator" />