Ticket #18662: josm_17661_18662_v2.patch

File josm_17661_18662_v2.patch, 17.4 KB (added by skyper, 5 years ago)

updated version 2; adds missing type=route to all relations; updates/adds wiki links; allow "Road" + "Access Restriction" for all types

  • resources/data/defaultpresets.xml

     
    518518        <text key="description" text="Description" />
    519519        <reference ref="color" />
    520520        <reference ref="oh" />
    521         <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" />
    522         <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" />
     521    </chunk>
     522    <chunk id="fee_reservation_roundtrip_website">
    523523        <reference ref="fee" />
     524        <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
     525        <check key="roundtrip" text="Roundtrip"/>
    524526        <text key="website" text="Website" />
    525527    </chunk>
     528    <chunk id="pt_route_opt2">
     529        <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" />
     530        <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" />
     531        <reference ref="fee_reservation_roundtrip_website" />
     532    </chunk>
    526533    <chunk id="climbing_styles">
    527534        <label text="Climbing styles:" />
    528535        <checkgroup columns="2">
    … …  
    947954            <reference ref="link_road_access_restrictions" />
    948955        </item> <!-- Construction -->
    949956        <separator/>
    950         <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway" preset_name_label="true">
     957        <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true"> <!-- There are links from MPs and route relations to this preset -->
    951958            <link wiki="Key:access" />
    952959            <space />
    953960            <checkgroup columns="3" >
    … …  
    974981            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
    975982            <preset_link preset_name="Access Restrictions" />
    976983        </item> <!-- Road Restrictions -->
    977         <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
     984        <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true"> <!-- There are links from MPs and route relations to this preset -->
    978985            <link wiki="Key:access" />
    979986            <space />
    980987            <label text="Some road types already imply some access restrictions which should not be set again." />
    … …  
    21742181            <text key="name" text="Name" />
    21752182            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
    21762183        </item> <!-- Ferry Terminal -->
    2177         <item name="Ferry Route" icon="presets/nautical/ferry.svg" type="way,closedway,relation" preset_name_label="true">
     2184        <item name="Ferry Route" icon="presets/nautical/ferry.svg" type="way,closedway" preset_name_label="true">
    21782185            <link wiki="Tag:route=ferry" />
    21792186            <key key="route" value="ferry" />
    21802187            <optional>
    21812188                <reference ref="name_ref_operator" />
    21822189                <reference ref="wheelchair" />
    2183                 <space />
    2184                 <reference ref="oh" />
    2185                 <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" />
    2186                 <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" />
    2187                 <reference ref="fee" />
    21882190                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
    21892191                <check key="ferry:cable" text="Reaction ferry" />
     2192                <space />
     2193                <reference ref="oh" />
     2194                <reference ref="pt_route_opt2" />
    21902195            </optional>
    21912196            <reference ref="link_road_access_restrictions" />
    21922197        </item> <!-- Ferry Route -->
    … …  
    28562861            <reference ref="name_ref" />
    28572862            <optional>
    28582863                <reference ref="public_transport_route_optionals" />
     2864                <reference ref="pt_route_opt2" />
    28592865            </optional>
    28602866            <roles>
    28612867                <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)" />
    … …  
    28682874            </roles>
    28692875        </item> <!-- Public Transport Route (Rail) -->
    28702876        <item name="Public Transport Route (Bus)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    2871             <link wiki="Public_transport#Service_routes" />
     2877            <link wiki="Tag:route=bus" />
    28722878            <space />
    28732879            <key key="type" value="route" />
    28742880            <combo key="route" text="Route type" values="bus,share_taxi,trolleybus" values_searchable="true" match="keyvalue!" />
    … …  
    28762882            <reference ref="name_ref" />
    28772883            <optional>
    28782884                <reference ref="public_transport_route_optionals" />
    2879                 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
     2885                <reference ref="pt_route_opt2" />
    28802886            </optional>
    28812887            <roles>
    28822888                <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)" />
    … …  
    28892895                <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
    28902896            </roles>
    28912897        </item> <!-- Public Transport Route (Bus) -->
     2898        <item name="Public Transport Route (Ferry)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     2899            <link wiki="Tag:route=ferry" />
     2900            <key key="type" value="route" />
     2901            <key key="route" value="ferry" />
     2902            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
     2903            <optional>
     2904                <check key="ferry:cable" text="Reaction ferry" />
     2905                <space />
     2906                <reference ref="oh" />
     2907                <reference ref="public_transport_route_optionals" />
     2908                <reference ref="pt_route_opt2" />
     2909            </optional>
     2910            <reference ref="link_road_access_restrictions" />
     2911            <roles>
     2912                <role key="stop" text="stop_position" requisite="optional" type="node" member_expression="public_transport=stop_position ferry=yes" />
     2913                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2914                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2915                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform ferry=yes" />
     2916                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="route=ferry" />
     2917            </roles>
     2918        </item> <!-- Public Transport Route (Ferry) -->
     2919        <item name="Public Transport Route (Aerialway)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     2920            <link wiki="Public_transport" />
     2921            <space />
     2922            <key key="type" value="route" />
     2923            <key key="route" value="aerialway"/>
     2924            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
     2925            <reference ref="name_ref" />
     2926            <optional>
     2927                <reference ref="public_transport_route_optionals" />
     2928                <reference ref="pt_route_opt2" />
     2929            </optional>
     2930            <roles>
     2931               <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (aerialway=yes OR aerialway=station)" />
     2932                <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)" />
     2933                <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)" />
     2934                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2935                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2936                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2937                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="aerialway" />
     2938            </roles>
     2939        </item> <!-- Public Transport Route (Aerialway) -->
    28922940        <item name="Route Master" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    28932941            <link wiki="Public_transport#Route_Master_relations" />
    28942942            <space />
    … …  
    29993047        </item> <!-- Ticket Machine -->
    30003048    </group> <!-- Public Transport -->
    30013049    <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
    3002         <item name="Public transport route (Legacy)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3050        <item name="Public transport route (Legacy) (Bus/Train)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3051            <link wiki="Public_transport#Service_routes" />
     3052            <space />
    30033053            <key key="type" value="route" />
    3004             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" match="keyvalue!" />
     3054            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi" values_searchable="true" match="keyvalue!" />
    30053055            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
    30063056            <reference ref="name_ref" />
    30073057            <optional>
    3008                 <text key="from" text="From (initial stop)" />
    3009                 <text key="to" text="To (terminal stop)" />
    3010                 <text key="via" text="Via (intermediate stops)" />
    3011                 <text key="operator" text="Operator" />
    3012                 <text key="network" text="Network" />
    3013                 <text key="description" text="Description" />
    3014                 <reference ref="color" />
    3015                 <reference ref="oh" />
    3016                 <reference ref="fee" />
    3017                 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
    3018                 <text key="website" text="Website" />
     3058                <reference ref="public_transport_route_optionals" />
     3059                <reference ref="fee_reservation_roundtrip_website" />
    30193060            </optional>
    30203061            <roles>
    3021                 <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
    3022                 <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
    3023                 <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry" />
     3062                <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|railway|route=ferry" />
     3063                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="highway|railway|route=ferry" />
     3064                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|railway|route=ferry" />
    30243065                <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" />
    30253066                <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" />
    30263067                <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" />
    30273068                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="highway=platform OR railway=platform" />
    30283069            </roles>
    3029         </item> <!-- Public transport route (Legacy) -->
     3070        </item> <!-- Public transport route (Legacy) (Bus/Train) -->
     3071        <item name="Public transport route (Legacy) (Ferry)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3072            <link wiki="Tag:route=ferry" />
     3073            <space />
     3074            <key key="type" value="route" />
     3075            <key key="route" value="ferry" />
     3076            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
     3077            <reference ref="name_ref_operator" />
     3078            <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
     3079            <check key="ferry:cable" text="Reaction ferry" />
     3080            <optional>
     3081                <reference ref="oh_wheelchair" />
     3082                <text key="network" text="Network" />
     3083                <text key="description" text="Description" />
     3084                <reference ref="color" />
     3085                <reference ref="pt_route_opt2" />
     3086            </optional>
     3087            <reference ref="link_road_access_restrictions" />
     3088            <roles>
     3089                <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="route=ferry" />
     3090                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="route=ferry" />
     3091                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="route=ferry" />
     3092                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="amenity=ferry_terminal OR (public_transport=stop_position ferry=yes)" />
     3093                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="man_made=pier OR (public_transport=platform ferry=yes)" />
     3094            </roles>
     3095        </item> <!-- Public transport route (Legacy) (Ferry) -->
     3096        <item name="Public transport route (Legacy) (Aerialway)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     3097            <link wiki="Public_transport" />
     3098            <space />
     3099            <key key="type" value="route" />
     3100            <key key="route" value="aerialway" />
     3101            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
     3102            <reference ref="name_ref_operator" />
     3103            <optional>
     3104                <reference ref="oh_wheelchair" />
     3105                <text key="network" text="Network" />
     3106                <text key="description" text="Description" />
     3107                <reference ref="color" />
     3108                <reference ref="pt_route_opt2" />
     3109            </optional>
     3110            <roles>
     3111                <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="aerialway" />
     3112                <role key="forward" text="forward segment" requisite="optional" type="way,closedway" member_expression="aerialway" />
     3113                <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="aerialway" />
     3114                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="aerialway=station OR (public_transport=stop_position aerialway=yes)" />
     3115                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     3116            </roles>
     3117        </item> <!-- Public transport route (Legacy) (Aerialway) -->
     3118        <separator/>
    30303119        <item name="Station" name_context="railway" icon="presets/transport/railway_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30313120            <link wiki="Tag:railway=station" />
    30323121            <key key="railway" value="station" />