Ticket #18698: josm_path_access_update.patch

File josm_path_access_update.patch, 11.2 KB (added by skyper, 6 years ago)

patch

  • src/org/openstreetmap/josm/resources/data/defaultpresets.xml

     
    211211    <chunk id="sport">
    212212        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
    213213    </chunk>
     214    <chunk id="highway_access">
     215        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" />
     216    </chunk>
     217    <chunk id="POI_access">
     218        <combo key="access" text="General Access" values="yes,private,customers,permissive,no" />
     219    </chunk>
    214220    <chunk id="fee">
    215221        <combo key="fee" text="Fee" values="yes,no" />
    216222    </chunk>
    … …  
    240246        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
    241247        <reference ref="oh" />
    242248    </chunk>
    243     <chunk id="highway_access">
    244         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" />
    245     </chunk>
    246     <chunk id="POI_access">
    247         <combo key="access" text="General Access" values="yes,private,customers,permissive,no" />
    248     </chunk>
    249249    <chunk id="name_wikipedia">
    250250        <text key="name" text="Name" />
    251251        <text key="wikipedia" text="Wikipedia" />
    … …  
    883883            <space />
    884884            <label text="Transport mode restrictions" />
    885885            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
    886             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
     886            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
     887            <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" />
     888            <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
     889            <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" match="key" />
    887890            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    888891            <space />
    889892            <label text="Vehicles per type" />
    890893            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    891894            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
    892             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     895            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     896            <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    893897            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    894898            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     899            <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     900            <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    895901            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    896902            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    897             <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" match="key" />
     903            <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     904            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,agricultural,forestry,no" match="key" />
    898905            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" match="key" />
     906            <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
     907            <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    899908            <space />
    900909            <label text="Vehicles per use" />
    901910            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
     911            <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,private,no" match="key" />
    902912            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    903913            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    904             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
     914            <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,private,no" match="key" />
     915            <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,private,no" match="key" />
     916            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" match="key" />
     917            <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,private,no" match="key" />
    905918            <space />
    906919            <text key="maxspeed" text="Max. speed (km/h)" />
    907920            <text key="maxspeed:forward" text="Max. speed in way direction" />
    … …  
    9871000                <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" />
    9881001                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
    9891002                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1003                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    9901004                <check key="segregated" text="Segregated" />
    9911005            </optional>
     1006            <preset_link preset_name="Road Restrictions" />
    9921007        </item> <!-- Path -->
    9931008        <separator/>
    9941009        <item name="Dedicated Bridleway" icon="presets/transport/way/dedicated_bridleway.svg" type="way,closedway" preset_name_label="true">
    … …  
    10001015                <reference ref="surface_smoothness" />
    10011016                <reference ref="highway_yesno_incline_oneway_lit_width" />
    10021017            </optional>
     1018            <preset_link preset_name="Road Restrictions" />
    10031019        </item> <!-- Dedicated Bridleway -->
    10041020        <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
    10051021            <link wiki="Bicycle" />
    … …  
    10211037                <reference ref="name_layer" />
    10221038                <reference ref="surface_smoothness" />
    10231039                <reference ref="highway_yesno_incline_oneway_lit_width" />
    1024                 <combo key="foot" text="Pedestrians" values="yes,no,designated" />
     1040                <combo key="foot" text="Pedestrians" values="yes,no" />
    10251041                <check key="segregated" text="Segregated" />
    10261042            </optional>
    10271043        </item> <!-- Dedicated Cycleway -->
    … …  
    10351051                <reference ref="name_layer" />
    10361052                <reference ref="surface_smoothness" />
    10371053                <reference ref="highway_yesno_incline_oneway_lit_width" />
     1054                <space />
     1055                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1056                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    10381057            </optional>
     1058            <preset_link preset_name="Road Restrictions" />
    10391059        </item> <!-- Segregated Foot- and Cycleway -->
    10401060        <item name="Combined Foot- and Cycleway" icon="presets/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
    10411061            <link wiki="Tag:highway=path" />
    … …  
    10471067                <reference ref="name_layer" />
    10481068                <reference ref="surface_smoothness" />
    10491069                <reference ref="highway_yesno_incline_oneway_lit_width" />
    1050                 <check key="passing_places" text="Passing Places" />
     1070                <check key="passing_places" text="Passing Places" />
     1071                <space />
     1072                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1073                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    10511074            </optional>
     1075            <preset_link preset_name="Road Restrictions" />
    10521076        </item> <!-- Combined Foot- and Cycleway -->
    10531077        <item name="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" type="way,closedway" preset_name_label="true">
    10541078            <link wiki="Tag:highway=footway" />
    … …  
    10581082                <reference ref="name_layer" />
    10591083                <reference ref="surface_smoothness" />
    10601084                <reference ref="highway_yesno_incline_oneway_lit_width" />
    1061                 <combo key="bicycle" text="Bicycle" values="yes,no,designated" />
     1085                <combo key="bicycle" text="Bicycle" values="yes,no" />
    10621086                <check key="segregated" text="Segregated" />
    10631087            </optional>
    10641088        </item> <!-- Dedicated Footway -->