Changeset 1564 in josm for trunk


Ignore:
Timestamp:
2009-04-28T22:40:14+02:00 (15 years ago)
Author:
ulfl
Message:

trying to sort barrier items based on map features:

  • node barriers (bollard, ...)
  • linear barriers (wall, fence, ...)
  • access (entrance, gate, ...)

but for some items it's not that clear where to put them :-(

... but I think the sequence of items is at least better than before now

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/presets/presets.xml

    r1549 r1564  
    826826    </group> <!-- Waypoints -->
    827827    <group name="Barriers" icon="presets/barrier.png">
    828         <item name="Stile" icon="presets/stile.png" type="node">
    829             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
    830             <label text="Edit Stile" />
    831             <space />
    832             <key key="barrier" value="stile" />
    833             <label text="Allowed traffic:" />
    834             <space />
    835             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    836             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
    837         </item> <!-- stile -->
    838         <item name="Kissing Gate" icon="presets/empty.png" type="node">
    839             <label text="Edit Kissing Gate" />
    840             <space />
    841             <key key="barrier" value="kissing_gate" />
    842             <label text="Allowed traffic:" />
    843             <space />
    844             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    845             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
    846         </item> <!-- kissing_gate -->
    847         <item name="Hampshire Gate" icon="presets/empty.png" type="node">
    848             <label text="Edit Hampshire Gate" />
    849             <space />
    850             <key key="barrier" value="hampshire_gate" />
    851             <label text="Allowed traffic:" />
    852             <space />
    853             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    854             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    855             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    856             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    857             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    858         </item> <!-- hampshire_gate -->
     828
     829        <!-- *** node barriers *** -->   
    859830        <item name="Bollard" icon="presets/bollard.png" type="node,way">
    860831            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
    … …  
    869840            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    870841        </item> <!-- bollard -->
    871         <item name="Drawbridge" icon="presets/empty.png" type="node">
    872             <label text="Edit Drawbridge" />
    873             <space />
    874             <key key="barrier" value="drawbridge" />
    875             <label text="Allowed traffic:" />
    876             <space />
    877             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    878             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    879             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    880             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    881             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    882         </item> <!-- drawbridge -->
    883         <item name="Bus Trap" icon="presets/empty.png" type="node">
    884             <key key="barrier" value="bus_trap" />
    885         </item> <!-- bus_trap -->
     842        <item name="Cycle Barrier" icon="presets/empty.png" type="node">
     843            <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
     844            <key key="barrier" value="cycle_barrier" />
     845        </item> <!-- cycle_barrier -->
     846        <item name="Block" icon="presets/empty.png" type="node,way,closedway">
     847            <key key="barrier" value="block" />
     848        </item> <!-- block -->
    886849        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
    887850            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
    … …  
    896859            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    897860        </item> <!-- cattle_grid -->
     861        <item name="Bus Trap" icon="presets/empty.png" type="node">
     862            <key key="barrier" value="bus_trap" />
     863        </item> <!-- bus_trap -->
    898864        <item name="Spikes" icon="presets/empty.png" type="node">
    899865            <label text="Edit Spikes" />
    … …  
    908874            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    909875        </item> <!-- spikes -->
    910         <item name="Portcullis" icon="presets/empty.png" type="node">
    911             <label text="Edit Portcullis" />
    912             <space />
    913             <key key="barrier" value="portcullis" />
    914             <label text="Allowed traffic:" />
    915             <space />
    916             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    917             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    918             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    919         </item> <!-- portcullis -->
    920         <item name="Gate" icon="presets/gate.png" type="node">
    921             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
    922             <label text="Edit Gate" />
    923             <space />
    924             <key key="barrier" value="gate" />
     876        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
     877            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
     878            <label text="Edit Toll Booth" />
     879            <space />
     880            <key key="barrier" value="toll_booth" />
     881            <optional>
     882                <text key="name" text="Name" default="" delete_if_empty="true" />
     883                <text key="operator" text="Operator" default="" delete_if_empty="true" />
     884            </optional>
     885        </item> <!-- toll_booth -->
     886        <item name="Border Control" icon="presets/douane.png" type="node">
     887            <label text="Edit Border Control" />
     888            <space />
     889            <key key="barrier" value="border_control" />
    925890            <label text="Allowed traffic:" />
    926891            <space />
    … …  
    930895            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    931896            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    932         </item> <!-- gate -->
    933         <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
    934             <label text="Edit Lift Gate" />
    935             <space />
    936             <key key="barrier" value="lift_gate" />
    937             <label text="Allowed traffic:" />
    938             <space />
    939             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    940             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    941             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    942             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    943             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    944         </item> <!-- lift_gate -->
    945         <item name="Sally Port" icon="presets/empty.png" type="node">
    946             <label text="Edit Sally Port" />
    947             <space />
    948             <key key="barrier" value="sally_port" />
    949             <label text="Allowed traffic:" />
    950             <space />
    951             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    952             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    953             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    954             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    955             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    956         </item> <!-- sally_port -->
    957         <item name="Bump Gate" icon="presets/empty.png" type="node">
    958             <label text="Edit Bump Gate" />
    959             <space />
    960             <key key="barrier" value="bump_gate" />
    961             <label text="Allowed traffic:" />
    962             <space />
    963             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    964             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    965             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    966             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    967             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    968         </item> <!-- bump_gate -->
    969         <item name="Cycle Barrier" icon="presets/empty.png" type="node">
    970             <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
    971             <key key="barrier" value="cycle_barrier" />
    972         </item> <!-- bump_gate -->
     897        </item> <!-- border_control -->
     898        <separator/>
     899       
     900        <!-- *** linear barriers *** -->   
    973901        <item name="Hedge" icon="presets/empty.png" type="way,closedway,relation">
    974902            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
    … …  
    979907            <key key="barrier" value="fence" />
    980908        </item> <!-- fence -->
    981         <item name="Block" icon="presets/empty.png" type="node,way,closedway">
    982             <key key="barrier" value="block" />
    983         </item> <!-- block -->
    984909        <item name="Wall" icon="presets/empty.png" type="way,closedway">
    985910            <key key="barrier" value="wall" />
    … …  
    993918            <key key="barrier" value="retaining_wall" />
    994919        </item> <!-- retaining_wall -->
    995         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
    996             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
    997             <label text="Edit Toll Booth" />
    998             <space />
    999             <key key="barrier" value="toll_booth" />
    1000             <optional>
    1001                 <text key="name" text="Name" default="" delete_if_empty="true" />
    1002                 <text key="operator" text="Operator" default="" delete_if_empty="true" />
    1003             </optional>
    1004         </item> <!-- toll_booth -->
    1005         <item name="Border Control" icon="presets/douane.png" type="node">
    1006             <label text="Edit Border Control" />
    1007             <space />
    1008             <key key="barrier" value="border_control" />
    1009             <label text="Allowed traffic:" />
    1010             <space />
    1011             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    1012             <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
    1013             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
    1014             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    1015             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    1016         </item> <!-- border_control -->
    1017         <separator/>
     920        <separator/>
     921       
     922        <!-- *** access *** -->   
    1018923        <item name="Entrance" icon="presets/empty.png" type="node">
    1019924            <label text="Edit Entrance" />
    … …  
    1028933            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
    1029934        </item> <!-- entrance -->
     935        <item name="Gate" icon="presets/gate.png" type="node">
     936            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
     937            <label text="Edit Gate" />
     938            <space />
     939            <key key="barrier" value="gate" />
     940            <label text="Allowed traffic:" />
     941            <space />
     942            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     943            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
     944            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
     945            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
     946            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
     947        </item> <!-- gate -->
     948        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
     949            <label text="Edit Lift Gate" />
     950            <space />
     951            <key key="barrier" value="lift_gate" />
     952            <label text="Allowed traffic:" />
     953            <space />
     954            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     955            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
     956            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
     957            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
     958            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
     959        </item> <!-- lift_gate -->
     960        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
     961            <label text="Edit Hampshire Gate" />
     962            <space />
     963            <key key="barrier" value="hampshire_gate" />
     964            <label text="Allowed traffic:" />
     965            <space />
     966            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     967            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
     968            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
     969            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
     970            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
     971        </item> <!-- hampshire_gate -->
     972        <item name="Bump Gate" icon="presets/empty.png" type="node">
     973            <label text="Edit Bump Gate" />
     974            <space />
     975            <key key="barrier" value="bump_gate" />
     976            <label text="Allowed traffic:" />
     977            <space />
     978            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     979            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
     980            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
     981            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
     982            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
     983        </item> <!-- bump_gate -->
     984        <item name="Kissing Gate" icon="presets/empty.png" type="node">
     985            <label text="Edit Kissing Gate" />
     986            <space />
     987            <key key="barrier" value="kissing_gate" />
     988            <label text="Allowed traffic:" />
     989            <space />
     990            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     991            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
     992        </item> <!-- kissing_gate -->
     993        <item name="Stile" icon="presets/stile.png" type="node">
     994            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
     995            <label text="Edit Stile" />
     996            <space />
     997            <key key="barrier" value="stile" />
     998            <label text="Allowed traffic:" />
     999            <space />
     1000            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     1001            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
     1002        </item> <!-- stile -->
     1003        <item name="Sally Port" icon="presets/empty.png" type="node">
     1004            <label text="Edit Sally Port" />
     1005            <space />
     1006            <key key="barrier" value="sally_port" />
     1007            <label text="Allowed traffic:" />
     1008            <space />
     1009            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
     1010            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
     1011            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
     1012            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
     1013            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
     1014        </item> <!-- sally_port -->
     1015       
    10301016    </group> <!-- Barriers -->
    10311017    <separator/>
Note: See TracChangeset for help on using the changeset viewer.