Ticket #16391: josm_16391_19440_v3.patch

File josm_16391_19440_v3.patch, 15.3 KB (added by skyper, 4 years ago)

version 3 without transition for forward/backward

  • resources/data/defaultpresets.xml

     
    5151    <chunk id="highway_yesno">
    5252        <checkgroup columns="2">
    5353            <check key="bridge" text="Bridge" disable_off="true" />
    54             <check key="embankment" text="Embankment" disable_off="true" />
    5554            <check key="tunnel" text="Tunnel" disable_off="true" />
     55            <check key="embankment" text="Embankment" disable_off="true" />
    5656            <check key="cutting" text="Cutting" disable_off="true" />
    5757        </checkgroup>
    5858    </chunk>
    … …  
    6161        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    6262    </chunk>
    6363    <chunk id="highway_yesno_incline_oneway_lit_width">
    64         <check key="oneway" text="Oneway" />
    65         <reference ref="highway_yesno_incline" />
    66         <check key="lit" text="Lit" />
     64        <checkgroup columns="3">
     65            <check key="oneway" text="Oneway" />
     66            <check key="bridge" text="Bridge" disable_off="true" />
     67            <check key="tunnel" text="Tunnel" disable_off="true" />
     68            <check key="embankment" text="Embankment" disable_off="true" />
     69            <check key="cutting" text="Cutting" disable_off="true" />
     70            <check key="lit" text="Lit" />
     71        </checkgroup>
     72        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    6773        <text key="width" text="Width (meters)" />
    6874    </chunk>
    6975    <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
    7076        <reference ref="highway_yesno_incline_oneway_lit_width" />
    7177        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    7278    </chunk>
     79    <chunk id="placement">
     80        <space />
     81        <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5,transition" />
     82        <combo key="placement:forward" text="Placement in way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
     83        <combo key="placement:backward" text="Placement opposed to way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
     84    </chunk>
    7385    <chunk id="railway_service">
    7486        <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
    7587    </chunk>
    … …  
    551563                <text key="destination" text="Destination" />
    552564                <text key="destination:ref" text="Destination reference" />
    553565                <text key="width" text="Width (meters)" />
    554                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     566                <reference ref="placement" />
     567                <space />
    555568                <checkgroup columns="4">
    556569                    <check key="oneway" text="Oneway" default="on" />
    557570                    <check key="bridge" text="Bridge" disable_off="true" />
    … …  
    573586                <text key="destination:ref" text="Destination reference" />
    574587                <text key="junction:ref" text="Junction reference" />
    575588                <text key="width" text="Width (meters)" />
    576                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     589                <reference ref="placement" />
     590                <space />
    577591                <checkgroup columns="4">
    578592                    <check key="oneway" text="Oneway" default="on" />
    579593                    <check key="bridge" text="Bridge" disable_off="true" />
    … …  
    591605            <space />
    592606            <key key="highway" value="trunk" />
    593607            <text key="ref" text="Reference" />
     608            <check key="noref" text="Street has no reference" disable_off="true" />
    594609            <optional>
    595610                <text key="name" text="Name" />
     611                <check key="noname" text="Street has no name" disable_off="true" />
    596612                <reference ref="highway_base" />
    597613                <text key="destination" text="Destination" />
    598614                <text key="destination:ref" text="Destination reference" />
    599615                <text key="width" text="Width (meters)" />
    600                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     616                <reference ref="placement" />
     617                <space />
    601618                <checkgroup columns="4">
    602619                    <check key="oneway" text="Oneway" default="on" />
    603620                    <check key="motorroad" text="Motorroad" default="on" />
    … …  
    622639                <text key="destination:ref" text="Destination reference" />
    623640                <text key="junction:ref" text="Junction reference" />
    624641                <text key="width" text="Width (meters)" />
    625                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     642                <reference ref="placement" />
     643                <space />
    626644                <checkgroup columns="4">
    627645                    <check key="oneway" text="Oneway" default="on" />
    628646                    <check key="motorroad" text="Motorroad" default="on" />
    … …  
    642660            <space />
    643661            <key key="highway" value="primary" />
    644662            <text key="ref" text="Reference" />
     663            <check key="noref" text="Street has no reference" disable_off="true" />
    645664            <optional>
    646665                <text key="name" text="Name" />
     666                <check key="noname" text="Street has no name" disable_off="true" />
    647667                <reference ref="highway_base" />
    648668                <check key="motorroad" text="Motorroad" />
    649669                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    650                 <check key="narrow" text="Narrow" disable_off="true" />
    651                 <check key="trolley_wire" text="Overhead trolley wires" />
    652                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     670                <checkgroup columns="2">
     671                    <check key="narrow" text="Narrow" disable_off="true" />
     672                    <check key="trolley_wire" text="Overhead trolley wires" />
     673                </checkgroup>
     674                <reference ref="placement" />
    653675            </optional>
    654676            <preset_link preset_name="Road Restrictions" />
    655677        </item> <!-- Primary -->
    … …  
    663685                <text key="junction:ref" text="Junction reference" />
    664686                <check key="motorroad" text="Motorroad" />
    665687                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    666                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     688                <reference ref="placement" />
    667689            </optional>
    668690            <preset_link preset_name="Road Restrictions" />
    669691        </item> <!-- Primary Link -->
    … …  
    672694            <space />
    673695            <key key="highway" value="secondary" />
    674696            <text key="ref" text="Reference" />
     697            <check key="noref" text="Street has no reference" disable_off="true" />
    675698            <optional>
    676699                <text key="name" text="Name" />
     700                <check key="noname" text="Street has no name" disable_off="true" />
    677701                <reference ref="highway_base" />
    678702                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    679                 <check key="narrow" text="Narrow" disable_off="true" />
    680                 <check key="trolley_wire" text="Overhead trolley wires" />
    681                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     703                <checkgroup columns="2">
     704                    <check key="narrow" text="Narrow" disable_off="true" />
     705                    <check key="trolley_wire" text="Overhead trolley wires" />
     706                </checkgroup>
     707                <reference ref="placement" />
    682708            </optional>
    683709            <preset_link preset_name="Road Restrictions" />
    684710        </item> <!-- Secondary -->
    … …  
    690716                <text key="destination" text="Destination" />
    691717                <text key="destination:ref" text="Destination reference" />
    692718                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    693                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     719                <reference ref="placement" />
    694720            </optional>
    695721            <preset_link preset_name="Road Restrictions" />
    696722        </item> <!-- Secondary Link -->
    … …  
    699725            <space />
    700726            <key key="highway" value="tertiary" />
    701727            <text key="ref" text="Reference" />
     728            <check key="noref" text="Street has no reference" disable_off="true" />
    702729            <optional>
    703730                <text key="name" text="Name" />
     731                <check key="noname" text="Street has no name" disable_off="true" />
    704732                <reference ref="highway_base" />
    705733                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    706                 <check key="narrow" text="Narrow" disable_off="true" />
    707                 <check key="trolley_wire" text="Overhead trolley wires" />
    708                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     734                <checkgroup columns="2">
     735                    <check key="narrow" text="Narrow" disable_off="true" />
     736                    <check key="trolley_wire" text="Overhead trolley wires" />
     737                </checkgroup>
     738                <reference ref="placement" />
    709739            </optional>
    710740            <preset_link preset_name="Road Restrictions" />
    711741        </item> <!-- Tertiary -->
    … …  
    717747                <text key="destination" text="Destination" />
    718748                <text key="destination:ref" text="Destination reference" />
    719749                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
     750                <reference ref="placement" />
    720751            </optional>
    721752            <preset_link preset_name="Road Restrictions" />
    722753        </item> <!-- Tertiary Link -->
    … …  
    727758                <text key="name" text="Name" />
    728759                <check key="noname" text="Street has no name" disable_off="true" />
    729760                <text key="ref" text="Reference" />
     761                <check key="noref" text="Street has no reference" disable_off="true" />
    730762                <reference ref="highway_base" />
    731763                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    732                 <check key="narrow" text="Narrow" disable_off="true" />
    733                 <check key="trolley_wire" text="Overhead trolley wires" />
    734                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
    735                 <check key="passing_places" text="Passing Places" />
     764                <checkgroup columns="3">
     765                    <check key="narrow" text="Narrow" disable_off="true" />
     766                    <check key="trolley_wire" text="Overhead trolley wires" />
     767                    <check key="passing_places" text="Passing Places" />
     768                </checkgroup>
     769                <reference ref="placement" />
    736770            </optional>
    737771            <preset_link preset_name="Road Restrictions" />
    738772        </item> <!-- Unclassified -->
    … …  
    741775            <space />
    742776            <key key="highway" value="residential" />
    743777            <text key="name" text="Name" />
     778            <check key="noname" text="Street has no name" disable_off="true" />
    744779            <optional>
    745                 <check key="noname" text="Street has no name" disable_off="true" />
    746780                <text key="ref" text="Reference" />
    747781                <reference ref="highway_base" />
    748782                <checkgroup columns="2">
    749783                    <check key="oneway" text="Oneway" />
    750784                    <check key="oneway:bicycle" text="Oneway for bicycle" />
     785                    <check key="bridge" text="Bridge" disable_off="true" />
     786                    <check key="tunnel" text="Tunnel" disable_off="true" />
     787                    <check key="embankment" text="Embankment" disable_off="true" />
     788                    <check key="cutting" text="Cutting" disable_off="true" />
    751789                </checkgroup>
    752                 <reference ref="highway_yesno_incline" />
    753790                <check key="lit" text="Lit" />
    754791                <text key="width" text="Width (meters)" />
    755792                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    756                 <check key="narrow" text="Narrow" disable_off="true" />
    757                 <check key="trolley_wire" text="Overhead trolley wires" />
     793                <checkgroup columns="2">
     794                    <check key="narrow" text="Narrow" disable_off="true" />
     795                    <check key="trolley_wire" text="Overhead trolley wires" />
     796                </checkgroup>
    758797            </optional>
    759798            <preset_link preset_name="Road Restrictions" />
    760799        </item> <!-- Residential -->
    … …  
    790829                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    791830                <reference ref="surface_smoothness" />
    792831                <reference ref="highway_yesno_incline_oneway_lit_width" />
    793                 <check key="narrow" text="Narrow" disable_off="true" />
    794                 <check key="trolley_wire" text="Overhead trolley wires" />
     832                <checkgroup columns="2">
     833                    <check key="narrow" text="Narrow" disable_off="true" />
     834                    <check key="trolley_wire" text="Overhead trolley wires" />
     835                </checkgroup>
    795836            </optional>
    796837            <preset_link preset_name="Road Restrictions" />
    797838        </item> <!-- Living Street -->
    … …  
    11071148            <space />
    11081149            <key key="highway" value="motorway_junction" />
    11091150            <text key="name" text="Name" />
     1151            <check key="noname" text="Junction has no name" disable_off="true" />
    11101152            <text key="ref" text="Number" />
     1153            <check key="noref" text="Junction has no reference" disable_off="true" />
    11111154        </item> <!-- Motorway Junction -->
    11121155        <item name="Services" icon="presets/vehicle/services.svg" type="node,closedway,multipolygon" preset_name_label="true">
    11131156            <link wiki="Tag:highway=services" />