Ticket #15751: 15751_v4.patch

File 15751_v4.patch, 12.2 KB (added by reichg, 5 years ago)

moved toll and oneway to Road Restrictions item and moved motorroad to Access Restrictions.

  • resources/data/defaultpresets.xml

     
    2020            <list_entry value="very_horrible" short_description="Specialized off-road: tractor, ATV" />
    2121            <list_entry value="impassable" short_description="No wheeled vehicle" />
    2222        </combo>
     23        <space/>
    2324    </chunk>
    2425    <chunk id="sport_surface">
    2526        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
    … …  
    3940        <space />
    4041        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    4142        <reference ref="surface_smoothness" />
     43        <space/>
    4244    </chunk>
    4345    <chunk id="highway_yesno">
    4446        <checkgroup columns="4">
    … …  
    4648            <check key="tunnel" text="Tunnel" disable_off="true" />
    4749            <check key="embankment" text="Embankment" disable_off="true" />
    4850            <check key="cutting" text="Cutting" disable_off="true" />
     51            <check key="lit" text="Lit" />
    4952        </checkgroup>
    50     </chunk>
    51     <chunk id="highway_yesno_incline">
    52         <reference ref="highway_yesno" />
     53        <space />
    5354        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    5455    </chunk>
    5556    <chunk id="highway_yesno_incline_oneway_lit_width">
    56         <checkgroup columns="4">
    57             <check key="bridge" text="Bridge" disable_off="true" />
    58             <check key="tunnel" text="Tunnel" disable_off="true" />
    59             <check key="embankment" text="Embankment" disable_off="true" />
    60             <check key="cutting" text="Cutting" disable_off="true" />
    61             <check key="oneway" text="Oneway" />
    62             <check key="lit" text="Lit" />
    63         </checkgroup>
    64         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     57        <reference ref="highway_yesno" />
    6558        <text key="width" text="Width (meters)" />
    6659    </chunk>
    6760    <chunk id="highway_yesno_incline_oneway_lit_width_busbay_sidewalk">
    … …  
    591584        <preset_link preset_name="Road Restrictions" />
    592585        <preset_link preset_name="Access Restrictions" />
    593586    </chunk>
     587
    594588  <!-- Groups -->
    595589  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    596590    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
    … …  
    609603                <text key="width" text="Width (meters)" />
    610604                <space />
    611605                <reference ref="highway_yesno" />
    612                 <checkgroup columns="4">
    613                     <check key="oneway" text="Oneway" default="on" />
    614                     <check key="lit" text="Lit" />
    615                     <check key="toll" text="Toll" />
    616                 </checkgroup>
    617606                <reference ref="placement_shoulder" />
    618607            </optional>
    619608            <reference ref="link_road_access_restrictions" />
    … …  
    631620                <text key="width" text="Width (meters)" />
    632621                <space />
    633622                <reference ref="highway_yesno" />
    634                 <checkgroup columns="4">
    635                     <check key="oneway" text="Oneway" default="on" />
    636                     <check key="lit" text="Lit" />
    637                     <check key="toll" text="Toll" />
    638                 </checkgroup>
    639623                <reference ref="placement_shoulder" />
    640624            </optional>
    641625            <reference ref="link_road_access_restrictions" />
    … …  
    655639                <text key="width" text="Width (meters)" />
    656640                <space />
    657641                <reference ref="highway_yesno" />
    658                 <checkgroup columns="4">
    659                     <check key="oneway" text="Oneway" default="on" />
    660                     <check key="lit" text="Lit" />
    661                     <check key="toll" text="Toll" />
    662                     <check key="motorroad" text="Motorroad" default="on" />
    663                 </checkgroup>
    664642                <reference ref="placement_shoulder" />
    665643            </optional>
    666644            <reference ref="link_road_access_restrictions" />
    … …  
    679657                <text key="width" text="Width (meters)" />
    680658                <space />
    681659                <reference ref="highway_yesno" />
    682                 <checkgroup columns="4">
    683                     <check key="oneway" text="Oneway" default="on" />
    684                     <check key="lit" text="Lit" />
    685                     <check key="toll" text="Toll" />
    686                     <check key="motorroad" text="Motorroad" default="on" />
    687                 </checkgroup>
    688660                <reference ref="placement_shoulder" />
    689661            </optional>
    690662            <reference ref="link_road_access_restrictions" />
    … …  
    701673                <check key="noname" text="Street has no name" disable_off="true" />
    702674                <reference ref="highway_base" />
    703675                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    704                 <checkgroup columns="4">
    705                     <check key="motorroad" text="Motorroad" />
     676                <checkgroup columns="2">
    706677                    <check key="narrow" text="Narrow" disable_off="true" />
    707678                    <check key="trolley_wire" text="Overhead trolley wires" />
    708679                </checkgroup>
    … …  
    718689                <text key="destination" text="Destination" />
    719690                <text key="destination:ref" text="Destination reference" />
    720691                <text key="junction:ref" text="Junction reference" />
    721                 <check key="motorroad" text="Motorroad" />
    722692                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    723693                <space />
    724694                <reference ref="placement_shoulder" />
    … …  
    818788                <text key="ref" text="Reference" />
    819789                <reference ref="highway_base" />
    820790                <reference ref="highway_yesno" />
    821                 <checkgroup columns="4">
    822                     <check key="oneway" text="Oneway" />
    823                     <check key="oneway:bicycle" text="Oneway for bicycle" />
    824                     <check key="lit" text="Lit" />
    825                 </checkgroup>
     791                <check key="oneway:bicycle" text="Oneway for bicycle" />
    826792                <text key="width" text="Width (meters)" />
    827793                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
    828794                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    … …  
    847813                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    848814                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    849815                <reference ref="surface_smoothness" />
    850                 <reference ref="highway_yesno_incline" />
    851                 <checkgroup columns="4">
    852                     <check key="oneway" text="Oneway" />
    853                     <check key="oneway:bicycle" text="Oneway for bicycle" />
    854                     <check key="lit" text="Lit" />
    855                 </checkgroup>
     816                <reference ref="highway_yesno" />
     817                <check key="oneway:bicycle" text="Oneway for bicycle" />
    856818                <text key="width" text="Width (meters)" />
    857819                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
    858820                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    … …  
    887849                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    888850                <reference ref="surface_smoothness" />
    889851                <check key="area" text="Area" />
    890                 <reference ref="highway_yesno_incline" />
    891                 <check key="lit" text="Lit" />
     852                <reference ref="highway_yesno" />
    892853                <text key="width" text="Width (meters)" />
    893854            </optional>
    894855            <reference ref="link_road_access_restrictions" />
    … …  
    913874            <key key="service" value="parking_aisle" />
    914875            <optional>
    915876                <reference ref="surface_smoothness" />
    916                 <check key="oneway" text="Oneway" />
    917877                <check key="lit" text="Lit" />
    918878            </optional>
    919879            <reference ref="link_road_access_restrictions" />
    … …  
    965925        <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway,multipolygon" preset_name_label="true" > <!-- There are links from MP relations to this preset -->
    966926            <link wiki="Key:access" />
    967927            <space />
    968             <checkgroup columns="3" >
    969                 <check key="oneway" text="Oneway" />
     928            <checkgroup columns="4" >
     929                <check key="ice_road" text="Ice road" disable_off="true" />
     930                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
    970931                <check key="toll" text="Toll" />
    971                 <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
    972932                <check key="winter_road" text="Winter road" disable_off="true" />
    973                 <check key="ice_road" text="Ice road" disable_off="true" />
    974933            </checkgroup>
     934            <space/>
     935            <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
    975936            <text key="maxspeed" text="Max. speed (km/h)" />
    976937            <text key="maxspeed:forward" text="Max. speed in way direction" />
    977938            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    … …  
    998959            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    999960            <space />
    1000961            <label text="Vehicles per type" />
     962            <check key="motorroad" text="Motorroad" />
    1001963            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1002964            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    1003965            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    … …  
    10501012                <reference ref="name_layer" />
    10511013                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    10521014                <reference ref="highway_yesno" />
    1053                 <check key="oneway" text="Oneway" />
     1015                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
    10541016                <text key="width" text="Width (meters)" />
    10551017            </optional>
    10561018            <reference ref="link_road_access_restrictions" />
    … …  
    11591121            <space />
    11601122            <optional text="Edit Highway Attributes:">
    11611123                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
    1162                 <check key="oneway" text="Oneway" />
     1124                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
    11631125            </optional>
    11641126        </item> <!-- Cycle Lane/Track -->
    11651127        <item name="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true">
    … …  
    23422304            <optional>
    23432305                <text key="name" text="Name" />
    23442306                <reference ref="highway_yesno" />
    2345                 <check key="oneway" text="Oneway" />
     2307                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
    23462308                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    23472309                <reference ref="surface_smoothness" />
    23482310                <text key="maxspeed" text="Max. speed (km/h)" />