Ticket #17154: josm_17154_permit_v2.patch

File josm_17154_permit_v2.patch, 25.8 KB (added by skyper, 4 years ago)

patch version 2: revision update and one fix

  • TabularUnified resources/data/defaultpresets.xml

     
    104104    </chunk>
    105105    <chunk id="check_access_motor">
    106106        <optional text="Motor vehicle traffic:">
    107             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     107            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    108108            <space />
    109109            <checkgroup columns="2">
    110110                <check key="motorcar" text="Motorcar" icon="presets/vehicle/restriction/plain/motorcar.svg" />
    … …  
    228228    </chunk>
    229229    <chunk id="highway_access_vehicle">
    230230        <reference ref="highway_access" />
    231         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     231        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    232232    </chunk>
    233233    <chunk id="POI_access">
    234         <combo key="access" text="General Access" values="yes,private,customers,permissive,no" values_sort="false" />
     234        <combo key="access" text="General Access" values="yes,private,customers,permissive,permit,no" values_sort="false" />
    235235    </chunk>
    236236    <chunk id="path_access_modes">
    237         <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    238         <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    239         <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    240         <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     237        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
     238        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     239        <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     240        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    241241        <space />
    242242        <label text="Tags which are implied and do not need to be set are `motor_vehicle=no` and `emergency=destination`." />
    243         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    244         <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     243        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     244        <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    245245    </chunk>
    246246    <chunk id="fee">
    247247        <combo key="fee" text="Fee" values="yes,no" />
    … …  
    461461    </chunk>
    462462    <chunk id="water_access">
    463463        <optional text="Water access rules:">
    464             <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    465             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    466             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    467             <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
     464            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     465            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     466            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     467            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
    468468        </optional>
    469469    </chunk>
    470470    <chunk id="operator_substance">
    … …  
    981981            <label text="Some road types already imply some access restrictions which should not be set again." />
    982982            <space />
    983983            <label text="Transport mode restrictions" />
    984             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
    985             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
     984            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
     985            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    986986            <reference ref="wheelchair" />
    987             <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    988             <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    989             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     987            <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
     988            <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     989            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    990990            <space />
    991991            <label text="Vehicles per type" />
    992             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    993             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
    994             <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    995             <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    996             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    997             <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    998             <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    999             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1000             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1001             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1002             <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1003             <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     992            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     993            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
     994            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     995            <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     996            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     997            <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     998            <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     999            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1000            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1001            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1002            <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1003            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    10041004            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    1005             <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1006             <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     1005            <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1006            <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    10071007            <space />
    10081008            <label text="Vehicles per use" />
    10091009            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
    1010             <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1011             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1012             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1013             <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1014             <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1015             <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1016             <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     1010            <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1011            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1012            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1013            <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1014            <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1015            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1016            <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    10171017            <preset_link preset_name="Road Restrictions" />
    10181018        </item> <!-- Access Restrictions -->
    10191019        <separator/>
    … …  
    10791079                <reference ref="highway_yesno_incline_oneway_lit_width" />
    10801080                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    10811081                <reference ref="highway_access" />
    1082                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1083                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1084                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1085                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1086                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1082                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1083                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1084                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1085                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1086                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    10871087            </optional>
    10881088            <reference ref="link_road_access_restrictions" />
    10891089        </item> <!-- Track -->
    … …  
    11051105                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    11061106                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" values_context="trail_visibility" values_sort="false" />
    11071107                <check key="segregated" text="Segregated" />
    1108                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1108                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11091109                <reference ref="wheelchair" />
    1110                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1110                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11111111                <reference ref="path_access_modes" />
    11121112            </optional>
    11131113            <reference ref="link_road_access_restrictions" />
    … …  
    11251125                <space />
    11261126                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    11271127                <label text="Globally, `horse=designated` and `motor_vehicle=no` are implied." />
    1128                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1129                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1130                 <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1131                 <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
     1128                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1129                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1130                <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11321131                <reference ref="wheelchair" />
    1133                 <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
     1132                <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11341133                <combo key="ski" text="Ski" values="yes,permissive,private,no" values_sort="false" />
    1135                 <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1136                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1137                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1134                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1135                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1136                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    11381137            </optional>
    11391138            <reference ref="link_road_access_restrictions" />
    11401139        </item> <!-- Dedicated Bridleway -->
    … …  
    11621161                <space />
    11631162                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    11641163                <label text="Globally, `bicycle=designated` is implied." />
    1165                 <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1164                <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11661165                <reference ref="wheelchair" />
    11671166                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1168                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1169                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1170                 <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1171                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1172                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1167                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1168                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1169                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1170                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1171                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    11731172            </optional>
    11741173            <reference ref="link_road_access_restrictions" />
    11751174        </item> <!-- Dedicated Cycleway -->
    … …  
    12191218                <space />
    12201219                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    12211220                <label text="Globally, `foot=designated` is implied." />
    1222                 <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1221                <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    12231222                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1224                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1225                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1226                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1227                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1228                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1223                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1224                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1225                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1226                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1227                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    12291228            </optional>
    12301229            <reference ref="link_road_access_restrictions" />
    12311230        </item> <!-- Dedicated Footway -->
    … …  
    54075406                <list_entry value="home" icon="presets/misc/entrance_yes.svg" />
    54085407                <list_entry value="garage" icon="presets/misc/entrance_yes.svg" />
    54095408            </combo>
    5410             <combo key="access" text="General Access" values="yes,private,delivery,customers,permissive,no" />
     5409            <combo key="access" text="General Access" values="yes,private,delivery,customers,permissive,permit,no" />
    54115410            <reference ref="wheelchair" />
    54125411            <optional>
    54135412                <combo key="door" text="Door" values="yes,no,folding,hinged,loadingdock,overhead,revolving,sliding,trapdoor" match="key" values_searchable="true" />