Ignore:
Timestamp:
2020-07-11T15:14:22+02:00 (4 years ago)
Author:
Klumbumbus
Message:

fix #18698 - split Road Restrictions preset in Road Restrictions and Access Restrictions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16742 r16743  
    560560        <preset_link preset_name="Payment Methods" />
    561561    </chunk>
     562    <chunk id="link_road_access_restrictions">
     563        <preset_link preset_name="Road Restrictions" />
     564        <preset_link preset_name="Access Restrictions" />
     565    </chunk>
    562566  <!--  Groups -->
    563567  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    … …  
    585589                <reference ref="placement" />
    586590            </optional>
    587             <preset_link preset_name="Road Restrictions" />
     591            <reference ref="link_road_access_restrictions" />
    588592        </item> <!-- Motorway -->
    589593        <item name="Motorway Link" icon="presets/transport/way/way_motorway_link.svg" type="way" preset_name_label="true">
    … …  
    607611                <reference ref="placement" />
    608612            </optional>
    609             <preset_link preset_name="Road Restrictions" />
     613            <reference ref="link_road_access_restrictions" />
    610614        </item> <!-- Motorway Link -->
    611615        <item name="Trunk" icon="presets/transport/way/way_trunk.svg" type="way" preset_name_label="true">
    … …  
    632636                <reference ref="placement" />
    633637            </optional>
    634             <preset_link preset_name="Road Restrictions" />
     638            <reference ref="link_road_access_restrictions" />
    635639        </item> <!-- Trunk -->
    636640        <item name="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
    … …  
    656660                <reference ref="placement" />
    657661            </optional>
    658             <preset_link preset_name="Road Restrictions" />
     662            <reference ref="link_road_access_restrictions" />
    659663        </item> <!-- Trunk Link -->
    660664        <separator/>
    … …  
    677681                <reference ref="placement" />
    678682            </optional>
    679             <preset_link preset_name="Road Restrictions" />
     683            <reference ref="link_road_access_restrictions" />
    680684        </item> <!-- Primary -->
    681685        <item name="Primary Link" icon="presets/transport/way/way_primary_link.svg" type="way" preset_name_label="true">
    … …  
    692696                <reference ref="placement" />
    693697            </optional>
    694             <preset_link preset_name="Road Restrictions" />
     698            <reference ref="link_road_access_restrictions" />
    695699        </item> <!-- Primary Link -->
    696700        <item name="Secondary" icon="presets/transport/way/way_secondary.svg" type="way,closedway" preset_name_label="true">
    … …  
    711715                <reference ref="placement" />
    712716            </optional>
    713             <preset_link preset_name="Road Restrictions" />
     717            <reference ref="link_road_access_restrictions" />
    714718        </item> <!-- Secondary -->
    715719        <item name="Secondary Link" icon="presets/transport/way/way_secondary_link.svg" type="way" preset_name_label="true">
    … …  
    724728                <reference ref="placement" />
    725729            </optional>
    726             <preset_link preset_name="Road Restrictions" />
     730            <reference ref="link_road_access_restrictions" />
    727731        </item> <!-- Secondary Link -->
    728732        <item name="Tertiary" icon="presets/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
    … …  
    743747                <reference ref="placement" />
    744748            </optional>
    745             <preset_link preset_name="Road Restrictions" />
     749            <reference ref="link_road_access_restrictions" />
    746750        </item> <!-- Tertiary -->
    747751        <item name="Tertiary Link" icon="presets/transport/way/way_tertiary_link.svg" type="way" preset_name_label="true">
    … …  
    756760                <reference ref="placement" />
    757761            </optional>
    758             <preset_link preset_name="Road Restrictions" />
     762            <reference ref="link_road_access_restrictions" />
    759763        </item> <!-- Tertiary Link -->
    760764        <item name="Unclassified" icon="presets/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
    … …  
    775779                <reference ref="placement" />
    776780            </optional>
    777             <preset_link preset_name="Road Restrictions" />
     781            <reference ref="link_road_access_restrictions" />
    778782        </item> <!-- Unclassified -->
    779783        <item name="Residential" icon="presets/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
    … …  
    799803                </checkgroup>
    800804            </optional>
    801             <preset_link preset_name="Road Restrictions" />
     805            <reference ref="link_road_access_restrictions" />
    802806        </item> <!-- Residential -->
    803807        <item name="Bicycle Road" icon="presets/transport/way/way_bicycle_road.svg" type="way,closedway" preset_name_label="true">
    … …  
    824828                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    825829            </optional>
    826             <preset_link preset_name="Road Restrictions" />
     830            <reference ref="link_road_access_restrictions" />
    827831        </item> <!-- Bicycle Road -->
    828832        <item name="Living Street" icon="presets/transport/way/way_living_street.svg" type="way,closedway" preset_name_label="true">
    … …  
    842846                </checkgroup>
    843847            </optional>
    844             <preset_link preset_name="Road Restrictions" />
     848            <reference ref="link_road_access_restrictions" />
    845849        </item> <!-- Living Street -->
    846850        <item name="Pedestrian" icon="presets/transport/way/way_pedestrian.svg" type="way,closedway,multipolygon" preset_name_label="true">
    … …  
    858862                <text key="width" text="Width (meters)" />
    859863            </optional>
    860             <preset_link preset_name="Road Restrictions" />
     864            <reference ref="link_road_access_restrictions" />
    861865        </item> <!-- Pedestrian -->
    862866        <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
    … …  
    872876                <check key="passing_places" text="Passing Places" />
    873877            </optional>
    874             <preset_link preset_name="Road Restrictions" />
     878            <reference ref="link_road_access_restrictions" />
    875879        </item> <!-- Service -->
    876880        <item name="Parking Aisle" icon="presets/transport/way/way_service_parking_aisle.svg" type="way,closedway" preset_name_label="true">
    … …  
    883887                <check key="lit" text="Lit" />
    884888            </optional>
    885             <preset_link preset_name="Road Restrictions" />
     889            <reference ref="link_road_access_restrictions" />
    886890        </item> <!-- Parking Aisle -->
    887891        <item name="Escape" icon="presets/transport/way/way_escape.svg" type="way" preset_name_label="true">
    … …  
    912916                <check key="trolley_wire" text="Overhead trolley wires" />
    913917            </optional>
    914             <preset_link preset_name="Road Restrictions" />
     918            <reference ref="link_road_access_restrictions" />
    915919        </item> <!-- Road (Unknown Type) -->
    916920        <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
    … …  
    926930                <combo key="junction" text="Junction" values="roundabout,jughandle" />
    927931            </optional>
    928             <preset_link preset_name="Road Restrictions" />
     932            <reference ref="link_road_access_restrictions" />
    929933        </item> <!-- Construction -->
    930934        <separator/>
    931         <item name="Road Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
     935        <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway" preset_name_label="true">
    932936            <link wiki="Key:access" />
    933             <space />
    934             <label text="Some road types already imply some access restrictions which should not be set again." />
    935937            <space />
    936938            <checkgroup columns="3" >
    … …  
    941943                <check key="ice_road" text="Ice road" disable_off="true" />
    942944            </checkgroup>
     945            <text key="maxspeed" text="Max. speed (km/h)" />
     946            <text key="maxspeed:forward" text="Max. speed in way direction" />
     947            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
     948            <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
     949            <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
     950            <text key="minspeed" text="Min. speed (km/h)" match="key" />
     951            <space />
     952            <text key="maxweight" text="Max. weight (tonnes)" match="key" />
     953            <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
     954            <space />
     955            <text key="maxheight" text="Max. height (meters)" match="key" />
     956            <text key="maxwidth" text="Max. width (meters)" match="key" />
     957            <text key="maxlength" text="Max. length (meters)" match="key" />
     958            <space />
     959            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
     960            <preset_link preset_name="Access Restrictions" />
     961        </item> <!-- Road Restrictions -->
     962        <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
     963            <link wiki="Key:access" />
     964            <space />
     965            <label text="Some road types already imply some access restrictions which should not be set again." />
    943966            <space />
    944967            <label text="Transport mode restrictions" />
    … …  
    976999            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    9771000            <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    978             <space />
    979             <text key="maxspeed" text="Max. speed (km/h)" />
    980             <text key="maxspeed:forward" text="Max. speed in way direction" />
    981             <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    982             <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
    983             <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
    984             <text key="minspeed" text="Min. speed (km/h)" match="key" />
    985             <text key="maxweight" text="Max. weight (tonnes)" match="key" />
    986             <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
    987             <text key="maxheight" text="Max. height (meters)" match="key" />
    988             <text key="maxwidth" text="Max. width (meters)" match="key" />
    989             <text key="maxlength" text="Max. length (meters)" match="key" />
    990             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
    991         </item> <!-- Road Restrictions -->
     1001            <preset_link preset_name="Road Restrictions" />
     1002        </item> <!-- Access Restrictions -->
    9921003        <separator/>
    9931004        <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
    … …  
    10021013                <text key="width" text="Width (meters)" />
    10031014            </optional>
    1004             <preset_link preset_name="Road Restrictions" />
     1015            <reference ref="link_road_access_restrictions" />
    10051016        </item> <!-- Roundabout -->
    10061017        <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
    … …  
    10361047                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    10371048            </optional>
    1038             <preset_link preset_name="Road Restrictions" />
     1049            <reference ref="link_road_access_restrictions" />
    10391050        </item> <!-- Track -->
    10401051        <item name="Path" icon="presets/transport/way/path.svg" type="way,closedway" preset_name_label="true">
    … …  
    10611072                <reference ref="path_access_modes" />
    10621073            </optional>
    1063             <preset_link preset_name="Road Restrictions" />
     1074            <reference ref="link_road_access_restrictions" />
    10641075        </item> <!-- Path -->
    10651076        <separator/>
    … …  
    10871098                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    10881099            </optional>
    1089             <preset_link preset_name="Road Restrictions" />
     1100            <reference ref="link_road_access_restrictions" />
    10901101        </item> <!-- Dedicated Bridleway -->
    10911102        <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
    … …  
    11221133                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    11231134            </optional>
    1124             <preset_link preset_name="Road Restrictions" />
     1135            <reference ref="link_road_access_restrictions" />
    11251136        </item> <!-- Dedicated Cycleway -->
    11261137        <item name="Segregated Foot- and Cycleway" icon="presets/transport/way/segregated_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
    … …  
    11381149                <reference ref="path_access_modes" />
    11391150            </optional>
    1140             <preset_link preset_name="Road Restrictions" />
     1151            <reference ref="link_road_access_restrictions" />
    11411152        </item> <!-- Segregated Foot- and Cycleway -->
    11421153        <item name="Combined Foot- and Cycleway" icon="presets/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
    … …  
    11551166                <reference ref="path_access_modes" />
    11561167            </optional>
    1157             <preset_link preset_name="Road Restrictions" />
     1168            <reference ref="link_road_access_restrictions" />
    11581169        </item> <!-- Combined Foot- and Cycleway -->
    11591170        <item name="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" type="way,closedway" preset_name_label="true">
    … …  
    11781189                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
    11791190            </optional>
    1180             <preset_link preset_name="Road Restrictions" />
     1191            <reference ref="link_road_access_restrictions" />
    11811192        </item> <!-- Dedicated Footway -->
    11821193        <item name="Steps" icon="presets/transport/way/steps.svg" type="way" preset_name_label="true">
    … …  
    19871998                <check key="ferry:cable" text="Reaction ferry" />
    19881999            </optional>
    1989             <preset_link preset_name="Road Restrictions" />
     2000            <reference ref="link_road_access_restrictions" />
    19902001        </item> <!-- Ferry Route -->
    19912002        <separator/>
Note: See TracChangeset for help on using the changeset viewer.