Changeset 9931 in josm


Ignore:
Timestamp:
2016-03-05T16:43:37+01:00 (9 years ago)
Author:
simon04
Message:

see #8460 - Improve public transport route member validation by splitting preset into bus and rail

Drop rarely used relations route=ferry, route=aerialway.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r9892 r9931  
    381381    <preset_link preset_name="Payment Methods" />
    382382  </chunk>
     383  <chunk id="public_transport_route_optionals">
     384    <text key="from" text="From (initial stop)" />
     385    <text key="to" text="To (terminal stop)" />
     386    <text key="via" text="Via (intermediate stops)" />
     387    <text key="operator" text="Operator" />
     388    <text key="network" text="Network" />
     389    <text key="description" text="Description" />
     390    <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     391  </chunk>
    383392  <!--  Groups -->
    384393  <group name="Highways" icon="styles/standard/transport/way/way_secondary.svg">
    … …  
    30693078    </group> <!-- Bicycle -->
    30703079    <group name="Public Transport" icon="presets/bus.png">
    3071         <item name="Public Transport Route" icon="presets/path.png" type="relation" preset_name_label="true">
     3080        <item name="Public Transport Route (Rail)" icon="presets/path.png" type="relation" preset_name_label="true">
    30723081            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
    30733082            <space />
    30743083            <key key="type" value="route" />
    3075             <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
     3084            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" match="keyvalue!" />
    30763085            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
    30773086            <reference ref="name_ref" />
    30783087            <optional>
    3079                 <text key="from" text="From (initial stop)" />
    3080                 <text key="to" text="To (terminal stop)" />
    3081                 <text key="via" text="Via (intermediate stops)" />
    3082                 <text key="operator" text="Operator" />
    3083                 <text key="network" text="Network" />
    3084                 <text key="description" text="Description" />
    3085                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     3088                <reference ref="public_transport_route_optionals" />
    30863089            </optional>
    30873090            <roles>
    3088                 <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
    3089                 <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position" />
    3090                 <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position" />
    3091                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    3092                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
    3093                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
    3094                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway OR railway OR waterway OR aerialway" />
     3091                <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3092                <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3093                <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3094                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3095                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3096                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=stop_position (train OR subway OR monorail OR tram OR light_rail)" />
     3097                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
    30953098            </roles>
    3096         </item> <!-- Public Transport Route -->
     3099        </item> <!-- Public Transport Route (Rail) -->
     3100        <item name="Public Transport Route (Bus)" icon="presets/path.png" type="relation" preset_name_label="true">
     3101            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
     3102            <space />
     3103            <key key="type" value="route" />
     3104            <combo key="route" text="Route type" values="bus,trolleybus" values_searchable="true" match="keyvalue!" />
     3105            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
     3106            <reference ref="name_ref" />
     3107            <optional>
     3108                <reference ref="public_transport_route_optionals" />
     3109            </optional>
     3110            <roles>
     3111                <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus OR trolleybus)" />
     3112                <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus OR trolleybus)" />
     3113                <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus OR trolleybus)" />
     3114                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform (bus OR trolleybus)" />
     3115                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus OR trolleybus)" />
     3116                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus OR trolleybus)" />
     3117                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
     3118            </roles>
     3119        </item> <!-- Public Transport Route (Bus) -->
    30973120        <item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
    30983121            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
Note: See TracChangeset for help on using the changeset viewer.