Changeset 2878 in josm for trunk


Ignore:
Timestamp:
2010-01-19T08:42:05+01:00 (15 years ago)
Author:
ulfl
Message:

add (based on current usage numbers and map features entries):
various airport related entries
highway=passing_place
passing_places=yes (on highway types where it seemed appropriate)
trail_visibility=xy (on highway types where it seemed appropriate)
traffic_calming=xy (on highway types where it seemed appropriate)
amenity=grit_bin
amenity=waste_basket
amenity=fire_hydrant
barrier=fence some values
waterway=ditch
various railway properties (electrified, voltage, ...)
railway=buffer_stop
aerialway=pylon
various fuel types
appended some cuisine values
voltage values (needs cleanup between railway and common power distribution values)
some missing links ;-)
some types (node,way,closedway) enhanced

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r2872 r2878  
    233233                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
    234234                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
     235                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
    235236                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    236237                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    … …  
    300301            <optional>
    301302                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" default="" delete_if_empty="true" />
     303                <text key="name" text="Name" default="" delete_if_empty="true" />
     304                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
     305                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
     306                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
     307                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
     308                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
     309                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
     310                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     311                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     312                <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
     313                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
     314            </optional>
     315        </item>
     316        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way">
     317            <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
     318                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
     319                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
     320            <label text="Edit Parking Aisle" />
     321            <space />
     322            <key key="highway" value="service" />
     323            <key key="service" value="parking_aisle" />
     324            <optional>
     325                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
     326                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
     327            </optional>
     328        </item>
     329        <separator/>
     330        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way">
     331            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
     332                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
     333            <label text="Edit Road of unknown type" />
     334            <space />
     335            <key key="highway" value="road" />
     336            <optional>
    302337                <text key="name" text="Name" default="" delete_if_empty="true" />
    303338                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    … …  
    312347            </optional>
    313348        </item>
    314         <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way">
    315             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
    316                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
    317                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
    318             <label text="Edit Parking Aisle" />
    319             <space />
    320             <key key="highway" value="service" />
    321             <key key="service" value="parking_aisle" />
    322             <optional>
    323                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    324                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
    325             </optional>
    326         </item>
    327         <separator/>
    328         <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way">
    329             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
    330                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
    331             <label text="Edit Road of unknown type" />
    332             <space />
    333             <key key="highway" value="road" />
    334             <optional>
    335                 <text key="name" text="Name" default="" delete_if_empty="true" />
    336                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    337                 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    338                 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
    339                 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
    340                 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
    341                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    342                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
    343                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    344                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    345             </optional>
    346         </item>
    347349        <separator/>
    348350        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way">
    … …  
    352354            <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
    353355            <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     356            <combo key="agricultural" text="Agricultural" values="yes,designated,destination,permissive,no" default="" delete_if_empty="true" />
    354357            <combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
    355358            <combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    … …  
    360363            <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    361364            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    362             <combo key="motorboat" text="Motorboat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    363             <combo key="boat" text="Boat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    364365            <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    365366            <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
    … …  
    424425        <item name="Construction" icon="presets/construction.png" type="way">
    425426            <label text="Edit Highway Under Construction" />
    426 <!--     FIXME: no entry in the Wiki
    427427            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
    428428                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
    429 -->
    430429            <space />
    431430            <key key="highway" value="construction" />
    … …  
    484483                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" default="" delete_if_empty="true" />
    485484                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" />
     485                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" default="" delete_if_empty="true" />
    486486                <combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" />
    487487                <combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" />
    … …  
    574574                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
    575575                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
     576                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
     577                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    576578                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    577579                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />
    … …  
    592594                <check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
    593595                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
     596                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
     597                <combo key="surface" text="Surface" values="paved,concrete,cobblestone" default="" delete_if_empty="true" />
    594598                <combo key="bicycle" text="Bikes" values="unknown,yes,no" default="" delete_if_empty="true" />
    595599                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    … …  
    665669            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
    666670        </item>
     671        <item name="Traffic Calming" type="node">
     672            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
     673            <label text="Edit Traffic Calming" />
     674            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,table" default="" delete_if_empty="true" />
     675        </item>
     676        <item name="Passing Place" type="node">
     677            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
     678            <label text="Edit Passing Place" />
     679            <key key="highway" value="passing_place" />
     680        </item>
    667681        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
    668682            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
    … …  
    678692        </item>
    679693        <item name="City Limit" icon="presets/citylimit.png" type="node">
     694            <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
    680695            <label text="Edit City Limit Sign" />
    681696            <space />
    … …  
    686701        </item>
    687702        <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
     703            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
    688704            <key key="highway" value="speed_camera" />
    689705        </item>
    … …  
    696712        <item name="Incline Steep" icon="presets/incline_steep.png" type="node,way">
    697713            <key key="highway" value="incline_steep" />
     714        </item>
     715        <item name="Grit Bin" type="node">
     716            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
     717            <key key="amenity" value="grit_bin" />
    698718        </item>
    699719        <separator/>
    … …  
    797817        <item name="Fence" icon="presets/empty.png" type="way,closedway">
    798818            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
    799             <key key="barrier" value="fence" />
     819            <combo key="barrier" text="Fence" values="fence,wood_fence,wire_fence" default="" delete_if_empty="true" />
    800820        </item> <!-- fence -->
    801821        <item name="Wall" icon="presets/empty.png" type="way,closedway">
    … …  
    934954            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    935955        </item>
     956        <item name="Ditch" icon="presets/waterway.png" type="way">
     957            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
     958            <label text="Edit Ditch" />
     959            <space />
     960            <key key="waterway" value="ditch" />
     961            <text key="name" text="Name" default="" delete_if_empty="true" />
     962            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     963        </item>
    936964        <item name="Stream" icon="presets/waterway.png" type="way">
    937965            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
    … …  
    10631091        </item>
    10641092        <separator/>
    1065         <item name="Dam" icon="presets/empty.png" type="way,closedway">
     1093        <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
    10661094            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
    10671095            <label text="Edit Dam" />
    … …  
    11271155            <space />
    11281156            <key key="railway" value="rail" />
    1129             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1157            <optional>
     1158                <combo key="gauge" text="Gauge (mm)" values="standard,1435,1495,1520,1524,1600,1668,1676" default="" delete_if_empty="true" />
     1159                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1160                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1161                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1162                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1163            </optional>
    11301164        </item>
    11311165        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way">
    … …  
    11331167            <space />
    11341168            <key key="railway" value="narrow_gauge" />
    1135             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1169            <optional>
     1170                <combo key="gauge" text="Gauge (mm)" values="381,400,457,500,610,760,891,950,1000,1067" default="" delete_if_empty="true" />
     1171                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1172                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1173                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1174                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1175            </optional>
    11361176        </item>
    11371177        <item name="Monorail" icon="presets/railway.png" type="way">
    … …  
    11401180            <space />
    11411181            <key key="railway" value="monorail" />
    1142             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1182            <optional>
     1183                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1184                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1185                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1186                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1187            </optional>
    11431188        </item>
    11441189        <item name="Preserved" icon="presets/rail_preserved.png" type="way">
    … …  
    11461191            <space />
    11471192            <key key="railway" value="preserved" />
    1148             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1193            <optional>
     1194                <combo key="gauge" text="Gauge (mm)" values="381,400,457,500,610,760,891,950,1000,1067,1435,1495,1520,1524,1600,1668,1676" default="" delete_if_empty="true" />
     1195                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1196                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1197                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1198                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1199            </optional>
    11491200        </item>
    11501201        <item name="Light Rail" icon="presets/rail_light.png" type="way">
    … …  
    11521203            <space />
    11531204            <key key="railway" value="light_rail" />
    1154             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1205            <optional>
     1206                <combo key="gauge" text="Gauge (mm)" values="381,400,457,500,610,760,891,950,1000,1067,1435,1495,1520,1524,1600,1668,1676" default="" delete_if_empty="true" />
     1207                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1208                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1209                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1210                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1211            </optional>
    11551212        </item>
    11561213        <item name="Subway" icon="presets/rail_light.png" type="way">
    … …  
    11581215            <space />
    11591216            <key key="railway" value="subway" />
    1160             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1217            <optional>
     1218                <combo key="gauge" text="Gauge (mm)" values="381,400,457,500,610,760,891,950,1000,1067,1435,1495,1520,1524,1600,1668,1676" default="" delete_if_empty="true" />
     1219                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1220                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1221                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1222                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1223            </optional>
    11611224        </item>
    11621225        <item name="Tram" icon="presets/tram.png" type="way">
    … …  
    11641227            <space />
    11651228            <key key="railway" value="tram" />
    1166             <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1229            <optional>
     1230                <combo key="gauge" text="Gauge (mm)" values="381,400,457,500,610,760,891,950,1000,1067,1435,1495,1520,1524,1600,1668,1676" default="" delete_if_empty="true" />
     1231                <combo key="service" text="Types" values="yard,siding,spur" default="" delete_if_empty="true" />
     1232                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" default="" delete_if_empty="true" />
     1233                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" default="" delete_if_empty="true" />
     1234                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" default="" delete_if_empty="true" />
     1235            </optional>
    11671236        </item>
    11681237        <item name="Bus Guideway" icon="presets/busway.png" type="way">
    … …  
    12131282            <key key="railway" value="turntable" />
    12141283        </item>
     1284        <item name="Buffer Stop" type="node">
     1285            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
     1286            <key key="railway" value="buffer_stop" />
     1287        </item>
    12151288    </group> <!-- Railway -->
    12161289    <group name="Aerialway" icon="presets/aerialway.png">
    … …  
    12401313        </item>
    12411314        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
    1242             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
     1315            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
    12431316            <label text="Edit Station" text_context="aerialway" />
    12441317            <key key="aerialway" value="station" />
     1318            <text key="name" text="Name" default="" delete_if_empty="true" />
     1319        </item>
     1320        <item name="Pylon" name_context="aerialway" type="node">
     1321            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1322            <label text="Edit Pylon" text_context="aerialway" />
     1323            <key key="aerialway" value="pylon" />
    12451324            <text key="name" text="Name" default="" delete_if_empty="true" />
    12461325        </item>
    … …  
    12541333            <label text="Edit Fuel" />
    12551334            <key key="amenity" value="fuel" />
    1256             <text key="name" text="Name" default="" delete_if_empty="true" />
    1257             <text key="operator" text="Operator" default="" delete_if_empty="true" />
    1258             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
     1335            <combo key="operator" text="Operator" values="Agip,Aral,Avia,BP,Esso,OMV,Q8,Repsol,Shell,Statoil,Tamoil,Texaco,Total,Indipend." default="" delete_if_empty="true" />
     1336            <optional>
     1337                                <text key="name" text="Name" default="" delete_if_empty="true" />
     1338                                <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
     1339                                <label text="Fuel types:" />
     1340                                <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
     1341                                <check key="fuel:biodiesel" text="Bio Diesel" default="off" delete_if_empty="true" />
     1342                                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" delete_if_empty="true" />
     1343                                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" delete_if_empty="true" />
     1344                                <check key="fuel:octane 91" text="Octane 91" default="off" delete_if_empty="true" />
     1345                                <check key="fuel:octane 95" text="Octane 95" default="off" delete_if_empty="true" />
     1346                                <check key="fuel:octane 98" text="Octane 98" default="off" delete_if_empty="true" />
     1347                                <check key="fuel:octane 100" text="Octane 100" default="off" delete_if_empty="true" />
     1348                                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" delete_if_empty="true" />
     1349                                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" delete_if_empty="true" />
     1350                                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" delete_if_empty="true" />
     1351                                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" delete_if_empty="true" />
     1352                                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" delete_if_empty="true" />
     1353                                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" delete_if_empty="true" />
     1354            </optional>
    12591355        </item>
    12601356        <item name="Parking" icon="presets/parking.png" type="node,closedway">
    … …  
    14121508            <text key="name" text="Name" default="" delete_if_empty="true" />
    14131509        </item>
    1414         <separator/>
    1415         <item name="Airport" icon="presets/plane.png" type="node,closedway">
     1510    </group> <!-- Public Transport -->
     1511    <separator/>
     1512    <group name="Airport" icon="presets/plane.png">
     1513        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway">
    14161514            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
    1417             <label text="Edit Airport" />
     1515            <label text="Edit Airport Ground" />
    14181516            <key key="aeroway" value="aerodrome" />
    14191517            <text key="name" text="Name" default="" delete_if_empty="true" />
    14201518            <optional>
    1421                 <text key="ref" text="Reference" default="" delete_if_empty="true" />
    14221519                <text key="iata" text="IATA" default="" delete_if_empty="true" />
    14231520                <text key="icao" text="ICAO" default="" delete_if_empty="true" />
    14241521            </optional>
    14251522        </item>
    1426     </group> <!-- Public Transport -->
     1523        <separator/>
     1524        <item name="Runway" type="way">
     1525            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
     1526            <label text="Edit Runway" />
     1527            <key key="aeroway" value="runway" />
     1528            <optional>
     1529                <text key="ref" text="Reference" default="" delete_if_empty="true" />
     1530            </optional>
     1531        </item>
     1532        <item name="Taxiway" type="way">
     1533            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
     1534            <label text="Edit Taxiway" />
     1535            <key key="aeroway" value="taxiway" />
     1536            <optional>
     1537                <text key="ref" text="Reference" default="" delete_if_empty="true" />
     1538            </optional>
     1539        </item>
     1540        <item name="Helipad" type="node,closedway">
     1541            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
     1542            <label text="Edit Helipad" />
     1543            <key key="aeroway" value="helipad" />
     1544            <optional>
     1545                <text key="ref" text="Reference" default="" delete_if_empty="true" />
     1546            </optional>
     1547        </item>
     1548        <item name="Apron" type="closedway">
     1549            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
     1550            <label text="Apron" />
     1551            <key key="aeroway" value="apron" />
     1552        </item>
     1553        <item name="Hangar" type="closedway">
     1554            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
     1555            <label text="Hangar" />
     1556            <key key="building" value="hangar" />
     1557        </item>
     1558        <item name="Beacon" type="node">
     1559            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
     1560            <label text="Beacon" />
     1561            <key key="man_made" value="beacon" />
     1562        </item>
     1563        <item name="Windsock" type="node">
     1564            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
     1565            <label text="Windsock" />
     1566            <key key="aeroway" value="windsock" />
     1567        </item>
     1568        <separator/>
     1569        <item name="Terminal" type="node,closedway">
     1570            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
     1571            <label text="Edit Terminal" />
     1572            <key key="aeroway" value="terminal" />
     1573            <text key="name" text="Name" default="" delete_if_empty="true" />
     1574        </item>
     1575        <item name="Gate" type="node">
     1576            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
     1577            <label text="Edit Terminal Gate" />
     1578            <key key="aeroway" value="gate" />
     1579            <text key="ref" text="Reference" default="" delete_if_empty="true" />
     1580        </item>
     1581    </group> <!-- Aeroway -->
    14271582  </group>
    14281583  <group name="Travel" icon="presets/bed.png">
    … …  
    14831638            <key key="amenity" value="restaurant" />
    14841639            <text key="name" text="Name" default="" delete_if_empty="true" />
    1485             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
     1640            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi" default="" delete_if_empty="true" />
    14861641            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
    14871642        </item>
    … …  
    14911646            <key key="amenity" value="fast_food" />
    14921647            <text key="name" text="Name" default="" delete_if_empty="true" />
    1493             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
     1648            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" default="" delete_if_empty="true" />
    14941649            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
    14951650        </item>
    … …  
    18842039            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    18852040        </item>
    1886         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,closedway">
     2041        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
    18872042            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
    18882043            <label text="Edit Skiing" />
    … …  
    21962351            <key key="man_made" value="pipeline" />
    21972352            <text key="operator" text="Operator" default="" delete_if_empty="true" />
    2198             <combo key="type" text="Type" values="water,oil,gas,sewage,heat,any substance" default="" delete_if_empty="true" />
     2353            <combo key="type" text="Type" values="water,gas,heat,oil,sewage,any substance" default="" delete_if_empty="true" />
    21992354            <combo key="location" text="Location" values="underground,underwater,overground" default="" delete_if_empty="true" />
    22002355        </item>
    … …  
    22302385            <key key="man_made" value="surveillance" />
    22312386            <text key="name" text="Name" default="" delete_if_empty="true" />
     2387            <combo key="surveillance" text="Type" values="indoor,outdoor,public" default="" />
    22322388        </item>
    22332389        <separator/>
    … …  
    22582414            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
    22592415        </item>
    2260         <item name="Power Tower" icon="presets/power_tower.png" type="node">
     2416        <item name="Power Tower" icon="presets/power_tower.png" type="node,closedway">
    22612417            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
    22622418                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
    … …  
    22742430            <text key="operator" text="Operator" default="" delete_if_empty="true" />
    22752431            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
    2276             <text key="voltage" text="Voltage" default="" delete_if_empty="true" />
     2432                        <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
     2433            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" default="" delete_if_empty="true" />
    22772434            <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />
    22782435            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" default="" delete_if_empty="true" />
    … …  
    23202477            <check key="recycling:scrap_metal" text="Scrap Metal" default="off" delete_if_empty="true" />
    23212478        </item>
     2479        <item name="Waste Basket" type="node">
     2480            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
     2481            <label text="Edit Waste Basket" />
     2482            <key key="amenity" value="waste_basket" />
     2483        </item>
    23222484        <item name="Bench" icon="presets/bench.png" type="node">
    23232485            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
    … …  
    23492511            <key key="amenity" value="drinking_water" />
    23502512            <text key="name" text="Name" default="" delete_if_empty="true" />
     2513        </item>
     2514        <item name="Fire Hydrant" type="node">
     2515            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
     2516                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
     2517            <label text="Edit Fire Hydrant" />
     2518            <key key="amenity" value="fire_hydrant" />
    23512519        </item>
    23522520        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
Note: See TracChangeset for help on using the changeset viewer.