Ticket #15751: 15751_v3.patch
File 15751_v3.patch, 11.3 KB (added by , 3 years ago) |
---|
-
resources/data/defaultpresets.xml
20 20 <list_entry value="very_horrible" short_description="Specialized off-road: tractor, ATV" /> 21 21 <list_entry value="impassable" short_description="No wheeled vehicle" /> 22 22 </combo> 23 <space/> 23 24 </chunk> 24 25 <chunk id="sport_surface"> 25 26 <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" /> … … 39 40 <space /> 40 41 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" /> 41 42 <reference ref="surface_smoothness" /> 43 <space/> 42 44 </chunk> 43 45 <chunk id="highway_yesno"> 44 <checkgroup columns=" 4">46 <checkgroup columns="7"> 45 47 <check key="bridge" text="Bridge" disable_off="true" /> 46 48 <check key="tunnel" text="Tunnel" disable_off="true" /> 47 49 <check key="embankment" text="Embankment" disable_off="true" /> 48 50 <check key="cutting" text="Cutting" disable_off="true" /> 51 <check key="lit" text="Lit" /> 52 <check key="toll" text="Toll" /> 53 <check key="motorroad" text="Motorroad" /> 49 54 </checkgroup> 50 </chunk> 51 <chunk id="highway_yesno_incline"> 52 <reference ref="highway_yesno" /> 55 <space /> 53 56 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" /> 54 57 </chunk> 55 58 <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" /> 59 <reference ref="highway_yesno" /> 60 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 65 61 <text key="width" text="Width (meters)" /> 66 62 </chunk> 67 63 <chunk id="highway_yesno_incline_oneway_lit_width_busbay_sidewalk"> … … 576 572 <preset_link preset_name="Road Restrictions" /> 577 573 <preset_link preset_name="Access Restrictions" /> 578 574 </chunk> 575 579 576 <!-- Groups --> 580 577 <group name="Highways" icon="presets/transport/way/way_secondary.svg"> 581 578 <group name="Streets" icon="presets/transport/way/way_secondary.svg"> … … 594 591 <text key="width" text="Width (meters)" /> 595 592 <space /> 596 593 <reference ref="highway_yesno" /> 597 <checkgroup columns="4"> 598 <check key="oneway" text="Oneway" default="on" /> 599 <check key="lit" text="Lit" /> 600 <check key="toll" text="Toll" /> 601 </checkgroup> 594 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/> 602 595 <reference ref="placement_shoulder" /> 603 596 </optional> 604 597 <reference ref="link_road_access_restrictions" /> … … 616 609 <text key="width" text="Width (meters)" /> 617 610 <space /> 618 611 <reference ref="highway_yesno" /> 619 <checkgroup columns="4"> 620 <check key="oneway" text="Oneway" default="on" /> 621 <check key="lit" text="Lit" /> 622 <check key="toll" text="Toll" /> 623 </checkgroup> 612 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/> 624 613 <reference ref="placement_shoulder" /> 625 614 </optional> 626 615 <reference ref="link_road_access_restrictions" /> … … 640 629 <text key="width" text="Width (meters)" /> 641 630 <space /> 642 631 <reference ref="highway_yesno" /> 643 <checkgroup columns="4"> 644 <check key="oneway" text="Oneway" default="on" /> 645 <check key="lit" text="Lit" /> 646 <check key="toll" text="Toll" /> 647 <check key="motorroad" text="Motorroad" default="on" /> 648 </checkgroup> 632 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/> 649 633 <reference ref="placement_shoulder" /> 650 634 </optional> 651 635 <reference ref="link_road_access_restrictions" /> … … 664 648 <text key="width" text="Width (meters)" /> 665 649 <space /> 666 650 <reference ref="highway_yesno" /> 667 <checkgroup columns="4"> 668 <check key="oneway" text="Oneway" default="on" /> 669 <check key="lit" text="Lit" /> 670 <check key="toll" text="Toll" /> 671 <check key="motorroad" text="Motorroad" default="on" /> 672 </checkgroup> 651 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/> 673 652 <reference ref="placement_shoulder" /> 674 653 </optional> 675 654 <reference ref="link_road_access_restrictions" /> … … 686 665 <check key="noname" text="Street has no name" disable_off="true" /> 687 666 <reference ref="highway_base" /> 688 667 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" /> 689 <checkgroup columns="4"> 690 <check key="motorroad" text="Motorroad" /> 668 <checkgroup columns="2"> 691 669 <check key="narrow" text="Narrow" disable_off="true" /> 692 670 <check key="trolley_wire" text="Overhead trolley wires" /> 693 671 </checkgroup> … … 803 781 <text key="ref" text="Reference" /> 804 782 <reference ref="highway_base" /> 805 783 <reference ref="highway_yesno" /> 806 <c heckgroup columns="4">807 <check key="oneway" text="Oneway" />784 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 785 <checkgroup columns="1"> 808 786 <check key="oneway:bicycle" text="Oneway for bicycle" /> 809 <check key="lit" text="Lit" />810 787 </checkgroup> 811 788 <text key="width" text="Width (meters)" /> 812 789 <combo key="bus_bay" text="Bus bay" values="both,left,right" /> … … 832 809 <combo key="lanes" text="Lanes" values="1,2,3" length="3" /> 833 810 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" /> 834 811 <reference ref="surface_smoothness" /> 835 <reference ref="highway_yesno _incline" />836 <c heckgroup columns="4">837 <check key="oneway" text="Oneway" />812 <reference ref="highway_yesno" /> 813 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 814 <checkgroup columns="1"> 838 815 <check key="oneway:bicycle" text="Oneway for bicycle" /> 839 <check key="lit" text="Lit" />840 816 </checkgroup> 841 817 <text key="width" text="Width (meters)" /> 842 818 <combo key="bus_bay" text="Bus bay" values="both,left,right" /> … … 872 848 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" /> 873 849 <reference ref="surface_smoothness" /> 874 850 <check key="area" text="Area" /> 875 <reference ref="highway_yesno_incline" /> 876 <check key="lit" text="Lit" /> 851 <reference ref="highway_yesno" /> 877 852 <text key="width" text="Width (meters)" /> 878 853 </optional> 879 854 <reference ref="link_road_access_restrictions" /> … … 898 873 <key key="service" value="parking_aisle" /> 899 874 <optional> 900 875 <reference ref="surface_smoothness" /> 901 <c heck key="oneway" text="Oneway" />876 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 902 877 <check key="lit" text="Lit" /> 903 878 </optional> 904 879 <reference ref="link_road_access_restrictions" /> … … 950 925 <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway" preset_name_label="true"> 951 926 <link wiki="Key:access" /> 952 927 <space /> 953 <checkgroup columns="3" > 954 <check key="oneway" text="Oneway" /> 928 <checkgroup columns="4" > 955 929 <check key="toll" text="Toll" /> 956 930 <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" /> 957 931 <check key="winter_road" text="Winter road" disable_off="true" /> 958 932 <check key="ice_road" text="Ice road" disable_off="true" /> 959 933 </checkgroup> 934 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 960 935 <text key="maxspeed" text="Max. speed (km/h)" /> 961 936 <text key="maxspeed:forward" text="Max. speed in way direction" /> 962 937 <text key="maxspeed:backward" text="Max. speed opposed to way direction" /> … … 1040 1015 <reference ref="name_layer" /> 1041 1016 <combo key="lanes" text="Lanes" values="1,2,3" length="3" /> 1042 1017 <reference ref="highway_yesno" /> 1043 <c heck key="oneway" text="Oneway" />1018 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 1044 1019 <text key="width" text="Width (meters)" /> 1045 1020 </optional> 1046 1021 <reference ref="link_road_access_restrictions" /> … … 1149 1124 <space /> 1150 1125 <optional text="Edit Highway Attributes:"> 1151 1126 <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" /> 1152 <c heck key="oneway" text="Oneway" />1127 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 1153 1128 </optional> 1154 1129 </item> <!-- Cycle Lane/Track --> 1155 1130 <item name="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true"> … … 2332 2307 <optional> 2333 2308 <text key="name" text="Name" /> 2334 2309 <reference ref="highway_yesno" /> 2335 <c heck key="oneway" text="Oneway" />2310 <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" /> 2336 2311 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" /> 2337 2312 <reference ref="surface_smoothness" /> 2338 2313 <text key="maxspeed" text="Max. speed (km/h)" />