Changeset 7393 in josm for trunk/data


Ignore:
Timestamp:
2014-08-14T11:42:04+02:00 (5 years ago)
Author:
bastiK
Message:

applied #10351 - defaultpreset: Use expressions that are more common in the United States.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7384 r7393  
    435435  <!-- Link chunks -->
    436436  <chunk id="link_contact">
    437     <preset_link preset_name="Contact (common schema)" />
     437    <preset_link preset_name="Contact (Common Schema)" />
    438438  </chunk>
    439439  <!--  Groups -->
     
    469469                </checkgroup>
    470470            </optional>
    471         </item>
     471        </item> <!-- Motorway -->
    472472        <item name="Motorway Link" icon="presets/motorway.png" type="way" preset_name_label="true">
    473473            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
     
    493493                </checkgroup>
    494494            </optional>
    495         </item>
     495        </item> <!-- Motorway Link -->
    496496        <item name="Trunk" icon="presets/trunk.png" type="way" preset_name_label="true">
    497497            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
     
    521521                </checkgroup>
    522522            </optional>
    523         </item>
     523        </item> <!-- Trunk -->
    524524        <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
    525525            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
     
    546546                </checkgroup>
    547547            </optional>
    548         </item>
     548        </item> <!-- Trunk Link -->
    549549        <separator/>
    550550        <item name="Primary" icon="presets/way_primary.png" type="way,closedway" preset_name_label="true">
     
    567567                <reference ref="highway_yesno_incline_oneway_lit" />
    568568            </optional>
    569         </item>
     569        </item> <!-- Primary -->
    570570        <item name="Primary Link" icon="presets/way_primary.png" type="way" preset_name_label="true">
    571571            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
     
    582582                <reference ref="highway_yesno_incline_oneway_lit" />
    583583            </optional>
    584         </item>
     584        </item> <!-- Primary Link -->
    585585        <item name="Secondary" icon="presets/way_secondary.png" type="way,closedway" preset_name_label="true">
    586586            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
     
    602602                <reference ref="highway_yesno_incline_oneway_lit" />
    603603            </optional>
    604         </item>
     604        </item> <!-- Secondary -->
    605605        <item name="Secondary Link" icon="presets/way_secondary.png" type="way" preset_name_label="true">
    606606            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
     
    616616                <reference ref="highway_yesno_incline_oneway_lit" />
    617617            </optional>
    618         </item>
     618        </item> <!-- Secondary Link -->
    619619        <item name="Tertiary" icon="presets/way_tertiary.png" type="way,closedway" preset_name_label="true">
    620620            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
     
    637637                <reference ref="highway_yesno_incline_oneway_lit" />
    638638            </optional>
    639         </item>
     639        </item> <!-- Tertiary -->
    640640        <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
    641641            <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
     
    651651                <reference ref="highway_yesno_incline_oneway_lit" />
    652652            </optional>
    653         </item>
     653        </item> <!-- Tertiary Link -->
    654654        <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
    655655            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
     
    671671                <text key="width" text="Width (meters)" />
    672672            </optional>
    673         </item>
     673        </item> <!-- Unclassified -->
    674674        <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
    675675            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
     
    692692                <text key="width" text="Width (meters)" />
    693693            </optional>
    694         </item>
     694        </item> <!-- Residential -->
    695695        <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
    696696            <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
     
    714714                <text key="width" text="Width (meters)" />
    715715            </optional>
    716         </item>
     716        </item> <!-- Bicycle Road -->
    717717        <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
    718718            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
     
    734734                <text key="width" text="Width (meters)" />
    735735            </optional>
    736         </item>
     736        </item> <!-- Living Street -->
    737737        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
    738738            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
     
    758758                <text key="width" text="Width (meters)" />
    759759            </optional>
    760         </item>
     760        </item> <!-- Pedestrian -->
    761761        <item name="Service" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
    762762            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
     
    778778                <text key="width" text="Width (meters)" />
    779779            </optional>
    780         </item>
     780        </item> <!-- Service -->
    781781        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
    782782            <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
     
    795795                <check key="lit" text="Lit" />
    796796            </optional>
    797         </item>
     797        </item> <!-- Parking Aisle -->
    798798        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
    799799            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
     
    811811                <reference ref="highway_yesno_incline_oneway_lit_width" />
    812812            </optional>
    813         </item>
     813        </item> <!-- Road (Unknown Type) -->
    814814        <item name="Construction" icon="presets/construction.png" type="way,closedway" preset_name_label="true">
    815815            <link href="http://wiki.openstreetmap.org/wiki/Key:construction"
     
    828828                <text key="width" text="Width (meters)" />
    829829            </optional>
    830         </item>
     830        </item> <!-- Construction -->
    831831        <separator/>
    832832        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way" preset_name_label="true">
     
    875875            <text key="maxlength" text="Max. length (meters)" match="key" />
    876876            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
    877         </item>
     877        </item> <!-- Road Restrictions -->
    878878        <separator/>
    879879        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway" preset_name_label="true">
     
    897897                <text key="width" text="Width (meters)" />
    898898            </optional>
    899         </item>
     899        </item> <!-- Roundabout -->
    900900        <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">
    901901            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
     
    921921                <check key="toll" text="Toll" />
    922922            </optional>
    923         </item>
     923        </item> <!-- Bridge -->
    924924        <item name="Ford" icon="presets/ford.png" type="node,way" preset_name_label="true">
    925925            <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
     
    935935                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    936936            </optional>
    937         </item>
     937        </item> <!-- Ford -->
    938938    </group> <!-- Streets -->
    939939    <group name="Ways" icon="presets/way_unclassified.png">
     
    965965                <text key="width" text="Width (meters)" />
    966966            </optional>
    967         </item>
     967        </item> <!-- Track -->
    968968        <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
    969969            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
     
    10011001                <text key="width" text="Width (meters)" />
    10021002            </optional>
    1003         </item>
     1003        </item> <!-- Path -->
    10041004        <separator/>
    10051005        <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
     
    10191019                <text key="width" text="Width (meters)" />
    10201020            </optional>
    1021         </item>
     1021        </item> <!-- Dedicated Bridleway -->
    10221022        <item name="Cycle Lane/Track" type="way" preset_name_label="true">
    10231023            <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
     
    10421042                <check key="oneway" text="Oneway" />
    10431043            </optional>
    1044         </item>
     1044        </item> <!-- Cycle Lane/Track -->
    10451045        <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way" preset_name_label="true">
    10461046            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
     
    10601060                <text key="width" text="Width (meters)" />
    10611061            </optional>
    1062         </item>
     1062        </item> <!-- Dedicated Cycleway -->
    10631063        <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
    10641064            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
     
    10751075                <text key="width" text="Width (meters)" />
    10761076            </optional>
    1077         </item>
     1077        </item> <!-- Segregated Foot- and Cycleway -->
    10781078        <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
    10791079            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
     
    10911091                <text key="width" text="Width (meters)" />
    10921092            </optional>
    1093         </item>
     1093        </item> <!-- Combined Foot- and Cycleway -->
    10941094        <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
    10951095            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
     
    11121112                <text key="width" text="Width (meters)" />
    11131113            </optional>
    1114         </item>
     1114        </item> <!-- Dedicated Footway -->
    11151115        <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
    11161116            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
     
    11301130                <text key="width" text="Width (meters)" />
    11311131            </optional>
    1132         </item>
     1132        </item> <!-- Steps -->
    11331133    </group> <!-- Ways -->
    11341134    <group name="Waypoints" icon="presets/waypoints.png">
     
    11451145            <text key="ref" text="Number" />
    11461146            <text key="exit_to" text="Exit to" />
    1147         </item>
     1147        </item> <!-- Motorway Junction -->
    11481148        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation" preset_name_label="true">
    11491149            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
     
    11601160                <check key="toilets" text="Toilets" />
    11611161            </optional>
    1162         </item>
     1162        </item> <!-- Services -->
    11631163        <item name="Rest Area" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
    11641164            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
     
    11761176                <check key="drinking_water" text="Drinking Water" />
    11771177            </optional>
    1178         </item>
     1178        </item> <!-- Rest Area -->
    11791179        <separator/>
    11801180        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
     
    11921192                <check key="horse" text="Cross on horseback" />
    11931193            </optional>
    1194         </item>
     1194        </item> <!-- Traffic Signal -->
    11951195        <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
    11961196            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
     
    12011201                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stop" />
    12021202            <key key="highway" value="stop" />
    1203         </item>
    1204         <item name="Give way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
     1203        </item> <!-- Stop -->
     1204        <item name="Give Way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
    12051205            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=give_way"
    12061206                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=give_way"
     
    12101210                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=give_way" />
    12111211            <key key="highway" value="give_way" />
    1212         </item>
    1213         <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node" preset_name_label="true">
     1212        </item> <!-- Give Way -->
     1213        <item name="Mini-Roundabout" icon="presets/roundabout_left.png" type="node" preset_name_label="true">
    12141214            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
    12151215                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
     
    12211221            <space />
    12221222            <combo key="direction" text="Direction" values="clockwise" />
    1223         </item>
     1223        </item> <!-- Mini-Roundabout -->
    12241224        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node" preset_name_label="true">
    12251225            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
     
    12391239            <check key="bicycle" text="Cross by bicycle" />
    12401240            <check key="horse" text="Cross on horseback" />
    1241         </item>
     1241        </item> <!-- Pedestrian Crossing -->
    12421242        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way" preset_name_label="true">
    12431243            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
     
    12521252            <space />
    12531253            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
    1254         </item>
     1254        </item> <!-- Traffic Calming -->
    12551255        <item name="Passing Place" icon="presets/passingplace.png" type="node" preset_name_label="true">
    12561256            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
     
    12581258                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place" />
    12591259            <key key="highway" value="passing_place" />
    1260         </item>
     1260        </item> <!-- Passing Place -->
    12611261        <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.png" type="node" preset_name_label="true">
    12621262            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
     
    12661266                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=turning_circle" />
    12671267            <key key="highway" value="turning_circle" />
    1268         </item>
     1268        </item> <!-- Turning Circle -->
    12691269        <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.png" type="node" preset_name_label="true">
    12701270            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
    12711271                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop" />
    12721272            <key key="highway" value="turning_loop" />
    1273         </item>
     1273        </item> <!-- Turning Loop -->
    12741274        <item name="City Limit" icon="presets/citylimit.png" type="node" preset_name_label="true">
    12751275            <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
     
    12831283            <text key="name" text="Name" />
    12841284            <text key="alt_name" text="Second Name" />
    1285         </item>
     1285        </item> <!-- City Limit -->
    12861286        <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
    12871287            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
     
    12961296                <text key="maxspeed" text="Max. speed (km/h)" />
    12971297            </optional>
    1298         </item>
     1298        </item> <!-- Speed Camera -->
    12991299        <separator/>
    13001300        <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
     
    13041304                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=elevator" />
    13051305            <key key="highway" value="elevator" />
    1306         </item>
     1306        </item> <!-- Elevator -->
    13071307        <separator/>
    13081308        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node" preset_name_label="true">
     
    13121312                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grit_bin" />
    13131313            <key key="amenity" value="grit_bin" />
    1314         </item>
     1314        </item> <!-- Grit Bin -->
    13151315        <separator/>
    13161316        <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node" preset_name_label="true">
     
    13271327                <text key="wikipedia" text="Wikipedia" />
    13281328            </optional>
    1329         </item>
     1329        </item> <!-- Mountain Pass -->
    13301330    </group> <!-- Waypoints -->
    1331     <group name="Barriers" icon="presets/barrier.png"> <!-- *** node barriers *** -->
     1331    <group name="Barriers" icon="presets/barrier.png"> <!-- *** Node Barriers *** -->
    13321332        <item name="Block" icon="styles/standard/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
    13331333            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
     
    13411341                <combo key="material" text="Material" values="concrete,stone" />
    13421342            </optional>
    1343         </item> <!-- block -->
     1343        </item> <!-- Block -->
    13441344        <item name="Bollard" icon="presets/bollard.png" type="node,way" preset_name_label="true">
    13451345            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
     
    13581358                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    13591359            </optional>
    1360         </item> <!-- bollard -->
     1360        </item> <!-- Bollard -->
    13611361        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
    13621362            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
     
    13671367            <reference ref="barrier_4" />
    13681368            <reference ref="optional_maxwidth" />
    1369         </item> <!-- cycle_barrier -->
     1369        </item> <!-- Cycle Barrier -->
    13701370        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
    13711371            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
     
    13741374            <key key="barrier" value="cattle_grid" />
    13751375            <reference ref="barrier_4" />
    1376         </item> <!-- cattle_grid -->
     1376        </item> <!-- Cattle Grid -->
    13771377        <item name="Bus Trap" icon="presets/empty.png" type="node" preset_name_label="true">
    13781378            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
     
    13801380            <key key="barrier" value="bus_trap" />
    13811381            <reference ref="optional_maxwidth" />
    1382         </item> <!-- bus_trap -->
     1382        </item> <!-- Bus Trap -->
    13831383        <item name="Spikes" icon="presets/empty.png" type="node" preset_name_label="true">
    13841384            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
     
    13951395            <key key="barrier" value="spikes" />
    13961396            <reference ref="barrier_5" />
    1397         </item> <!-- spikes -->
     1397        </item> <!-- Spikes -->
    13981398        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway" preset_name_label="true">
    13991399            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
     
    14101410                <text key="operator" text="Operator" />
    14111411            </optional>
    1412         </item> <!-- toll_booth -->
     1412        </item> <!-- Toll Booth -->
    14131413        <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
    14141414            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
    14151415            <key key="barrier" value="border_control" />
    14161416            <reference ref="barrier_5" />
    1417         </item> <!-- border_control -->
    1418         <separator/> <!-- *** linear barriers *** -->
     1417        </item> <!-- Border Control -->
     1418        <separator/> <!-- *** Linear Barriers *** -->
    14191419        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation" preset_name_label="true">
    14201420            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
     
    14331433                <text key="taxon" text="Taxon" />
    14341434            </optional>
    1435         </item> <!-- hedge -->
     1435        </item> <!-- Hedge -->
    14361436        <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
    14371437            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
     
    14481448                <text key="height" text="Height (meters)" length="7" />
    14491449            </optional>
    1450         </item> <!-- fence -->
     1450        </item> <!-- Fence -->
    14511451        <item name="Guard Rail" type="way" preset_name_label="true">
    14521452            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
     
    14541454            <key key="barrier" value="guard_rail" />
    14551455            <reference ref="optional_height" />
    1456         </item> <!-- guard_rail -->
     1456        </item> <!-- Guard Rail -->
    14571457        <item name="Wall" icon="presets/wall.png" type="way,closedway" preset_name_label="true">
    14581458            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
     
    14661466            <key key="barrier" value="wall" />
    14671467            <reference ref="optional_height" />
    1468         </item> <!-- wall -->
     1468        </item> <!-- Wall -->
    14691469        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
    14701470            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
     
    14741474            <key key="barrier" value="city_wall" />
    14751475            <reference ref="optional_height" />
    1476         </item> <!-- city_wall -->
     1476        </item> <!-- City Wall -->
    14771477        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway" preset_name_label="true">
    14781478            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
     
    14861486            <key key="barrier" value="retaining_wall" />
    14871487            <reference ref="optional_height" />
    1488         </item> <!-- retaining_wall -->
     1488        </item> <!-- Retaining Wall -->
    14891489        <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
    14901490            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
     
    14971497                <text key="width" text="Width (meters)" length="7" />
    14981498            </optional>
    1499         </item> <!-- ditch -->
     1499        </item> <!-- Ditch -->
    15001500        <item name="Kerb" type="way,closedway" preset_name_label="true">
    15011501            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
     
    15031503            <key key="barrier" value="kerb" />
    15041504            <reference ref="optional_height" />
    1505         </item> <!-- kerb -->
    1506         <separator/> <!-- *** access *** -->
    1507         <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
     1505        </item> <!-- Kerb -->
     1506        <separator/> <!-- *** Access *** -->
     1507        <item name="Entrance (Barrier Opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
    15081508            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
    15091509                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
     
    15121512            <reference ref="barrier_5" />
    15131513            <reference ref="optional_maxwidth" />
    1514         </item> <!-- entrance -->
     1514        </item> <!-- Entrance (Barrier Opening) -->
    15151515        <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
    15161516            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
     
    15251525            <reference ref="optional_maxheight_maxwidth" />
    15261526            <reference ref="general_access" />
    1527         </item> <!-- gate -->
     1527        </item> <!-- Gate -->
    15281528        <item name="Lift Gate" icon="presets/lift_gate.png" type="node" preset_name_label="true">
    15291529            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
     
    15371537            <reference ref="optional_maxwidth" />
    15381538            <reference ref="general_access" />
    1539         </item> <!-- lift_gate -->
     1539        </item> <!-- Lift Gate -->
    15401540        <item name="Swing Gate" icon="presets/swing_gate.png" type="node" preset_name_label="true">
    15411541            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=swing_gate" />
     
    15451545            <reference ref="optional_maxwidth" />
    15461546            <reference ref="general_access" />
    1547         </item> <!-- swing_gate -->
     1547        </item> <!-- Swing Gate -->
    15481548        <item name="Hampshire Gate" icon="presets/empty.png" type="node" preset_name_label="true">
    15491549            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
     
    15611561            <reference ref="barrier_5" />
    15621562            <reference ref="optional_maxwidth" />
    1563         </item> <!-- hampshire_gate -->
     1563        </item> <!-- Hampshire Gate -->
    15641564        <item name="Bump Gate" icon="presets/empty.png" type="node" preset_name_label="true">
    15651565            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
     
    15771577            <reference ref="barrier_5" />
    15781578            <reference ref="optional_maxwidth" />
    1579         </item> <!-- bump_gate -->
     1579        </item> <!-- Bump Gate -->
    15801580        <item name="Kissing Gate" icon="presets/empty.png" type="node" preset_name_label="true">
    15811581            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
     
    15841584            <reference ref="barrier_2" />
    15851585            <reference ref="optional_maxwidth" />
    1586         </item> <!-- kissing_gate -->
     1586        </item> <!-- Kissing Gate -->
    15871587        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way" preset_name_label="true">
    15881588            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
     
    15911591            <reference ref="barrier_5" />
    15921592            <reference ref="optional_maxwidth" />
    1593         </item> <!-- chain -->
     1593        </item> <!-- Chain -->
    15941594        <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
    15951595            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
     
    16011601            </optional>
    16021602            <reference ref="barrier_2" />
    1603         </item> <!-- stile -->
     1603        </item> <!-- Stile -->
    16041604        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node" preset_name_label="true">
    16051605            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=turnstile"
     
    16081608            <key key="barrier" value="turnstile" />
    16091609            <reference ref="barrier_2" />
    1610         </item> <!-- turnstile -->
     1610        </item> <!-- Turnstile -->
    16111611        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node" preset_name_label="true">
    16121612            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=sally_port"
     
    16161616            <reference ref="barrier_5" />
    16171617            <reference ref="optional_maxheight_maxwidth" />
    1618         </item> <!-- sally_port -->
     1618        </item> <!-- Sally Port -->
    16191619    </group> <!-- Barriers -->
    16201620    <group name="Passageways" icon="presets/tunnel.png">
     
    16401640                <check key="toll" text="Toll" />
    16411641            </optional>
    1642         </item>
     1642        </item> <!-- Tunnel -->
    16431643        <item name="Building Passage" icon="presets/tunnel.png" type="way" preset_name_label="true">
    16441644            <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
     
    16591659                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    16601660            </optional>
    1661         </item>
     1661        </item> <!-- Building Passage -->
    16621662        <item name="Arcade" type="way" preset_name_label="true">
    16631663            <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
     
    16761676                <text key="width" text="Width (meters)" />
    16771677            </optional>
    1678         </item>
     1678        </item> <!-- Arcade -->
    16791679        <item name="Colonnade" type="way" preset_name_label="true">
    16801680            <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
     
    16931693                <text key="width" text="Width (meters)" />
    16941694            </optional>
    1695         </item>
     1695        </item> <!-- Colonnade -->
    16961696        <item name="Avalanche Protector" type="way" preset_name_label="true">
    16971697            <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
     
    17131713                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    17141714            </optional>
    1715         </item>
     1715        </item> <!-- Avalanche Protector -->
    17161716    </group> <!-- Passageways -->
    1717   </group>
     1717  </group> <!-- Highways -->
    17181718  <group name="Water" icon="presets/waterway.png">
    17191719    <group name="Water" icon="presets/waterway.png">
     
    17291729            <text key="name" text="Name" />
    17301730            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1731         </item>
     1731        </item> <!-- Drain -->
    17321732        <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
    17331733            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
     
    17401740            <text key="name" text="Name" />
    17411741            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1742         </item>
     1742        </item> <!-- Ditch -->
    17431743        <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
    17441744            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
     
    17561756            <text key="name" text="Name" />
    17571757            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1758         </item>
     1758        </item> <!-- Stream -->
    17591759        <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
    17601760            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
     
    17631763            <text key="name" text="Name" />
    17641764            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1765         </item>
     1765        </item> <!-- Wadi -->
    17661766        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
    17671767            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
     
    17761776            <reference ref="name_wikipedia" />
    17771777            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1778         </item>
     1778        </item> <!-- Canal -->
    17791779        <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
    17801780            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
     
    17901790            <reference ref="name_wikipedia" />
    17911791            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1792         </item>
     1792        </item> <!-- River -->
    17931793        <separator/>
    17941794        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
     
    18101810            <key key="waterway" value="waterfall" />
    18111811            <reference ref="name_wikipedia" />
    1812         </item>
     1812        </item> <!-- Waterfall -->
    18131813        <item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
    18141814            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
     
    18221822            <key key="waterway" value="weir" />
    18231823            <text key="name" text="Name" />
    1824         </item>
     1824        </item> <!-- Weir -->
    18251825        <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
    18261826            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
     
    18341834            <key key="waterway" value="dam" />
    18351835            <reference ref="name_wikipedia" />
    1836         </item>
     1836        </item> <!-- Dam -->
    18371837        <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway" preset_name_label="true">
    18381838            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
     
    18411841                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
    18421842            <key key="man_made" value="groyne" />
    1843         </item>
     1843        </item> <!-- Groyne -->
    18441844        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
    18451845            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
     
    18521852            <text key="ref" text="Reference" />
    18531853            <text key="name" text="Name" />
    1854         </item>
     1854        </item> <!-- Breakwater -->
    18551855        <separator/>
    18561856        <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
     
    18681868                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    18691869            </optional>
    1870         </item>
     1870        </item> <!-- Culvert -->
    18711871        <separator/>
    18721872        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
     
    18811881            <key key="landuse" value="basin" />
    18821882            <text key="name" text="Name" />
    1883         </item>
     1883        </item> <!-- Basin -->
    18841884        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
    18851885            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
     
    18911891            <key key="landuse" value="reservoir" />
    18921892            <text key="name" text="Name" />
    1893         </item>
     1893        </item> <!-- Reservoir -->
    18941894        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
    18951895            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
     
    19001900            <key key="man_made" value="reservoir_covered" />
    19011901            <text key="name" text="Name" />
    1902         </item>
     1902        </item> <!-- Covered Reservoir -->
    19031903        <separator/>
    19041904        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
     
    19461946            <key key="waterway" value="riverbank" />
    19471947            <text key="name" text="Name" />
    1948         </item>
     1948        </item> <!-- Riverbank -->
    19491949        <separator/>
    19501950        <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
     
    20302030            <text key="name" text="Name" />
    20312031            <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
    2032         </item>
     2032        </item> <!-- Ferry Terminal -->
    20332033        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation" preset_name_label="true">
    20342034            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
     
    20412041                <text key="name" text="Name" />
    20422042            </optional>
    2043         </item>
     2043        </item> <!-- Ferry Route -->
    20442044        <separator/>
    20452045        <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
     
    20542054            <key key="leisure" value="marina" />
    20552055            <text key="name" text="Name" />
    2056         </item>
     2056        </item> <!-- Marina -->
    20572057        <item name="Pier" icon="presets/pier.png" type="way,closedway" preset_name_label="true">
    20582058            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
     
    20662066            <key key="man_made" value="pier" />
    20672067            <text key="name" text="Name" />
    2068         </item>
     2068        </item> <!-- Pier -->
    20692069        <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
    20702070            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
     
    20762076                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=lock_gate" />
    20772077            <key key="waterway" value="lock_gate" />
    2078         </item>
     2078        </item> <!-- Lock Gate -->
    20792079        <item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
    20802080            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
    20812081                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=turning_point" />
    20822082            <key key="waterway" value="turning_point" />
    2083         </item>
     2083        </item> <!-- Turning Point -->
    20842084        <separator/>
    20852085        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node" preset_name_label="true">
     
    20942094                <text key="name" text="Name" />
    20952095            </optional>
    2096         </item>
     2096        </item> <!-- Slipway -->
    20972097        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
    20982098            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
     
    21042104            <key key="waterway" value="boatyard" />
    21052105            <text key="name" text="Name" />
    2106         </item>
     2106        </item> <!-- Boatyard -->
    21072107        <item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
    21082108            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
     
    21142114            <key key="waterway" value="dock" />
    21152115            <text key="name" text="Name" />
    2116         </item>
     2116        </item> <!-- Dock -->
    21172117    </group> <!-- Shipping -->
    2118   </group>
     2118  </group> <!-- Water -->
    21192119  <group name="Transport" icon="presets/railway.png">
    21202120    <group name="Railway" icon="presets/railway.png">
     
    21342134                <reference ref="railway_service_gauge_electrified" />
    21352135            </optional>
    2136         </item>
     2136        </item> <!-- Rail -->
    21372137        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
    21382138            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
     
    21422142                <reference ref="railway_service_gauge_electrified" />
    21432143            </optional>
    2144         </item>
     2144        </item> <!-- Narrow Gauge Rail -->
    21452145        <item name="Monorail" icon="presets/railway.png" type="way" preset_name_label="true">
    21462146            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
     
    21532153                <reference ref="railway_electrified" />
    21542154            </optional>
    2155         </item>
     2155        </item> <!-- Monorail -->
    21562156        <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
    21572157            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
     
    21622162                <reference ref="railway_service_gauge_electrified" />
    21632163            </optional>
    2164         </item>
     2164        </item> <!-- Preserved -->
    21652165        <item name="Light Rail" icon="presets/rail_light.png" type="way" preset_name_label="true">
    21662166            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
     
    21692169                <reference ref="railway_service_gauge_electrified" />
    21702170            </optional>
    2171         </item>
     2171        </item> <!-- Light Rail -->
    21722172        <item name="Subway" icon="presets/rail_light.png" type="way" preset_name_label="true">
    21732173            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
     
    21792179                <reference ref="railway_service_gauge_electrified" />
    21802180            </optional>
    2181         </item>
     2181        </item> <!-- Subway -->
    21822182        <item name="Tram" icon="presets/tram.png" type="way" preset_name_label="true">
    21832183            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
     
    21912191                <reference ref="railway_service_gauge_electrified" />
    21922192            </optional>
    2193         </item>
     2193        </item> <!-- Tram -->
    21942194        <item name="Bus Guideway" icon="presets/busway.png" type="way" preset_name_label="true">
    21952195            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
     
    22062206                <text key="width" text="Width (meters)" />
    22072207            </optional>
    2208         </item>
     2208        </item> <!-- Bus Guideway -->
    22092209        <separator/>
    22102210        <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
     
    22152215                <reference ref="railway_service" />
    22162216            </optional>
    2217         </item>
     2217        </item> <!-- Disused Rail -->
    22182218        <item name="Abandoned Rail" icon="presets/railway.png" type="way" preset_name_label="true">
    22192219            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
     
    22242224                <reference ref="railway_service" />
    22252225            </optional>
    2226         </item>
     2226        </item> <!-- Abandoned Rail -->
    22272227        <separator/>
    22282228        <item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
     
    22452245                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22462246            </optional>
    2247         </item>
     2247        </item> <!-- Level Crossing -->
    22482248        <item name="Crossing" icon="presets/crossing.png" type="node" preset_name_label="true">
    22492249            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
     
    22642264                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22652265            </optional>
    2266         </item>
     2266        </item> <!-- Crossing -->
    22672267        <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
    22682268            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
     
    22702270                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=turntable" />
    22712271            <key key="railway" value="turntable" />
    2272         </item>
     2272        </item> <!-- Turntable -->
    22732273        <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
    22742274            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
    22752275                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
    22762276            <key key="railway" value="buffer_stop" />
    2277         </item>
     2277        </item> <!-- Buffer Stop -->
    22782278        <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
    22792279            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
     
    22812281            <key key="railway" value="switch" />
    22822282            <text key="ref" text="Reference" />
    2283         </item>
     2283        </item> <!-- Railway Switch -->
    22842284    </group> <!-- Railway -->
    22852285    <group name="Aerialway" icon="presets/aerialway.png">
     
    22972297                <check key="aerialway:heating" text="Has heating?" />
    22982298            </optional>
    2299         </item>
     2299        </item> <!-- Chair Lift -->
    23002300        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    23012301            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
     
    23072307                <text key="aerialway:duration" text="Typical journey time in minutes" />
    23082308            </optional>
    2309         </item>
     2309        </item> <!-- Drag Lift -->
    23102310        <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
    23112311            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
     
    23242324                <check key="aerialway:heating" text="Has heating?" />
    23252325            </optional>
    2326         </item>
     2326        </item> <!-- Cable Car -->
    23272327        <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
    23282328            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
     
    23362336                <check key="aerialway:heating" text="Has heating?" />
    23372337            </optional>
    2338         </item>
     2338        </item> <!-- Gondola -->
    23392339        <item name="Mixed Lift" type="way" preset_name_label="true">
    23402340            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
     
    23492349                <check key="aerialway:heating" text="Has heating?" />
    23502350            </optional>
    2351         </item>
     2351        </item> <!-- Mixed Lift -->
    23522352        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    23532353            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=t-bar" />
     
    23592359                <text key="aerialway:duration" text="Typical journey time in minutes" />
    23602360            </optional>
    2361         </item>
     2361        </item> <!-- T-bar Lift -->
    23622362        <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    23632363            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=j-bar" />
     
    23692369                <text key="aerialway:duration" text="Typical journey time in minutes" />
    23702370            </optional>
    2371         </item>
     2371        </item> <!-- J-bar Lift -->
    23722372        <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    23732373            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=platter" />
     
    23792379                <text key="aerialway:duration" text="Typical journey time in minutes" />
    23802380            </optional>
    2381         </item>
     2381        </item> <!-- Platter Lift -->
    23822382        <item name="Rope Tow" type="way" preset_name_label="true">
    23832383            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=rope_tow" />
     
    23892389                <text key="aerialway:duration" text="Typical journey time in minutes" />
    23902390            </optional>
    2391         </item>
     2391        </item> <!-- Rope Tow -->
    23922392        <item name="Magic Carpet" type="way" preset_name_label="true">
    23932393            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=magic_carpet" />
     
    23992399                <text key="aerialway:duration" text="Typical journey time in minutes" />
    24002400            </optional>
    2401         </item>
     2401        </item> <!-- Magic Carpet -->
    24022402        <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
    24032403            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=goods" />
     
    24082408                <text key="aerialway:duration" text="Typical journey time in minutes" />
    24092409            </optional>
    2410         </item>
     2410        </item> <!-- Goods -->
    24112411        <separator/>
    24122412        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
     
    24162416            <key key="aerialway" value="station" />
    24172417            <text key="name" text="Name" />
    2418         </item>
     2418        </item> <!-- Station -->
    24192419        <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
    24202420            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=pylon" />
     
    24222422            <key key="aerialway" value="pylon" />
    24232423            <text key="name" text="Name" />
    2424         </item>
     2424        </item> <!-- Pylon -->
    24252425    </group> <!-- Aerialway -->
    24262426    <separator/>
     
    24512451            <reference ref="stay" />
    24522452            <reference ref="supervised_lit_oh" />
    2453         </item>
    2454         <item name="Parking space" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
     2453        </item> <!-- Parking -->
     2454        <item name="Parking Space" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
    24552455            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
    24562456                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
     
    24672467            <reference ref="supervised_lit_oh" />
    24682468            <check key="covered" text="Covered (with roof)" />
    2469         </item>
    2470         <item name="Parking entrance" icon="presets/parking.png" type="node" preset_name_label="true">
     2469        </item> <!-- Parking Space -->
     2470        <item name="Parking Entrance" icon="presets/parking.png" type="node" preset_name_label="true">
    24712471            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
    24722472                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
     
    24812481            <reference ref="supervised_lit_oh" />
    24822482            <check key="covered" text="Covered (with roof)" />
    2483         </item>
     2483        </item> <!-- Parking Entrance -->
    24842484        <separator/>
    24852485        <item name="Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
     
    25242524                </checkgroup>
    25252525            </optional>
    2526         </item>
     2526        </item> <!-- Fuel -->
    25272527        <item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
    25282528            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
     
    25352535            <text key="voltage" text="Voltage" />
    25362536            <text key="amperage" text="Amperage" />
    2537         </item>
     2537        </item> <!-- Charging Station -->
    25382538        <item name="Wash" icon="presets/car_wash.png" type="node,closedway" preset_name_label="true">
    25392539            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_wash"
     
    25472547            <key key="amenity" value="car_wash" />
    25482548            <reference ref="name_brand_operator_oh" />
    2549         </item>
     2549        </item> <!-- Wash -->
    25502550        <separator/>
    25512551        <item name="Car Dealer" icon="presets/car.png" type="node,closedway" preset_name_label="true">
     
    25632563            <reference ref="name_brand_operator_oh" />
    25642564            <reference ref="link_contact" />
    2565         </item>
     2565        </item> <!-- Car Dealer -->
    25662566        <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
    25672567            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
     
    25742574            <reference ref="name_brand_operator_oh" />
    25752575            <reference ref="link_contact" />
    2576         </item>
     2576        </item> <!-- Repair -->
    25772577        <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway" preset_name_label="true">
    25782578            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
     
    25832583            <reference ref="name_brand_operator_oh" />
    25842584            <reference ref="link_contact" />
    2585         </item>
    2586         <item name="Tyres" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
     2585        </item> <!-- Parts -->
     2586        <item name="Tires" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
    25872587            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tyres"
    25882588                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tyres" />
     
    25912591            <reference ref="name_brand_operator_oh" />
    25922592            <reference ref="link_contact" />
    2593         </item>
     2593        </item> <!-- Tires -->
    25942594        <separator/>
    25952595        <item name="Rental" icon="presets/car_rental.png" type="node,closedway" preset_name_label="true">
     
    26062606            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    26072607            <reference ref="link_contact" />
    2608         </item>
     2608        </item> <!-- Rental -->
    26092609        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
    26102610            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
     
    26212621            <reference ref="name_oh" />
    26222622            <text key="website" text="Website" />
    2623         </item>
     2623        </item> <!-- Sharing -->
    26242624    </group> <!-- Car -->
    26252625    <group name="Motorcycle" icon="presets/motorbike.png">
     
    26342634            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    26352635            <combo key="fee" text="Fee" values="yes,no" />
    2636         </item>
     2636        </item> <!-- Parking -->
    26372637        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
    26382638            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
     
    26582658            </optional>
    26592659            <reference ref="link_contact" />
    2660         </item>
     2660        </item> <!-- Motorcycle Dealer -->
    26612661    </group> <!-- Motorcycle -->
    26622662    <group name="Bicycle" icon="presets/bike.png">
     
    26792679            <check key="covered" text="Covered" />
    26802680            <check key="supervised" text="Supervised" />
    2681         </item>
     2681        </item> <!-- Parking -->
    26822682        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
    26832683            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
     
    27012701            <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
    27022702            <reference ref="link_contact" />
    2703         </item>
     2703        </item> <!-- Bike Dealer -->
    27042704        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
    27052705            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
     
    27182718            <text key="name" text="Name" />
    27192719            <reference ref="link_contact" />
    2720         </item>
     2720        </item> <!-- Rental -->
    27212721    </group> <!-- Bicycle -->
    27222722    <group name="Public Transport" icon="presets/bus.png">
    2723         <item name="Public transport route" icon="presets/path.png" type="relation" preset_name_label="true">
     2723        <item name="Public Transport Route" icon="presets/path.png" type="relation" preset_name_label="true">
    27242724            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
    27252725            <space />
     
    27462746                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
    27472747            </roles>
    2748         </item>
    2749         <item name="Route master" icon="presets/path.png" type="relation" preset_name_label="true">
     2748        </item> <!-- Public Transport Route -->
     2749        <item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
    27502750            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
    27512751            <space />
     
    27612761                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- FIXME: at least 2 members are required -->
    27622762            </roles>
    2763         </item>
     2763        </item> <!-- Route Master -->
    27642764        <item name="Stop Area" type="relation" icon="presets/interpolation.png" preset_name_label="true">
    27652765            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
     
    27802780                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
    27812781            </roles>
    2782         </item>
     2782        </item> <!-- Stop Area -->
    27832783        <separator/>
    27842784        <item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
     
    28082808            <check key="aerialway" text="Aerialway" />
    28092809            <check key="ferry" text="Ferry" />
    2810         </item>
     2810        </item> <!-- Stop Position -->
    28112811        <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png" preset_name_label="true">
    28122812            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
     
    28382838                <check key="ferry" text="ferry" />
    28392839            </optional>
    2840         </item>
     2840        </item> <!-- Platform -->
    28412841        <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
    28422842            <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
     
    28512851            <text key="operator" text="Operator" />
    28522852            <text key="network" text="Network" />
    2853         </item>
    2854         <separator/>
     2853        </item> <!-- Station -->
     2854        <separator/> <!-- *** Access *** -->
    28552855        <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
    28562856            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
     
    28642864                <check key="bicycle" text="Bicycle" />
    28652865            </optional>
    2866         </item>
     2866        </item> <!-- Subway Entrance -->
    28672867        <item name="Ticket Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
    28682868            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
     
    28782878            <text key="ref" text="Reference Number" />
    28792879            <reference ref="payment_account" />
    2880         </item>
    2881     </group>
    2882     <group name="Public Transport (legacy)" icon="presets/bus.png">
    2883         <item name="Public transport route (legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
     2880        </item> <!-- Ticket Machine -->
     2881    </group> <!-- Public Transport -->
     2882    <group name="Public Transport (Legacy)" icon="presets/bus.png">
     2883        <item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
    28842884            <key key="type" value="route" />
    28852885            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
     
    29042904                <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
    29052905            </roles>
    2906         </item>
     2906        </item> <!-- Public transport route (Legacy) -->
    29072907        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway" preset_name_label="true">
    29082908            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
     
    29182918                <text key="uic_ref" text="UIC-Reference" />
    29192919            </optional>
    2920         </item>
     2920        </item> <!-- Station -->
    29212921        <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
    29222922            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
     
    29282928                <text key="name" text="Name" />
    29292929            </optional>
    2930         </item>
     2930        </item> <!-- Railway Halt -->
    29312931        <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
    29322932           <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
     
    29372937                <text key="name" text="Name" />
    29382938            </optional>
    2939         </item>
     2939        </item> <!-- Tram Stop -->
    29402940        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway" preset_name_label="true">
    29412941            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
     
    29472947            <text key="width" text="Width (meters)" />
    29482948            <check key="area" text="Area" />
    2949         </item>
     2949        </item> <!-- Railway Platform -->
    29502950        <separator/>
    29512951        <item name="Bus Station" icon="presets/bus.png" type="node,closedway" preset_name_label="true">
     
    29592959                <text key="name" text="Name" />
    29602960            </optional>
    2961         </item>
     2961        </item> <!-- Bus Station -->
    29622962        <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
    29632963            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
     
    29772977                <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
    29782978            </optional>
    2979         </item>
     2979        </item> <!-- Bus Stop -->
    29802980        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway" preset_name_label="true">
    29812981            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=platform"
     
    29882988            <text key="width" text="Width (meters)" />
    29892989            <check key="area" text="Area" />
    2990         </item>
     2990        </item> <!-- Bus Platform -->
    29912991    </group> <!-- Public Transport -->
    29922992    <item name="Taxi" icon="presets/taxi.png" type="node,closedway" preset_name_label="true">
     
    30023002        <key key="amenity" value="taxi" />
    30033003        <text key="name" text="Name" />
    3004     </item>
     3004    </item> <!-- Taxi -->
    30053005    <separator/>
    30063006    <group name="Airport" icon="presets/plane.png">
     
    30173017                <text key="wikipedia" text="Wikipedia" />
    30183018            </optional>
    3019         </item>
     3019        </item> <!-- Airport Ground -->
    30203020        <separator/>
    30213021        <item name="Runway" icon="presets/runway.png" type="way" preset_name_label="true">
     
    30293029                <text key="ref" text="Reference" />
    30303030            </optional>
    3031         </item>
     3031        </item> <!-- Runway -->
    30323032        <item name="Taxiway" icon="presets/taxiway.png" type="way" preset_name_label="true">
    30333033            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
     
    30393039                <text key="ref" text="Reference" />
    30403040            </optional>
    3041         </item>
     3041        </item> <!-- Taxiway -->
    30423042        <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
    30433043            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
     
    30513051                <text key="ref" text="Reference" />
    30523052            </optional>
    3053         </item>
     3053        </item> <!-- Helipad -->
    30543054        <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
    30553055            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
     
    30583058                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=apron" />
    30593059            <key key="aeroway" value="apron" />
    3060         </item>
     3060        </item> <!-- Apron -->
    30613061        <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
    30623062            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
     
    30643064                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=hangar" />
    30653065            <key key="building" value="hangar" />
    3066         </item>
     3066        </item> <!-- Hangar -->
    30673067        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
    30683068            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
     
    30703070                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
    30713071            <key key="man_made" value="beacon" />
    3072         </item>
     3072        </item> <!-- Beacon -->
    30733073        <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node" preset_name_label="true">
    30743074            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
     
    30763076                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=windsock" />
    30773077            <key key="aeroway" value="windsock" />
    3078         </item>
     3078        </item> <!-- Windsock -->
    30793079        <separator/>
    30803080        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway" preset_name_label="true">
     
    30903090            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    30913091            <reference ref="link_contact" />
    3092         </item>
     3092        </item> <!-- Terminal -->
    30933093        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
    30943094            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
     
    30983098            <key key="aeroway" value="gate" />
    30993099            <text key="ref" text="Reference" />
    3100         </item>
    3101     </group> <!-- Aeroway -->
    3102   </group>
     3100        </item> <!-- Gate -->
     3101    </group> <!-- Airport -->
     3102  </group> <!-- Transport -->
    31033103  <group name="Facilities" icon="presets/bed.png">
    31043104    <group name="Accommodation" icon="presets/bed.png">
     
    31203120            <space />
    31213121            <reference ref="contact" />
    3122         </item>
     3122        </item> <!-- Hotel -->
    31233123        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
    31243124            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
     
    31363136            <space />
    31373137            <reference ref="contact" />
    3138         </item>
    3139         <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
     3138        </item> <!-- Motel -->
     3139        <item name="Guest House/Bed & Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
    31403140            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
    31413141                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
     
    31513151            <space />
    31523152            <reference ref="contact" />
    3153         </item>
     3153        </item> <!-- Guest House/Bed & Breakfast -->
    31543154        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
    31553155            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
     
    31673167            <space />
    31683168            <reference ref="contact" />
    3169         </item>
     3169        </item> <!-- Chalet -->
    31703170        <item name="Hostel" icon="presets/hostel.png" type="node,closedway" preset_name_label="true">
    31713171            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
     
    31843184            <space />
    31853185            <reference ref="contact" />
    3186         </item>
     3186        </item> <!-- Hostel -->
    31873187        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
    31883188            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
     
    32003200            <space />
    32013201            <reference ref="contact" />
    3202         </item>
     3202        </item> <!-- Alpine Hut -->
    32033203        <separator/>
    3204         <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
     3204        <item name="Caravan Site/RV Park" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
    32053205            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
    32063206                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
     
    32203220            <space />
    32213221            <reference ref="contact" />
    3222         </item>
     3222        </item> <!-- Caravan Site/RV Park -->
    32233223        <item name="Camping Site" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
    32243224            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
     
    32383238            <space />
    32393239            <reference ref="contact" />
    3240         </item>
     3240        </item> <!-- Camping Site -->
    32413241    </group> <!-- Accommodation -->
    32423242    <group name="Food+Drinks" icon="presets/restaurant.png">
     
    32603260            <space />
    32613261            <reference ref="contact" />
    3262         </item>
     3262        </item> <!-- Restaurant -->
    32633263        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
    32643264            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
     
    32763276            <space />
    32773277            <reference ref="contact" />
    3278         </item>
     3278        </item> <!-- Fast Food -->
    32793279        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
    32803280            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
     
    32893289            <space />
    32903290            <reference ref="contact" />
    3291         </item>
     3291        </item> <!-- Food Court -->
    32923292        <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
    32933293            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
     
    33093309            <space />
    33103310            <reference ref="contact" />
    3311         </item>
     3311        </item> <!-- Cafe -->
    33123312        <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
    33133313            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
     
    33253325            <space />
    33263326            <reference ref="contact" />
    3327         </item>
    3328         <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
     3327        </item> <!-- Pub -->
     3328        <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
    33293329            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
    33303330                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
     
    33413341            <space />
    33423342            <reference ref="contact" />
    3343         </item>
     3343        </item> <!-- Beer Garden -->
    33443344        <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
    33453345            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
     
    33583358            <space />
    33593359            <reference ref="contact" />
    3360         </item>
    3361         <item name="Nightclub" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
     3360        </item> <!-- Bar -->
     3361        <item name="Night Club" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
    33623362            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
    33633363                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
     
    33773377            <space />
    33783378            <reference ref="contact" />
    3379         </item>
    3380         <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
     3379        </item> <!-- Night Club -->
     3380        <item name="Strip Club" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
    33813381            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
    33823382                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
     
    33913391            <space />
    33923392            <reference ref="contact" />
    3393         </item>
     3393        </item> <!-- Strip Club -->
    33943394    </group> <!-- Food+Drinks -->
    33953395    <group name="Tourism" icon="presets/sightseeing.png">
     
    34013401            <key key="tourism" value="attraction" />
    34023402            <reference ref="name_oh" />
    3403         </item>
     3403        </item> <!-- Attraction -->
    34043404        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway" preset_name_label="true">
    34053405            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
     
    34143414            <text key="name" text="Name" />
    34153415            <!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
    3416         </item>
     3416        </item> <!-- Viewpoint -->
    34173417        <separator/>
    34183418        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway" preset_name_label="true">
     
    35113511            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    35123512        </item> <!-- Information Terminal -->
    3513         <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
     3513        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
    35143514            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    35153515                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
     
    35293529            <label text="Audioguide via mobile phone?" />
    35303530            <text key="phone" text="Phone number" />
    3531         </item> <!-- Audioguide -->
     3531        </item> <!-- Audio Guide -->
    35323532        <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
    35333533            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
     
    35453545    </group> <!-- Tourism -->
    35463546    <group name="Leisure" icon="presets/theme_park.png">
    3547         <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation" preset_name_label="true">
     3547        <item name="Movie Theater/Cinema" icon="presets/cinema.png" type="node,closedway,relation" preset_name_label="true">
    35483548            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
    35493549                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cinema"
     
    35573557            <reference ref="name_operator_oh" />
    35583558            <reference ref="link_contact" />
    3559         </item>
     3559        </item> <!-- Movie Theater/Cinema -->
    35603560        <item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
    35613561            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
     
    35703570            <space />
    35713571            <reference ref="contact" />
    3572         </item>
     3572        </item> <!-- Zoo -->
    35733573        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway" preset_name_label="true">
    35743574            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
     
    35883588            <reference ref="oh" />
    35893589            <check key="lit" text="Lit" />
    3590         </item>
    3591         <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
     3590        </item> <!-- Dog Park -->
     3591        <item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
    35923592            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
    35933593                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
     
    35993599            <space />
    36003600            <reference ref="contact" />
    3601         </item>
     3601        </item> <!-- Amusement/Theme Park -->
    36023602        <item name="Water Park" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
    36033603            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
     
    36133613            <space />
    36143614            <reference ref="contact" />
    3615         </item>
     3615        </item> <!-- Water Park -->
    36163616        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway" preset_name_label="true">
    36173617            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
     
    36273627            <space />
    36283628            <reference ref="contact" />
    3629         </item>
    3630         <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
     3629        </item> <!-- Sauna -->
     3630        <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
    36313631            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
    36323632            <space />
     
    36363636            <space />
    36373637            <reference ref="contact" />
    3638         </item>
     3638        </item> <!-- Horse Riding -->
    36393639        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
    36403640            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
     
    36533653            <space />
    36543654            <reference ref="contact" />
    3655         </item>
     3655        </item> <!-- Brothel -->
    36563656        <separator/>
    36573657        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway" preset_name_label="true">
     
    36693669            <key key="leisure" value="playground" />
    36703670            <text key="name" text="Name" />
    3671         </item>
     3671        </item> <!-- Playground -->
    36723672        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
    36733673            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
     
    36813681            <text key="name" text="Name" />
    36823682            <check key="fireplace" text="Fireplace" />
    3683         </item>
     3683        </item> <!-- Picnic Site -->
    36843684        <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
    36853685            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
     
    36933693            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
    36943694            <check key="covered" text="Covered" />
    3695         </item>
     3695        </item> <!-- Public Grill -->
    36963696        <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
    36973697            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
     
    37023702            <key key="leisure" value="fishing" />
    37033703            <text key="name" text="Name" />
    3704         </item>
     3704        </item> <!-- Fishing -->
    37053705        <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
    37063706            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
     
    37143714            <key key="leisure" value="swimming_pool" />
    37153715            <key key="access" value="private" />
    3716         </item>
     3716        </item> <!-- Private Swimming Pool -->
    37173717    </group> <!-- Leisure -->
    37183718    <group name="Culture" icon="presets/theater.png">
     
    37293729            <text key="wikipedia" text="Wikipedia" />
    37303730            <reference ref="link_contact" />
    3731         </item>
     3731        </item> <!-- Museum -->
    37323732        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
    37333733            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
     
    37413741            <reference ref="name_operator" />
    37423742            <reference ref="link_contact" />
    3743         </item>
     3743        </item> <!-- Theatre -->
    37443744        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation" preset_name_label="true">
    37453745            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
     
    37553755            <reference ref="name_operator_oh" />
    37563756            <reference ref="link_contact" />
    3757         </item>
     3757        </item> <!-- Library -->
    37583758        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation" preset_name_label="true">
    37593759            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
     
    37663766            <text key="name" text="Name" />
    37673767            <reference ref="link_contact" />
    3768         </item>
     3768        </item> <!-- Arts Centre -->
    37693769        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
    37703770            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
     
    37813781            <text key="name" text="Name" />
    37823782            <text key="artist_name" text="Artist Name" />
    3783         </item>
     3783        </item> <!-- Artwork -->
    37843784        <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation" preset_name_label="true">
    37853785            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
     
    37923792            <combo key="type" text="Type" values="audio,video" />
    37933793            <reference ref="link_contact" />
    3794         </item>
     3794        </item> <!-- Recording Studio -->
    37953795    </group> <!-- Culture -->
    37963796    <group name="Place of Worship" icon="styles/standard/religion.png">
     
    38173817            <reference ref="service_times" />
    38183818            <reference ref="oh" />
    3819         </item>
     3819        </item> <!-- Church -->
    38203820        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation" preset_name_label="true">
    38213821            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    38403840            <reference ref="service_times" />
    38413841            <reference ref="oh" />
    3842         </item>
     3842        </item> <!-- Mosque -->
    38433843        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation" preset_name_label="true">
    38443844            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    38633863            <reference ref="service_times" />
    38643864            <reference ref="oh" />
    3865         </item>
     3865        </item> <!-- Synagogue -->
    38663866        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation" preset_name_label="true">
    38673867            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    38853885            <reference ref="service_times" />
    38863886            <reference ref="oh" />
    3887         </item>
     3887        </item> <!-- Buddhist Temple -->
    38883888        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation" preset_name_label="true">
    38893889            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    39073907            <reference ref="service_times" />
    39083908            <reference ref="oh" />
    3909         </item>
     3909        </item> <!-- Hindu Temple -->
    39103910        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation" preset_name_label="true">
    39113911            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    39283928            <reference ref="service_times" />
    39293929            <reference ref="oh" />
    3930         </item>
     3930        </item> <!-- Shinto Shrine -->
    39313931        <item name="Other Place of Worship" type="node,closedway,relation" preset_name_label="true">
    39323932            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
     
    39493949            <reference ref="service_times" />
    39503950            <reference ref="oh" />
    3951         </item>
     3951        </item> <!-- Other Place of Worship -->
    39523952    </group> <!-- Place of Worship -->
    39533953    <group name="Public Building" icon="presets/townhall.png">
     
    39603960            <key key="amenity" value="public_building" />
    39613961            <text key="name" text="Name" />
    3962         </item>
    3963         <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
     3962        </item> <!-- Public Building -->
     3963        <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
    39643964            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
    39653965                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
     
    39733973            <text key="name" text="Name" />
    39743974            <reference ref="link_contact" />
    3975         </item>
     3975        </item> <!-- Town Hall -->
    39763976        <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway" preset_name_label="true">
    39773977            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
     
    39863986            <reference ref="name_operator" />
    39873987            <reference ref="oh" />
    3988         </item>
     3988        </item> <!-- Community Centre -->
    39893989        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
    39903990            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
     
    39993999            <text key="name" text="Name" />
    40004000            <reference ref="link_contact" />
    4001         </item>
     4001        </item> <!-- Embassy -->
    40024002        <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
    40034003            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
     
    40114011            <text key="name" text="Name" />
    40124012            <reference ref="link_contact" />
    4013         </item>
     4013        </item> <!-- Courthouse -->
    40144014        <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
    40154015            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
     
    40234023            <text key="name" text="Name" />
    40244024            <reference ref="link_contact" />
    4025         </item>
     4025        </item> <!-- Prison -->
    40264026        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
    40274027            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
     
    40374037            <text key="name" text="Name" />
    40384038            <reference ref="link_contact" />
    4039         </item>
     4039        </item> <!-- Police -->
    40404040        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation" preset_name_label="true">
    40414041            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
     
    40504050            <key key="amenity" value="fire_station" />
    40514051            <text key="name" text="Name" />
    4052         </item>
     4052        </item> <!-- Fire Station -->
    40534053        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation" preset_name_label="true">
    40544054            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
     
    40644064            <key key="amenity" value="post_office" />
    40654065            <reference ref="name_operator" />
    4066         </item>
     4066        </item> <!-- Post Office -->
    40674067    </group> <!-- Public Buildings -->
    40684068    <group name="Education" icon="presets/school.png">
     
    40794079            <text key="name" text="Name" />
    40804080            <reference ref="link_contact" />
    4081         </item>
     4081        </item> <!-- Kindergarten -->
    40824082        <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
    40834083            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
     
    40954095            <text key="name" text="Name" />
    40964096            <reference ref="link_contact" />
    4097         </item>
     4097        </item> <!-- School -->
    40984098        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
    40994099            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
     
    41104110            <text key="name" text="Name" />
    41114111            <reference ref="link_contact" />
    4112         </item>
     4112        </item> <!-- University -->
    41134113        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
    41144114            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
     
    41224122            <text key="name" text="Name" />
    41234123            <reference ref="link_contact" />
    4124         </item>
     4124        </item> <!-- College -->
    41254125         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
    41264126            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=driving_school"
     
    41324132            <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
    41334133            <reference ref="link_contact" />
    4134         </item>
     4134        </item> <!-- Driving School -->
    41354135    </group> <!-- Education -->
    41364136    <group name="Health" icon="presets/pharmacy.png">
     
    41484148            <reference ref="name_operator" />
    41494149            <reference ref="link_contact" />
    4150         </item>
     4150        </item> <!-- Hospital -->
    41514151        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
    41524152            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
     
    41564156            <text key="name" text="Name" />
    41574157            <reference ref="link_contact" />
    4158         </item>
    4159         <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
     4158        </item> <!-- Clinic -->
     4159        <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
    41604160            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
    41614161                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
     
    41674167            <reference ref="name_oh" />
    41684168            <reference ref="link_contact" />
    4169         </item>
     4169        </item> <!-- Doctor's Office -->
    41704170        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
    41714171            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=dentist"
     
    41774177            <reference ref="name_oh" />
    41784178            <reference ref="link_contact" />
    4179         </item>
     4179        </item> <!-- Dentist -->
    41804180        <item name="Nursing Home" type="node,closedway" preset_name_label="true">
    41814181            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nursing_home"
     
    41884188            <reference ref="name_operator" />
    41894189            <reference ref="link_contact" />
    4190         </item>
     4190        </item> <!-- Nursing Home -->
    41914191        <item name="Retirement Home" type="node,closedway" preset_name_label="true">
    41924192            <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
     
    42024202            <text key="capacity" text="Capacity" />
    42034203            <reference ref="link_contact" />
    4204         </item>
     4204        </item> <!-- Retirement Home -->
    42054205        <separator/>
    42064206        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway" preset_name_label="true">
     
    42194219            <reference ref="oh" />
    42204220            <reference ref="link_contact" />
    4221         </item>
     4221        </item> <!-- Pharmacy -->
    42224222        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
    42234223            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
     
    42284228            <reference ref="name_operator_oh" />
    42294229            <reference ref="link_contact" />
    4230         </item>
     4230        </item> <!-- Hearing Aids -->
    42314231        <separator/>
    4232         <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
     4232        <item name="Baby Hatch/Safe Haven" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
    42334233            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
    42344234                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
     
    42454245            <text key="operator" text="Operator" />
    42464246            <reference ref="oh" />
    4247         </item>
     4247        </item> <!-- Baby Hatch/Safe Haven -->
    42484248        <separator/>
    42494249        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway" preset_name_label="true">
     
    42614261            <label text="(Use international code, like +12-345-67890)" />
    42624262            <space />
    4263         </item>
     4263        </item> <!-- Emergency Access Point -->
    42644264        <separator/>
    42654265        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway" preset_name_label="true">
     
    42774277            <reference ref="name_oh" />
    42784278            <reference ref="link_contact" />
    4279         </item>
     4279        </item> <!-- Veterinary -->
    42804280    </group> <!-- Health -->
    42814281    <group name="Facilities" icon="presets/telephone.png">
    4282         <item name="Toilets" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
     4282        <item name="Toilets/Restrooms" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
    42834283            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
    42844284                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
     
    43014301                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
    43024302            </optional>
    4303         </item>
     4303        </item> <!-- Toilets/Restrooms -->
    43044304        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
    43054305            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
     
    43154315            <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off" />
    43164316            <check key="drive_through" text="Drive through" />
    4317         </item>
     4317        </item> <!-- Post Box -->
    43184318        <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
    43194319            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
     
    43294329            <reference ref="payment_base" />
    43304330            <check key="payment:telephone_cards" text="Telephone cards" />
    4331         </item>
     4331        </item> <!-- Telephone -->
    43324332        <item name="Emergency Phone" icon="presets/telephone.png" type="node" preset_name_label="true">
    43334333            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
     
    43364336                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
    43374337            <key key="emergency" value="phone" />
    4338         </item>
     4338        </item> <!-- Emergency Phone -->
    43394339        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation" preset_name_label="true">
    43404340            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
     
    43474347            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
    43484348            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
    4349         </item>
     4349        </item> <!-- Internet Access -->
    43504350        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
    43514351            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
     
    43654365            </optional>
    43664366            -->
    4367         </item>
     4367        </item> <!-- Automated Defibrillator -->
    43684368        <item name="Clock" icon="styles/standard/service/clock.png" type="node" preset_name_label="true">
    43694369            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
     
    43824382                <check key="hygrometer" text="Shows humidity" />
    43834383            </optional>
    4384         </item>
     4384        </item> <!-- Clock -->
    43854385        <item name="Recycling" icon="presets/recycling.png" type="node,closedway" preset_name_label="true">
    43864386           <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
     
    44044404            <check key="recycling:scrap_metal" text="Scrap Metal" />
    44054405            <combo key="recycling_type" text="Type" values="container,centre" />
    4406         </item>
    4407         <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
     4406        </item> <!-- Recycling -->
     4407        <item name="Waste Basket/Trash Can" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
    44084408            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
    44094409                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
     
    44154415                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
    44164416            <key key="amenity" value="waste_basket" />
    4417         </item>
    4418         <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
     4417        </item> <!-- Waste Basket/Trash Can -->
     4418        <item name="Waste Disposal/Dumpster" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
    44194419            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
    44204420                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_disposal"
     
    44244424                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
    44254425            <key key="amenity" value="waste_disposal" />
    4426         </item>
     4426        </item> <!-- Waste Disposal/Dumpster -->
    44274427        <separator/>
    44284428        <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
     
    44454445            <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
    44464446            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
    4447         </item>
     4447        </item> <!-- Bench -->
    44484448        <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
    44494449            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
     
    44604460            <check key="fireplace" text="Fireplace" />
    44614461            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
    4462         </item>
     4462        </item> <!-- Shelter -->
    44634463        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
    44644464            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hunting_stand"
     
    44734473            <combo key="hide" text="Hide" values="yes,no,unknown" />
    44744474            <combo key="lock" text="Lock" values="yes,no,unknown" />
    4475         </item>
     4475        </item> <!-- Hunting Stand -->
    44764476        <separator/>
    44774477        <item name="Drinking Water" icon="presets/drinking_water.png" type="node" preset_name_label="true">
     
    44914491                <text key="description" text="Description" />
    44924492            </optional>
    4493         </item>
     4493        </item> <!-- Drinking Water -->
    44944494        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
    44954495            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
     
    45124512            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
    45134513            <text key="fire_hydrant:count" text="Count" />
    4514         </item>
     4514        </item> <!-- Fire Hydrant -->
    45154515    </group> <!-- Facilities -->
    45164516  </group>  <!-- Facilities -->
     
    45294529            <text key="name" text="Name" />
    45304530            <reference ref="optional_sport" />
    4531         </item>
     4531        </item> <!-- Stadium -->
    45324532        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
    45334533            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
     
    45414541            <text key="name" text="Name" />
    45424542            <reference ref="optional_sport" />
    4543         </item>
     4543        </item> <!-- Sports Centre -->
    45444544        <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
    45454545            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
     
    45564556            <text key="name" text="Name" />
    45574557            <reference ref="optional_sport" />
    4558         </item>
     4558        </item> <!-- Pitch -->
    45594559        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
    45604560            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
     
    45694569            <text key="name" text="Name" />
    45704570            <reference ref="optional_sport" />
    4571         </item>
     4571        </item> <!-- Racetrack -->
    45724572        <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
    45734573            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
     
    45804580            <key key="leisure" value="golf_course" />
    45814581            <reference ref="name_oh" />
    4582         </item>
     4582        </item> <!-- Golf Course -->
    45834583        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
    45844584            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
     
    45894589            <key key="leisure" value="miniature_golf" />
    45904590            <reference ref="name_oh" />
    4591         </item>
    4592     </group> <!-- Sport facilities -->
     4591        </item> <!-- Miniature Golf -->
     4592    </group> <!-- Sport Facilities -->
    45934593    <group name="Sport" icon="presets/rowing.png">
    45944594        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
     
    45984598            <text key="name" text="Name" />
    45994599            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
    4600         </item>
    4601         <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
     4600        </item> <!-- Multi -->
     4601        <item name="Nine-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
    46024602            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
    46034603                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
     
    46064606            <text key="name" text="Name" />
    46074607            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4608         </item>
    4609         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
     4608        </item> <!-- Nine-pin Bowling -->
     4609        <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
    46104610            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
    46114611            <space />
     
    46134613            <text key="name" text="Name" />
    46144614            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4615         </item>
     4615        </item> <!-- Ten-pin Bowling -->
    46164616        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway" preset_name_label="true">
    46174617            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
     
    46214621            <text key="name" text="Name" />
    46224622            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4623         </item>
    4624         <item name="Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
     4623        </item> <!-- Archery -->
     4624        <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
    46254625            <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
    46264626            <space />
     
    46284628            <text key="name" text="Name" />
    46294629            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
    4630         </item>
     4630        </item> <!-- Track and Field Athletics -->
    46314631        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway" preset_name_label="true">
    46324632            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
     
    46374637            <text key="name" text="Name" />
    46384638            <combo key="leisure" text="Type" values="sports_centre" />
    4639         </item>
    4640         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
     4639        </item> <!-- Climbing -->
     4640        <item name="Canoeing/Kayaking" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
    46414641            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
    46424642            <space />
    46434643            <key key="sport" value="canoe" />
    46444644            <text key="name" text="Name" />
    4645         </item>
     4645        </item> <!-- Canoeing/Kayaking -->
    46464646        <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
    46474647            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
     
    46504650            <text key="name" text="Name" />
    46514651            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    4652         </item>
     4652        </item> <!-- Cycling -->
    46534653        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway" preset_name_label="true">
    46544654            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
     
    46574657            <text key="name" text="Name" />
    46584658            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    4659         </item>
     4659        </item> <!-- Dog Racing -->
    46604660        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
    46614661            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
     
    46644664            <text key="name" text="Name" />
    46654665            <reference ref="riding_surface" />
    4666         </item>
     4666        </item> <!-- Equestrian -->
    46674667        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
    46684668            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
     
    46714671            <text key="name" text="Name" />
    46724672            <reference ref="riding_surface" />
    4673         </item>
     4673        </item> <!-- Horse Racing -->
    46744674        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
    46754675            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
     
    46784678            <text key="name" text="Name" />
    46794679            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4680         </item>
     4680        </item> <!-- Gymnastics -->
    46814681        <item name="Skating" icon="presets/skating.png" type="node,closedway" preset_name_label="true">
    46824682            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
     
    46864686            <text key="name" text="Name" />
    46874687            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
    4688         </item>
     4688        </item> <!-- Skating -->
    46894689        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway" preset_name_label="true">
    46904690            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
     
    46944694            <text key="name" text="Name" />
    46954695            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
    4696         </item>
     4696        </item> <!-- Skateboard -->
    46974697        <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
    46984698            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
     
    47024702            <text key="name" text="Name" />
    47034703            <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
    4704         </item>
     4704        </item> <!-- Swimming -->
    47054705        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
    47064706            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
     
    47144714            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
    47154715            <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
    4716         </item>
     4716        </item> <!-- Skiing -->
    47174717        <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
    47184718            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
     
    47254725            <text key="name" text="Name" />
    47264726            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4727         </item>
     4727        </item> <!-- Shooting -->
    47284728    </group> <!-- Sport -->
    47294729    <group name="Sport (Ball)" icon="presets/soccer.png">
     
    47364736            <key key="sport" value="soccer" />
    47374737            <reference ref="name_leisure_pitch" />
    4738         </item>
     4738        </item> <!-- Soccer -->
    47394739        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
    47404740            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
     
    47424742            <key key="sport" value="australian_football" />
    47434743            <reference ref="name_leisure_pitch" />
    4744         </item>
     4744        </item> <!-- Australian Football -->
    47454745        <item name="American Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
    47464746            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
     
    47484748            <key key="sport" value="american_football" />
    47494749            <reference ref="name_leisure_pitch" />
    4750         </item>
     4750        </item> <!-- American Football -->
    47514751        <item name="Canadian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
    47524752            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
     
    47544754            <key key="sport" value="canadian_football" />
    47554755            <reference ref="name_leisure_pitch" />
    4756         </item>
     4756        </item> <!-- Canadian Football -->
    47574757        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
    47584758            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
     
    47664766                <check key="gaelic_games:rounders" text="Rounders" />
    47674767            </optional>
    4768         </item>
     4768        </item> <!-- Gaelic Games -->
    47694769        <item name="Rugby League" icon="presets/football.png" type="node,closedway" preset_name_label="true">
    47704770            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
     
    47734773            <key key="sport" value="rugby_league" />
    47744774            <reference ref="name_leisure_pitch" />
    4775         </item>
     4775        </item> <!-- Rugby League -->
    47764776        <item name="Rugby Union" icon="presets/football.png" type="node,closedway" preset_name_label="true">
    47774777            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
     
    47804780            <key key="sport" value="rugby_union" />
    47814781            <reference ref="name_leisure_pitch" />
    4782         </item>
     4782        </item> <!-- Rugby Union -->
    47834783        <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
    47844784            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
     
    47864786            <key key="sport" value="baseball" />
    47874787            <reference ref="name_leisure_pitch" />
    4788         </item>
     4788        </item> <!-- Baseball -->
    47894789        <item name="Basketball" icon="presets/basketball.png" type="node,closedway" preset_name_label="true">
    47904790            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
     
    47924792            <key key="sport" value="basketball" />
    47934793            <reference ref="name_leisure_pitch" />
    4794         </item>
     4794        </item> <!-- Basketball -->
    47954795        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway" preset_name_label="true">
    47964796            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
     
    47994799            <reference ref="name_operator" />
    48004800            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    4801         </item>
    4802         <item name="Beach volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
     4801        </item> <!-- Volleyball -->
     4802        <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
    48034803            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
    48044804            <space />
     
    48064806            <reference ref="name_operator" />
    48074807            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    4808         </item>
     4808        </item> <!-- Beach Volleyball -->
    48094809        <item name="Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
    48104810            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
     
    48164816            <text key="name" text="Name" />
    48174817            <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
    4818         </item>
     4818        </item> <!-- Golf -->
    48194819        <item name="Boule" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
    48204820            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
     
    48224822            <key key="sport" value="boules" />
    48234823            <reference ref="name_leisure_pitch" />
    4824         </item>
    4825         <item name="Bowls" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
     4824        </item> <!-- Boule -->
     4825        <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
    48264826            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
    48274827            <space />
    48284828            <key key="sport" value="bowls" />
    48294829            <reference ref="name_leisure_pitch" />
    4830         </item>
     4830        </item> <!-- Lawn Bowling -->
    48314831        <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
    48324832            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
     
    48344834            <key key="sport" value="cricket" />
    48354835            <reference ref="name_leisure_pitch" />
    4836         </item>
     4836        </item> <!-- Cricket -->
    48374837        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
    48384838            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
     
    48414841            <text key="name" text="Name" />
    48424842            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4843         </item>
     4843        </item> <!-- Cricket Nets -->
    48444844        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway" preset_name_label="true">
    48454845            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
     
    48474847            <key key="sport" value="croquet" />
    48484848            <reference ref="name_leisure_pitch" />
    4849         </item>
     4849        </item> <!-- Croquet -->
    48504850        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway" preset_name_label="true">
    48514851            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
     
    48544854            <text key="name" text="Name" />
    48554855            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
    4856         </item>
     4856        </item> <!-- Hockey -->
    48574857        <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
    48584858            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
     
    48614861            <key key="sport" value="pelota" />
    48624862            <reference ref="name_leisure_pitch" />
    4863         </item>
    4864         <item name="Racquet" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
     4863        </item> <!-- Pelota -->
     4864        <item name="Racquetball" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
    48654865            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
    48664866                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
     
    48694869            <text key="name" text="Name" />
    48704870            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4871         </item>
    4872         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
     4871        </item> <!-- Racquetball -->
     4872        <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
    48734873            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
    48744874            <space />
     
    48764876            <text key="name" text="Name" />
    48774877            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    4878         </item>
     4878        </item> <!-- Table Tennis/Ping-Pong -->
    48794879        <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
    48804880            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
     
    48824882            <key key="sport" value="tennis" />
    48834883            <reference ref="name_leisure_pitch" />
    4884         </item>
     4884        </item> <!-- Tennis -->
    48854885    </group> <!-- Sport (Ball) -->
    48864886    <group name="Motorsport" icon="presets/motorbike.png">
     
    48914891            <text key="name" text="Name" />
    48924892            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    4893         </item>
    4894         <item name="Karting" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
     4893        </item> <!-- Motorsport -->
     4894        <item name="Kart Racing" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
    48954895            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting" />
    48964896            <space />
     
    48984898            <text key="name" text="Name" />
    48994899            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
    4900         </item>
     4900        </item> <!-- Kart Racing -->
    49014901        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
    49024902            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
     
    49154915            <text key="name" text="Name" />
    49164916            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
    4917         </item>
     4917        </item> <!-- Motocross -->
    49184918        <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway" preset_name_label="true">
    49194919            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=safety_training"
     
    49324932            <text key="name" text="Name" />
    49334933            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
    4934         </item>
     4934        </item> <!-- Safety Training -->
    49354935        <separator/>
    49364936        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
     
    49404940            <text key="name" text="Name" />
    49414941            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
    4942         </item>
     4942        </item> <!-- Model Aerodrome -->
    49434943        <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
    49444944            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
     
    49574957            <text key="name" text="Name" />
    49584958            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
    4959         </item>
     4959        </item> <!-- RC Car -->
    49604960        <item name="Raceway" type="closedway" preset_name_label="true">
    49614961            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
     
    49674967            <key key="highway" value="raceway" />
    49684968            <text key="name" text="Name" />
    4969         </item>
     4969        </item> <!-- Raceway -->
    49704970    </group> <!-- Motorsport -->
    49714971  </group> <!-- Sports -->
     
    49894989            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,construction" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
    49904990            <text key="name" text="Name" />
    4991         </item>
     4991        </item> <!-- Building -->
    49924992        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
    49934993            <link href="http://wiki.openstreetmap.org/wiki/Key:building"
     
    50075007            <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
    50085008            <text key="name" text="Name" />
    5009         </item>
     5009        </item> <!-- Residential Building -->
    50105010        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
    50115011            <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
     
    50235023                <text key="addr:flats" text="Flat numbers" />
    50245024            </optional>
    5025         </item>
     5025        </item> <!-- Entrance -->
    50265026        <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
    50275027            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
     
    50405040                <text key="operator" text="Operator" />
    50415041            </optional>
    5042         </item>
     5042        </item> <!-- Tower -->
    50435043        <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
    50445044            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
     
    50465046                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=flagpole" />
    50475047            <key key="man_made" value="flagpole" />
    5048         </item>
     5048        </item> <!-- Flagpole -->
    50495049        <separator/>
    50505050        <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
     
    50565056            <key key="man_made" value="works" />
    50575057            <text key="name" text="Name" />
    5058         </item>
     5058        </item> <!-- Works -->
    50595059        <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
    50605060            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney" />
     
    50635063            <reference ref="name_operator" />
    50645064            <text key="height" text="Height (meters)" />
    5065         </item>
     5065        </item> <!-- Chimney -->
    50665066        <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
    50675067            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
     
    50745074            <key key="man_made" value="windmill" />
    50755075            <text key="name" text="Name" />
    5076         </item>
     5076        </item> <!-- Windmill -->
    50775077        <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
    50785078            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=gasometer"
     
    50815081            <key key="man_made" value="gasometer" />
    50825082            <text key="name" text="Name" />
    5083         </item>
     5083        </item> <!-- Gasometer -->
    50845084        <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
    50855085            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
     
    50925092            <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
    50935093            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
    5094         </item>
     5094        </item> <!-- Pipeline -->
    50955095        <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
    50965096            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
     
    51025102            <key key="man_made" value="crane" />
    51035103            <text key="name" text="Name" />
    5104         </item>
     5104        </item> <!-- Crane -->
    51055105        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
    51065106            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
     
    51185118            <combo key="headframe" text="Visible Headframe" values="yes,no" />
    51195119            <check key="disused" text="Disused" />
    5120         </item>
     5120        </item> <!-- Mineshaft -->
    51215121        <item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
    51225122            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
     
    51345134            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    51355135            <check key="disused" text="Disused" />
    5136         </item>
     5136        </item> <!-- Adit -->
    51375137        <item name="Embankment" icon="presets/cliff.png" type="way" preset_name_label="true">
    51385138            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=embankment"
     
    51415141            <space />
    51425142            <key key="man_made" value="embankment" />
    5143         </item>
     5143        </item> <!-- Embankment -->
    51445144        <separator/>
    51455145        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
     
    51515151            <key key="man_made" value="water_tower" />
    51525152            <text key="name" text="Name" />
    5153         </item>
     5153        </item> <!-- Water Tower -->
    51545154        <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
    51555155            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
     
    51615161            <key key="man_made" value="water_works" />
    51625162            <reference ref="name_operator" />
    5163         </item>
    5164         <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
     5163        </item> <!-- Water Works -->
     5164        <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
    51655165            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
    51665166                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
     
    51735173            <key key="man_made" value="wastewater_plant" />
    51745174            <text key="name" text="Name" />
    5175         </item>
     5175        </item> <!-- Wastewater Treatment Plant -->
    51765176        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
    51775177            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
     
    51845184            <key key="man_made" value="watermill" />
    51855185            <text key="name" text="Name" />
    5186         </item>
     5186        </item> <!-- Watermill -->
    51875187        <item name="Fountain" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
    51885188            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
     
    51985198            <key key="amenity" value="fountain" />
    51995199            <text key="name" text="Name" />
    5200         </item>
     5200        </item> <!-- Fountain -->
    52015201        <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
    52025202            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
     
    52105210            <key key="man_made" value="water_well" />
    52115211            <text key="name" text="Name" />
    5212         </item>
     5212        </item> <!-- Water Well -->
    52135213        <separator/>
    52145214        <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
     
    52215221            <key key="man_made" value="lighthouse" />
    52225222            <text key="name" text="Name" />
    5223         </item>
     5223        </item> <!-- Lighthouse -->
    52245224        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
    52255225            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
     
    52295229            <key key="man_made" value="beacon" />
    52305230            <text key="name" text="Name" />
    5231         </item>
     5231        </item> <!-- Beacon -->
    52325232        <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node" preset_name_label="true">
    52335233            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
     
    52385238            <key key="highway" value="street_lamp" />
    52395239            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
    5240         </item>
     5240        </item> <!-- Street Lamp -->
    52415241        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
    52425242            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
     
    52725272                <check key="display:digital" text="Digital" />
    52735273            </checkgroup>
    5274         </item>
     5274        </item> <!-- Monitoring Station -->
    52755275        <item name="Survey Point" icon="presets/survey_point.png" type="node" preset_name_label="true">
    52765276            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
     
    52815281            <key key="man_made" value="survey_point" />
    52825282            <text key="name" text="Name" />
    5283         </item>
     5283        </item> <!-- Survey Point -->
    52845284        <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
    52855285            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
     
    53095309                <text key="height" text="Height in meter (m)" />
    53105310            </optional>
    5311         </item>
     5311        </item> <!-- Surveillance Camera -->
    53125312    </group> <!-- Man Made -->
    53135313    <group name="Power" icon="presets/power.png">
     
    53345334                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    53355335            </optional>
    5336         </item>
     5336        </item> <!-- Power Plant -->
    53375337        <group name="Power Generator" icon="presets/power.png">
    53385338            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     
    53425342                <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
    53435343                <reference ref="power_output" />
    5344             </item>
     5344            </item> <!-- Power Generator -->
    53455345            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
    53465346                <key key="generator:source" value="biogas" />
     
    53495349                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
    53505350                <reference ref="power_output" />
    5351             </item>
     5351            </item> <!-- Biogas Power Generator -->
    53525352            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
    53535353                <key key="generator:source" value="biomass" />
     
    53615361                </combo>
    53625362                <reference ref="power_output" />
    5363             </item>
     5363            </item> <!-- Biomass Power Generator -->
    53645364            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,relation" preset_name_label="true">
    53655365                <key key="generator:source" value="coal" />
     
    53685368                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
    53695369                <reference ref="power_output" />
    5370             </item>
     5370            </item> <!-- Coal Power Generator -->
    53715371            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,relation" preset_name_label="true">
    53725372                <key key="generator:source" value="gas" />
     
    53755375                <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
    53765376                <reference ref="power_output" />
    5377             </item>
     5377            </item> <!-- Gas Power Generator -->
    53785378            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
    53795379                <key key="generator:source" value="oil" />
     
    53825382                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
    53835383                <reference ref="power_output" />
    5384             </item>
     5384            </item> <!-- Oil Power Generator -->
    53855385            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
    53865386                <key key="generator:source" value="diesel" />
     
    53895389                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
    53905390                <reference ref="power_output" />
    5391             </item>
     5391            </item> <!-- Diesel Power Generator -->
    53925392            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
    53935393                <key key="generator:source" value="gasoline" />
     
    53965396                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
    53975397                <reference ref="power_output" />
    5398             </item>
     5398            </item> <!-- Gasoline Power Generator -->
    53995399            <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,relation" preset_name_label="true">
    54005400                <key key="generator:source" value="nuclear" />
     
    54215421                </combo>
    54225422                <reference ref="power_output" />
    5423             </item>
     5423            </item> <!-- Nuclear Reactor -->
    54245424            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,relation" preset_name_label="true">
    54255425                <key key="generator:source" value="solar" />
     
    54325432                </combo>
    54335433                <reference ref="power_output" />
    5434             </item>
     5434            </item> <!-- Solar Power Generator -->
    54355435            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,relation" preset_name_label="true">
    54365436                <key key="generator:source" value="waste" />
     
    54455445                <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
    54465446                <reference ref="power_output" />
    5447             </item>
     5447            </item> <!-- Waste Power Generator -->
    54485448            <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
    54495449                <key key="generator:source" value="hydro" />
     
    54575457                </combo>
    54585458                <reference ref="power_output" />
    5459             </item>
     5459            </item> <!-- Water Turbine -->
    54605460            <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
    54615461                <key key="generator:source" value="tidal" />
     
    54685468                </combo>
    54695469                <reference ref="power_output" />
    5470             </item>
     5470            </item> <!-- Tidal Water Turbine -->
    54715471            <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
    54725472                <key key="generator:source" value="wave" />
    54735473                <reference ref="power_generator" />
    54745474                <reference ref="power_output" />
    5475             </item>
     5475            </item> <!-- Wave Energy Converter -->
    54765476            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
    54775477                <key key="generator:source" value="osmotic" />
    54785478                <reference ref="power_generator" />
    54795479                <reference ref="power_output" />
    5480             </item>
     5480            </item> <!-- Osmotic Power Generator -->
    54815481            <item name="Geothermal Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
    54825482                <key key="generator:source" value="geothermal" />
     
    54845484                <combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
    54855485                <reference ref="power_output" />
    5486             </item>
     5486            </item> <!-- Geothermal Power Generator -->
    54875487            <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway,relation" preset_name_label="true">
    54885488                <key key="generator:source" value="wind" />
     
    54915491                <combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
    54925492                <reference ref="power_output" />
    5493             </item>
    5494         </group>
     5493            </item> <!-- Wind Turbine -->
     5494        </group> <!-- Power Generator -->
    54955495        <separator/>
    54965496        <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
     
    55105510                <check key="gas_insulated" text="Gas insulated" />
    55115511            </optional>
    5512         </item>
     5512        </item> <!-- Power Substation -->
    55135513        <item name="Power Transformer" icon="styles/standard/misc/landmark/power/transformer.png" type="node,closedway" preset_name_label="true">
    55145514            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
     
    55265526                <combo key="phases" text="Phases" values="1,3" length="1" />
    55275527            </optional>
    5528         </item>
     5528        </item> <!-- Power Transformer -->
    55295529        <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
    55305530            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
     
    55425542                <check key="gas_insulated" text="Gas insulated" />
    55435543            </optional>
    5544         </item>
     5544        </item> <!-- Power Switchgear -->
    55455545        <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
    55465546            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
     
    55535553            <key key="line" value="busbar" />
    55545554            <reference ref="power_line_extra" />
    5555         </item>
     5555        </item> <!-- Power Busbar -->
    55565556        <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
    55575557            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
     
    55645564            <key key="line" value="bay" />
    55655565            <reference ref="power_line_extra" />
    5566         </item>
     5566        </item> <!-- Power Bay -->
    55675567        <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
    55685568            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
    55695569            <space />
    55705570            <key key="power" value="switch" />
    5571         </item>
     5571        </item> <!-- Power Switch -->
    55725572        <separator/>
    55735573        <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     
    55865586                <combo key="rating" text="Power rating (MVA)" values="15 MVA,50 MVA,100 MVA" />
    55875587            </optional>
    5588         </item>
     5588        </item> <!-- Power Converter -->
    55895589        <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
    55905590            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
     
    56015601                <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
    56025602            </optional>
    5603         </item>
     5603        </item> <!-- Power Compensator -->
    56045604        <separator/>
    56055605        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
     
    56115611            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
    56125612            <reference ref="ref_operator_branch" />
    5613         </item>
     5613        </item> <!-- Cable Distribution Cabinet -->
    56145614        <separator/>
    56155615        <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
     
    56375637                <check key="design:incomplete" text="Incomplete tower" />
    56385638            </optional>
    5639         </item>
     5639        </item> <!-- Power Tower -->
    56405640        <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
    56415641            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
     
    56525652            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    56535653            <reference ref="ref_operator_branch" />
    5654         </item>
     5654        </item> <!-- Pole -->
    56555655        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
    56565656            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
     
    56725672                <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
    56735673            </optional>
    5674         </item>
     5674        </item> <!-- Power Line -->
    56755675        <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
    56765676            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
     
    56875687                <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
    56885688            </optional>
    5689         </item>
     5689        </item> <!-- Power Cable -->
    56905690    </group> <!-- Power -->
    56915691    <group name="Historic Places" icon="presets/State_Tourist.png">
     
    56995699            <key key="historic" value="castle" />
    57005700            <reference ref="name_wikipedia" />
    5701         </item>
     5701        </item> <!-- Castle -->
    57025702        <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
    57035703            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
     
    57095709            <key key="historic" value="ruins" />
    57105710            <reference ref="name_oh" />
    5711         </item>
     5711        </item> <!-- Ruins -->
    57125712        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway" preset_name_label="true">
    57135713            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
     
    57195719            <key key="historic" value="archaeological_site" />
    57205720            <reference ref="name_oh" />
    5721         </item>
     5721        </item> <!-- Archaeological Site -->
    57225722        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
    57235723            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
     
    57305730            <key key="historic" value="battlefield" />
    57315731            <text key="name" text="Name" />
    5732         </item>
     5732        </item> <!-- Battlefield -->
    57335733        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway" preset_name_label="true">
    57345734            <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
     
    57405740            <key key="geological" value="palaeontological_site" />
    57415741            <text key="name" text="Name" />
    5742         </item>
     5742        </item> <!-- Palaeontological Site -->
    57435743        <separator/>
    57445744        <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
     
    57545754            <key key="historic" value="monument" />
    57555755            <text key="name" text="Name" />
    5756         </item>
     5756        </item> <!-- Monument -->
    57575757        <item name="Memorial" icon="presets/memorial.png" type="node,closedway" preset_name_label="true">
    57585758            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
     
    57675767            <key key="historic" value="memorial" />
    57685768            <text key="name" text="Name" />
    5769         </item>
     5769        </item> <!-- Memorial -->
    57705770        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
    57715771            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
     
    57765776            <key key="historic" value="wayside_cross" />
    57775777            <text key="name" text="Name" />
    5778         </item>
     5778        </item> <!-- Wayside Cross -->
    57795779        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
    57805780            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_shrine"
     
    57885788            <key key="historic" value="wayside_shrine" />
    57895789            <text key="name" text="Name" />
    5790         </item>
     5790        </item> <!-- Wayside Shrine -->
    57915791        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
    57925792            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
     
    57985798            <key key="historic" value="boundary_stone" />
    57995799            <text key="name" text="Name" />
    5800         </item>
     5800        </item> <!-- Boundary Stone -->
    58015801    </group> <!-- Historic Places -->
    5802   </group> <!-- Structures -->
     5802  </group> <!-- Man Made -->
    58035803  <group name="Shops" icon="styles/standard/shop/mall.png">
    58045804    <group name="Food" icon="styles/standard/shop/supermarket.png">
     
    58155815            <reference ref="name_oh" />
    58165816            <reference ref="link_contact" />
    5817         </item>
     5817        </item> <!-- Supermarket -->
    58185818        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
    58195819            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
     
    58285828            <reference ref="name_oh" />
    58295829            <reference ref="link_contact" />
    5830         </item>
     5830        </item> <!-- Convenience Store -->
    58315831        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
    58325832            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
     
    58405840            <reference ref="name_oh" />
    58415841            <reference ref="link_contact" />
    5842         </item>
     5842        </item> <!-- Kiosk -->
    58435843        <separator/>
    58445844        <item name="Bakery" icon="presets/baker.png" type="node,closedway" preset_name_label="true">
     
    58565856            <reference ref="name_oh" />
    58575857            <reference ref="link_contact" />
    5858         </item>
     5858        </item> <!-- Bakery -->
    58595859        <item name="Butcher" icon="presets/cow.png" type="node,closedway" preset_name_label="true">
    58605860            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
     
    58705870            <reference ref="name_oh" />
    58715871            <reference ref="link_contact" />
    5872         </item>
     5872        </item> <!-- Butcher -->
    58735873        <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
    58745874            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
     
    58805880            <reference ref="name_operator_oh" />
    58815881            <reference ref="link_contact" />
    5882         </item>
     5882        </item> <!-- Seafood -->
    58835883        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
    58845884            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
     
    58925892            <reference ref="name_operator_oh" />
    58935893            <reference ref="link_contact" />
    5894         </item>
    5895         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
     5894        </item> <!-- Deli (Fine Food) -->
     5895        <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
    58965896            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
    58975897                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
     
    59065906            <reference ref="name_oh" />
    59075907            <reference ref="link_contact" />
    5908         </item>
     5908        </item> <!-- Candy Store -->
    59095909        <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
    59105910            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea" />
     
    59135913            <reference ref="name_oh" />
    59145914            <reference ref="link_contact" />
    5915         </item>
     5915        </item> <!-- Tea -->
    59165916        <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
    59175917            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee" />
     
    59205920            <reference ref="name_oh" />
    59215921            <reference ref="link_contact" />
    5922         </item>
     5922        </item> <!-- Coffee -->
    59235923        <separator/>
    5924         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
     5924        <item name="Public Market" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
    59255925            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
    59265926                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
     
    59365936            <text key="website" text="Website" />
    59375937            <combo key="organic" text="Organic" values="only,yes,no" />
    5938         </item>
     5938        </item> <!-- Public Market -->
    59395939        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
    59405940            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
     
    59495949            <combo key="organic" text="Organic" values="only,yes,no" />
    59505950            <reference ref="link_contact" />
    5951         </item>
     5951        </item> <!-- Greengrocer -->
    59525952        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
    59535953            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
     
    59625962            <combo key="organic" text="Organic" values="only,yes,no" />
    59635963            <reference ref="link_contact" />
    5964         </item>
     5964        </item> <!-- Farm Stand -->
    59655965        <separator/>
    59665966        <item name="Organic" type="node,closedway" preset_name_label="true">
     
    59695969            <space />
    59705970            <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
    5971         </item>
     5971        </item> <!-- Organic -->
    59725972        <item name="Fair Trade" type="node,closedway" preset_name_label="true">
    59735973            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
    59745974            <space />
    59755975            <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
    5976         </item>
     5976        </item> <!-- Fair Trade -->
    59775977        <separator/>
    59785978        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
     
    59875987            <reference ref="name_oh" />
    59885988            <reference ref="link_contact" />
    5989         </item>
     5989        </item> <!-- Alcohol -->
    59905990        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
    59915991            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
     
    59985998            <reference ref="name_oh" />
    59995999            <reference ref="link_contact" />
    6000         </item>
     6000        </item> <!-- Beverages -->
    60016001    </group> <!-- Food -->
    60026002    <group name="Clothes" icon="styles/standard/shop/clothes.png">
     
    60156015            <combo key="organic" text="Organic" values="only,yes,no" />
    60166016            <reference ref="link_contact" />
    6017         </item>
     6017        </item> <!-- Clothes -->
    60186018        <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
    60196019            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
     
    60266026            <reference ref="name_operator_oh" />
    60276027            <reference ref="link_contact" />
    6028         </item>
     6028        </item> <!-- Boutique -->
    60296029        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
    60306030            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
     
    60386038            <combo key="organic" text="Organic" values="only,yes,no" />
    60396039            <reference ref="link_contact" />
    6040         </item>
     6040        </item> <!-- Shoes -->
    60416041        <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
    60426042            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
     
    60496049            <reference ref="name_oh" />
    60506050            <reference ref="link_contact" />
    6051         </item>
     6051        </item> <!-- Outdoor -->
    60526052        <item name="Sports" icon="presets/rowing.png" type="node,closedway" preset_name_label="true">
    60536053             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
     
    60586058            <reference ref="name_oh" />
    60596059            <reference ref="link_contact" />
    6060         </item>
     6060        </item> <!-- Sports -->
    60616061        <separator/>
    60626062        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
     
    60706070            <reference ref="name_oh" />
    60716071            <reference ref="link_contact" />
    6072         </item>
     6072        </item> <!-- Dry Cleaning -->
    60736073        <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
    60746074            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
     
    60806080            <reference ref="name_oh" />
    60816081            <reference ref="link_contact" />
    6082         </item>
     6082        </item> <!-- Laundry -->
    60836083        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
    60846084            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
     
    61026102            <reference ref="name_oh" />
    61036103            <reference ref="link_contact" />
    6104         </item>
     6104        </item> <!-- Tailor -->
    61056105        <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
    61066106            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
     
    61126112            <reference ref="name_operator_oh" />
    61136113            <reference ref="link_contact" />
    6114         </item>
     6114        </item> <!-- Fabric -->
    61156115    </group> <!-- Clothes -->
    61166116    <group name="Electronic" icon="styles/standard/shop/electronics.png">
     
    61256125            <reference ref="name_oh" />
    61266126            <reference ref="link_contact" />
    6127         </item>
     6127        </item> <!-- Computer -->
    61286128        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
    61296129            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
     
    61356135            <reference ref="name_oh" />
    61366136            <reference ref="link_contact" />
    6137         </item>
     6137        </item> <!-- Computer -->
    61386138        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
    61396139            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
     
    61446144            <reference ref="name_operator_oh" />
    61456145            <reference ref="link_contact" />
    6146         </item>
     6146        </item> <!-- Mobile Phone -->
    61476147        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
    61486148            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
     
    61536153            <reference ref="name_operator_oh" />
    61546154            <reference ref="link_contact" />
    6155         </item>
     6155        </item> <!-- Vacuum Cleaner -->
    61566156        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway" preset_name_label="true">
    61576157            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
     
    61636163            <reference ref="name_oh" />
    61646164            <reference ref="link_contact" />
    6165         </item>
     6165        </item> <!-- Hifi -->
    61666166        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
    61676167            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
     
    61736173            <reference ref="name_oh" />
    61746174            <reference ref="link_contact" />
    6175         </item>
    6176         <item name="Video games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
     6175        </item> <!-- Video -->
     6176        <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
    61776177            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games" />
    61786178            <space />
     
    61806180            <reference ref="name_oh" />
    61816181            <reference ref="link_contact" />
    6182         </item>
     6182        </item> <!-- Video Games -->
    61836183    </group> <!-- Electronic -->
    61846184    <group name="Cash" icon="presets/dollar.png">
     
    61996199            <check key="atm" text="Automated Teller Machine" default="on" />
    62006200            <reference ref="link_contact" />
    6201         </item>
     6201        </item> <!-- Bank -->
    62026202        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
    62036203            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
     
    62116211            <reference ref="name_oh" />
    62126212            <reference ref="link_contact" />
    6213         </item>
     6213        </item> <!-- Money Exchange -->
    62146214        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
    62156215            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
     
    62296229            <text key="operator" text="Operator" />
    62306230            <reference ref="oh" />
    6231         </item>
     6231        </item> <!-- Automated Teller Machine -->
    62326232        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
    62336233            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
     
    62386238            <reference ref="name_oh" />
    62396239            <reference ref="link_contact" />
    6240         </item>
     6240        </item> <!-- Pawnbroker -->
    62416241    </group> <!-- Cash -->
    62426242    <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg"> 
     
    62516251            <reference ref="name_brand_operator_oh" />
    62526252            <reference ref="link_contact" />
    6253         </item>
     6253        </item> <!-- Furniture -->
    62546254        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
    62556255            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
     
    62636263            <reference ref="name_brand_operator_oh" />
    62646264            <reference ref="link_contact" />
    6265         </item>
     6265        </item> <!-- Kitchen -->
    62666266        <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
    62676267            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
     
    62726272            <reference ref="name_operator_oh" />
    62736273            <reference ref="link_contact" />
    6274         </item>
     6274        </item> <!-- Curtain -->
    62756275        <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
    62766276            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
     
    62826282            <reference ref="name_operator_oh" />
    62836283            <reference ref="link_contact" />
    6284         </item>
     6284        </item> <!-- Frame -->
    62856285        <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway" preset_name_label="true">
    62866286            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bed"
     
    62936293            <reference ref="name_oh" />
    62946294            <reference ref="link_contact" />
    6295         </item>
    6296         <item name="Interior decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
     6295        </item> <!-- Bed -->
     6296        <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
    62976297            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
    62986298                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=interior_decoration"
     
    63026302            <reference ref="name_oh" />
    63036303            <reference ref="link_contact" />
    6304         </item>
     6304        </item> <!-- Interior Decoration -->
    63056305    </group> <!-- Home decoration -->
    6306     <group name="Printed material" icon="presets/stationery.png">
    6307             <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
     6306    <group name="Printed Material" icon="presets/stationery.png">
     6307        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
    63086308            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
    63096309                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
     
    63146314            <key key="shop" value="stationery" />
    63156315            <reference ref="name_oh" />
    6316         </item>
    6317         <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
     6316        </item> <!-- Stationery -->
     6317        <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
    63186318            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
    63196319                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
     
    63246324            <key key="shop" value="copyshop" />
    63256325            <reference ref="name_operator_oh" />
    6326         </item>
     6326        </item> <!-- Copy Shop -->
    63276327        <item name="Book Store" icon="presets/book.png" type="node,closedway" preset_name_label="true">
    63286328            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
     
    63366336            <reference ref="name_brand_oh" />
    63376337            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    6338         </item>
    6339         <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
     6338        </item> <!-- Book Store -->
     6339        <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
    63406340            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
    63416341                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
     
    63476347            <key key="shop" value="newsagent" />
    63486348            <reference ref="name_oh" />
    6349         </item>
     6349        </item> <!-- Newspaper Stand -->
    63506350        <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
    63516351            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=ticket"
     
    63556355            <reference ref="name_oh" />
    63566356            <reference ref="link_contact" />
    6357         </item>
    6358     </group> <!-- Printed material -->
     6357        </item> <!-- Ticket -->
     6358    </group> <!-- Printed Material -->
    63596359    <group name="Other" icon="styles/standard/shop/mall.png">
    63606360        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
     
    63696369            <reference ref="name_operator_oh" />
    63706370            <reference ref="link_contact" />
    6371         </item>
     6371        </item> <!-- Department Store -->
    63726372        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
    63736373            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
     
    63806380            <reference ref="name_operator_oh" />
    63816381            <reference ref="link_contact" />
    6382         </item>
     6382        </item> <!-- Mall -->
    63836383        <separator/>
    63846384        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
     
    63926392            <reference ref="name_oh" />
    63936393            <reference ref="link_contact" />
    6394         </item>
    6395         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
     6394        </item> <!-- Chemist -->
     6395        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
    63966396            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
    63976397                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
     
    64046404            <reference ref="name_oh" />
    64056405            <reference ref="link_contact" />
    6406         </item>
     6406        </item> <!-- Hairdresser/Barber -->
    64076407        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
    64086408            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
     
    64156415            <reference ref="name_oh" />
    64166416            <reference ref="link_contact" />
    6417         </item>
     6417        </item> <!-- Beauty -->
    64186418        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
    64196419            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
     
    64246424            <reference ref="name_oh" />
    64256425            <reference ref="link_contact" />
    6426         </item>
    6427         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
     6426        </item> <!-- Optician -->
     6427        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
    64286428            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
    64296429                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
     
    64336433            <reference ref="name_operator_oh" />
    64346434            <reference ref="link_contact" />
    6435         </item>
    6436         <item name="Gift" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
     6435        </item> <!-- Jewellery -->
     6436        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
    64376437            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
    64386438                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
     
    64496449            </optional>
    64506450            <reference ref="link_contact" />
    6451         </item>
     6451        </item> <!-- Gift/Souvenir -->
    64526452        <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
    64536453            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
     
    64586458            <reference ref="name_operator_oh" />
    64596459            <reference ref="link_contact" />
    6460         </item>
     6460        </item> <!-- Erotic -->
    64616461        <separator/>
    64626462        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway" preset_name_label="true">
     
    64716471            <reference ref="name_oh" />
    64726472            <reference ref="link_contact" />
    6473         </item>
     6473        </item> <!-- Florist -->
    64746474        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
    64756475            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
     
    64846484            <reference ref="name_brand_oh" />
    64856485            <reference ref="link_contact" />
    6486         </item>
     6486        </item> <!-- Garden Centre -->
    64876487        <separator/>
    6488         <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
     6488        <item name="Do-It-Yourself Store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
    64896489            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
    64906490                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
     
    64976497            <reference ref="name_brand_oh" />
    64986498            <reference ref="link_contact" />
    6499         </item>
     6499        </item> <!-- Do-It-Yourself Store -->
    65006500        <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
    65016501            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
     
    65086508            <reference ref="name_oh" />
    65096509            <reference ref="link_contact" />
    6510         </item>
     6510        </item> <!-- Hardware -->
    65116511        <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
    65126512            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
     
    65186518            <reference ref="name_operator_oh" />
    65196519            <reference ref="link_contact" />
    6520         </item>
     6520        </item> <!-- Paint -->
    65216521        <separator/>
    65226522        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway" preset_name_label="true">
     
    65276527            <key key="shop" value="travel_agency" />
    65286528            <reference ref="name_brand_oh" />
    6529         </item>
     6529        </item> <!-- Travel Agency -->
    65306530        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
    65316531            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
     
    65356535            <key key="shop" value="musical_instrument" />
    65366536            <reference ref="name_operator_oh" />
    6537         </item>
     6537        </item> <!-- Musical Instrument -->
    65386538        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
    65396539            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
     
    65456545            <key key="shop" value="toys" />
    65466546            <reference ref="name_oh" />
    6547         </item>
     6547        </item> <!-- Toys -->
    65486548        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
    65496549            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
     
    65566556            <key key="shop" value="variety_store" />
    65576557            <reference ref="name_operator_oh" />
    6558         </item>
     6558        </item> <!-- Variety Store -->
    65596559        <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
    65606560            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker" />
     
    65626562            <key key="shop" value="bookmaker" />
    65636563            <reference ref="name_operator_oh" />
    6564         </item>
     6564        </item> <!-- Bookmaker -->
    65656565        <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
    65666566            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
     
    65696569            <key key="shop" value="lottery" />
    65706570            <reference ref="name_operator_oh" />
    6571         </item>
     6571        </item> <!-- Lottery -->
    65726572        <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
    65736573            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bag"
     
    65786578            <reference ref="name_oh" />
    65796579            <reference ref="link_contact" />
    6580         </item>
     6580        </item> <!-- Bag -->
    65816581        <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
    65826582            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
     
    65896589            <reference ref="name_oh" />
    65906590            <reference ref="link_contact" />
    6591         </item>
     6591        </item> <!-- Pet -->
    65926592    </group> <!-- Other -->
    65936593        <separator/>
    6594     <item name="Vending machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
     6594    <item name="Vending Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
    65956595        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
    65966596                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
     
    66046604        <text key="note" text="Note" />
    66056605        <reference ref="payment_account" />
    6606     </item>
     6606    </item> <!-- Vending Machine -->
    66076607  </group> <!-- Shops -->
    66086608  <group name="Geography" icon="presets/peak.svg">
     
    66136613            <key key="boundary" value="national" />
    66146614            <text key="name" text="Name" />
    6615         </item>
     6615        </item> <!-- National -->
    66166616        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
    66176617            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
     
    66256625            <key key="boundary" value="administrative" />
    66266626            <text key="name" text="Name" />
    6627         </item>
     6627        </item> <!-- Administrative -->
    66286628        <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
    66296629            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
     
    66336633            <combo key="political_division" text="Division" values="canton,linguistic_community,ward" />
    66346634            <text key="name" text="Name" />
    6635         </item>
     6635        </item> <!-- Political -->
    66366636        <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
    66376637            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
     
    66396639            <key key="boundary" value="postal_code" />
    66406640            <text key="postal_code" text="Postal Code" />
    6641         </item>
    6642         <item name="National park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
     6641        </item> <!-- Postal Code -->
     6642        <item name="National Park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
    66436643            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
    66446644                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
     
    66486648            <key key="boundary" value="national_park" />
    66496649            <text key="name" text="Name" />
    6650         </item>
     6650        </item> <!-- National Park -->
    66516651    </group> <!-- Boundaries -->
    66526652    <group name="Places" icon="presets/places.png">
     
    66576657            <key key="place" value="continent" />
    66586658            <reference ref="name_wikipedia" />
    6659         </item>
     6659        </item> <!-- Places -->
    66606660        <item name="Country" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    66616661            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=country"
    66626662                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=country" />
    6663         <space />
     6663            <space />
    66646664            <key key="place" value="country" />
    66656665            <reference ref="name_wikipedia" />
    6666         </item>
     6666        </item> <!-- Country -->
    66676667        <item name="State" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    66686668            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=state"
     
    66716671            <key key="place" value="state" />
    66726672            <reference ref="name_wikipedia" />
    6673         </item>
     6673        </item> <!-- State -->
    66746674        <item name="Region" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    66756675            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=region"
     
    66786678            <key key="place" value="region" />
    66796679            <reference ref="name_wikipedia" />
    6680         </item>
     6680        </item> <!-- Region -->
    66816681        <item name="County" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    66826682            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=county"
     
    66866686            <reference ref="name_wikipedia" />
    66876687            <reference ref="population_postcode_website" />
    6688         </item>
     6688        </item> <!-- County -->
    66896689        <separator/>
    66906690        <item name="City" icon="presets/places.png" type="node,closedway" preset_name_label="true">
     
    66996699            <reference ref="name_wikipedia" />
    67006700            <reference ref="population_postcode_website" />
    6701         </item>
     6701        </item> <!-- City -->
    67026702        <item name="Town" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67036703            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
     
    67126712            <reference ref="name_wikipedia" />
    67136713            <reference ref="population_postcode_website" />
    6714         </item>
     6714        </item> <!-- Town -->
    67156715        <item name="Suburb" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67166716            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
     
    67246724            <reference ref="name_wikipedia" />
    67256725            <reference ref="population_postcode_website" />
    6726         </item>
     6726        </item> <!-- Suburb -->
    67276727        <item name="Village" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67286728            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
     
    67386738            <reference ref="name_wikipedia" />
    67396739            <reference ref="population_postcode_website" />
    6740         </item>
     6740        </item> <!-- Village -->
    67416741        <item name="Hamlet" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67426742            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
     
    67516751            <reference ref="name_wikipedia" />
    67526752            <reference ref="population_postcode_website" />
    6753         </item>
     6753        </item> <!-- Hamlet -->
    67546754        <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67556755            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
     
    67636763            <reference ref="name_wikipedia" />
    67646764            <reference ref="population_postcode_website" />
    6765         </item>
     6765        </item> <!-- Isolated Dwelling -->
    67666766        <item name="Neighbourhood" icon="presets/places.png" type="node,closedway" preset_name_label="true">
    67676767            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
     
    67766776            <text key="population" text="Population" />
    67776777            <text key="website" text="Website" />
    6778         </item>
     6778        </item> <!-- Neighbourhood -->
    67796779        <separator/>
    67806780        <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
     
    67886788            <key key="place" value="locality" />
    67896789            <reference ref="name_wikipedia" />
    6790         </item>
     6790        </item> <!-- Locality -->
    67916791    </group> <!-- Places -->
    67926792    <group name="Geography" icon="presets/peak.svg">
     
    68646864            <key key="place" value="island" />
    68656865            <reference ref="name_wikipedia" />
    6866         </item>
     6866        </item> <!-- Island -->
    68676867        <item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
    68686868            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
     
    68736873            <key key="place" value="islet" />
    68746874            <reference ref="name_wikipedia" />
    6875         </item>
     6875        </item> <!-- Islet -->
    68766876        <item name="Ridge" icon="presets/empty.png" type="way" preset_name_label="true">
    68776877            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
     
    70757075            <key key="landuse" value="farmyard" />
    70767076            <text key="name" text="Name" />
    7077         </item>
     7077        </item> <!-- Farmyard -->
    70787078        <item name="Farmland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    70797079            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmland"
     
    70887088            <key key="landuse" value="farmland" />
    70897089            <text key="name" text="Name" />
    7090         </item>
     7090        </item> <!-- Farmland -->
    70917091        <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    70927092            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
     
    70997099            <key key="landuse" value="meadow" />
    71007100            <text key="name" text="Name" />
    7101         </item>
     7101        </item> <!-- Meadow -->
    71027102        <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    71037103            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
     
    71107110            <key key="landuse" value="orchard" />
    71117111            <text key="name" text="Name" />
    7112         </item>
     7112        </item> <!-- Orchard -->
    71137113        <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
    71147114            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
     
    71197119            <key key="landuse" value="vineyard" />
    71207120            <text key="name" text="Name" />
    7121         </item>
     7121        </item> <!-- Vineyard -->
    71227122        <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway" preset_name_label="true">
    71237123            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
     
    71307130            <text key="name" text="Name" />
    71317131            <text key="operator" text="Operator" />
    7132         </item>
     7132        </item> <!-- Greenhouse Horticulture -->
    71337133        <item name="Plant Nursery" icon="styles/standard/misc/landmark/plant.png" type="closedway" preset_name_label="true">
    71347134            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
     
    71447144            <text key="genus" text="Genus" />
    71457145            <text key="species" text="Species" />
    7146         </item>
     7146        </item> <!-- Plant Nursery -->
    71477147        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    71487148            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
     
    71587158            <key key="landuse" value="allotments" />
    71597159            <text key="name" text="Name" />
    7160         </item>
     7160        </item> <!-- Allotments -->
    71617161        <separator/>
    71627162        <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     
    71697169            <key key="leisure" value="garden" />
    71707170            <text key="name" text="Name" />
    7171         </item>
     7171        </item> <!-- Garden -->
    71727172        <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    71737173            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
     
    71827182            <key key="landuse" value="grass" />
    71837183            <text key="name" text="Name" />
    7184         </item>
     7184        </item> <!-- Grass -->
    71857185        <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    71867186            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
     
    71947194            <key key="landuse" value="village_green" />
    71957195            <text key="name" text="Name" />
    7196         </item>
     7196        </item> <!-- Village Green -->
    71977197        <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
    71987198            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
     
    72027202            <key key="leisure" value="common" />
    72037203            <text key="name" text="Name" />
    7204         </item>
     7204        </item> <!-- Common -->
    72057205        <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
    72067206            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=park"
     
    72157215            <key key="leisure" value="park" />
    72167216            <text key="name" text="Name" />
    7217         </item>
     7217        </item> <!-- Park -->
    72187218        <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    72197219            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
     
    72267226            <key key="landuse" value="recreation_ground" />
    72277227            <text key="name" text="Name" />
    7228         </item>
     7228        </item> <!-- Recreation Ground -->
    72297229        <separator/>
    72307230        <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
     
    72407240            <key key="landuse" value="residential" />
    72417241            <text key="name" text="Name" />
    7242         </item>
     7242        </item> <!-- Residential Area -->
    72437243        <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation" preset_name_label="true">
    72447244            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
     
    72537253            <key key="amenity" value="grave_yard" />
    72547254            <reference ref="religious" />
    7255         </item>
     7255        </item> <!-- Graveyard -->
    72567256        <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation" preset_name_label="true">
    72577257            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
     
    72687268            <key key="landuse" value="cemetery" />
    72697269            <reference ref="religious" />
    7270         </item>
     7270        </item> <!-- Cemetery -->
    72717271        <item name="Religious" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
    72727272            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
     
    72777277            <key key="landuse" value="religious" />
    72787278            <reference ref="religious" />
    7279         </item>
     7279        </item> <!-- Religious -->
    72807280        <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation" preset_name_label="true">
    72817281            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
     
    72887288            <key key="landuse" value="retail" />
    72897289            <text key="name" text="Name" />
    7290         </item>
     7290        </item> <!-- Retail -->
    72917291        <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
    72927292            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
     
    72997299            <key key="landuse" value="commercial" />
    73007300            <text key="name" text="Name" />
    7301         </item>
     7301        </item> <!-- Commercial -->
    73027302        <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
    73037303            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
     
    73117311            <key key="landuse" value="industrial" />
    73127312            <text key="name" text="Name" />
    7313         </item>
     7313        </item> <!-- Industrial -->
    73147314        <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
    73157315            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
     
    73237323            <text key="name" text="Name" />
    73247324            <text key="operator" text="Operator" />
    7325         </item>
    7326         <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
     7325        </item> <!-- Garages -->
     7326        <item name="Railway Land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
    73277327            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
    73287328                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=railway"
     
    73347334            <key key="landuse" value="railway" />
    73357335            <text key="name" text="Name" />
    7336         </item>
     7336        </item> <!-- Railway Land -->
    73377337        <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
    73387338            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
     
    73447344            <key key="landuse" value="military" />
    73457345            <text key="name" text="Name" />
    7346         </item>
     7346        </item> <!-- Military -->
    73477347        <separator/>
    7348         <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
     7348        <item name="Construction Area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
    73497349            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
    73507350                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
     
    73567356            <key key="landuse" value="construction" />
    73577357            <text key="name" text="Name" />
    7358         </item>
     7358        </item> <!-- Construction Area -->
    73597359        <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    73607360            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
     
    73677367            <key key="landuse" value="brownfield" />
    73687368            <text key="name" text="Name" />
    7369         </item>
     7369        </item> <!-- Brownfield -->
    73707370        <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    73717371            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
     
    73777377            <key key="landuse" value="greenfield" />
    73787378            <text key="name" text="Name" />
    7379         </item>
     7379        </item> <!-- Greenfield -->
    73807380        <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
    73817381            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
     
    73887388            <key key="landuse" value="landfill" />
    73897389            <text key="name" text="Name" />
    7390         </item>
     7390        </item> <!-- Landfill -->
    73917391        <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
    73927392            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
     
    73997399            <key key="landuse" value="quarry" />
    74007400            <reference ref="name_operator" />
    7401         </item>
     7401        </item> <!-- Quarry -->
    74027402    </group> <!-- Landuse -->
    7403   </group>
     7403  </group> <!-- Geography -->
    74047404    <group name="Annotation" icon="presets/addresses.png">
    74057405        <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
     
    74337433                <text key="short_name" text="Common name abbreviation" match="key" />
    74347434            </optional>
    7435         </item>
     7435        </item> <!-- Name -->
    74367436        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation" preset_name_label="true">
    74377437            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
     
    74587458                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
    74597459            </optional>
    7460         </item>
     7460        </item> <!-- Addresses -->
    74617461        <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
    74627462           <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
     
    74777477                <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
    74787478            </optional>
    7479         </item>
    7480         <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
     7479        </item> <!-- Address Interpolation -->
     7480        <item name="Contact (Common Schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
    74817481            <link href="http://wiki.openstreetmap.org/wiki/Annotations"
    74827482                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
     
    74927492            <text key="wikipedia" text="Wikipedia" />
    74937493            <text key="image" text="Image" />
    7494         </item>
    7495         <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
     7494        </item> <!-- Contact (Common Schema) -->
     7495        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
    74967496            <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
    74977497                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
     
    75117511            <text key="wikipedia" text="Wikipedia" />
    75127512            <text key="image" text="Image" />
    7513         </item>
     7513        </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
    75147514    </group> <!-- Annotation -->
    75157515    <group name="Relations" icon="presets/relations.png">
     
    75327532                <role key="inner" text="inner segment" requisite="optional" type="way" />
    75337533            </roles>
    7534         </item>
     7534        </item> <!-- Multipolygon -->
    75357535        <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
    75367536            <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
     
    75557555                <role key="label" text="Label point" requisite="optional" type="node" count="1" />
    75567556            </roles>
    7557         </item>
     7557        </item> <!-- Boundary -->
    75587558        <item name="Site" type="relation" preset_name_label="true">
    75597559            <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
     
    75707570                <role key="" text="members of site" requisite="optional" type="node,way,closedway,relation" />
    75717571            </roles>
    7572         </item>
     7572        </item> <!-- Site -->
    75737573        <separator/>
    7574         <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
     7574        <item name="Turn Restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
    75757575            <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
    75767576                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
     
    75937593                <role key="to" text="to way" requisite="required" count="1" type="way" />
    75947594            </roles>
    7595         </item>
     7595        </item> <!-- Turn Restriction -->
    75967596        <item name="Enforcement" icon="presets/speed_camera.png" type="relation" preset_name_label="true">
    75977597            <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
     
    76147614                <role key="force" text="traffic light or barrier that stops you" requisite="optional" type="node" />
    76157615            </roles>
    7616         </item>
     7616        </item> <!-- Enforcement -->
    76177617        <separator/>
    76187618        <group name="Routes">
    7619             <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
     7619            <item name="Bicycle Route" icon="presets/path.png" type="relation" preset_name_label="true">
    76207620                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
    76217621                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Cycle_routes"
     
    76337633                    <role key="" text="route segment" requisite="required" type="way"/>
    76347634                </roles>
    7635             </item>
    7636             <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
     7635            </item> <!-- Bicycle Route -->
     7636            <item name="Mountain Biking Route" icon="presets/path.png" type="relation" preset_name_label="true">
    76377637                <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
    76387638                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
     
    76537653                    <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track"/>
    76547654                </roles>
    7655             </item>
    7656             <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
     7655            </item> <!-- Mountain Biking Route -->
     7656            <item name="Hiking Route" icon="presets/path.png" type="relation" preset_name_label="true">
    76577657                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
    76587658                  de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
     
    76757675                    <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    76767676                </roles>
    7677             </item>
    7678             <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
     7677            </item> <!-- Hiking Route -->
     7678            <item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
    76797679                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
    76807680                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste" />
     
    76967696                    <role key="start" text="entry points" requisite="optional" type="node" />
    76977697                </roles>
    7698             </item>
    7699             <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
     7698            </item> <!-- Piste Route -->
     7699            <item name="Ski Route" icon="presets/path.png" type="relation" preset_name_label="true">
    77007700                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
    77017701                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski" />
     
    77177717                    <role key="start" text="entry points" requisite="optional" type="node" />
    77187718                </roles>
    7719             </item>
     7719            </item> <!-- Ski Route -->
    77207720            <separator/>
    7721             <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
     7721            <item name="Detour Route" icon="presets/path.png" type="relation" preset_name_label="true">
    77227722                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
    77237723                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour" />
     
    77347734                    <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
    77357735                </roles>
    7736             </item>
    7737             <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
     7736            </item> <!-- Detour Route -->
     7737            <item name="Power Route" icon="presets/path.png" type="relation" preset_name_label="true">
    77387738                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=power" />
    77397739                <space/>
     
    77447744                    <role key="" text="route segment" requisite="required" type="way" member_expression="power"/>
    77457745                </roles>
    7746             </item>
    7747             <item name="Railway route" icon="presets/path.png" type="relation" preset_name_label="true">
     7746            </item> <!-- Power Route -->
     7747            <item name="Railway Route" icon="presets/path.png" type="relation" preset_name_label="true">
    77487748                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
    77497749                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
     
    77577757                    <role key="" text="route segment" requisite="required" type="way" member_expression="railway"/>
    77587758                </roles>
    7759             </item>
    7760             <item name="Road route" icon="presets/path.png" type="relation" preset_name_label="true">
     7759            </item> <!-- Railway Route -->
     7760            <item name="Road Route" icon="presets/path.png" type="relation" preset_name_label="true">
    77617761                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
    77627762                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=road"
     
    77757775                    <role key="link" text="link segment" requisite="optional" type="way" member_expression="highway"/>
    77767776                </roles>
    7777             </item>
     7777            </item> <!-- Road Route -->
    77787778        </group> <!-- Routes -->
    77797779        <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
     
    77897789                <role key="" text="member" requisite="required" type="relation" />
    77907790            </roles>
    7791         </item>
     7791        </item> <!-- Route Network -->
    77927792        <separator/>
    77937793        <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
     
    78067806                <role key="house" text="house" requisite="required" type="node,way,closedway,relation" member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot;" />
    78077807            </roles>
    7808         </item>
     7808        </item> <!-- Associated Street -->
    78097809        <item name="Street" type="relation" preset_name_label="true">
    78107810            <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
     
    78197819                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
    78207820            </roles>
    7821         </item>
    7822         <item name="Destination sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
     7821        </item> <!-- Street -->
     7822        <item name="Destination Sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
    78237823            <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
    78247824                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
     
    78427842                <role key="sign" text="position of sign" requisite="optional" type="node" />
    78437843            </roles>
    7844         </item>
     7844        </item> <!-- Destination Sign -->
    78457845        <separator/>
    78467846        <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
     
    78667866                <role key="spring" text="spring of waterway" requisite="optional" type="node" />
    78677867            </roles>
    7868         </item>
     7868        </item> <!-- Waterway -->
    78697869        <item name="Bridge" icon="presets/bridge.png" type="relation" preset_name_label="true">
    78707870            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
     
    78857885                <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
    78867886            </roles>
    7887         </item>
     7887        </item> <!-- Bridge -->
    78887888        <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
    78897889            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
     
    78997899                <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
    79007900            </roles>
    7901         </item>
     7901        </item> <!-- Tunnel -->
    79027902    </group> <!-- Relations -->
    79037903</presets>
Note: See TracChangeset for help on using the changeset viewer.