Changeset 3460 in josm for trunk/data


Ignore:
Timestamp:
2010-08-24T10:12:56+02:00 (9 years ago)
Author:
ulfl
Message:

Major rework of the presets menu layout. Goals were:

  • add lot's of icons from mappaint (bring presets and mappaint icons closer together)
  • trying to group stuff together that belongs together (making it easier to find things)
  • split very long menus (to better fit on low resolution screens)
  • add some stuff I was missing

In detail:

  • (slight) relayout of waypoints entries
  • add a new transport/motorcycle section
  • whole relayout of water menu entries (water vs. shipping)
  • (slight) relayout of travel/tourism entries
  • add a new sport/motorsport section
  • add a new man_made/food section (selected items from shop section go here)
  • relayout of man_made/shop section
  • whole relayout of places entries
  • add a new annotation section
  • add some entries came to mind
  • other minor changes
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r3429 r3460  
    645645                <text key="name" text="Name" default="" delete_if_empty="true" />
    646646                <text key="operator" text="Operator" default="" delete_if_empty="true" />
    647             </optional>
     647                <check key="toilets" default="off" delete_if_empty="true" />
     648            </optional>
     649        </item>
     650        <item name="Rest Area" icon="presets/parking.png" type="node,closedway">
     651            <label text="Edit Rest Area" />
     652            <space />
     653            <key key="highway" value="rest_area" />
     654            <optional>
     655                <text key="name" text="Name" default="" delete_if_empty="true" />
     656                <check key="toilets" default="off" delete_if_empty="true" />
     657            </optional>
     658        </item>
     659        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
     660            <key key="amenity" value="emergency_phone" />
    648661        </item>
    649662        <separator/>
     
    661674        <item name="Stop" icon="presets/Stop.png" type="node">
    662675            <key key="highway" value="stop" />
     676        </item>
     677        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
     678            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
     679                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
     680                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
     681            <key key="highway" value="mini_roundabout" />
     682            <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
    663683        </item>
    664684        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png" type="node">
     
    673693            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
    674694        </item>
    675         <item name="Traffic Calming" type="node">
     695        <item name="Traffic Calming" icon="presets/empty.png" type="node">
    676696            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
    677697            <label text="Edit Traffic Calming" />
     
    683703            <key key="highway" value="passing_place" />
    684704        </item>
    685         <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
    686             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
    687                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
    688                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
    689             <key key="highway" value="mini_roundabout" />
    690             <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
    691         </item>
    692705        <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
    693706            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
     
    708721            <key key="highway" value="speed_camera" />
    709722        </item>
    710         <item name="Emergency Phone" icon="presets/telephone.png" type="node">
    711             <key key="amenity" value="emergency_phone" />
    712         </item>
     723        <separator/>
    713724        <item name="Incline" icon="presets/incline.png" type="node,way">
    714725            <key key="highway" value="incline" />
     
    717728            <key key="highway" value="incline_steep" />
    718729        </item>
    719         <item name="Grit Bin" type="node">
     730        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
    720731            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
    721732            <key key="amenity" value="grit_bin" />
     
    756767            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
    757768        </item> <!-- bollard -->
    758         <item name="Cycle Barrier" icon="presets/empty.png" type="node">
     769        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
    759770            <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
    760771            <key key="barrier" value="cycle_barrier" />
     
    837848
    838849        <!-- *** access *** -->
    839         <item name="Entrance" icon="presets/empty.png" type="node">
     850        <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
    840851            <label text="Edit Entrance" />
    841852            <space />
     
    917928            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
    918929        </item> <!-- stile -->
    919         <item name="Turnstile" icon="presets/empty.png" type="node">
     930        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
    920931            <label text="Edit Turnstile" />
    921932            <space />
     
    943954  <group name="Water" icon="presets/waterway.png">
    944955    <group name="Water" icon="presets/waterway.png">
    945         <item name="Spring" icon="presets/spring.png" type="node,closedway">
    946             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
    947             <label text="Edit Spring" />
    948             <key key="natural" value="spring" />
    949             <text key="name" text="Name" default="" delete_if_empty="true" />
    950         </item>
    951956        <separator/>
    952957        <item name="Drain" icon="presets/waterway.png" type="way">
     
    993998        </item>
    994999        <separator/>
     1000        <item name="Spring" icon="presets/spring.png" type="node,closedway">
     1001            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
     1002            <label text="Edit Spring" />
     1003            <key key="natural" value="spring" />
     1004            <text key="name" text="Name" default="" delete_if_empty="true" />
     1005        </item>
     1006        <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
     1007            <label text="Edit Waterfall" />
     1008            <space />
     1009            <key key="waterway" value="waterfall" />
     1010            <text key="name" text="Name" default="" delete_if_empty="true" />
     1011        </item>
     1012        <item name="Weir" icon="presets/weir.png" type="node,way">
     1013            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
     1014            <label text="Edit Weir" />
     1015            <space />
     1016            <key key="waterway" value="weir" />
     1017            <text key="name" text="Name" default="" delete_if_empty="true" />
     1018        </item>
     1019        <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
     1020            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
     1021            <label text="Edit Dam" />
     1022            <space />
     1023            <key key="waterway" value="dam" />
     1024            <text key="name" text="Name" default="" delete_if_empty="true" />
     1025        </item>
     1026        <separator/>
     1027        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation">
     1028            <label text="Edit Basin Landuse" />
     1029            <space />
     1030            <key key="landuse" value="basin" />
     1031            <text key="name" text="Name" default="" delete_if_empty="true" />
     1032        </item>
     1033        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
     1034            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
     1035            <label text="Edit Reservoir Landuse" />
     1036            <space />
     1037            <key key="landuse" value="reservoir" />
     1038            <text key="name" text="Name" default="" delete_if_empty="true" />
     1039        </item>
     1040        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
     1041            <label text="Edit Covered Reservoir" />
     1042            <key key="man_made" value="reservoir_covered" />
     1043            <text key="name" text="Name" default="" delete_if_empty="true" />
     1044        </item>
     1045        <separator/>
    9951046        <item name="Water" icon="presets/water.png" type="node,closedway,relation">
    9961047            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
     
    10041055            <text key="name" text="Name" default="" delete_if_empty="true" />
    10051056        </item>
    1006         <separator/>
    1007         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation">
    1008             <label text="Edit Basin Landuse" />
    1009             <space />
    1010             <key key="landuse" value="basin" />
    1011             <text key="name" text="Name" default="" delete_if_empty="true" />
    1012         </item>
    1013         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation">
    1014             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
    1015             <label text="Edit Reservoir Landuse" />
    1016             <space />
    1017             <key key="landuse" value="reservoir" />
    1018             <text key="name" text="Name" default="" delete_if_empty="true" />
    1019         </item>
    1020         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
    1021             <label text="Edit Covered Reservoir" />
    1022             <key key="man_made" value="reservoir_covered" />
    1023             <text key="name" text="Name" default="" delete_if_empty="true" />
    1024         </item>
    1025         <separator/>
     1057        <item name="Coastline" icon="presets/empty.png" type="node,way,closedway,relation">
     1058            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
     1059            <label text="Edit Coastline" />
     1060            <key key="natural" value="coastline" />
     1061            <text key="name" text="Name" default="" delete_if_empty="true" />
     1062        </item>
    10261063        <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation">
    10271064            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
     
    10311068            <text key="name" text="Name" default="" delete_if_empty="true" />
    10321069        </item>
     1070        <separator/>
    10331071        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation">
    10341072            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
     
    10631101            <text key="name" text="Name" default="" delete_if_empty="true" />
    10641102        </item>
    1065         <item name="Coastline" icon="presets/empty.png" type="node,way,closedway,relation">
    1066             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
    1067             <label text="Edit Coastline" />
    1068             <key key="natural" value="coastline" />
    1069             <text key="name" text="Name" default="" delete_if_empty="true" />
    1070         </item>
    1071         <separator/>
     1103      </group> <!-- Water -->
     1104    <group name="Shipping" icon="presets/ferry.png">
     1105        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway">
     1106            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
     1107            <label text="Edit Ferry Terminal" />
     1108            <key key="amenity" value="ferry_terminal" />
     1109            <text key="name" text="Name" default="" delete_if_empty="true" />
     1110            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" default="" delete_if_empty="true" />
     1111        </item>
    10721112        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway">
    10731113            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
     
    10801120        </item>
    10811121        <separator/>
    1082         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
    1083             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
    1084             <label text="Edit Boatyard" />
    1085             <space />
    1086             <key key="waterway" value="boatyard" />
    1087             <text key="name" text="Name" default="" delete_if_empty="true" />
    1088         </item>
    1089         <item name="Dock" icon="presets/waterway.png" type="node,closedway">
    1090             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
    1091             <label text="Edit Dock" />
    1092             <space />
    1093             <key key="waterway" value="dock" />
    1094             <text key="name" text="Name" default="" delete_if_empty="true" />
    1095         </item>
    1096         <separator/>
    1097         <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
    1098             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
    1099             <label text="Edit Dam" />
    1100             <space />
    1101             <key key="waterway" value="dam" />
    1102             <text key="name" text="Name" default="" delete_if_empty="true" />
    1103         </item>
    1104       </group> <!-- Water -->
    1105     <group name="Waterway Point" icon="presets/waterwaypoint.png">
    1106         <item name="Lock Gate" icon="presets/lock_gate.png" type="node">
    1107             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
    1108             <key key="waterway" value="lock_gate" />
    1109         </item>
    1110         <item name="Weir" icon="presets/weir.png" type="node,way">
    1111             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
    1112             <label text="Edit Weir" />
    1113             <space />
    1114             <key key="waterway" value="weir" />
    1115             <text key="name" text="Name" default="" delete_if_empty="true" />
    1116         </item>
    1117         <item name="Waterfall" icon="presets/waterfall.png" type="node,way">
    1118             <label text="Edit Waterfall" />
    1119             <space />
    1120             <key key="waterway" value="waterfall" />
    1121             <text key="name" text="Name" default="" delete_if_empty="true" />
    1122         </item>
    1123         <item name="Turning Point" icon="presets/turning.png" type="node">
    1124             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
    1125             <key key="waterway" value="turning_point" />
    1126         </item>
    11271122        <item name="Marina" icon="presets/marina.png" type="node,closedway">
    11281123            <label text="Edit Marina" />
     
    11361131            <text key="name" text="Name" default="" delete_if_empty="true" />
    11371132        </item>
    1138         <item name="Ferry Terminal" icon="presets/empty.png" type="node,closedway">
    1139             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
    1140             <label text="Edit Ferry Terminal" />
    1141             <key key="amenity" value="ferry_terminal" />
    1142             <text key="name" text="Name" default="" delete_if_empty="true" />
    1143         </item>
     1133        <item name="Lock Gate" icon="presets/lock_gate.png" type="node">
     1134            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
     1135            <key key="waterway" value="lock_gate" />
     1136        </item>
     1137        <item name="Turning Point" icon="presets/turning.png" type="node">
     1138            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
     1139            <key key="waterway" value="turning_point" />
     1140        </item>
     1141        <separator/>
    11441142        <item name="Slipway" icon="presets/slipway.png" type="node">
    11451143            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
     
    11501148            <text key="name" text="Name" default="" delete_if_empty="true" />
    11511149        </item>
    1152     </group> <!-- Waterway -->
     1150        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
     1151            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
     1152            <label text="Edit Boatyard" />
     1153            <space />
     1154            <key key="waterway" value="boatyard" />
     1155            <text key="name" text="Name" default="" delete_if_empty="true" />
     1156        </item>
     1157        <item name="Dock" icon="presets/empty.png" type="node,closedway">
     1158            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
     1159            <label text="Edit Dock" />
     1160            <space />
     1161            <key key="waterway" value="dock" />
     1162            <text key="name" text="Name" default="" delete_if_empty="true" />
     1163        </item>
     1164    </group> <!-- Shipping -->
    11531165  </group>
    11541166  <group name="Transport" icon="presets/railway.png">
     
    12861298            <key key="railway" value="turntable" />
    12871299        </item>
    1288         <item name="Buffer Stop" type="node">
     1300        <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node">
    12891301            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
    12901302            <key key="railway" value="buffer_stop" />
     
    13161328            <text key="name" text="Name" default="" delete_if_empty="true" />
    13171329        </item>
     1330        <separator/>
    13181331        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
    13191332            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     
    13221335            <text key="name" text="Name" default="" delete_if_empty="true" />
    13231336        </item>
    1324         <item name="Pylon" name_context="aerialway" type="node">
     1337        <item name="Pylon" name_context="aerialway" icon="presets/power_tower.png" type="node">
    13251338            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
    13261339            <label text="Edit Pylon" text_context="aerialway" />
     
    13371350            <label text="Edit Fuel" />
    13381351            <key key="amenity" value="fuel" />
    1339             <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" />
     1352            <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Esso,OMV,Q8,Repsol,Shell,Statoil,Tamoil,Texaco,Total,Independent" default="" delete_if_empty="true" />
    13401353            <optional>
    13411354                <text key="name" text="Name" default="" delete_if_empty="true" />
     1355                <text key="operator" text="Operator" default="" delete_if_empty="true" />
    13421356                <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" />
    1343                 <check key="shop" text="With kiosk" value_on="kiosk" value_off="" default="off" delete_if_empty="true" />
     1357                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" default="" delete_if_empty="true" />
    13441358                <label text="Fuel types:" />
    13451359                <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
     
    13801394            <key key="amenity" value="car_wash" />
    13811395            <text key="name" text="Name" default="" delete_if_empty="true" />
     1396            <text key="brand" text="Brand" default="" delete_if_empty="true" />
     1397            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1398            <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" />
     1399        </item>
     1400        <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
     1401            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
     1402            <label text="Edit Car Shop" />
     1403            <key key="shop" value="car" />
     1404            <text key="name" text="Name" default="" delete_if_empty="true" />
    13821405            <text key="operator" text="Operator" default="" delete_if_empty="true" />
    13831406        </item>
     
    13861409            <key key="shop" value="car_repair" />
    13871410            <text key="name" text="Name" default="" delete_if_empty="true" />
     1411            <text key="brand" text="Brand" default="" delete_if_empty="true" />
    13881412            <text key="operator" text="Operator" default="" delete_if_empty="true" />
    1389         </item>
     1413            <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" />
     1414        </item>
     1415        <item name="Tyres" icon="presets/empty.png" type="node,closedway">
     1416            <label text="Edit Tyres" />
     1417            <key key="shop" value="tyres" />
     1418            <text key="name" text="Name" default="" delete_if_empty="true" />
     1419            <text key="brand" text="Brand" default="" delete_if_empty="true" />
     1420            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1421            <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" />
     1422            <label text="Contact:" />
     1423                <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
     1424                <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
     1425                <text key="website" text="Website" default="" delete_if_empty="true" />
     1426                <text key="email" text="Email Address" default="" delete_if_empty="true" />
     1427         </item>
    13901428        <item name="Rental" icon="presets/car_rental.png" type="node,closedway">
    13911429            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
     
    13941432            <key key="amenity" value="car_rental" />
    13951433            <text key="name" text="Name" default="" delete_if_empty="true" />
     1434            <text key="brand" text="Brand" default="" delete_if_empty="true" />
    13961435            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1436            <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" />
    13971437        </item>
    13981438        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
     
    14011441            <key key="amenity" value="car_sharing" />
    14021442            <text key="name" text="Name" default="" delete_if_empty="true" />
     1443            <text key="brand" text="Brand" default="" delete_if_empty="true" />
    14031444            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1445            <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" />
    14041446        </item>
    14051447    </group> <!-- Car -->
     1448    <group name="Motorcycle" icon="presets/motorbike.png">
     1449        <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
     1450            <label text="Edit Motorcycle Parking" />
     1451            <key key="amenity" value="motorcycle_parking" />
     1452            <text key="name" text="Name" default="" delete_if_empty="true" />
     1453            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
     1454            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" delete_if_empty="true" />
     1455            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
     1456        </item>
     1457        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway">
     1458            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
     1459            <label text="Edit Shop Motorcycle" />
     1460            <key key="shop" value="motorcycle" />
     1461            <text key="name" text="Name" default="" delete_if_empty="true" />
     1462            <combo key="brand" text="Brand" values="Independent" default="" delete_if_empty="true" />
     1463            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1464            <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" />
     1465            <label text="Services:" />
     1466                <combo key="sale" text="Sale" values="yes,no" default="off" delete_if_empty="true" />
     1467                <combo key="rental" text="Rental" values="yes,no" default="off" delete_if_empty="true" />
     1468                <combo key="repair" text="Repair" values="yes,brand,no" default="off" delete_if_empty="true" />
     1469                <combo key="parts" text="Parts" values="yes,brand,no" default="off" delete_if_empty="true" />
     1470                <combo key="clothes" text="Clothes" values="yes,no" default="off" delete_if_empty="true" />
     1471            <label text="Contact:" />
     1472                <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
     1473                <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
     1474                <text key="website" text="Website" default="" delete_if_empty="true" />
     1475                <text key="email" text="Email Address" default="" delete_if_empty="true" />
     1476        </item>
     1477    </group> <!-- Motorcycle -->
    14061478    <group name="Bicycle" icon="presets/bike.png">
    14071479        <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
     
    14111483            <text key="name" text="Name" default="" delete_if_empty="true" />
    14121484            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
     1485        </item>
     1486        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
     1487            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
     1488                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
     1489            <label text="Edit Bicycle Shop" />
     1490            <key key="shop" value="bicycle" />
     1491            <text key="name" text="Name" default="" delete_if_empty="true" />
    14131492        </item>
    14141493        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
     
    15271606        </item>
    15281607        <separator/>
    1529         <item name="Runway" type="way">
     1608        <item name="Runway" icon="presets/empty.png" type="way">
    15301609            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
    15311610            <label text="Edit Runway" />
     
    15351614            </optional>
    15361615        </item>
    1537         <item name="Taxiway" type="way">
     1616        <item name="Taxiway" icon="presets/empty.png" type="way">
    15381617            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
    15391618            <label text="Edit Taxiway" />
     
    15431622            </optional>
    15441623        </item>
    1545         <item name="Helipad" type="node,closedway">
     1624        <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway">
    15461625            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
    15471626            <label text="Edit Helipad" />
     
    15511630            </optional>
    15521631        </item>
    1553         <item name="Apron" type="closedway">
     1632        <item name="Apron" icon="presets/empty.png" type="closedway">
    15541633            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
    15551634            <label text="Apron" />
    15561635            <key key="aeroway" value="apron" />
    15571636        </item>
    1558         <item name="Hangar" type="closedway">
     1637        <item name="Hangar" icon="presets/empty.png" type="closedway">
    15591638            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
    15601639            <label text="Hangar" />
    15611640            <key key="building" value="hangar" />
    15621641        </item>
    1563         <item name="Beacon" type="node">
     1642        <item name="Beacon" icon="presets/empty.png" type="node">
    15641643            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
    15651644            <label text="Beacon" />
    15661645            <key key="man_made" value="beacon" />
    15671646        </item>
    1568         <item name="Windsock" type="node">
     1647        <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node">
    15691648            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
    15701649            <label text="Windsock" />
     
    15721651        </item>
    15731652        <separator/>
    1574         <item name="Terminal" type="node,closedway">
     1653        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway">
    15751654            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
    15761655            <label text="Edit Terminal" />
     
    15781657            <text key="name" text="Name" default="" delete_if_empty="true" />
    15791658        </item>
    1580         <item name="Gate" type="node">
     1659        <item name="Gate" icon="presets/empty.png" type="node">
    15811660            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
    15821661            <label text="Edit Terminal Gate" />
     
    16071686            <text key="email" text="Email Address" default="" delete_if_empty="true" />
    16081687        </item>
    1609         <item name="Motel" icon="presets/bed.png" type="node,closedway">
     1688        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
    16101689            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
    16111690            <label text="Edit Motel" />
     
    16251704            <text key="email" text="Email Address" default="" delete_if_empty="true" />
    16261705        </item>
    1627         <item name="Guest House" icon="presets/bed.png" type="node,closedway">
     1706        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
    16281707            <label text="Edit Guest House" />
    16291708            <key key="tourism" value="guest_house" />
     
    16411720            <text key="email" text="Email Address" default="" delete_if_empty="true" />
    16421721        </item>
    1643         <item name="Chalet" icon="presets/empty.png" type="node,closedway">
     1722        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
    16441723            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
    16451724            <label text="Edit Chalet" />
     
    16761755            <text key="email" text="Email Address" default="" delete_if_empty="true" />
    16771756        </item>
    1678         <item name="Alpine Hut" icon="presets/hostel.png" type="node,closedway">
     1757        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
    16791758            <label text="Edit Alpine Hut" />
    16801759            <key key="tourism" value="alpine_hut" />
     
    16931772            <text key="email" text="Email Address" default="" delete_if_empty="true" />
    16941773        </item>
     1774        <separator/>
    16951775        <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
    16961776            <label text="Edit Caravan Site" />
     
    17911871            <text key="name" text="Name" default="" delete_if_empty="true" />
    17921872            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     1873            <combo key="cuisine" text="Cuisine" values="ice_cream" default="" delete_if_empty="true" />
    17931874            <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" />
    17941875            <space />
     
    18931974            <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" />
    18941975        </item>
     1976        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
     1977            <label text="Edit Theme Park" />
     1978            <key key="tourism" value="theme_park" />
     1979            <text key="name" text="Name" default="" delete_if_empty="true" />
     1980            <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" />
     1981        </item>
     1982        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
     1983            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
     1984            <label text="Edit Artwork" />
     1985            <key key="tourism" value="artwork" />
     1986            <text key="name" text="Name" default="" delete_if_empty="true" />
     1987        </item>
     1988        <separator/>
    18951989        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
    18961990            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
     
    19001994<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
    19011995        </item>
    1902         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
    1903             <label text="Edit Theme Park" />
    1904             <key key="tourism" value="theme_park" />
    1905             <text key="name" text="Name" default="" delete_if_empty="true" />
    1906             <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" />
    1907         </item>
    1908         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
    1909             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
    1910             <label text="Edit Artwork" />
    1911             <key key="tourism" value="artwork" />
    1912             <text key="name" text="Name" default="" delete_if_empty="true" />
     1996        <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
     1997            <label text="Edit Shelter" />
     1998            <key key="amenity" value="shelter" />
     1999            <text key="name" text="Name" default="" delete_if_empty="true" />
     2000            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
     2001        </item>
     2002        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
     2003            <label text="Edit Picnic Site" />
     2004            <key key="tourism" value="picnic_site" />
     2005            <text key="name" text="Name" default="" delete_if_empty="true" />
     2006            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
    19132007        </item>
    19142008        <separator/>
     
    19932087            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
    19942088        </item>
    1995         <separator/>
    1996         <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
    1997             <label text="Edit Shelter" />
    1998             <key key="amenity" value="shelter" />
    1999             <text key="name" text="Name" default="" delete_if_empty="true" />
    2000             <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
    2001         </item>
    2002         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
    2003             <label text="Edit Picnic Site" />
    2004             <key key="tourism" value="picnic_site" />
    2005             <text key="name" text="Name" default="" delete_if_empty="true" />
    2006             <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
    2007         </item>
    20082089    </group> <!-- Tourism -->
    20092090    <group name="Historic Places" icon="presets/State_Tourist.png">
     
    21402221    </group>
    21412222    <group name="Sport" icon="presets/rowing.png">
    2142         <item name="Multi" icon="presets/empty.png" type="node,closedway">
     2223        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
    21432224            <label text="Edit Multi" />
    21442225            <key key="sport" value="multi" />
     
    21462227            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    21472228        </item>
    2148         <item name="10pin" icon="presets/empty.png" type="node,closedway">
     2229        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
    21492230            <label text="Edit 10pin" />
    21502231            <key key="sport" value="10pin" />
     
    21582239            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    21592240        </item>
    2160         <item name="Archery" icon="presets/empty.png" type="node,closedway">
     2241        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
    21612242            <label text="Edit Archery" />
    21622243            <key key="sport" value="archery" />
     
    21642245            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    21652246        </item>
    2166         <item name="Climbing" icon="presets/empty.png" type="node,closedway">
     2247        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
    21672248            <label text="Edit Climbing" />
    21682249            <key key="sport" value="climbing" />
     
    21822263            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    21832264        </item>
    2184         <item name="Dog Racing" icon="presets/empty.png" type="node,closedway">
     2265        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
    21852266            <label text="Edit Dog Racing" />
    21862267            <key key="sport" value="dog_racing" />
     
    22062287            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    22072288        </item>
    2208         <item name="Motor Sports" icon="presets/motorbike.png" type="node,closedway">
    2209             <label text="Edit Motor Sports" />
    2210             <key key="sport" value="motor" />
    2211             <text key="name" text="Name" default="" delete_if_empty="true" />
    2212             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    2213         </item>
    22142289        <item name="Skating" icon="presets/empty.png" type="node,closedway">
    22152290            <label text="Edit Skating" />
     
    22182293            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    22192294        </item>
    2220         <item name="Skateboard" icon="presets/empty.png" type="node,closedway">
     2295        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
    22212296            <label text="Edit Skateboard" />
    22222297            <key key="sport" value="skateboard" />
     
    23262401            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    23272402        </item>
    2328         <item name="Cricket Nets" icon="presets/empty.png" type="node,closedway">
     2403        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
    23292404            <label text="Edit Cricket Nets" />
    23302405            <key key="sport" value="cricket_nets" />
     
    23322407            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    23332408        </item>
    2334         <item name="Croquet" icon="presets/empty.png" type="node,closedway">
     2409        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
    23352410            <label text="Edit Croquet" />
    23362411            <key key="sport" value="croquet" />
     
    23672442            <text key="name" text="Name" default="" delete_if_empty="true" />
    23682443            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2444        </item>
     2445    </group>
     2446    <group name="Motorsport" icon="presets/motorbike.png">
     2447        <item name="Motorsport" icon="presets/empty.png" type="node,closedway">
     2448            <label text="Edit Motorsport" />
     2449            <key key="sport" value="motor" />
     2450            <text key="name" text="Name" default="" delete_if_empty="true" />
     2451            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2452        </item>
     2453        <item name="Karting" icon="presets/empty.png" type="node,closedway">
     2454            <label text="Edit Karting" />
     2455            <key key="sport" value="karting" />
     2456            <text key="name" text="Name" default="" delete_if_empty="true" />
     2457            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
     2458        </item>
     2459        <item name="Motocross" icon="presets/empty.png" type="node,closedway">
     2460            <label text="Edit Motocross" />
     2461            <key key="sport" value="motocross" />
     2462            <text key="name" text="Name" default="" delete_if_empty="true" />
     2463            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
     2464        </item>
     2465        <item name="Safety Training" icon="presets/empty.png" type="node,closedway">
     2466            <label text="Edit Safety Training" />
     2467            <key key="sport" value="safety_training" />
     2468            <text key="name" text="Name" default="" delete_if_empty="true" />
     2469            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
     2470        </item>
     2471        <separator/>
     2472        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
     2473            <label text="Edit Model Aerodrome" />
     2474            <key key="sport" value="model_aerodrome" />
     2475            <text key="name" text="Name" default="" delete_if_empty="true" />
     2476            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
     2477        </item>
     2478        <item name="Model Car" icon="presets/car.png" type="node,closedway">
     2479            <label text="Edit Model Car" />
     2480            <key key="sport" value="model_car" />
     2481            <text key="name" text="Name" default="" delete_if_empty="true" />
     2482            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
    23692483        </item>
    23702484    </group>
     
    23752489            <key key="building" value="yes" />
    23762490        </item>
    2377         <item name="Public Building" icon="presets/empty.png" type="node,closedway,relation">
     2491        <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation">
    23782492            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
    23792493            <label text="Edit Public Building" />
     
    24412555            <text key="name" text="Name" default="" delete_if_empty="true" />
    24422556        </item>
    2443         <item name="University" icon="presets/empty.png" type="node,closedway,relation">
     2557        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
    24442558            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
    24452559            <label text="Edit University" />
     
    24472561            <text key="name" text="Name" default="" delete_if_empty="true" />
    24482562        </item>
    2449         <item name="College" icon="presets/empty.png" type="node,closedway,relation">
     2563        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
    24502564            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
    24512565            <label text="Edit College" />
     
    24922606            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
    24932607            <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" />
    2494         </item>
    2495         <separator/>
    2496         <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway">
    2497             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
    2498                   de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
    2499             <label text="Edit Address Information" />
    2500             <space />
    2501             <text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
    2502             <optional>
    2503                 <text key="addr:housename" text="House name" default="" delete_if_empty="true" />
    2504                 <text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
    2505                 <text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
    2506                 <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
    2507                 <text key="addr:country" text="Country code" use_last_as_default="true" delete_if_empty="true" />
    2508             </optional>
    2509         </item>
    2510         <item name="Address Interpolation" icon="presets/addresses.png" type="way">
    2511            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
    2512                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
    2513             <label text="Edit Address Interpolation" />
    2514             <space />
    2515             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" />
    25162608        </item>
    25172609    </group> <!-- Buildings -->
     
    26862778            <check key="recycling:scrap_metal" text="Scrap Metal" default="off" delete_if_empty="true" />
    26872779        </item>
    2688         <item name="Waste Basket" type="node">
     2780        <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
    26892781            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
    26902782            <label text="Edit Waste Basket" />
     
    27272819            <key key="amenity" value="fire_hydrant" />
    27282820        </item>
    2729         <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
    2730             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
    2731             <label text="Edit Baby Hatch" />
    2732             <key key="amenity" value="baby_hatch" />
    2733             <text key="operator" text="Operator" default="" delete_if_empty="true" />
    2734             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
    2735         </item>
    27362821    </group> <!-- Amenities -->
    2737     <group name="Shops" icon="presets/shopping.png">
    2738         <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
    2739             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
    2740             <label text="Edit Car Shop" />
    2741             <key key="shop" value="car" />
    2742             <text key="name" text="Name" default="" delete_if_empty="true" />
    2743             <text key="operator" text="Operator" default="" delete_if_empty="true" />
    2744         </item>
    2745         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
    2746             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
    2747                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
    2748             <label text="Edit Bicycle Shop" />
    2749             <key key="shop" value="bicycle" />
    2750             <text key="name" text="Name" default="" delete_if_empty="true" />
    2751         </item>
     2822    <group name="Food" icon="presets/shopping.png">
    27522823        <item name="Supermarket" icon="presets/shopping.png" type="node,closedway">
    27532824            <label text="Edit Supermarket" />
    27542825            <key key="shop" value="supermarket" />
    2755             <text key="name" text="Name" default="" delete_if_empty="true" />
    2756             <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" />
    2757         </item>
    2758         <item name="Chemist" icon="presets/empty.png" type="node,closedway">
    2759             <label text="Edit Chemist" />
    2760             <key key="shop" value="chemist" />
    27612826            <text key="name" text="Name" default="" delete_if_empty="true" />
    27622827            <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" />
     
    27762841            <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" />
    27772842        </item>
    2778         <item name="Book Store" icon="presets/book.png" type="node,closedway">
    2779             <label text="Edit Book Store" />
    2780             <key key="shop" value="books" />
    2781             <text key="name" text="Name" default="" delete_if_empty="true" />
    2782             <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" />
    2783         </item>
    2784         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
    2785             <label text="Edit Travel Agency" />
    2786             <key key="shop" value="travel_agency" />
    2787             <text key="name" text="Name" default="" delete_if_empty="true" />
    2788             <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" />
    2789         </item>
    27902843        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
    27912844            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
     
    28022855            <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" />
    28032856        </item>
    2804         <item name="Florist" icon="presets/empty.png" type="node,closedway">
    2805             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
    2806             <label text="Edit Florist" />
    2807             <key key="shop" value="florist" />
    2808             <text key="name" text="Name" default="" delete_if_empty="true" />
    2809             <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" />
    2810         </item>
    28112857        <item name="Organic" icon="presets/empty.png" type="node,closedway">
    28122858            <label text="Edit Organic Shop" />
     
    28222868            <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" />
    28232869        </item>
    2824         <item name="Beverages" icon="presets/empty.png" type="node,closedway">
     2870        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
    28252871            <label text="Edit Beverages Shop" />
    28262872            <key key="shop" value="beverages" />
     
    28282874            <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" />
    28292875        </item>
    2830         <item name="Computer" icon="presets/empty.png" type="node,closedway">
     2876    </group> <!-- Food -->
     2877    <group name="Shops" icon="styles/standard/shop/mall.png">
     2878        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
     2879            <label text="Edit Chemist" />
     2880            <key key="shop" value="chemist" />
     2881            <text key="name" text="Name" default="" delete_if_empty="true" />
     2882            <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" />
     2883        </item>
     2884        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
     2885            <label text="Edit Hairdresser" />
     2886            <key key="shop" value="hairdresser" />
     2887            <text key="name" text="Name" default="" delete_if_empty="true" />
     2888            <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" />
     2889        </item>
     2890        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
     2891            <label text="Edit Optician" />
     2892            <key key="shop" value="optician" />
     2893            <text key="name" text="Name" default="" delete_if_empty="true" />
     2894            <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" />
     2895        </item>
     2896        <separator/>
     2897        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
     2898            <label text="Edit Clothes Shop" />
     2899            <key key="shop" value="clothes" />
     2900            <text key="name" text="Name" default="" delete_if_empty="true" />
     2901            <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" />
     2902        </item>
     2903        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
     2904            <label text="Edit Shoe Shop" />
     2905            <key key="shop" value="shoes" />
     2906            <text key="name" text="Name" default="" delete_if_empty="true" />
     2907            <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" />
     2908        </item>
     2909        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
     2910            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
     2911            <label text="Edit Outdoor Shop" />
     2912            <key key="shop" value="outdoor" />
     2913            <text key="name" text="Name" default="" delete_if_empty="true" />
     2914            <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" />
     2915        </item>
     2916        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
     2917            <label text="Edit Sports Shop" />
     2918            <key key="shop" value="sports" />
     2919            <text key="name" text="Name" default="" delete_if_empty="true" />
     2920            <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" />
     2921        </item>
     2922        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
     2923            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
     2924            <label text="Edit Dry Cleaning" />
     2925            <key key="shop" value="dry_cleaning" />
     2926            <text key="name" text="Name" default="" delete_if_empty="true" />
     2927            <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" />
     2928        </item>
     2929        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
     2930            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
     2931            <label text="Edit Laundry" />
     2932            <key key="shop" value="laundry" />
     2933            <text key="name" text="Name" default="" delete_if_empty="true" />
     2934            <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" />
     2935        </item>
     2936        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
     2937            <label text="Edit Tailor" />
     2938            <key key="shop" value="tailor" />
     2939            <text key="name" text="Name" default="" delete_if_empty="true" />
     2940            <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" />
     2941        </item>
     2942        <separator/>
     2943        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
    28312944            <label text="Edit Computer Shop" />
    28322945            <key key="shop" value="computer" />
     
    28342947            <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" />
    28352948        </item>
    2836         <item name="Electronics" icon="presets/empty.png" type="node,closedway">
     2949        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
    28372950            <label text="Edit Electronics Shop" />
    28382951            <key key="shop" value="electronics" />
     
    28402953            <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" />
    28412954        </item>
    2842         <item name="Hifi" icon="presets/empty.png" type="node,closedway">
     2955        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
    28432956            <label text="Edit Hifi Shop" />
    28442957            <key key="shop" value="hifi" />
     
    28462959            <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" />
    28472960        </item>
    2848         <item name="Furniture" icon="presets/empty.png" type="node,closedway">
    2849             <label text="Edit Furniture Shop" />
    2850             <key key="shop" value="furniture" />
    2851             <text key="name" text="Name" default="" delete_if_empty="true" />
    2852             <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" />
    2853         </item>
    2854         <item name="Garden Centre" icon="presets/empty.png" type="node,closedway">
     2961        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
     2962            <label text="Edit Video Shop" />
     2963            <key key="shop" value="video" />
     2964            <text key="name" text="Name" default="" delete_if_empty="true" />
     2965            <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" />
     2966        </item>
     2967        <separator/>
     2968        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
     2969            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
     2970            <label text="Edit Florist" />
     2971            <key key="shop" value="florist" />
     2972            <text key="name" text="Name" default="" delete_if_empty="true" />
     2973            <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" />
     2974        </item>
     2975        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
    28552976            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
    28562977            <label text="Edit Garden Centre" />
     
    28732994            <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" />
    28742995        </item>
     2996        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
     2997            <label text="Edit Furniture Shop" />
     2998            <key key="shop" value="furniture" />
     2999            <text key="name" text="Name" default="" delete_if_empty="true" />
     3000            <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" />
     3001        </item>
    28753002        <item name="Stationery" icon="presets/empty.png" type="node,closedway">
    28763003            <label text="Edit Stationery Shop" />
     
    28793006            <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" />
    28803007        </item>
    2881         <item name="Hairdresser" icon="presets/empty.png" type="node,closedway">
    2882             <label text="Edit Hairdresser" />
    2883             <key key="shop" value="hairdresser" />
    2884             <text key="name" text="Name" default="" delete_if_empty="true" />
    2885             <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" />
    2886         </item>
    2887         <item name="Shoes" icon="presets/empty.png" type="node,closedway">
    2888             <label text="Edit Shoe Shop" />
    2889             <key key="shop" value="shoes" />
    2890             <text key="name" text="Name" default="" delete_if_empty="true" />
    2891             <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" />
    2892         </item>
    2893         <item name="Toys" icon="presets/empty.png" type="node,closedway">
     3008        <item name="Book Store" icon="presets/book.png" type="node,closedway">
     3009            <label text="Edit Book Store" />
     3010            <key key="shop" value="books" />
     3011            <text key="name" text="Name" default="" delete_if_empty="true" />
     3012            <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" />
     3013        </item>
     3014        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
     3015            <label text="Edit Travel Agency" />
     3016            <key key="shop" value="travel_agency" />
     3017            <text key="name" text="Name" default="" delete_if_empty="true" />
     3018            <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" />
     3019        </item>
     3020        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
    28943021            <label text="Edit Toy Shop" />
    28953022            <key key="shop" value="toys" />
    2896             <text key="name" text="Name" default="" delete_if_empty="true" />
    2897             <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" />
    2898         </item>
    2899         <item name="Video" icon="presets/empty.png" type="node,closedway">
    2900             <label text="Edit Video Shop" />
    2901             <key key="shop" value="video" />
    2902             <text key="name" text="Name" default="" delete_if_empty="true" />
    2903             <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" />
    2904         </item>
    2905         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
    2906             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
    2907             <label text="Edit Dry Cleaning" />
    2908             <key key="shop" value="dry_cleaning" />
    2909             <text key="name" text="Name" default="" delete_if_empty="true" />
    2910             <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" />
    2911         </item>
    2912         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
    2913             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
    2914             <label text="Edit Laundry" />
    2915             <key key="shop" value="laundry" />
    2916             <text key="name" text="Name" default="" delete_if_empty="true" />
    2917             <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" />
    2918         </item>
    2919         <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
    2920             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
    2921             <label text="Edit Outdoor Shop" />
    2922             <key key="shop" value="outdoor" />
    2923             <text key="name" text="Name" default="" delete_if_empty="true" />
    2924             <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" />
    2925         </item>
    2926         <item name="Sports" icon="presets/empty.png" type="node,closedway">
    2927             <label text="Edit Sports Shop" />
    2928             <key key="shop" value="sports" />
    2929             <text key="name" text="Name" default="" delete_if_empty="true" />
    2930             <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" />
    2931         </item>
    2932         <item name="Optician" icon="presets/empty.png" type="node,closedway">
    2933             <label text="Edit Optician" />
    2934             <key key="shop" value="optician" />
    29353023            <text key="name" text="Name" default="" delete_if_empty="true" />
    29363024            <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" />
     
    29783066    </group> <!-- Cash -->
    29793067    <group name="Health" icon="presets/pharmacy.png">
    2980         <item name="Doctors" icon="presets/empty.png" type="node,closedway">
     3068        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
    29813069            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
    29823070            <label text="Edit Doctors" />
     
    29853073            <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" />
    29863074        </item>
    2987         <item name="Dentist" icon="presets/empty.png" type="node,closedway">
     3075        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
    29883076            <label text="Edit Dentist" />
    29893077            <key key="amenity" value="dentist" />
     
    30043092            <key key="amenity" value="hospital" />
    30053093            <text key="name" text="Name" default="" delete_if_empty="true" />
     3094        </item>
     3095        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
     3096            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
     3097            <label text="Edit Baby Hatch" />
     3098            <key key="amenity" value="baby_hatch" />
     3099            <text key="operator" text="Operator" default="" delete_if_empty="true" />
     3100            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
    30063101        </item>
    30073102        <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,closedway">
     
    30293124  </group>
    30303125  <group name="Geography" icon="presets/places.png">
     3126    <group name="Boundaries" icon="presets/boundaries.png">
     3127        <item name="National" icon="presets/boundaries.png" type="closedway,relation">
     3128            <label text="Edit National Boundary" />
     3129            <space />
     3130            <key key="boundary" value="national" />
     3131            <text key="name" text="Name" default="" delete_if_empty="true" />
     3132        </item>
     3133        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
     3134            <label text="Edit Administrative Boundary" />
     3135            <space />
     3136            <key key="boundary" value="administrative" />
     3137            <text key="name" text="Name" default="" delete_if_empty="true" />
     3138        </item>
     3139        <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
     3140            <label text="Edit Civil Boundary" />
     3141            <space />
     3142            <key key="boundary" value="civil" />
     3143            <text key="name" text="Name" default="" delete_if_empty="true" />
     3144        </item>
     3145        <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
     3146            <label text="Edit Political Boundary" />
     3147            <space />
     3148            <key key="boundary" value="political" />
     3149            <text key="name" text="Name" default="" delete_if_empty="true" />
     3150        </item>
     3151        <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
     3152            <label text="Edit National Park Boundary" />
     3153            <space />
     3154            <key key="boundary" value="national_park" />
     3155            <text key="name" text="Name" default="" delete_if_empty="true" />
     3156        </item>
     3157    </group> <!-- Boundaries -->
    30313158    <group name="Places" icon="presets/places.png">
    30323159        <item name="Continent" icon="presets/places.png" type="node,closedway">
     
    31013228            <text key="name" text="Name" default="" delete_if_empty="true" />
    31023229        </item>
    3103         <item name="Island" icon="presets/island.png" type="node,closedway">
    3104             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
    3105             <label text="Edit Island" />
    3106             <space />
    3107             <key key="place" value="island" />
    3108             <text key="name" text="Name" default="" delete_if_empty="true" />
    3109         </item>
    3110         <item name="Islet" icon="presets/islet.png" type="node,closedway">
    3111             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
    3112             <label text="Edit Islet" />
    3113             <space />
    3114             <key key="place" value="islet" />
    3115             <text key="name" text="Name" default="" delete_if_empty="true" />
    3116         </item>
    3117         <separator/>
     3230    </group> <!-- Places -->
     3231    <group name="Geography" icon="presets/peak.png">
     3232        <item name="Peak" icon="presets/peak.png" type="node">
     3233            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
     3234            <label text="Edit Peak" />
     3235            <key key="natural" value="peak" />
     3236            <text key="name" text="Name" default="" delete_if_empty="true" />
     3237            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
     3238        </item>
     3239        <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
     3240            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
     3241            <label text="Edit Glacier" />
     3242            <key key="natural" value="glacier" />
     3243            <text key="name" text="Name" default="" delete_if_empty="true" />
     3244            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
     3245        </item>
     3246        <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
     3247            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
     3248            <label text="Edit Volcano" />
     3249            <key key="natural" value="volcano" />
     3250            <text key="name" text="Name" default="" delete_if_empty="true" />
     3251            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
     3252        </item>
    31183253        <item name="Cave Entrance" icon="presets/empty.png" type="node,closedway">
    31193254            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
     
    31223257            <text key="name" text="Name" default="" delete_if_empty="true" />
    31233258        </item>
    3124         <item name="Peak" icon="presets/peak.png" type="node">
    3125             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
    3126             <label text="Edit Peak" />
    3127             <key key="natural" value="peak" />
    3128             <text key="name" text="Name" default="" delete_if_empty="true" />
    3129             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
    3130         </item>
    3131         <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
    3132             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
    3133             <label text="Edit Glacier" />
    3134             <key key="natural" value="glacier" />
    3135             <text key="name" text="Name" default="" delete_if_empty="true" />
    3136             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
    3137         </item>
    3138         <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
    3139             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
    3140             <label text="Edit Volcano" />
    3141             <key key="natural" value="volcano" />
    3142             <text key="name" text="Name" default="" delete_if_empty="true" />
    3143             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
    3144         </item>
    3145     </group> <!-- Places -->
    3146     <group name="Boundaries" icon="presets/boundaries.png">
    3147         <item name="National" icon="presets/boundaries.png" type="closedway,relation">
    3148             <label text="Edit National Boundary" />
    3149             <space />
    3150             <key key="boundary" value="national" />
    3151             <text key="name" text="Name" default="" delete_if_empty="true" />
    3152         </item>
    3153         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation">
    3154             <label text="Edit Administrative Boundary" />
    3155             <space />
    3156             <key key="boundary" value="administrative" />
    3157             <text key="name" text="Name" default="" delete_if_empty="true" />
    3158         </item>
    3159         <item name="Civil" icon="presets/boundaries.png" type="closedway,relation">
    3160             <label text="Edit Civil Boundary" />
    3161             <space />
    3162             <key key="boundary" value="civil" />
    3163             <text key="name" text="Name" default="" delete_if_empty="true" />
    3164         </item>
    3165         <item name="Political" icon="presets/boundaries.png" type="closedway,relation">
    3166             <label text="Edit Political Boundary" />
    3167             <space />
    3168             <key key="boundary" value="political" />
    3169             <text key="name" text="Name" default="" delete_if_empty="true" />
    3170         </item>
    3171         <item name="National park" icon="presets/boundaries.png" type="closedway,relation">
    3172             <label text="Edit National Park Boundary" />
    3173             <space />
    3174             <key key="boundary" value="national_park" />
    3175             <text key="name" text="Name" default="" delete_if_empty="true" />
    3176         </item>
    3177     </group> <!-- Boundaries -->
    3178     <group name="Land use" icon="presets/landuse.png">
     3259        <separator/>
     3260        <item name="Island" icon="presets/island.png" type="node,closedway">
     3261            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
     3262            <label text="Edit Island" />
     3263            <space />
     3264            <key key="place" value="island" />
     3265            <text key="name" text="Name" default="" delete_if_empty="true" />
     3266        </item>
     3267        <item name="Islet" icon="presets/islet.png" type="node,closedway">
     3268            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
     3269            <label text="Edit Islet" />
     3270            <space />
     3271            <key key="place" value="islet" />
     3272            <text key="name" text="Name" default="" delete_if_empty="true" />
     3273        </item>
     3274    </group> <!-- Geography -->
     3275    <group name="Nature" icon="presets/tree.png">
    31793276        <item name="Tree" icon="presets/tree.png" type="node">
    31803277            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
     
    32153312            <text key="name" text="Name" default="" delete_if_empty="true" />
    32163313        </item>
    3217         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
    3218             <label text="Edit Scrub" />
    3219             <key key="natural" value="scrub" />
    3220             <text key="name" text="Name" default="" delete_if_empty="true" />
    3221         </item>
    32223314        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation">
    32233315            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
     
    32263318            <text key="name" text="Name" default="" delete_if_empty="true" />
    32273319        </item>
     3320        <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
     3321            <label text="Edit Scrub" />
     3322            <key key="natural" value="scrub" />
     3323            <text key="name" text="Name" default="" delete_if_empty="true" />
     3324        </item>
    32283325        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
    32293326            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
     
    32323329            <text key="name" text="Name" default="" delete_if_empty="true" />
    32333330        </item>
    3234         <separator/>
     3331    </group> <!-- Nature -->
     3332    <group name="Land use" icon="presets/landuse.png">
    32353333        <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation">
    32363334            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
     
    33033401        </item>
    33043402        <separator/>
    3305         <item name="Residential area" icon="presets/landuse.png" type="closedway,relation">
     3403        <item name="Residential area" icon="presets/empty.png" type="closedway,relation">
    33063404            <label text="Edit Residential Landuse" />
    33073405            <space />
     
    33263424            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
    33273425        </item>
    3328         <item name="Retail" icon="presets/landuse.png" type="node,closedway,relation">
     3426        <item name="Retail" icon="presets/shopping.png" type="node,closedway,relation">
    33293427            <label text="Edit Retail Landuse" />
    33303428            <space />
     
    33323430            <text key="name" text="Name" default="" delete_if_empty="true" />
    33333431        </item>
    3334         <item name="Commercial" icon="presets/landuse.png" type="node,closedway,relation">
     3432        <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation">
    33353433            <label text="Edit Commercial Landuse" />
    33363434            <space />
     
    33903488    </group> <!-- Landuse -->
    33913489  </group>
     3490    <group name="Annotation" icon="presets/addresses.png">
     3491        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway">
     3492            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
     3493                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
     3494            <label text="Edit Address Information" />
     3495            <space />
     3496            <text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
     3497            <optional>
     3498                <text key="addr:housename" text="House name" default="" delete_if_empty="true" />
     3499                <text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
     3500                <text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
     3501                <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
     3502                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="true" delete_if_empty="true" />
     3503            </optional>
     3504        </item>
     3505        <item name="Address Interpolation" icon="presets/addresses.png" type="way">
     3506           <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
     3507                 de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
     3508            <label text="Edit Address Interpolation" />
     3509            <space />
     3510            <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" />
     3511        </item>
     3512        <item name="Contact" icon="presets/empty.png" type="node,way,closedway,relation">
     3513            <label text="Edit Contact information" />
     3514            <space />
     3515            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
     3516            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
     3517            <space />
     3518            <text key="website" text="Website" default="" delete_if_empty="true" />
     3519            <text key="email" text="Email Address" default="" delete_if_empty="true" />
     3520            <space />
     3521            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
     3522            <text key="image" text="Image" default="" delete_if_empty="true" />
     3523        </item>
     3524    </group> <!-- Annotation -->
    33923525    <group name="Relations" icon="presets/relations.png">
    33933526        <item name="Multipolygon" icon="presets/empty.png" type="relation">
     
    34053538            </roles>
    34063539        </item>
    3407         <item name="Boundary" icon="presets/empty.png" type="relation">
     3540        <item name="Boundary" icon="presets/boundaries.png" type="relation">
    34083541            <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
    34093542                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
     
    34243557            </roles>
    34253558        </item>
    3426         <item name="Turn restriction" icon="presets/empty.png" type="relation">
     3559        <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation">
    34273560            <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
    34283561                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
     
    34393572            </roles>
    34403573        </item>
    3441         <item name="Route" icon="presets/empty.png" type="relation">
     3574        <item name="Route" icon="presets/path.png" type="relation">
    34423575            <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
    34433576                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
Note: See TracChangeset for help on using the changeset viewer.