Ticket #17154: josm_17154_permit_v3.patch

File josm_17154_permit_v3.patch, 25.7 KB (added by skyper, 4 years ago)

patch update for r17833 (no changes)

  • TabularUnified resources/data/defaultpresets.xml

     
    103103    </chunk>
    104104    <chunk id="check_access_motor">
    105105        <optional text="Motor vehicle traffic:">
    106             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     106            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    107107            <space />
    108108            <checkgroup columns="2">
    109109                <check key="motorcar" text="Motorcar" icon="presets/vehicle/restriction/plain/motorcar.svg" />
    … …  
    227227    </chunk>
    228228    <chunk id="highway_access_vehicle">
    229229        <reference ref="highway_access" />
    230         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     230        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    231231    </chunk>
    232232    <chunk id="POI_access">
    233         <combo key="access" text="General Access" values="yes,private,customers,permissive,no" values_sort="false" />
     233        <combo key="access" text="General Access" values="yes,private,customers,permissive,permit,no" values_sort="false" />
    234234    </chunk>
    235235    <chunk id="path_access_modes">
    236         <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    237         <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    238         <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    239         <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     236        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
     237        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     238        <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     239        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    240240        <space />
    241241        <label text="Tags which are implied and do not need to be set are `motor_vehicle=no` and `emergency=destination`." />
    242         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    243         <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     242        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     243        <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    244244    </chunk>
    245245    <chunk id="fee">
    246246        <combo key="fee" text="Fee" values="yes,no" />
    … …  
    460460    </chunk>
    461461    <chunk id="water_access">
    462462        <optional text="Water access rules:">
    463             <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    464             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    465             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    466             <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
     463            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     464            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     465            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
     466            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,permit,private,no" values_sort="false" />
    467467        </optional>
    468468    </chunk>
    469469    <chunk id="operator_substance">
    … …  
    982982            <label text="Some road types already imply some access restrictions which should not be set again." />
    983983            <space />
    984984            <label text="Transport mode restrictions" />
    985             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
    986             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
     985            <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" />
     986            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    987987            <reference ref="wheelchair" />
    988             <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    989             <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    990             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     988            <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
     989            <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     990            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    991991            <space />
    992992            <label text="Vehicles per type" />
    993             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    994             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
    995             <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    996             <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    997             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    998             <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    999             <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1000             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1001             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1002             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1003             <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    1004             <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" />
     993            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     994            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
     995            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     996            <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     997            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     998            <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     999            <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1000            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1001            <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" />
     1002            <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" />
     1003            <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" />
     1004            <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" />
    10051005            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    1006             <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1007             <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     1006            <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1007            <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    10081008            <space />
    10091009            <label text="Vehicles per use" />
    10101010            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
    1011             <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1012             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1013             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1014             <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1015             <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1016             <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    1017             <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     1011            <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1012            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1013            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1014            <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1015            <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1016            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1017            <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    10181018            <preset_link preset_name="Road Restrictions" />
    10191019        </item> <!-- Access Restrictions -->
    10201020        <separator/>
    … …  
    10801080                <reference ref="highway_yesno_incline_oneway_lit_width" />
    10811081                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    10821082                <reference ref="highway_access" />
    1083                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1084                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1085                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1086                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1087                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1083                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1084                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1085                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1086                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1087                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    10881088            </optional>
    10891089            <reference ref="link_road_access_restrictions" />
    10901090        </item> <!-- Track -->
    … …  
    11091109                    <check key="segregated" text="Segregated" />
    11101110                    <check key="informal" text="Informal" disable_off="true" />
    11111111                </checkgroup>
    1112                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1112                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11131113                <reference ref="wheelchair" />
    1114                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1114                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11151115                <reference ref="path_access_modes" />
    11161116            </optional>
    11171117            <reference ref="link_road_access_restrictions" />
    … …  
    11291129                <space />
    11301130                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    11311131                <label text="Globally, `horse=designated` and `motor_vehicle=no` are implied." />
    1132                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1133                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1134                 <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1135                 <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
     1132                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1133                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1134                <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11361135                <reference ref="wheelchair" />
    1137                 <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
     1136                <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11381137                <combo key="ski" text="Ski" values="yes,permissive,private,no" values_sort="false" />
    1139                 <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1140                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1141                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1138                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1139                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1140                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    11421141            </optional>
    11431142            <reference ref="link_road_access_restrictions" />
    11441143        </item> <!-- Dedicated Bridleway -->
    … …  
    11661165                <space />
    11671166                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    11681167                <label text="Globally, `bicycle=designated` is implied." />
    1169                 <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1168                <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    11701169                <reference ref="wheelchair" />
    11711170                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1172                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1173                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1174                 <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,private,no" values_sort="false" />
    1175                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1176                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1171                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1172                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1173                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1174                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1175                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    11771176            </optional>
    11781177            <reference ref="link_road_access_restrictions" />
    11791178        </item> <!-- Dedicated Cycleway -->
    … …  
    12231222                <space />
    12241223                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    12251224                <label text="Globally, `foot=designated` is implied." />
    1226                 <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1225                <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    12271226                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1228                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1229                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,private,no" values_sort="false" match="key" />
    1230                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    1231                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
    1232                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     1227                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1228                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1229                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1230                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1231                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    12331232            </optional>
    12341233            <reference ref="link_road_access_restrictions" />
    12351234        </item> <!-- Dedicated Footway -->
    … …  
    54215420                <list_entry value="home" icon="presets/misc/entrance_yes.svg" />
    54225421                <list_entry value="garage" icon="presets/misc/entrance_yes.svg" />
    54235422            </combo>
    5424             <combo key="access" text="General Access" values="yes,private,delivery,customers,permissive,no" />
     5423            <combo key="access" text="General Access" values="yes,private,delivery,customers,permissive,permit,no" />
    54255424            <reference ref="wheelchair" />
    54265425            <optional>
    54275426                <combo key="door" text="Door" values="yes,no,folding,hinged,loadingdock,overhead,revolving,sliding,trapdoor" match="key" values_searchable="true" />