Ticket #18662: josm_17661_18662_route_relation_presets.patch

File josm_17661_18662_route_relation_presets.patch, 15.5 KB (added by skyper, 5 years ago)

patch adding ptv1 and ptv2 route relations for ferry and aerialway

  • resources/data/defaultpresets.xml

     
    485485    </chunk>
    486486    <chunk id="walking_routes_roles">
    487487        <roles>
    488             <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
     488            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway"/>
    489489            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
    490490            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
    491491            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
    … …  
    496496        </roles>
    497497    </chunk>
    498498    <chunk id="route_segment_roles">
    499         <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     499        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|leisure=track"/>
    500500        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    501501        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    502502        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    … …  
    515515        <text key="description" text="Description" />
    516516        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    517517        <reference ref="oh" />
    518         <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    519         <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     518    </chunk>
     519    <chunk id="pt_route_opt2">
    520520        <reference ref="fee" />
     521        <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
     522        <check key="roundtrip" text="Roundtrip"/>
    521523        <text key="website" text="Website" />
    522524    </chunk>
     525    <chunk id="pt_route_opt2_dur-int">
     526        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     527        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     528        <reference ref="pt_route_opt2" />
     529    </chunk>
    523530    <chunk id="climbing_styles">
    524531        <label text="Climbing styles:" />
    525532        <checkgroup columns="2">
    … …  
    21322139            <text key="name" text="Name" />
    21332140            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
    21342141        </item> <!-- Ferry Terminal -->
    2135         <item name="Ferry Route" icon="presets/nautical/ferry.svg" type="way,closedway,relation" preset_name_label="true">
     2142        <item name="Ferry Route" icon="presets/nautical/ferry.svg" type="way,closedway" preset_name_label="true">
    21362143            <link wiki="Tag:route=ferry" />
    21372144            <key key="route" value="ferry" />
    21382145            <optional>
    21392146                <reference ref="name_ref_operator" />
    21402147                <reference ref="wheelchair" />
    2141                 <space />
    2142                 <reference ref="oh" />
    2143                 <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    2144                 <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    2145                 <reference ref="fee" />
    21462148                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
    21472149                <check key="ferry:cable" text="Reaction ferry" />
     2150                <space />
     2151                <reference ref="oh" />
     2152                <reference ref="pt_route_opt2_dur-int" />
    21482153            </optional>
    21492154            <reference ref="link_road_access_restrictions" />
    21502155        </item> <!-- Ferry Route -->
    … …  
    28052810            <reference ref="name_ref" />
    28062811            <optional>
    28072812                <reference ref="public_transport_route_optionals" />
     2813                <reference ref="pt_route_opt2_dur-int" />
    28082814            </optional>
    28092815            <roles>
    28102816                <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
    … …  
    28252831            <reference ref="name_ref" />
    28262832            <optional>
    28272833                <reference ref="public_transport_route_optionals" />
    2828                 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
     2834                <reference ref="pt_route_opt2_dur-int" />
    28292835            </optional>
    28302836            <roles>
    28312837                <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" />
    … …  
    28382844                <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
    28392845            </roles>
    28402846        </item> <!-- Public Transport Route (Bus) -->
     2847        <item name="Public Transport Route (Ferry)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     2848            <link wiki="Tag:route=ferry" />
     2849            <key key="route" value="ferry" />
     2850            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
     2851            <optional>
     2852                <check key="ferry:cable" text="Reaction ferry" />
     2853                <space />
     2854                <reference ref="oh" />
     2855                <reference ref="public_transport_route_optionals" />
     2856                <reference ref="pt_route_opt2_dur-int" />
     2857            </optional>
     2858            <reference ref="link_road_access_restrictions" />
     2859            <roles>
     2860                <role key="stop" text="stop_position" requisite="optional" type="node" member_expression="public_transport=stop_position ferry=yes" />
     2861                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2862                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2863                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2864                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="route=ferry" />
     2865            </roles>
     2866        </item> <!-- Public Transport Route (Ferry) -->
     2867        <item name="Public Transport Route (Aerialway)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     2868            <link wiki="Public_transport#Service_routes" />
     2869            <space />
     2870            <key key="type" value="route" />
     2871            <combo key="route" text="Route type" values="aerialway" values_searchable="true" match="keyvalue!" />
     2872            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
     2873            <reference ref="name_ref" />
     2874            <optional>
     2875                <reference ref="public_transport_route_optionals" />
     2876                <reference ref="pt_route_opt2_dur-int" />
     2877            </optional>
     2878            <roles>
     2879               <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (aerialway=yes OR aerialway=station)" />
     2880                <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (aerialway=yes OR aerialway=station)" />
     2881                <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (aerialway=yes OR aerialway=station)" />
     2882                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2883                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2884                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2885                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="aerialway" />
     2886            </roles>
     2887        </item> <!-- Public Transport Route (Aerialway) -->
    28412888        <item name="Route Master" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    28422889            <link wiki="Public_transport#Route_Master_relations" />
    28432890            <space />
    … …  
    29482995        </item> <!-- Ticket Machine -->
    29492996    </group> <!-- Public Transport -->
    29502997    <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
    2951         <item name="Public transport route (Legacy)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     2998        <item name="Public transport route (Legacy) (Bus/Train)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    29522999            <key key="type" value="route" />
    2953             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" match="keyvalue!" />
     3000            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi" values_searchable="true" match="keyvalue!" />
    29543001            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
    29553002            <reference ref="name_ref" />
    29563003            <optional>
    2957                 <text key="from" text="From (initial stop)" />
    2958                 <text key="to" text="To (terminal stop)" />
    2959                 <text key="via" text="Via (intermediate stops)" />
    2960                 <text key="operator" text="Operator" />
    2961                 <text key="network" text="Network" />
    2962                 <text key="description" text="Description" />
    2963                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    2964                 <reference ref="oh" />
    2965                 <reference ref="fee" />
    2966                 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
    2967                 <text key="website" text="Website" />
     3004                <reference ref="public_transport_route_optionals" />
     3005                <reference ref="pt_route_opt2" />
    29683006            </optional>
    29693007            <roles>
    29703008                <role key="" text="route segment" requisite="optional" type="way,closedway" />
    … …  
    29753013                <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" />
    29763014                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="highway=platform OR railway=platform" />
    29773015            </roles>
    2978         </item> <!-- Public transport route (Legacy) -->
     3016        </item> <!-- Public transport route (Legacy) (Bus/Train) -->
     3017        <item name="Public transport route (Legacy) (Ferry)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3018            <link wiki="Tag:route=ferry" />
     3019            <key key="route" value="ferry" />
     3020            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
     3021            <optional>
     3022                <reference ref="name_ref_operator" />
     3023                <reference ref="wheelchair" />
     3024                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
     3025                <check key="ferry:cable" text="Reaction ferry" />
     3026                <space />
     3027                <reference ref="oh" />
     3028                <reference ref="pt_route_opt2_dur-int" />
     3029            </optional>
     3030            <reference ref="link_road_access_restrictions" />
     3031            <roles>
     3032                <role key="" text="route segment" requisite="optional" type="way,closedway" />
     3033                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     3034                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     3035                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="amenity=ferry_terminal OR (public_transport=stop_position ferry=yes)" />
     3036                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="man_made=pier OR (public_transport=platform ferry=yes)" />
     3037            </roles>
     3038        </item> <!-- Public transport route (Legacy) (Ferry) -->
     3039        <item name="Public transport route (Legacy) (Aerialway)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3040            <key key="type" value="route" />
     3041            <combo key="route" text="Route type" values="aerialway" values_searchable="true" match="keyvalue!" />
     3042            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
     3043            <reference ref="name_ref" />
     3044            <optional>
     3045                <reference ref="public_transport_route_optionals" />
     3046                <reference ref="pt_route_opt2" />
     3047            </optional>
     3048            <roles>
     3049                <role key="" text="route segment" requisite="optional" type="way,closedway" />
     3050                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     3051                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     3052                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="aerialway=station OR (public_transport=stop_position aerialway=yes)" />
     3053                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     3054            </roles>
     3055        </item> <!-- Public transport route (Legacy) (Aerialway) -->
     3056        <separator/>
    29793057        <item name="Station" name_context="railway" icon="presets/transport/railway_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29803058            <link wiki="Tag:railway=station" />
    29813059            <key key="railway" value="station" />