Changeset 1374 in josm for trunk/presets/presets.xml


Ignore:
Timestamp:
2009-02-07T22:10:15+01:00 (15 years ago)
Author:
stoecker
Message:

fixed #2135

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/presets/presets.xml

    r1360 r1374  
    208208                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    209209                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    210                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     210                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    211211            </optional>
    212212        </item>
    … …  
    226226                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    227227                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    228                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     228                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    229229            </optional>
    230230        </item>
    … …  
    244244                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    245245                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    246                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     246                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    247247            </optional>
    248248        </item>
    … …  
    254254            <key key="highway" value="service" />
    255255            <optional>
     256                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" default="" delete_if_empty="true" />
    256257                <text key="name" text="Name" default="" delete_if_empty="true" />
    257258                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    … …  
    263264                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    264265                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    265                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     266                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    266267            </optional>
    267268        </item>
    … …  
    295296                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    296297                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    297                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     298                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    298299            </optional>
    299300        </item>
    … …  
    318319            <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
    319320            <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
    320             <text key="maxheight" text="Max. Height (metres)" default="" delete_if_empty="true" />
    321             <text key="maxwidth" text="Max. Width (metres)" default="" delete_if_empty="true" />
    322             <text key="maxlength" text="Max. Length (metres)" default="" delete_if_empty="true" />
     321            <text key="maxheight" text="Max. Height (meters)" default="" delete_if_empty="true" />
     322            <text key="maxwidth" text="Max. Width (meters)" default="" delete_if_empty="true" />
     323            <text key="maxlength" text="Max. Length (meters)" default="" delete_if_empty="true" />
    323324        </item>
    324325        <item name="Roundabout" icon="presets/roundabout.png">
    … …  
    340341                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    341342                <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
    342                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     343                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    343344            </optional>
    344345        </item>
    … …  
    356357                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    357358                <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
    358                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    359             </optional>
     359                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
     360            </optional>
     361        </item>
     362        <item name="Tunnel" icon="presets/tunnel.png">
     363             <label text="Edit a Tunnel"/>
     364             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
     365                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
     366                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
     367             <space />
     368             <key key="tunnel" value="yes" />
     369             <optional>
     370                 <text key="name" text="Name" default="" delete_if_empty="true" />
     371                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" delete_if_empty="true" />
     372                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
     373                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
     374             </optional>
    360375        </item>
    361376    </group> <!-- Streets -->
    … …  
    380395                <combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" />
    381396                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    382                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     397                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    383398            </optional>
    384399        </item>
    … …  
    399414                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    400415                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    401                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     416                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    402417            </optional>
    403418        </item>
    … …  
    419434                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    420435                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    421                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     436                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    422437            </optional>
    423438        </item>
    … …  
    438453                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    439454                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    440                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     455                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    441456            </optional>
    442457        </item>
    … …  
    456471                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    457472                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    458                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     473                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    459474            </optional>
    460475        </item>
    … …  
    476491                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    477492                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    478                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     493                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    479494            </optional>
    480495        </item>
    … …  
    497512                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    498513                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    499                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     514                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    500515            </optional>
    501516        </item>
    … …  
    518533                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    519534                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    520                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     535                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    521536            </optional>
    522537        </item>
    … …  
    539554                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    540555                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    541                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     556                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    542557            </optional>
    543558        </item>
    … …  
    560575                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    561576                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    562                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     577                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    563578            </optional>
    564579        </item>
    … …  
    581596                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    582597                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    583                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     598                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    584599            </optional>
    585600        </item>
    … …  
    602617                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    603618                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    604                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     619                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    605620            </optional>
    606621        </item>
    … …  
    630645                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    631646                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    632                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     647                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    633648            </optional>
    634649        </item>
    … …  
    643658            <optional>
    644659                <text key="name" text="Name" default="" delete_if_empty="true" />
    645                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     660                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    646661            </optional>
    647662        </item>
    … …  
    656671            <optional>
    657672                <text key="name" text="Name" default="" delete_if_empty="true" />
    658                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     673                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    659674            </optional>
    660675        </item>
    … …  
    669684            <optional>
    670685                <text key="name" text="Name" default="" delete_if_empty="true" />
    671                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     686                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    672687            </optional>
    673688        </item>
    … …  
    682697            <optional>
    683698                <text key="name" text="Name" default="" delete_if_empty="true" />
    684                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     699                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    685700            </optional>
    686701        </item>
    … …  
    695710            <optional>
    696711                <text key="name" text="Name" default="" delete_if_empty="true" />
    697                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     712                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    698713            </optional>
    699714        </item>
    … …  
    708723            <optional>
    709724                <text key="name" text="Name" default="" delete_if_empty="true" />
    710                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     725                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    711726            </optional>
    712727        </item>
    … …  
    742757            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
    743758            <key key="highway" value="traffic_signals" />
     759            <optional>
     760                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
     761                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
     762                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
     763                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
     764                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
     765            </optional>
    744766        </item>
    745767        <item name="Stop" icon="presets/Stop.png">
    746768            <key key="highway" value="stop" />
    747769        </item>
    748         <item name="Zebra Crossing" icon="presets/zebracrossing.png">
     770        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png">
    749771            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
    750772                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
    751773            <label text="Edit a crossing" />
    752774            <key key="highway" value="crossing" />
    753             <combo key="crossing" text="Type" values="uncontrolled,island" default="uncontrolled" />
    754             <combo key="crossing_ref" text="Ref" values="zebra,pelican" default="zebra" />
    755             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
    756             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
    757         </item>
    758         <item name="Mini Roundabout" icon="presets/roundabout_left.png">
     775            <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
     776            <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
     777            <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
     778            <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
     779            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
     780        </item>
     781        <item name="Mini-roundabout" icon="presets/roundabout_left.png">
    759782            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
    760783                  de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
    761784                  it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
    762785            <key key="highway" value="mini_roundabout" />
     786            <combo key="direction" text="Clockwise direction?" values="clockwise" default="" delete_if_empty="true" />
    763787        </item>
    764788        <item name="Turning Circle" icon="presets/turning_circle.png">
    … …  
    876900        </item> <!-- cattle_grid -->
    877901        <item name="Spikes" icon="presets/empty.png">
    878             <label text="Edit a Spikes" />
     902            <label text="Edit Spikes" />
    879903            <space />
    880904            <key key="barrier" value="spikes" />
    … …  
    11831207                <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
    11841208                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    1185                 <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     1209                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    11861210            </optional>
    11871211        </item>
    … …  
    12041228            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
    12051229            <key key="railway" value="crossing" />
     1230            <optional>
     1231                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
     1232                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
     1233                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
     1234                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
     1235            </optional>
    12061236        </item>
    12071237        <item name="Turntable" icon="presets/turntable.png">
    … …  
    12981328            <key key="amenity" value="bicycle_parking" />
    12991329            <text key="name" text="Name" default="" delete_if_empty="true" />
     1330            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
    13001331        </item>
    13011332        <item name="Rental" icon="presets/bicycle_rental.png">
    … …  
    13521383            <space />
    13531384            <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
    1354             <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     1385            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    13551386            <check key="area" text="Area" default="off" delete_if_empty="true" />
    13561387        </item>
    … …  
    13931424            <space />
    13941425            <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
    1395             <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
     1426            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    13961427            <check key="area" text="Area" default="off" delete_if_empty="true" />
    13971428        </item>
    … …  
    24212452            <label text="Edit Automated Teller Machine" />
    24222453            <key key="amenity" value="atm" />
    2423             <text key="name" text="Provider" default="" delete_if_empty="true" />
     2454            <text key="operator" text="Operator" default="" delete_if_empty="true" />
    24242455        </item>
    24252456    </group> <!-- Cash -->
Note: See TracChangeset for help on using the changeset viewer.