Changeset 6558 in josm


Ignore:
Timestamp:
2013-12-28T23:40:51+01:00 (10 years ago)
Author:
simon04
Message:

fix #9327 - De-duplicate contents of defaultpresets.xml by introducing <chunk id="X"> and <reference ref="X" />

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r6508 r6558  
    4646  default: default string to display (defaults to "")
    4747  use_last_as_default: true/false/force (default is "false")
    48   auto_increment: may contain a comma separated list of integer increments or 
     48  auto_increment: may contain a comma separated list of integer increments or
    4949                  decrements, e.g. "-2,-1,+1,+2"; a button will be shown next
    5050                  to the text field for each value, allowing the user to select
     
    6060  delimiter: character that separates values (default: comma)
    6161  values: separated list of values
    62   values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
     62  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
    6363               of this form: public static String[] getValues();
    6464               The value must be: "full.package.name.ClassName#methodName"
     
    8585             will also be used to separate selected values in the tag.
    8686  values: delimiter-separated list of values (delimiter can be escaped with backslash)
    87   values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
     87  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
    8888               of this form: public static String[] getValues();
    8989               The value must be: "full.package.name.ClassName#methodName"
     
    109109  key: key to set
    110110  text: fixed label to display
    111   default: ticked on/off
     111  default: ticked on/off (default is "off")
    112112  value_on: the value to set when checked (default is "yes")
    113113  value_off: the value to set when unchecked (default is "no")
     
    121121  type: the data types - way,node,relation,closedway (separated by comma)
    122122  member_expression: an expression (cf. search dialog) for objects of this role
     123
     124chunk: a template of elements for later (repeated) use
     125  id: the unique identifier for this chunk
     126
     127reference: include an earlier defined template
     128  ref: he unique identifier of the (already defined) template to include
    123129
    124130 presets: For external files <presets> should have following attributes:
     
    149155Note that for a match, at least one positive and no negative is required.
    150156-->
     157    <chunk id="surface">
     158        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     159    </chunk>
     160    <chunk id="highway_base">
     161        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
     162        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
     163        <text key="maxspeed" text="Max. speed (km/h)"/>
     164        <reference ref="surface" />
     165    </chunk>
     166    <chunk id="highway_yesno_incline">
     167        <check key="bridge" text="Bridge" />
     168        <check key="tunnel" text="Tunnel" />
     169        <check key="cutting" text="Cutting" />
     170        <check key="embankment" text="Embankment" />
     171        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
     172    </chunk>
     173    <chunk id="highway_yesno_incline_oneway">
     174        <check key="oneway" text="Oneway" />
     175        <reference ref="highway_yesno_incline" />
     176    </chunk>
     177    <chunk id="highway_yesno_incline_oneway_lit">
     178        <reference ref="highway_yesno_incline_oneway" />
     179        <check key="lit" text="Lit" />
     180    </chunk>
     181    <chunk id="highway_yesno_incline_oneway_lit_width">
     182        <reference ref="highway_yesno_incline_oneway_lit" />
     183        <check key="lit" text="Lit" />
     184    </chunk>
     185    <chunk id="barrier_5">
     186        <optional text="Allowed traffic:">
     187            <check key="foot" text="Foot" default="on"/>
     188            <check key="bicycle" text="Bicycle" default="on"/>
     189            <check key="horse" text="Horse" />
     190            <check key="motorcycle" text="Motorcycle" />
     191            <check key="motorcar" text="Motorcar" />
     192        </optional>
     193    </chunk>
     194    <chunk id="barrier_4">
     195        <optional text="Allowed traffic:">
     196            <check key="foot" text="Foot" default="on"/>
     197            <check key="bicycle" text="Bicycle" default="on"/>
     198            <check key="horse" text="Horse" />
     199            <check key="motorcycle" text="Motorcycle" />
     200        </optional>
     201    </chunk>
     202    <chunk id="barrier_2">
     203        <optional text="Allowed traffic:">
     204            <check key="foot" text="Foot" default="on"/>
     205            <check key="bicycle" text="Bicycle" default="on"/>
     206        </optional>
     207    </chunk>
     208    <chunk id="contact">
     209        <text key="phone" text="Phone Number"/>
     210        <text key="fax" text="Fax Number"/>
     211        <text key="website" text="Website"/>
     212    <text key="email" text="Email Address"/>
     213    </chunk>
     214    <chunk id="name_ref">
     215        <text key="name" text="Name" />
     216        <text key="ref" text="Reference" />
     217    </chunk>
     218    <chunk id="name_operator">
     219        <text key="name" text="Name" />
     220        <text key="operator" text="Operator" />
     221    </chunk>
     222    <chunk id="name_layer">
     223        <text key="name" text="Name" />
     224        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     225    </chunk>
     226    <chunk id="oh">
     227        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     228    </chunk>
     229    <chunk id="name_oh">
     230        <text key="name" text="Name" />
     231        <reference ref="oh" />
     232    </chunk>
     233    <chunk id="name_operator_oh">
     234        <text key="name" text="Name" />
     235        <text key="operator" text="Operator" />
     236        <reference ref="oh" />
     237    </chunk>
     238    <chunk id="name_brand_operator_oh">
     239        <text key="name" text="Name" />
     240        <text key="brand" text="Brand" />
     241        <text key="operator" text="Operator" />
     242        <reference ref="oh" />
     243    </chunk>
     244    <chunk id="name_brand_oh">
     245        <text key="name" text="Name" />
     246        <text key="brand" text="Brand" />
     247        <reference ref="oh" />
     248    </chunk>
     249    <chunk id="internet_smoking_wheelchair">
     250        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
     251        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     252        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
     253        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     254    </chunk>
     255    <chunk id="optional_height">
     256        <optional>
     257            <text key="height" text="Height (meters)" length="7" />
     258        </optional>
     259    </chunk>
     260    <chunk id="optional_maxwidth">
     261        <optional>
     262            <text key="maxwidth" text="Max. width (meters)" length="7" />
     263        </optional>
     264    </chunk>
     265    <chunk id="name_leisure_pitch">
     266        <text key="name" text="Name" />
     267        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     268    </chunk>
    151269  <group name="Highways" icon="presets/way_secondary.png">
    152270    <group name="Streets" icon="presets/way_secondary.png">
     
    168286            <optional>
    169287                <text key="name" text="Name" />
    170                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    171                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    172                 <text key="maxspeed" text="Max. speed (km/h)" />
    173                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     288                <reference ref="highway_base" />
    174289                <checkgroup columns="4">
    175290                    <check key="oneway" text="Oneway" default="on" />
    176                     <check key="bridge" text="Bridge" default="off" />
    177                     <check key="tunnel" text="Tunnel" default="off" />
    178                     <check key="cutting" text="Cutting" default="off" />
    179                     <check key="embankment" text="Embankment" default="off" />
    180                     <check key="lit" text="Lit" default="off" />
    181                     <check key="toll" text="Toll" default="off"  />
     291                    <check key="bridge" text="Bridge" />
     292                    <check key="tunnel" text="Tunnel" />
     293                    <check key="cutting" text="Cutting" />
     294                    <check key="embankment" text="Embankment" />
     295                    <check key="lit" text="Lit" />
     296                    <check key="toll" text="Toll" />
    182297                </checkgroup>
    183298            </optional>
     
    196311            <key key="highway" value="motorway_link" />
    197312            <optional>
    198                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    199                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    200                 <text key="maxspeed" text="Max. speed (km/h)" />
    201                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     313                <reference ref="highway_base" />
    202314                <checkgroup columns="4">
    203315                    <check key="oneway" text="Oneway" default="on" />
     
    227339            <optional>
    228340                <text key="name" text="Name" />
    229                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    230                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    231                 <text key="maxspeed" text="Max. speed (km/h)" />
    232                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     341                <reference ref="highway_base" />
    233342                <checkgroup columns="4">
    234343                    <check key="oneway" text="Oneway" default="on" />
     
    256365            <text key="ref" text="Reference" />
    257366            <optional>
    258                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    259                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    260                 <text key="maxspeed" text="Max. speed (km/h)" />
    261                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     367                <reference ref="highway_base" />
    262368                <checkgroup columns="4">
    263369                    <check key="oneway" text="Oneway" default="on" />
     
    269375                    <check key="lit" text="Lit" />
    270376                    <check key="toll" text="Toll" />
    271                 </checkgroup> 
     377                </checkgroup>
    272378            </optional>
    273379        </item>
     
    289395            <optional>
    290396                <text key="name" text="Name" />
    291                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    292                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    293                 <text key="maxspeed" text="Max. speed (km/h)" />
    294                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    295                 <check key="oneway" text="Oneway" default="off" />
    296                 <check key="motorroad" text="Motorroad" default="off" />
    297                 <check key="bridge" text="Bridge" default="off" />
    298                 <check key="tunnel" text="Tunnel" default="off" />
    299                 <check key="cutting" text="Cutting" default="off" />
    300                 <check key="embankment" text="Embankment" default="off" />
    301                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    302                 <check key="lit" text="Lit" default="off" />
     397                <reference ref="highway_base" />
     398                <check key="oneway" text="Oneway" />
     399                <check key="motorroad" text="Motorroad" />
     400                <reference ref="highway_yesno_incline" />
     401                <check key="lit" text="Lit" />
    303402            </optional>
    304403        </item>
     
    314413            <key key="highway" value="primary_link" />
    315414            <optional>
    316                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    317                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    318                 <text key="maxspeed" text="Max. speed (km/h)" />
    319                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    320                 <check key="oneway" text="Oneway" default="off" />
    321                 <check key="motorroad" text="Motorroad" default="off" />
    322                 <check key="bridge" text="Bridge" default="off" />
    323                 <check key="tunnel" text="Tunnel" default="off" />
    324                 <check key="cutting" text="Cutting" default="off" />
    325                 <check key="embankment" text="Embankment" default="off" />
    326                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    327                 <check key="lit" text="Lit" default="off" />
     415                <reference ref="highway_base" />
     416                <check key="oneway" text="Oneway" />
     417                <check key="motorroad" text="Motorroad" />
     418                <reference ref="highway_yesno_incline" />
     419                <check key="lit" text="Lit" />
    328420            </optional>
    329421        </item>
     
    345437            <optional>
    346438                <text key="name" text="Name" />
    347                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    348                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    349                 <text key="maxspeed" text="Max. speed (km/h)" />
    350                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    351                 <check key="oneway" text="Oneway" default="off" />
    352                 <check key="bridge" text="Bridge" default="off" />
    353                 <check key="tunnel" text="Tunnel" default="off" />
    354                 <check key="cutting" text="Cutting" default="off" />
    355                 <check key="embankment" text="Embankment" default="off" />
    356                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    357                 <check key="lit" text="Lit" default="off" />
     439                <reference ref="highway_base" />
     440                <reference ref="highway_yesno_incline_oneway_lit" />
    358441            </optional>
    359442        </item>
     
    369452            <key key="highway" value="secondary_link" />
    370453            <optional>
    371                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    372                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    373                 <text key="maxspeed" text="Max. speed (km/h)" />
    374                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    375                 <check key="oneway" text="Oneway" default="off" />
    376                 <check key="bridge" text="Bridge" default="off" />
    377                 <check key="tunnel" text="Tunnel" default="off" />
    378                 <check key="cutting" text="Cutting" default="off" />
    379                 <check key="embankment" text="Embankment" default="off" />
    380                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    381                 <check key="lit" text="Lit" default="off" />
     454                <reference ref="highway_base" />
     455                <reference ref="highway_yesno_incline_oneway_lit" />
    382456            </optional>
    383457        </item>
     
    400474            <optional>
    401475                <text key="name" text="Name" />
    402                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    403                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    404                 <text key="maxspeed" text="Max. speed (km/h)" />
    405                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    406                 <check key="oneway" text="Oneway" default="off" />
    407                 <check key="bridge" text="Bridge" default="off" />
    408                 <check key="tunnel" text="Tunnel" default="off" />
    409                 <check key="cutting" text="Cutting" default="off" />
    410                 <check key="embankment" text="Embankment" default="off" />
    411                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    412                 <check key="lit" text="Lit" default="off" />
     476                <reference ref="highway_base" />
     477                <reference ref="highway_yesno_incline_oneway_lit" />
    413478            </optional>
    414479        </item>
     
    424489            <key key="highway" value="tertiary_link" />
    425490            <optional>
    426                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    427                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    428                 <text key="maxspeed" text="Max. speed (km/h)" />
    429                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    430                 <check key="oneway" text="Oneway" default="off" />
    431                 <check key="bridge" text="Bridge" default="off" />
    432                 <check key="tunnel" text="Tunnel" default="off" />
    433                 <check key="cutting" text="Cutting" default="off" />
    434                 <check key="embankment" text="Embankment" default="off" />
    435                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    436                 <check key="lit" text="Lit" default="off" />
     491                <reference ref="highway_base" />
     492                <reference ref="highway_yesno_incline_oneway_lit" />
    437493            </optional>
    438494        </item>
     
    452508                <text key="name" text="Name" />
    453509                <text key="ref" text="Reference" />
    454                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    455                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    456                 <text key="maxspeed" text="Max. speed (km/h)" />
    457                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    458                 <check key="oneway" text="Oneway" default="off" />
    459                 <check key="bridge" text="Bridge" default="off" />
    460                 <check key="tunnel" text="Tunnel" default="off" />
    461                 <check key="cutting" text="Cutting" default="off" />
    462                 <check key="embankment" text="Embankment" default="off" />
    463                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    464                 <check key="lit" text="Lit" default="off" />
    465                 <check key="passing_places" text="Passing Places" default="off" />
     510                <reference ref="highway_base" />
     511                <reference ref="highway_yesno_incline_oneway_lit" />
     512                <check key="passing_places" text="Passing Places" />
    466513                <text key="width" text="Width (meters)" />
    467514            </optional>
     
    483530            <optional>
    484531                <text key="ref" text="Reference" />
    485                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    486                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    487                 <text key="maxspeed" text="Max. speed (km/h)" />
    488                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    489                 <check key="oneway" text="Oneway" default="off" />
    490                 <check key="bridge" text="Bridge" default="off" />
    491                 <check key="tunnel" text="Tunnel" default="off" />
    492                 <check key="cutting" text="Cutting" default="off" />
    493                 <check key="embankment" text="Embankment" default="off" />
    494                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    495                 <check key="lit" text="Lit" default="off" />
     532                <reference ref="highway_base" />
     533                <reference ref="highway_yesno_incline_oneway_lit" />
    496534                <text key="width" text="Width (meters)" />
    497535            </optional>
     
    512550                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
    513551                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
    514                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    515                 <check key="oneway" text="Oneway" default="off" />
    516                 <check key="oneway:bicycle" text="Oneway for bicycle" default="off" />
    517                 <check key="bridge" text="Bridge" default="off" />
    518                 <check key="tunnel" text="Tunnel" default="off" />
    519                 <check key="cutting" text="Cutting" default="off" />
    520                 <check key="embankment" text="Embankment" default="off" />
    521                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    522                 <check key="lit" text="Lit" default="off" />
     552                <reference ref="surface" />
     553                <check key="oneway" text="Oneway" />
     554                <check key="oneway:bicycle" text="Oneway for bicycle" />
     555                <reference ref="highway_yesno_incline" />
     556                <check key="lit" text="Lit" />
    523557                <text key="width" text="Width (meters)" />
    524558            </optional>
     
    540574                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    541575                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    542                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    543                 <check key="oneway" text="Oneway" default="off" />
    544                 <check key="bridge" text="Bridge" default="off" />
    545                 <check key="tunnel" text="Tunnel" default="off" />
    546                 <check key="cutting" text="Cutting" default="off" />
    547                 <check key="embankment" text="Embankment" default="off" />
    548                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    549                 <check key="lit" text="Lit" default="off" />
     576                <reference ref="surface" />
     577                <reference ref="highway_yesno_incline_oneway_lit" />
    550578                <text key="width" text="Width (meters)" />
    551579            </optional>
     
    569597                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    570598                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    571                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    572                 <check key="area" text="Area" default="off" />
    573                 <check key="bridge" text="Bridge" default="off" />
    574                 <check key="tunnel" text="Tunnel" default="off" />
    575                 <check key="cutting" text="Cutting" default="off" />
    576                 <check key="embankment" text="Embankment" default="off" />
    577                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    578                 <check key="lit" text="Lit" default="off" />
     599                <reference ref="surface" />
     600                <check key="area" text="Area" />
     601                <reference ref="highway_yesno_incline" />
     602                <check key="lit" text="Lit" />
    579603                <text key="width" text="Width (meters)" />
    580604            </optional>
     
    595619            <optional>
    596620                <text key="name" text="Name" />
    597                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    598                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    599                 <text key="maxspeed" text="Max. speed (km/h)" />
    600                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    601                 <check key="oneway" text="Oneway" default="off" />
    602                 <check key="bridge" text="Bridge" default="off" />
    603                 <check key="tunnel" text="Tunnel" default="off" />
    604                 <check key="cutting" text="Cutting" default="off" />
    605                 <check key="embankment" text="Embankment" default="off" />
    606                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    607                 <check key="lit" text="Lit" default="off" />
    608                 <check key="passing_places" text="Passing Places" default="off" />
     621                <reference ref="highway_base" />
     622                <reference ref="highway_yesno_incline_oneway_lit" />
     623                <check key="passing_places" text="Passing Places" />
    609624                <text key="width" text="Width (meters)" />
    610625            </optional>
     
    623638            <key key="service" value="parking_aisle" />
    624639            <optional>
    625                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    626                 <check key="oneway" text="Oneway" default="off" />
    627                 <check key="lit" text="Lit" default="off" />
     640                <reference ref="surface" />
     641                <check key="oneway" text="Oneway" />
     642                <check key="lit" text="Lit" />
    628643            </optional>
    629644        </item>
     
    641656            <optional>
    642657                <text key="name" text="Name" />
    643                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    644                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    645                 <text key="maxspeed" text="Max. speed (km/h)" />
    646                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    647                 <check key="oneway" text="Oneway" default="off" />
    648                 <check key="bridge" text="Bridge" default="off" />
    649                 <check key="tunnel" text="Tunnel" default="off" />
    650                 <check key="cutting" text="Cutting" default="off" />
    651                 <check key="embankment" text="Embankment" default="off" />
    652                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    653                 <check key="lit" text="Lit" default="off" />
    654                 <text key="width" text="Width (meters)" />
     658                <reference ref="highway_base" />
     659                <reference ref="highway_yesno_incline_oneway_lit_width" />
    655660            </optional>
    656661        </item>
     
    667672            <optional>
    668673                <text key="name" text="Name" />
    669                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    670                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    671                 <text key="maxspeed" text="Max. speed (km/h)" />
    672                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    673                 <check key="oneway" text="Oneway" default="off" />
    674                 <check key="bridge" text="Bridge" default="off" />
    675                 <check key="tunnel" text="Tunnel" default="off" />
    676                 <check key="cutting" text="Cutting" default="off" />
    677                 <check key="embankment" text="Embankment" default="off" />
    678                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    679                 <check key="lit" text="Lit" default="off" />
     674                <reference ref="highway_base" />
     675                <reference ref="highway_yesno_incline_oneway_lit" />
    680676                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
    681677                <text key="width" text="Width (meters)" />
     
    697693            <label text="Edit Road Restrictions" />
    698694            <space />
    699             <check key="oneway" text="Oneway" default="off" />
    700             <check key="toll" text="Toll" default="off"  />
    701             <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
     695            <check key="oneway" text="Oneway" />
     696            <check key="toll" text="Toll" />
     697            <check key="noexit" text="No exit (cul-de-sac)" />
    702698            <label text="Transport mode restrictions" />
    703699            <space />
     
    747743            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
    748744            <optional>
    749                 <text key="name" text="Name" />
    750                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     745                <reference ref="name_layer" />
    751746                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    752                 <check key="oneway" text="Oneway" default="off" />
    753                 <check key="bridge" text="Bridge" default="off" />
    754                 <check key="tunnel" text="Tunnel" default="off" />
    755                 <check key="cutting" text="Cutting" default="off" />
    756                 <check key="embankment" text="Embankment" default="off" />
    757                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     747                <reference ref="highway_yesno_incline_oneway" />
    758748                <text key="width" text="Width (meters)" />
    759749            </optional>
     
    816806            <key key="highway" value="track" />
    817807            <optional>
    818                 <text key="name" text="Name" />
    819                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     808                <reference ref="name_layer" />
    820809                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
    821                 <check key="oneway" text="Oneway" default="off" />
    822                 <check key="bridge" text="Bridge" default="off" />
    823                 <check key="tunnel" text="Tunnel" default="off" />
    824                 <check key="cutting" text="Cutting" default="off" />
    825                 <check key="embankment" text="Embankment" default="off" />
    826                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    827                 <check key="lit" text="Lit" default="off" />
     810                <reference ref="highway_yesno_incline_oneway_lit" />
    828811                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    829812                <combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
     
    848831            <key key="highway" value="path" />
    849832            <optional>
    850                 <text key="name" text="Name" />
    851                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    852                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    853                 <check key="oneway" text="Oneway" default="off" />
    854                 <check key="bridge" text="Bridge" default="off" />
    855                 <check key="tunnel" text="Tunnel" default="off" />
    856                 <check key="cutting" text="Cutting" default="off" />
    857                 <check key="embankment" text="Embankment" default="off" />
    858                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    859                 <check key="lit" text="Lit" default="off" />
     833                <reference ref="name_layer" />
     834                <reference ref="surface" />
     835                <reference ref="highway_yesno_incline_oneway_lit" />
    860836                <combo key="sac_scale" text="SAC Scale" values_searchable="true">
    861837                    <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
     
    889865            <key key="highway" value="bridleway" />
    890866            <optional>
    891                 <text key="name" text="Name" />
    892                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     867                <reference ref="name_layer" />
    893868                <text key="maxspeed" text="Max. speed (km/h)" />
    894                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    895                 <check key="oneway" text="Oneway" default="off" />
    896                 <check key="bridge" text="Bridge" default="off" />
    897                 <check key="tunnel" text="Tunnel" default="off" />
    898                 <check key="cutting" text="Cutting" default="off" />
    899                 <check key="embankment" text="Embankment" default="off" />
    900                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    901                 <check key="lit" text="Lit" default="off" />
     869                <reference ref="surface" />
     870                <reference ref="highway_yesno_incline_oneway_lit" />
    902871                <text key="width" text="Width (meters)" />
    903872            </optional>
     
    919888            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
    920889            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
    921             <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
     890            <check key="oneway:bicycle" text="Oneway (bicycle)" />
    922891            <space />
    923892            <optional text="Edit Highway Attributes:">
    924893                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
    925                 <check key="oneway" text="Oneway" default="off" />
     894                <check key="oneway" text="Oneway" />
    926895            </optional>
    927896        </item>
     
    938907            <key key="highway" value="cycleway" />
    939908            <optional>
    940                 <text key="name" text="Name" />
    941                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    942                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    943                 <check key="oneway" text="Oneway" default="off" />
    944                 <check key="bridge" text="Bridge" default="off" />
    945                 <check key="tunnel" text="Tunnel" default="off" />
    946                 <check key="cutting" text="Cutting" default="off" />
    947                 <check key="embankment" text="Embankment" default="off" />
    948                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    949                 <check key="lit" text="Lit" default="off" />
     909                <reference ref="name_layer" />
     910                <reference ref="surface" />
     911                <reference ref="highway_yesno_incline_oneway_lit" />
    950912                <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
    951913                <text key="width" text="Width (meters)" />
     
    962924            <key key="segregated" value="yes" />
    963925            <optional>
    964                 <text key="name" text="Name" />
    965                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    966                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    967                 <check key="oneway" text="Oneway" default="off" />
    968                 <check key="bridge" text="Bridge" default="off" />
    969                 <check key="tunnel" text="Tunnel" default="off" />
    970                 <check key="cutting" text="Cutting" default="off" />
    971                 <check key="embankment" text="Embankment" default="off" />
    972                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    973                 <check key="lit" text="Lit" default="off" />
     926                <reference ref="name_layer" />
     927                <reference ref="surface" />
     928                <reference ref="highway_yesno_incline_oneway_lit" />
    974929                <text key="width" text="Width (meters)" />
    975930            </optional>
     
    985940            <key key="segregated" value="no" />
    986941            <optional>
    987                 <text key="name" text="Name" />
    988                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    989                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    990                 <check key="oneway" text="Oneway" default="off" />
    991                 <check key="bridge" text="Bridge" default="off" />
    992                 <check key="tunnel" text="Tunnel" default="off" />
    993                 <check key="cutting" text="Cutting" default="off" />
    994                 <check key="embankment" text="Embankment" default="off" />
    995                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    996                 <check key="lit" text="Lit" default="off" />
    997                 <check key="passing_places" text="Passing Places" default="off" />
     942                <reference ref="name_layer" />
     943                <reference ref="surface" />
     944                <reference ref="highway_yesno_incline_oneway_lit" />
     945                <check key="passing_places" text="Passing Places" />
    998946                <text key="width" text="Width (meters)" />
    999947            </optional>
     
    1013961            <key key="highway" value="footway" />
    1014962            <optional>
    1015                 <text key="name" text="Name" />
    1016                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1017                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    1018                 <check key="bridge" text="Bridge" default="off" />
    1019                 <check key="tunnel" text="Tunnel" default="off" />
    1020                 <check key="cutting" text="Cutting" default="off" />
    1021                 <check key="embankment" text="Embankment" default="off" />
    1022                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    1023                 <check key="lit" text="Lit" default="off" />
    1024                 <check key="bicycle" text="Bicycle" default="off" />
     963                <reference ref="name_layer" />
     964                <reference ref="surface" />
     965                <reference ref="highway_yesno_incline" />
     966                <check key="lit" text="Lit" />
     967                <check key="bicycle" text="Bicycle" />
    1025968                <text key="width" text="Width (meters)" />
    1026969            </optional>
     
    1037980            <key key="highway" value="steps" />
    1038981            <optional>
    1039                 <text key="name" text="Name" />
    1040                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1041                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     982                <reference ref="name_layer" />
     983                <reference ref="surface" />
    1042984                <text key="step_count" text="Amount of Steps" />
    1043                 <check key="oneway" text="Oneway" default="off" />
    1044                 <check key="bridge" text="Bridge" default="off" />
    1045                 <check key="tunnel" text="Tunnel" default="off" />
    1046                 <check key="cutting" text="Cutting" default="off" />
    1047                 <check key="embankment" text="Embankment" default="off" />
    1048                 <check key="lit" text="Lit" default="off" />
     985                <reference ref="highway_yesno_incline_oneway_lit" />
    1049986                <text key="width" text="Width (meters)" />
    1050987            </optional>
     
    10781015                <text key="name" text="Name" />
    10791016                <text key="operator" text="Operator" />
    1080                 <check key="toilets" text="Toilets" default="off" />
     1017                <check key="toilets" text="Toilets" />
    10811018            </optional>
    10821019        </item>
     
    10941031            <optional>
    10951032                <text key="name" text="Name" />
    1096                 <check key="toilets" text="Toilets" default="off" />
    1097                 <check key="drinking_water" text="Drinking Water" default="off" />
     1033                <check key="toilets" text="Toilets" />
     1034                <check key="drinking_water" text="Drinking Water" />
    10981035            </optional>
    10991036        </item>
     
    11101047                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11111048                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1112                  <check key="supervised" text="Crossing attendant" default="off" />
    1113                  <check key="bicycle" text="Cross by bicycle" default="off" />
    1114                  <check key="horse" text="Cross on horseback" default="off" />
     1049                 <check key="supervised" text="Crossing attendant" />
     1050                 <check key="bicycle" text="Cross by bicycle" />
     1051                 <check key="horse" text="Cross on horseback" />
    11151052            </optional>
    11161053        </item>
     
    11471084            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11481085            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    1149             <check key="supervised" text="Crossing attendant" default="off" />
    1150             <check key="bicycle" text="Cross by bicycle" default="off" />
    1151             <check key="horse" text="Cross on horseback" default="off" />
     1086            <check key="supervised" text="Crossing attendant" />
     1087            <check key="bicycle" text="Cross by bicycle" />
     1088            <check key="horse" text="Cross on horseback" />
    11521089        </item>
    11531090        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
     
    12351172            <label text="Edit Block" />
    12361173            <key key="barrier" value="block" />
    1237             <optional text="Allowed traffic:">
    1238                 <check key="foot" text="Foot" default="on" />
    1239                 <check key="bicycle" text="Bicycle" default="on" />
    1240                 <check key="horse" text="Horse" default="off" />
    1241                 <check key="motorcycle" text="Motorcycle" default="off" />
    1242             </optional>
     1174            <reference ref="barrier_4" />
    12431175            <optional>
    12441176                <text key="maxwidth" text="Max. width (meters)" length="7" />
     
    12581190            <key key="barrier" value="bollard" />
    12591191            <combo key="bollard" text="Bollard type" values="rising,removable" />
    1260             <optional text="Allowed traffic:">
    1261                 <check key="foot" text="Foot" default="on" />
    1262                 <check key="bicycle" text="Bicycle" default="on" />
    1263                 <check key="horse" text="Horse" default="off" />
    1264                 <check key="motorcycle" text="Motorcycle" default="off" />
    1265             </optional>
     1192            <reference ref="barrier_4" />
    12661193            <optional>
    12671194                <text key="maxwidth" text="Max. width (meters)" length="7" />
     
    12761203            <label text="Edit Cycle Barrier" />
    12771204            <key key="barrier" value="cycle_barrier" />
    1278             <optional text="Allowed traffic:">
    1279                 <check key="foot" text="Foot" default="on" />
    1280                 <check key="bicycle" text="Bicycle" default="on" />
    1281                 <check key="horse" text="Horse" default="off" />
    1282                 <check key="motorcycle" text="Motorcycle" default="off" />
    1283             </optional>
    1284             <optional>
    1285                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1286             </optional>
     1205            <reference ref="barrier_4" />
     1206            <reference ref="optional_maxwidth" />
    12871207        </item> <!-- cycle_barrier -->
    12881208        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
     
    12901210            <label text="Edit Cattle Grid" />
    12911211            <key key="barrier" value="cattle_grid" />
    1292             <optional text="Allowed traffic:">
    1293                 <check key="foot" text="Foot" default="on" />
    1294                 <check key="bicycle" text="Bicycle" default="on" />
    1295                 <check key="motorcycle" text="Motorcycle" default="off" />
    1296                 <check key="motorcar" text="Motorcar" default="off" />
    1297             </optional>
     1212            <reference ref="barrier_4" />
    12981213        </item> <!-- cattle_grid -->
    12991214        <item name="Bus Trap" icon="presets/empty.png" type="node">
     
    13021217            <label text="Edit Bus Trap" />
    13031218            <key key="barrier" value="bus_trap" />
    1304             <optional>
    1305                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1306             </optional>
     1219            <reference ref="optional_maxwidth" />
    13071220        </item> <!-- bus_trap -->
    13081221        <item name="Spikes" icon="presets/empty.png" type="node">
    13091222            <label text="Edit Spikes" />
    13101223            <key key="barrier" value="spikes" />
    1311             <optional text="Allowed traffic:">
    1312                 <check key="foot" text="Foot" default="on" />
    1313                 <check key="bicycle" text="Bicycle" default="on" />
    1314                 <check key="horse" text="Horse" default="off" />
    1315                 <check key="motorcycle" text="Motorcycle" default="off" />
    1316                 <check key="motorcar" text="Motorcar" default="off" />
    1317             </optional>
     1224            <reference ref="barrier_5" />
    13181225        </item> <!-- spikes -->
    13191226        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
     
    13361243            <label text="Edit Border Control" />
    13371244            <key key="barrier" value="border_control" />
    1338             <optional text="Allowed traffic:">
    1339                 <check key="foot" text="Foot" default="on" />
    1340                 <check key="bicycle" text="Bicycle" default="on" />
    1341                 <check key="horse" text="Horse" default="off" />
    1342                 <check key="motorcycle" text="Motorcycle" default="off" />
    1343                 <check key="motorcar" text="Motorcar" default="off" />
    1344             </optional>
     1245            <reference ref="barrier_5" />
    13451246        </item> <!-- border_control -->
    13461247        <separator/> <!-- *** linear barriers *** -->
     
    13841285            <label text="Edit Guard Rail" />
    13851286            <key key="barrier" value="guard_rail" />
    1386             <optional>
    1387                 <text key="height" text="Height (meters)" length="7" />
    1388             </optional>
     1287            <reference ref="optional_height" />
    13891288        </item> <!-- guard_rail -->
    13901289        <item name="Wall" icon="presets/wall.png" type="way,closedway">
     
    13991298            <label text="Edit Wall" />
    14001299            <key key="barrier" value="wall" />
    1401             <optional>
    1402                 <text key="height" text="Height (meters)" length="7" />
    1403             </optional>
     1300            <reference ref="optional_height" />
    14041301        </item> <!-- wall -->
    14051302        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
     
    14101307            <label text="Edit City Wall" />
    14111308            <key key="barrier" value="city_wall" />
    1412             <optional>
    1413                 <text key="height" text="Height (meters)" length="7" />
    1414             </optional>
     1309            <reference ref="optional_height" />
    14151310        </item> <!-- city_wall -->
    14161311        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
     
    14241319            <label text="Edit Retaining Wall" />
    14251320            <key key="barrier" value="retaining_wall" />
    1426             <optional>
    1427                 <text key="height" text="Height (meters)" length="7" />
    1428             </optional>
     1321            <reference ref="optional_height" />
    14291322        </item> <!-- retaining_wall -->
    14301323        <item name="Ditch" name_context="Barrier" type="way">
     
    14431336            <label text="Edit Kerb" />
    14441337            <key key="barrier" value="kerb" />
    1445             <optional>
    1446                 <text key="height" text="Height (meters)" length="7" />
    1447             </optional>
     1338            <reference ref="optional_height" />
    14481339        </item> <!-- kerb -->
    14491340        <separator/> <!-- *** access *** -->
     
    14541345            <label text="Edit Entrance (barrier opening)" />
    14551346            <key key="barrier" value="entrance" />
    1456             <optional text="Allowed traffic:">
    1457                 <check key="foot" text="Foot" default="on" />
    1458                 <check key="bicycle" text="Bicycle" default="on" />
    1459                 <check key="horse" text="Horse" default="off" />
    1460                 <check key="motorcycle" text="Motorcycle" default="off" />
    1461                 <check key="motorcar" text="Motorcar" default="off" />
    1462             </optional>
    1463             <optional>
    1464                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1465             </optional>
     1347            <reference ref="barrier_5" />
     1348            <reference ref="optional_maxwidth" />
    14661349        </item> <!-- entrance -->
    14671350        <item name="Gate" icon="presets/gate.png" type="node">
     
    14751358            <label text="Edit Gate" />
    14761359            <key key="barrier" value="gate" />
    1477             <optional text="Allowed traffic:">
    1478                 <check key="foot" text="Foot" default="on" />
    1479                 <check key="bicycle" text="Bicycle" default="on" />
    1480                 <check key="horse" text="Horse" default="off" />
    1481                 <check key="motorcycle" text="Motorcycle" default="off" />
    1482                 <check key="motorcar" text="Motorcar" default="off" />
    1483             </optional>
    1484             <optional>
    1485                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1486             </optional>
     1360            <reference ref="barrier_5" />
     1361            <reference ref="optional_maxwidth" />
    14871362        </item> <!-- gate -->
    14881363        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
     
    14951370            <label text="Edit Lift Gate" />
    14961371            <key key="barrier" value="lift_gate" />
    1497             <optional text="Allowed traffic:">
    1498                 <check key="foot" text="Foot" default="on" />
    1499                 <check key="bicycle" text="Bicycle" default="on" />
    1500                 <check key="horse" text="Horse" default="off" />
    1501                 <check key="motorcycle" text="Motorcycle" default="off" />
    1502                 <check key="motorcar" text="Motorcar" default="off" />
    1503             </optional>
    1504             <optional>
    1505                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1506             </optional>
     1372            <reference ref="barrier_5" />
     1373            <reference ref="optional_maxwidth" />
    15071374        </item> <!-- lift_gate -->
    15081375        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
    15091376            <label text="Edit Hampshire Gate" />
    15101377            <key key="barrier" value="hampshire_gate" />
    1511             <optional text="Allowed traffic:">
    1512                 <check key="foot" text="Foot" default="on" />
    1513                 <check key="bicycle" text="Bicycle" default="on" />
    1514                 <check key="horse" text="Horse" default="off" />
    1515                 <check key="motorcycle" text="Motorcycle" default="off" />
    1516                 <check key="motorcar" text="Motorcar" default="off" />
    1517             </optional>
    1518             <optional>
    1519                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1520             </optional>
     1378            <reference ref="barrier_5" />
     1379            <reference ref="optional_maxwidth" />
    15211380        </item> <!-- hampshire_gate -->
    15221381        <item name="Bump Gate" icon="presets/empty.png" type="node">
    15231382            <label text="Edit Bump Gate" />
    15241383            <key key="barrier" value="bump_gate" />
    1525             <optional text="Allowed traffic:">
    1526                 <check key="foot" text="Foot" default="on" />
    1527                 <check key="bicycle" text="Bicycle" default="on" />
    1528                 <check key="horse" text="Horse" default="off" />
    1529                 <check key="motorcycle" text="Motorcycle" default="off" />
    1530                 <check key="motorcar" text="Motorcar" default="off" />
    1531             </optional>
    1532             <optional>
    1533                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1534             </optional>
     1384            <reference ref="barrier_5" />
     1385            <reference ref="optional_maxwidth" />
    15351386        </item> <!-- bump_gate -->
    15361387        <item name="Kissing Gate" icon="presets/empty.png" type="node">
     
    15381389            <label text="Edit Kissing Gate" />
    15391390            <key key="barrier" value="kissing_gate" />
    1540             <optional text="Allowed traffic:">
    1541                 <check key="foot" text="Foot" default="on" />
    1542                 <check key="bicycle" text="Bicycle" default="off" />
    1543             </optional>
    1544             <optional>
    1545                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1546             </optional>
     1391            <reference ref="barrier_2" />
     1392            <reference ref="optional_maxwidth" />
    15471393        </item> <!-- kissing_gate -->
    15481394        <item name="Chain" type="node">
     
    15511397            <label text="Edit Chain" />
    15521398            <key key="barrier" value="chain" />
    1553             <optional text="Allowed traffic:">
    1554                 <check key="foot" text="Foot" default="on" />
    1555                 <check key="bicycle" text="Bicycle" default="on" />
    1556                 <check key="horse" text="Horse" default="off" />
    1557                 <check key="motorcycle" text="Motorcycle" default="off" />
    1558                 <check key="motorcar" text="Motorcar" default="off" />
    1559             </optional>
    1560             <optional>
    1561                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1562             </optional>
     1399            <reference ref="barrier_5" />
     1400            <reference ref="optional_maxwidth" />
    15631401        </item> <!-- chain -->
    15641402        <item name="Stile" icon="presets/stile.png" type="node">
     
    15711409                <combo key="material" text="Material" values="metal,stone,wood" />
    15721410            </optional>
    1573             <optional text="Allowed traffic:">
    1574                 <check key="foot" text="Foot" default="on" />
    1575                 <check key="bicycle" text="Bicycle" default="off" />
    1576             </optional>
     1411            <reference ref="barrier_2" />
    15771412        </item> <!-- stile -->
    15781413        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
     
    15821417            <label text="Edit Turnstile" />
    15831418            <key key="barrier" value="turnstile" />
    1584             <optional text="Allowed traffic:">
    1585                 <check key="foot" text="Foot" default="on" />
    1586                 <check key="bicycle" text="Bicycle" default="off" />
    1587             </optional>
     1419            <reference ref="barrier_2" />
    15881420        </item> <!-- turnstile -->
    15891421        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
     
    15911423            <label text="Edit Sally Port" />
    15921424            <key key="barrier" value="sally_port" />
    1593             <optional text="Allowed traffic:">
    1594                 <check key="foot" text="Foot" default="on" />
    1595                 <check key="bicycle" text="Bicycle" default="on" />
    1596                 <check key="horse" text="Horse" default="off" />
    1597                 <check key="motorcycle" text="Motorcycle" default="off" />
    1598                 <check key="motorcar" text="Motorcar" default="off" />
    1599             </optional>
     1425            <reference ref="barrier_5" />
    16001426            <optional>
    16011427                <text key="maxheight" text="Max. height (meters)" length="7" />
     
    16201446                <text key="name" text="Name" />
    16211447                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
     1448                <text key="width" text="Width (meters)" />
    16221449                <text key="maxspeed" text="Max. speed (km/h)" />
    1623                 <text key="width" text="Width (meters)" />
    16241450                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    16251451                <check key="toll" text="Toll" />
     
    16391465            <key key="tunnel" value="building_passage" />
    16401466            <optional>
    1641                 <text key="name" text="Name" />
    1642                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1467                <reference ref="name_layer" />
     1468                <text key="width" text="Width (meters)" />
    16431469                <text key="maxspeed" text="Max. speed (km/h)" />
    1644                 <text key="width" text="Width (meters)" />
    16451470                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    16461471            </optional>
     
    16601485            <check key="arcade:right" value_on="open" text="Open on right side" />
    16611486            <optional>
    1662                 <text key="name" text="Name" />
    1663                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1487                <reference ref="name_layer" />
    16641488                <text key="width" text="Width (meters)" />
    16651489            </optional>
     
    16771501            <check key="colonnade:right" value_on="open" text="Open on right side" />
    16781502            <optional>
    1679                 <text key="name" text="Name" />
    1680                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1503                <reference ref="name_layer" />
    16811504                <text key="width" text="Width (meters)" />
    16821505            </optional>
     
    16981521            <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
    16991522            <optional>
    1700                 <text key="name" text="Name" />
    1701                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1523                <reference ref="name_layer" />
    17021524                <text key="width" text="Width (meters)" />
    17031525                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     
    18301652                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
    18311653                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
    1832             <key key="man_made" value="groyne" />                               
     1654            <key key="man_made" value="groyne" />
    18331655        </item>
    18341656        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
     
    21852007            <optional>
    21862008                <text key="name" text="Name" />
    2187                 <check key="oneway" text="Oneway" default="off" />
    2188                 <check key="bridge" text="Bridge" default="off" />
    2189                 <check key="tunnel" text="Tunnel" default="off" />
    2190                 <check key="cutting" text="Cutting" default="off" />
    2191                 <check key="embankment" text="Embankment" default="off" />
     2009                <reference ref="highway_yesno_incline_oneway" />
    21922010                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    2193                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2011                <reference ref="surface" />
    21942012                <text key="maxspeed" text="Max. speed (km/h)" />
    21952013                <text key="width" text="Width (meters)" />
    2196                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    21972014            </optional>
    21982015        </item>
     
    22322049            <key key="railway" value="level_crossing" />
    22332050            <optional>
    2234                 <check key="supervised" text="Supervised" default="off" />
    2235                 <check key="crossing:light" text="Traffic lights" default="off" />
    2236                 <check key="crossing:bell" text="Sound signals" default="off" />
     2051                <check key="supervised" text="Supervised" />
     2052                <check key="crossing:light" text="Traffic lights" />
     2053                <check key="crossing:bell" text="Sound signals" />
    22372054                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22382055            </optional>
     
    22502067            <optional>
    22512068                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    2252                 <check key="horse" text="Cross on horseback" default="off" />
    2253                 <check key="bicycle" text="Cross by bicycle" default="off" />
    2254                 <check key="supervised" text="Supervised" default="off" />
    2255                 <check key="crossing:light" text="Traffic lights" default="off" />
    2256                 <check key="crossing:bell" text="Sound signals" default="off" />
     2069                <check key="horse" text="Cross on horseback" />
     2070                <check key="bicycle" text="Cross by bicycle" />
     2071                <check key="supervised" text="Supervised" />
     2072                <check key="crossing:light" text="Traffic lights" />
     2073                <check key="crossing:bell" text="Sound signals" />
    22572074                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22582075            </optional>
     
    22772094            <space />
    22782095            <key key="aerialway" value="chair_lift" />
    2279             <text key="name" text="Name" />
    2280             <text key="ref" text="Reference number" />
     2096            <reference ref="name_ref" />
    22812097            <optional>
    22822098                <text key="aerialway:capacity" text="Number of people per hour" />
    22832099                <text key="aerialway:occupancy" text="Number of people per chair" />
    22842100                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2285                 <check key="aerialway:bubble" text="Has bubble?" default="off" />
    2286                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2101                <check key="aerialway:bubble" text="Has bubble?" />
     2102                <check key="aerialway:heating" text="Has heating?" />
    22872103            </optional>
    22882104        </item>
     
    22922108            <space />
    22932109            <key key="aerialway" value="drag_lift" />
    2294             <text key="name" text="Name" />
    2295             <text key="ref" text="Reference number" />
     2110            <reference ref="name_ref" />
    22962111            <optional>
    22972112                <text key="aerialway:capacity" text="Number of people per hour" />
     
    23092124            <space />
    23102125            <key key="aerialway" value="cable_car" />
    2311             <text key="name" text="Name" />
    2312             <text key="ref" text="Reference number" />
     2126            <reference ref="name_ref" />
    23132127            <optional>
    23142128                <text key="aerialway:capacity" text="Number of people per hour" />
    23152129                <text key="aerialway:occupancy" text="Number of people per car" />
    23162130                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2317                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2131                <check key="aerialway:heating" text="Has heating?" />
    23182132            </optional>
    23192133        </item>
     
    23262140            <space />
    23272141            <key key="aerialway" value="gondola" />
    2328             <text key="name" text="Name" />
    2329             <text key="ref" text="Reference number" />
     2142            <reference ref="name_ref" />
    23302143            <optional>
    23312144                <text key="aerialway:capacity" text="Number of people per hour" />
    23322145                <text key="aerialway:occupancy" text="Number of people per gondola" />
    23332146                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2334                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2147                <check key="aerialway:heating" text="Has heating?" />
    23352148            </optional>
    23362149        </item>
     
    23402153            <space />
    23412154            <key key="aerialway" value="mixed_lift" />
    2342             <text key="name" text="Name" />
    2343             <text key="ref" text="Reference number" />
     2155            <reference ref="name_ref" />
    23442156            <optional>
    23452157                <text key="aerialway:capacity" text="Number of people per hour" />
    23462158                <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
    23472159                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2348                 <check key="aerialway:bubble" text="Has bubble?" default="off" />
    2349                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2160                <check key="aerialway:bubble" text="Has bubble?" />
     2161                <check key="aerialway:heating" text="Has heating?" />
    23502162            </optional>
    23512163        </item>
     
    23582170            <space />
    23592171            <key key="aerialway" value="t-bar" />
    2360             <text key="name" text="Name" />
    2361             <text key="ref" text="Reference number" />
     2172            <reference ref="name_ref" />
    23622173            <optional>
    23632174                <text key="aerialway:capacity" text="Number of people per hour" />
     
    23702181            <space />
    23712182            <key key="aerialway" value="j-bar" />
    2372             <text key="name" text="Name" />
    2373             <text key="ref" text="Reference number" />
     2183            <reference ref="name_ref" />
    23742184            <optional>
    23752185                <text key="aerialway:capacity" text="Number of people per hour" />
     
    23822192            <space />
    23832193            <key key="aerialway" value="platter" />
    2384             <text key="name" text="Name" />
    2385             <text key="ref" text="Reference number" />
     2194            <reference ref="name_ref" />
    23862195            <optional>
    23872196                <text key="aerialway:capacity" text="Number of people per hour" />
     
    23942203            <space />
    23952204            <key key="aerialway" value="rope_tow" />
    2396             <text key="name" text="Name" />
    2397             <text key="ref" text="Reference number" />
     2205            <reference ref="name_ref" />
    23982206            <optional>
    23992207                <text key="aerialway:capacity" text="Number of people per hour" />
     
    24062214            <space />
    24072215            <key key="aerialway" value="magic_carpet" />
    2408             <text key="name" text="Name" />
    2409             <text key="ref" text="Reference number" />
     2216            <reference ref="name_ref" />
    24102217            <optional>
    24112218                <text key="aerialway:capacity" text="Number of people per hour" />
     
    24172224            <space />
    24182225            <key key="aerialway" value="goods" />
    2419             <text key="name" text="Name" />
    2420             <text key="ref" text="Reference number" />
     2226            <reference ref="name_ref" />
    24212227            <optional>
    24222228                <text key="aerialway:duration" text="Typical journey time in minutes" />
     
    24882294            <combo key="fee" text="Fee" values="yes,no,interval" />
    24892295            <text key="operator" text="Operator" />
    2490             <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2296            <reference ref="surface" />
    24912297            <combo key="covered" text="Covered (with roof)" values="yes,no" />
    24922298            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
    24932299            <combo key="supervised" text="Supervised" values="yes,no,interval" />
    24942300            <combo key="lit" text="Lit" values="yes,no,interval" />
    2495             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2301            <reference ref="oh" />
    24962302        </item>
    24972303        <item name="Parking entrance" icon="presets/parking.png" type="node">
     
    25112317            <combo key="fee" text="Fee" values="yes,no,interval" />
    25122318            <text key="operator" text="Operator" />
    2513             <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2319            <reference ref="surface" />
    25142320            <combo key="covered" text="Covered (with roof)" values="yes,no" />
    25152321            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
    25162322            <combo key="supervised" text="Supervised" values="yes,no,interval" />
    25172323            <combo key="lit" text="Lit" values="yes,no,interval" />
    2518             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2324            <reference ref="oh" />
    25192325        </item>
    25202326        <separator/>
     
    25382344                <text key="name" text="Name" />
    25392345                <text key="operator" text="Operator" />
    2540                 <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2346                <reference ref="oh" />
    25412347                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
    25422348                <label text="Fuel types:" />
    25432349                <checkgroup columns="2">
    2544                     <check key="fuel:diesel" text="Diesel" default="off" />
    2545                     <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
    2546                     <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
    2547                     <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
    2548                     <check key="fuel:octane_80" text="Octane 80" default="off" />
    2549                     <check key="fuel:octane_91" text="Octane 91" default="off" />
    2550                     <check key="fuel:octane_92" text="Octane 92" default="off" />
    2551                     <check key="fuel:octane_95" text="Octane 95" default="off" />
    2552                     <check key="fuel:octane_98" text="Octane 98" default="off" />
    2553                     <check key="fuel:octane_100" text="Octane 100" default="off" />
    2554                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
    2555                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
    2556                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
    2557                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
    2558                     <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
    2559                     <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
     2350                    <check key="fuel:diesel" text="Diesel" />
     2351                    <check key="fuel:biodiesel" text="Bio Diesel" />
     2352                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
     2353                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
     2354                    <check key="fuel:octane_80" text="Octane 80" />
     2355                    <check key="fuel:octane_91" text="Octane 91" />
     2356                    <check key="fuel:octane_92" text="Octane 92" />
     2357                    <check key="fuel:octane_95" text="Octane 95" />
     2358                    <check key="fuel:octane_98" text="Octane 98" />
     2359                    <check key="fuel:octane_100" text="Octane 100" />
     2360                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
     2361                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
     2362                    <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
     2363                    <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
     2364                    <check key="fuel:1_25" text="1/25 mix (mofa/moped)" />
     2365                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
    25602366                </checkgroup>
    25612367            </optional>
     
    25692375            <text key="voltage" text="Voltage" />
    25702376            <text key="amperage" text="Amperage" />
    2571         </item>           
     2377        </item>
    25722378        <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
    25732379            <label text="Edit Car Wash" />
    25742380            <space />
    25752381            <key key="amenity" value="car_wash" />
    2576             <text key="name" text="Name" />
    2577             <text key="brand" text="Brand" />
    2578             <text key="operator" text="Operator" />
    2579             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2382            <reference ref="name_brand_operator_oh" />
    25802383        </item>
    25812384        <separator/>
     
    25912394            <space />
    25922395            <key key="shop" value="car" />
    2593             <text key="name" text="Name" />
    2594             <text key="brand" text="Brand" />
    2595             <text key="operator" text="Operator" />
    2596             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2396            <reference ref="name_brand_operator_oh" />
    25972397        </item>
    25982398        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
     
    26002400            <space />
    26012401            <key key="shop" value="car_repair" />
    2602             <text key="name" text="Name" />
    2603             <text key="brand" text="Brand" />
    2604             <text key="operator" text="Operator" />
    2605             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2402            <reference ref="name_brand_operator_oh" />
    26062403        </item>
    26072404        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
     
    26112408            <space />
    26122409            <key key="shop" value="car_parts" />
    2613             <text key="name" text="Name" />
    2614             <text key="brand" text="Brand" />
    2615             <text key="operator" text="Operator" />
    2616             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2410            <reference ref="name_brand_operator_oh" />
    26172411        </item>
    26182412        <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
     
    26202414            <space />
    26212415            <key key="shop" value="tyres" />
    2622             <text key="name" text="Name" />
    2623             <text key="brand" text="Brand" />
    2624             <text key="operator" text="Operator" />
    2625             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2416            <reference ref="name_brand_operator_oh" />
    26262417            <label text="Contact:" />
    26272418                <text key="phone" text="Phone Number" />
     
    26402431            <space />
    26412432            <key key="amenity" value="car_rental" />
    2642             <text key="name" text="Name" />
    2643             <text key="brand" text="Brand" />
    2644             <text key="operator" text="Operator" />
    2645             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2433            <reference ref="name_brand_operator_oh" />
    26462434            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    26472435        </item>
     
    26592447            <text key="operator" text="Operator" />
    26602448            <text key="capacity" text="Capacity" />
    2661             <text key="name" text="Name" />
    2662             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2449            <reference ref="name_oh" />
    26632450            <text key="website" text="Website" />
    26642451        </item>
     
    26852472            <combo key="brand" text="Brand" values="independent" />
    26862473            <text key="operator" text="Operator" />
    2687             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     2474            <reference ref="oh" />
    26882475            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    26892476            <optional text="Services:">
     
    27182505            <space />
    27192506            <key key="amenity" value="bicycle_parking" />
    2720             <text key="name" text="Name" />
    2721             <text key="operator" text="Operator" />
     2507            <reference ref="name_operator" />
    27222508            <text key="capacity" text="Capacity" />
    27232509            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" />
    2724             <check key="covered" text="Covered" default="off" />
    2725             <check key="supervised" text="Supervised" default="off" />
     2510            <check key="covered" text="Covered" />
     2511            <check key="supervised" text="Supervised" />
    27262512        </item>
    27272513        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
     
    27722558            <key key="type" value="route" />
    27732559            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" />
    2774             <text key="name" text="Name" />
    2775             <text key="ref" text="Reference" />
     2560            <reference ref="name_ref" />
    27762561            <optional>
    27772562                <text key="from" text="From (initial stop)" />
     
    27992584            <key key="type" value="route_master" />
    28002585            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
    2801             <text key="name" text="Name" />
    2802             <text key="ref" text="Reference" />
     2586            <reference ref="name_ref" />
    28032587            <optional>
    28042588                <text key="operator" text="Operator" />
     
    29142698            <optional>
    29152699                <text key="name" text="Name" />
    2916                 <check key="wheelchair" text="Wheelchair" default="off" />
    2917                 <check key="bicycle" text="Bicycle" default="off" />
     2700                <check key="wheelchair" text="Wheelchair" />
     2701                <check key="bicycle" text="Bicycle" />
    29182702            </optional>
    29192703        </item>
     
    29282712            <key key="amenity" value="vending_machine" />
    29292713            <key key="vending" value="public_transport_tickets" />
    2930             <text key="name" text="Name" />
    2931             <text key="operator" text="Operator" />
     2714            <reference ref="name_operator" />
    29322715            <text key="ref" text="Reference Number" />
    2933             <check key="payment:coins" text="Coins" default="off" />
    2934             <check key="payment:notes" text="Notes" default="off" />
    2935             <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    2936             <check key="payment:debit_cards" text="Debit cards" default="off" />
    2937             <check key="payment:credit_cards" text="Credit cards" default="off" />
    2938             <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     2716            <check key="payment:coins" text="Coins" />
     2717            <check key="payment:notes" text="Notes" />
     2718            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     2719            <check key="payment:debit_cards" text="Debit cards" />
     2720            <check key="payment:credit_cards" text="Credit cards" />
     2721            <check key="payment:account_cards" text="Account or loyalty cards" />
    29392722        </item>
    29402723    </group>
     
    29852768            <text key="ref" text="Reference (track number)" />
    29862769            <text key="width" text="Width (meters)" />
    2987             <check key="area" text="Area" default="off" />
     2770            <check key="area" text="Area" />
    29882771        </item>
    29892772        <separator/>
     
    30242807            <text key="ref" text="Reference (track number)" />
    30252808            <text key="width" text="Width (meters)" />
    3026             <check key="area" text="Area" default="off" />
     2809            <check key="area" text="Area" />
    30272810        </item>
    30282811    </group> <!-- Public Transport -->
     
    31552938            <space />
    31562939            <key key="tourism" value="hotel" />
    3157             <text key="name" text="Name" />
    3158             <text key="operator" text="Operator" />
     2940            <reference ref="name_operator" />
    31592941            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    31602942            <space />
    3161             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3162             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3163             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3164             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3165             <space />
    3166             <text key="phone" text="Phone Number" />
    3167             <text key="fax" text="Fax Number" />
    3168             <text key="website" text="Website" />
    3169             <text key="email" text="Email Address" />
     2943            <reference ref="internet_smoking_wheelchair" />
     2944            <space />
     2945            <reference ref="contact" />
    31702946        </item>
    31712947        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
     
    31772953            <space />
    31782954            <key key="tourism" value="motel" />
    3179             <text key="name" text="Name" />
    3180             <text key="operator" text="Operator" />
     2955            <reference ref="name_operator" />
    31812956            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    31822957            <space />
    3183             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3184             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3185             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3186             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3187             <space />
    3188             <text key="phone" text="Phone Number" />
    3189             <text key="fax" text="Fax Number" />
    3190             <text key="website" text="Website" />
    3191             <text key="email" text="Email Address" />
     2958            <reference ref="internet_smoking_wheelchair" />
     2959            <space />
     2960            <reference ref="contact" />
    31922961        </item>
    31932962        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
     
    31992968            <space />
    32002969            <key key="tourism" value="guest_house" />
    3201             <text key="name" text="Name" />
    3202             <text key="operator" text="Operator" />
     2970            <reference ref="name_operator" />
    32032971            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32042972            <space />
    3205             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3206             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3207             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3208             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3209             <space />
    3210             <text key="phone" text="Phone Number" />
    3211             <text key="fax" text="Fax Number" />
    3212             <text key="website" text="Website" />
    3213             <text key="email" text="Email Address" />
     2973            <reference ref="internet_smoking_wheelchair" />
     2974            <space />
     2975            <reference ref="contact" />
    32142976        </item>
    32152977        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
     
    32222984            <space />
    32232985            <key key="tourism" value="chalet" />
    3224             <text key="name" text="Name" />
    3225             <text key="operator" text="Operator" />
     2986            <reference ref="name_operator" />
    32262987            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32272988            <space />
    3228             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3229             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3230             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3231             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3232             <space />
    3233             <text key="phone" text="Phone Number" />
    3234             <text key="fax" text="Fax Number" />
    3235             <text key="website" text="Website" />
    3236             <text key="email" text="Email Address" />
     2989            <reference ref="internet_smoking_wheelchair" />
     2990            <space />
     2991            <reference ref="contact" />
    32372992        </item>
    32382993        <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
     
    32463001            <space />
    32473002            <key key="tourism" value="hostel" />
    3248             <text key="name" text="Name" />
    3249             <text key="operator" text="Operator" />
     3003            <reference ref="name_operator" />
    32503004            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32513005            <space />
    3252             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3253             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3254             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3255             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3256             <space />
    3257             <text key="phone" text="Phone Number" />
    3258             <text key="fax" text="Fax Number" />
    3259             <text key="website" text="Website" />
    3260             <text key="email" text="Email Address" />
     3006            <reference ref="internet_smoking_wheelchair" />
     3007            <space />
     3008            <reference ref="contact" />
    32613009        </item>
    32623010        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
     
    32703018            <space />
    32713019            <key key="tourism" value="alpine_hut" />
    3272             <text key="name" text="Name" />
    3273             <text key="operator" text="Operator" />
     3020            <reference ref="name_operator" />
    32743021            <text key="ele" text="Elevation" />
    32753022            <space />
    3276             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3277             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3278             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3279             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3280             <space />
    3281             <text key="phone" text="Phone Number" />
    3282             <text key="fax" text="Fax Number" />
    3283             <text key="website" text="Website" />
    3284             <text key="email" text="Email Address" />
     3023            <reference ref="internet_smoking_wheelchair" />
     3024            <space />
     3025            <reference ref="contact" />
    32853026        </item>
    32863027        <separator/>
     
    32933034            <space />
    32943035            <key key="tourism" value="caravan_site" />
    3295             <text key="name" text="Name" />
    3296             <text key="operator" text="Operator" />
     3036            <reference ref="name_operator" />
    32973037            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32983038            <space />
    3299             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3300             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3301             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3302             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3039            <reference ref="internet_smoking_wheelchair" />
    33033040            <space />
    33043041            <text key="capacity" text="Number of places" />
    33053042            <combo key="fee" text="Requires a fee" values="yes,no,interval" />
    3306             <check key="power_supply" text="Power supply" default="off" />
    3307             <check key="tents" text="Tents allowed" default="off" />
    3308             <space />
    3309             <text key="phone" text="Phone Number" />
    3310             <text key="fax" text="Fax Number" />
    3311             <text key="website" text="Website" />
    3312             <text key="email" text="Email Address" />
     3043            <check key="power_supply" text="Power supply" />
     3044            <check key="tents" text="Tents allowed" />
     3045            <space />
     3046            <reference ref="contact" />
    33133047        </item>
    33143048        <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
     
    33243058            <space />
    33253059            <key key="tourism" value="camp_site" />
    3326             <text key="name" text="Name" />
    3327             <text key="operator" text="Operator" />
     3060            <reference ref="name_operator" />
    33283061            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    33293062            <space />
    3330             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3331             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3332             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3333             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3334             <space />
    3335             <text key="phone" text="Phone Number" />
    3336             <text key="fax" text="Fax Number" />
    3337             <text key="website" text="Website" />
    3338             <text key="email" text="Email Address" />
     3063            <reference ref="internet_smoking_wheelchair" />
     3064            <space />
     3065            <reference ref="contact" />
    33393066        </item>
    33403067    </group> <!-- Accomodation -->
     
    33513078            <space />
    33523079            <key key="amenity" value="restaurant" />
    3353             <text key="name" text="Name" />
    3354             <text key="operator" text="Operator" />
     3080            <reference ref="name_operator" />
    33553081            <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
    3356             <check key="microbrewery" text="Microbrewery" default="off" />
    3357             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3082            <check key="microbrewery" text="Microbrewery" />
     3083            <reference ref="oh" />
    33583084            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    33593085            <space />
    3360             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3361             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3362             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3363             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3364             <space />
    3365             <text key="phone" text="Phone Number" />
    3366             <text key="fax" text="Fax Number" />
    3367             <text key="website" text="Website" />
    3368             <text key="email" text="Email Address" />
     3086            <reference ref="internet_smoking_wheelchair" />
     3087            <space />
     3088            <reference ref="contact" />
    33693089        </item>
    33703090        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
     
    33773097            <space />
    33783098            <key key="amenity" value="fast_food" />
    3379             <text key="name" text="Name" />
    3380             <text key="operator" text="Operator" />
     3099            <reference ref="name_operator" />
    33813100            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
    3382             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3383             <space />
    3384             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3385             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3386             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3387             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3388             <space />
    3389             <text key="phone" text="Phone Number" />
    3390             <text key="fax" text="Fax Number" />
    3391             <text key="website" text="Website" />
    3392             <text key="email" text="Email Address" />
     3101            <reference ref="oh" />
     3102            <space />
     3103            <reference ref="internet_smoking_wheelchair" />
     3104            <space />
     3105            <reference ref="contact" />
    33933106        </item>
    33943107        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
     
    34003113            <space />
    34013114            <key key="amenity" value="food_court" />
    3402             <text key="name" text="Name" />
    3403             <text key="operator" text="Operator" />
    3404             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3405             <space />
    3406             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3407             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3408             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3409             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3410             <space />
    3411             <text key="phone" text="Phone Number" />
    3412             <text key="fax" text="Fax Number" />
    3413             <text key="website" text="Website" />
    3414             <text key="email" text="Email Address" />
     3115            <reference ref="name_operator_oh" />
     3116            <space />
     3117            <reference ref="internet_smoking_wheelchair" />
     3118            <space />
     3119            <reference ref="contact" />
    34153120        </item>
    34163121        <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
     
    34273132            <space />
    34283133            <key key="amenity" value="cafe" />
    3429             <text key="name" text="Name" />
    3430             <text key="operator" text="Operator" />
     3134            <reference ref="name_operator" />
    34313135            <combo key="cuisine" text="Cuisine" values="ice_cream" />
    3432             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3433             <space />
    3434             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3435             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3436             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3437             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3438             <space />
    3439             <text key="phone" text="Phone Number" />
    3440             <text key="fax" text="Fax Number" />
    3441             <text key="website" text="Website" />
    3442             <text key="email" text="Email Address" />
     3136            <reference ref="oh" />
     3137            <space />
     3138            <reference ref="internet_smoking_wheelchair" />
     3139            <space />
     3140            <reference ref="contact" />
    34433141        </item>
    34443142        <item name="Pub" icon="presets/pub.png" type="node,closedway">
     
    34513149            <space />
    34523150            <key key="amenity" value="pub" />
    3453             <text key="name" text="Name" />
    3454             <text key="operator" text="Operator" />
    3455             <check key="microbrewery" text="Microbrewery" default="off" />
    3456             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3457             <space />
    3458             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3459             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3460             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3461             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3462             <space />
    3463             <text key="phone" text="Phone Number" />
    3464             <text key="fax" text="Fax Number" />
    3465             <text key="website" text="Website" />
    3466             <text key="email" text="Email Address" />
     3151            <reference ref="name_operator" />
     3152            <check key="microbrewery" text="Microbrewery" />
     3153            <reference ref="oh" />
     3154            <space />
     3155            <reference ref="internet_smoking_wheelchair" />
     3156            <space />
     3157            <reference ref="contact" />
    34673158        </item>
    34683159        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
     
    34753166            <space />
    34763167            <key key="amenity" value="biergarten" />
    3477             <text key="name" text="Name" />
    3478             <text key="operator" text="Operator" />
    3479             <check key="microbrewery" text="Microbrewery" default="off" />
    3480             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3481             <space />
    3482             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3483             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3484             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3485             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3486             <space />
    3487             <text key="phone" text="Phone Number" />
    3488             <text key="fax" text="Fax Number" />
    3489             <text key="website" text="Website" />
    3490             <text key="email" text="Email Address" />
     3168            <reference ref="name_operator" />
     3169            <check key="microbrewery" text="Microbrewery" />
     3170            <reference ref="oh" />
     3171            <space />
     3172            <reference ref="internet_smoking_wheelchair" />
     3173            <space />
     3174            <reference ref="contact" />
    34913175        </item>
    34923176        <item name="Bar" icon="presets/bar.png" type="node,closedway">
     
    35023186            <space />
    35033187            <key key="amenity" value="bar" />
    3504             <text key="name" text="Name" />
    3505             <text key="operator" text="Operator" />
    3506             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3507             <space />
    3508             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3509             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3510             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3511             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3512             <space />
    3513             <text key="phone" text="Phone Number" />
    3514             <text key="fax" text="Fax Number" />
    3515             <text key="website" text="Website" />
    3516             <text key="email" text="Email Address" />
     3188            <reference ref="name_operator_oh" />
     3189            <space />
     3190            <reference ref="internet_smoking_wheelchair" />
     3191            <space />
     3192            <reference ref="contact" />
    35173193        </item>
    35183194        <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
     
    35293205            <space />
    35303206            <key key="amenity" value="nightclub" />
    3531             <text key="name" text="Name" />
    3532             <text key="operator" text="Operator" />
    3533             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3207            <reference ref="name_operator_oh" />
    35343208            <space />
    35353209            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    35363210            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    35373211            <space />
    3538             <text key="phone" text="Phone Number" />
    3539             <text key="fax" text="Fax Number" />
    3540             <text key="website" text="Website" />
    3541             <text key="email" text="Email Address" />
     3212            <reference ref="contact" />
    35423213        </item>
    35433214        <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
     
    35503221            <space />
    35513222            <key key="amenity" value="stripclub" />
    3552             <text key="name" text="Name" />
    3553             <text key="operator" text="Operator" />
    3554             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3555             <space />
    3556             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3557             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3558             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3559             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    3560             <space />
    3561             <text key="phone" text="Phone Number" />
    3562             <text key="fax" text="Fax Number" />
    3563             <text key="website" text="Website" />
    3564             <text key="email" text="Email Address" />
     3223            <reference ref="name_operator_oh" />
     3224            <space />
     3225            <reference ref="internet_smoking_wheelchair" />
     3226            <space />
     3227            <reference ref="contact" />
    35653228        </item>
    35663229    </group> <!-- Food+Drinks -->
     
    35703233            <space />
    35713234            <key key="tourism" value="attraction" />
    3572             <text key="name" text="Name" />
    3573             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3235            <reference ref="name_oh" />
    35743236        </item>
    35753237        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
     
    35853247            <key key="tourism" value="viewpoint" />
    35863248            <text key="name" text="Name" />
    3587 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
     3249<!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
    35883250        </item>
    35893251        <separator/>
     
    35993261            <key key="tourism" value="information" />
    36003262            <key key="information" value="office" />
    3601             <text key="name" text="Name" />
    3602             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3263            <reference ref="name_oh" />
    36033264            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    36043265            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     
    36153276            <text key="description" text="Closer Description" />
    36163277            <optional text="Routes shown for:">
    3617                 <check key="hiking" text="Hiking" default="off" />
    3618                 <check key="bicycle" text="Cycling" default="off" />
    3619                 <check key="mtb" text="Mountainbiking" default="off" />
    3620                 <check key="ski" text="Skiing" default="off" />
    3621                 <check key="horse" text="Riding" default="off" />
     3278                <check key="hiking" text="Hiking" />
     3279                <check key="bicycle" text="Cycling" />
     3280                <check key="mtb" text="Mountainbiking" />
     3281                <check key="ski" text="Skiing" />
     3282                <check key="horse" text="Riding" />
    36223283                <space />
    36233284                <label text="... other transportation modes possible" />
     
    36483309            <text key="ele" text="Elevation" />
    36493310            <optional text="Routes shown for:">
    3650                 <check key="hiking" text="Hiking" default="off" />
    3651                 <check key="bicycle" text="Cycling" default="off" />
    3652                 <check key="mtb" text="Mountainbiking" default="off" />
    3653                 <check key="ski" text="Skiing" default="off" />
    3654                 <check key="horse" text="Riding" default="off" />
     3311                <check key="hiking" text="Hiking" />
     3312                <check key="bicycle" text="Cycling" />
     3313                <check key="mtb" text="Mountainbiking" />
     3314                <check key="ski" text="Skiing" />
     3315                <check key="horse" text="Riding" />
    36553316                <space />
    36563317                <label text="... other transportation modes possible" />
     
    37113372            <space />
    37123373            <key key="amenity" value="cinema" />
    3713             <text key="name" text="Name" />
    3714             <text key="operator" text="Operator" />           
    3715             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3374            <reference ref="name_operator_oh" />
    37163375        </item>
    37173376        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
     
    37233382            <space />
    37243383            <key key="tourism" value="zoo" />
    3725             <text key="name" text="Name" />
    3726             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3384            <reference ref="name_oh" />
    37273385            <text key="wikipedia" text="Wikipedia" />
    37283386            <space />
    3729             <text key="phone" text="Phone Number" />
    3730             <text key="fax" text="Fax Number" />
    3731             <text key="website" text="Website" />
    3732             <text key="email" text="Email Address" />
     3387            <reference ref="contact" />
    37333388        </item>
    37343389        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
     
    37463401            <key key="leisure" value="dog_park" />
    37473402            <text key="name" text="Name" />
    3748             <check key="area" text="Area" default="off" />
    3749             <combo key="barrier" text="Barrier" values="fence,wall" /> 
    3750             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3751             <check key="lit" text="Lit" default="off" />
    3752         </item> 
     3403            <check key="area" text="Area" />
     3404            <combo key="barrier" text="Barrier" values="fence,wall" />
     3405            <reference ref="oh" />
     3406            <check key="lit" text="Lit" />
     3407        </item>
    37533408        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
    37543409            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
     
    37593414            <space />
    37603415            <key key="tourism" value="theme_park" />
    3761             <text key="name" text="Name" />
    3762             <text key="operator" text="Operator" />           
    3763             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3764             <space />
    3765             <text key="phone" text="Phone Number" />
    3766             <text key="fax" text="Fax Number" />
    3767             <text key="website" text="Website" />
    3768             <text key="email" text="Email Address" />
     3416            <reference ref="name_operator_oh" />
     3417            <space />
     3418            <reference ref="contact" />
    37693419        </item>
    37703420        <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
     
    37793429            <space />
    37803430            <key key="leisure" value="water_park" />
    3781             <text key="name" text="Name" />
    3782             <text key="operator" text="Operator" />           
    3783             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3784             <space />
    3785             <text key="phone" text="Phone Number" />
    3786             <text key="fax" text="Fax Number" />
    3787             <text key="website" text="Website" />
    3788             <text key="email" text="Email Address" />
     3431            <reference ref="name_operator_oh" />
     3432            <space />
     3433            <reference ref="contact" />
    37893434        </item>
    37903435        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
     
    37963441            <space />
    37973442            <key key="leisure" value="sauna" />
    3798             <text key="name" text="Name" />           
    3799             <text key="operator" text="Operator" />           
    3800             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    3801             <combo key="access" text="Access" values="yes,permissive,private,unknown" />                                           
    3802             <space />
    3803             <text key="phone" text="Phone Number" />
    3804             <text key="fax" text="Fax Number" />
    3805             <text key="website" text="Website" />
    3806             <text key="email" text="Email Address" />
     3443            <text key="name" text="Name" />
     3444            <text key="operator" text="Operator" />
     3445            <reference ref="oh" />
     3446            <combo key="access" text="Access" values="yes,permissive,private,unknown" />
     3447            <space />
     3448            <reference ref="contact" />
    38073449        </item>
    38083450        <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
     
    38113453            <space />
    38123454            <key key="leisure" value="horse_riding" />
    3813             <text key="name" text="Name" />
    3814             <text key="operator" text="Operator" />
    3815             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3455            <reference ref="name_operator_oh" />
    38163456            <text key="fee" text="Fee" />
    38173457            <space />
    3818             <text key="phone" text="Phone Number" />
    3819             <text key="fax" text="Fax Number" />
    3820             <text key="website" text="Website" />
    3821             <text key="email" text="Email Address" />
     3458            <reference ref="contact" />
    38223459        </item>
    38233460        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
     
    38323469            <space />
    38333470            <key key="amenity" value="brothel" />
    3834             <text key="name" text="Name" />
    3835             <text key="operator" text="Operator" />
    3836             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3471            <reference ref="name_operator_oh" />
    38373472            <space />
    38383473            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    38393474            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    38403475            <space />
    3841             <text key="phone" text="Phone Number" />
    3842             <text key="fax" text="Fax Number" />
    3843             <text key="website" text="Website" />
    3844             <text key="email" text="Email Address" />
    3845         </item>
     3476            <reference ref="contact" />
     3477        </item>
    38463478        <separator/>
    38473479        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
     
    38653497            <key key="tourism" value="picnic_site" />
    38663498            <text key="name" text="Name" />
    3867             <check key="fireplace" text="Fireplace" default="off" />
     3499            <check key="fireplace" text="Fireplace" />
    38683500        </item>
    38693501        <item name="Public Grill" icon="presets/bbq.png" type="node">
     
    38743506                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
    38753507            <label text="Edit Public Grill" />
    3876             <space />           
     3508            <space />
    38773509            <key key="amenity" value="bbq" />
    38783510            <text key="name" text="Name" />
    3879             <combo key="covered" text="Covered" values="yes,no" />                               
    3880             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />                               
     3511            <combo key="covered" text="Covered" values="yes,no" />
     3512            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
    38813513        </item>
    38823514        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
     
    39053537            <space />
    39063538            <key key="tourism" value="museum" />
    3907             <text key="name" text="Name" />
    3908             <text key="operator" text="Operator" />
    3909             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3539            <reference ref="name_operator_oh" />
    39103540            <text key="wikipedia" text="Wikipedia" />
    39113541        </item>
     
    39193549            <space />
    39203550            <key key="amenity" value="theatre" />
    3921             <text key="name" text="Name" />
    3922             <text key="operator" text="Operator" />
     3551            <reference ref="name_operator" />
    39233552        </item>
    39243553        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
     
    39343563            <space />
    39353564            <key key="amenity" value="library" />
    3936             <text key="name" text="Name" />
    3937             <text key="operator" text="Operator" />
    3938             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3565            <reference ref="name_operator_oh" />
    39393566        </item>
    39403567        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
     
    39683595                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
    39693596            <label text="Edit Studio" />
    3970             <space />           
     3597            <space />
    39713598            <key key="amenity" value="studio" />
    3972             <text key="name" text="Name" />
    3973             <text key="operator" text="Operator" />           
     3599            <reference ref="name_operator" />
    39743600            <combo key="type" text="Type" values="audio,video" />
    39753601            <text key="phone" text="Phone Number" />
    3976             <text key="website" text="Website" />                         
     3602            <text key="website" text="Website" />
    39773603        </item>
    39783604    </group> <!-- Culture -->
     
    40003626            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_searchable="true" />
    40013627            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4002             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3628            <reference ref="oh" />
    40033629        </item>
    40043630        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation">
     
    40243650            <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
    40253651            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4026             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3652            <reference ref="oh" />
    40273653        </item>
    40283654        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation">
     
    40483674            <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_searchable="true" />
    40493675            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4050             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3676            <reference ref="oh" />
    40513677        </item>
    40523678        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation">
     
    40713697            <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
    40723698            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4073             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3699            <reference ref="oh" />
    40743700        </item>
    40753701        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation">
     
    40943720            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    40953721            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4096             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3722            <reference ref="oh" />
    40973723        </item>
    40983724        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation">
     
    41163742            <text key="name" text="Name" />
    41173743            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4118             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3744            <reference ref="oh" />
    41193745        </item>
    41203746        <item name="Other Place of Worship" type="node,closedway,relation">
     
    41383764            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
    41393765            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    4140             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3766            <reference ref="oh" />
    41413767        </item>
    41423768    </group> <!-- Place of Worship -->
     
    41733799                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=community_centre" />
    41743800            <label text="Community Centre" />
    4175             <space />           
     3801            <space />
    41763802            <key key="amenity" value="community_centre" />
    4177             <text key="name" text="Name" />
    4178             <text key="operator" text="Operator" />
    4179             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3803            <reference ref="name_operator" />
     3804            <reference ref="oh" />
    41803805        </item>
    41813806        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
     
    42533878            <space />
    42543879            <key key="amenity" value="post_office" />
    4255             <text key="name" text="Name" />
    4256             <text key="operator" text="Operator" />
     3880            <reference ref="name_operator" />
    42573881        </item>
    42583882    </group> <!-- Public Buildings -->
     
    43123936            <space />
    43133937            <key key="amenity" value="driving_school" />
    4314             <text key="name" text="Name" />
    4315             <text key="operator" text="Operator" />
     3938            <reference ref="name_operator" />
    43163939            <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" />
    43173940        </item>
     
    43303953            <space />
    43313954            <key key="amenity" value="hospital" />
    4332             <text key="name" text="Name" />
    4333             <text key="operator" text="Operator" />
     3955            <reference ref="name_operator" />
    43343956        </item>
    43353957        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
     
    43493971            <space />
    43503972            <key key="amenity" value="doctors" />
    4351             <text key="name" text="Name" />
    4352             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3973            <reference ref="name_oh" />
    43533974        </item>
    43543975        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
     
    43563977            <space />
    43573978            <key key="amenity" value="dentist" />
    4358             <text key="name" text="Name" />
    4359             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     3979            <reference ref="name_oh" />
    43603980        </item>
    43613981        <item name="Nursing Home" type="node,closedway">
     
    43633983            <space />
    43643984            <key key="amenity" value="nursing_home" />
    4365             <text key="name" text="Name" />
    4366             <text key="operator" text="Operator" />
     3985            <reference ref="name_operator" />
    43673986        </item>
    43683987        <item name="Retirement Home" type="node,closedway">
     
    43773996            <key key="social_facility" value="group_home" />
    43783997            <key key="social_facility:for" value="senior" />
    4379             <text key="name" text="Name" />
    4380             <text key="operator" text="Operator" />
     3998            <reference ref="name_operator" />
    43813999            <text key="capacity" text="Capacity" />
    43824000        </item>
     
    43964014            <text key="name" text="Name" />
    43974015            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
    4398             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4016            <reference ref="oh" />
    43994017        </item>
    44004018        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
     
    44054023            <space />
    44064024            <key key="shop" value="hearing_aids" />
    4407             <text key="name" text="Name" />
    4408             <text key="operator" text="Operator" />
    4409             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4025            <reference ref="name_operator_oh" />
    44104026        </item>
    44114027        <separator/>
     
    44254041            <key key="amenity" value="baby_hatch" />
    44264042            <text key="operator" text="Operator" />
    4427             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4043            <reference ref="oh" />
    44284044        </item>
    44294045        <separator/>
     
    44584074            <space />
    44594075            <key key="amenity" value="veterinary" />
    4460             <text key="name" text="Name" />
    4461             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4076            <reference ref="name_oh" />
    44624077        </item>
    44634078    </group> <!-- Health -->
     
    45134128            <key key="amenity" value="telephone" />
    45144129            <text key="operator" text="Operator" />
    4515             <check key="payment:coins" text="Coins" default="off" />
    4516             <check key="payment:notes" text="Notes" default="off" />
    4517             <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    4518             <check key="payment:debit_cards" text="Debit cards" default="off" />
    4519             <check key="payment:credit_cards" text="Credit cards" default="off" />
    4520             <check key="payment:telephone_cards" text="Telephone cards" default="off" />
     4130            <check key="payment:coins" text="Coins" />
     4131            <check key="payment:notes" text="Notes" />
     4132            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     4133            <check key="payment:debit_cards" text="Debit cards" />
     4134            <check key="payment:credit_cards" text="Credit cards" />
     4135            <check key="payment:telephone_cards" text="Telephone cards" />
    45214136        </item>
    45224137        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
     
    45284143        </item>
    45294144        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation">
    4530             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access" 
     4145            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
    45314146                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
    45324147                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
     
    45484163            <key key="emergency" value="aed" />
    45494164            <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
    4550             <text  key="operator" text="Operator" /> 
    4551             <check key="indoor" text="Located inside a building?" default="off" />
     4165            <text  key="operator" text="Operator" />
     4166            <check key="indoor" text="Located inside a building?" />
    45524167            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
    45534168            <optional>
     
    45694184                <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
    45704185                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
    4571                 <check key="date" text="Shows current date" default="off" />
    4572                 <check key="thermometer" text="Shows temperature" default="off" />
    4573                 <check key="barometer" text="Shows barometric pressure" default="off" />
    4574                 <check key="hygrometer" text="Shows humidity" default="off" />
     4186                <check key="date" text="Shows current date" />
     4187                <check key="thermometer" text="Shows temperature" />
     4188                <check key="barometer" text="Shows barometric pressure" />
     4189                <check key="hygrometer" text="Shows humidity" />
    45754190            </optional>
    45764191        </item>
     
    45894204            <space />
    45904205            <key key="amenity" value="recycling" />
    4591             <check key="recycling:batteries" text="Batteries" default="off" />
    4592             <check key="recycling:cans" text="Cans" default="off" />
    4593             <check key="recycling:clothes" text="Clothes" default="off" />
    4594             <check key="recycling:glass" text="Glass" default="off" />
    4595             <check key="recycling:paper" text="Paper" default="off" />
    4596             <check key="recycling:scrap_metal" text="Scrap Metal" default="off" />
     4206            <check key="recycling:batteries" text="Batteries" />
     4207            <check key="recycling:cans" text="Cans" />
     4208            <check key="recycling:clothes" text="Clothes" />
     4209            <check key="recycling:glass" text="Glass" />
     4210            <check key="recycling:paper" text="Paper" />
     4211            <check key="recycling:scrap_metal" text="Scrap Metal" />
    45974212            <combo key="recycling_type" text="Type" values="container,centre" />
    45984213        </item>
     
    46434258            <key key="amenity" value="shelter" />
    46444259            <text key="name" text="Name" />
    4645             <check key="fireplace" text="Fireplace" default="off" />
     4260            <check key="fireplace" text="Fireplace" />
    46464261            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
    46474262        </item>
     
    46674282            <space />
    46684283            <key key="amenity" value="drinking_water" />
    4669             <check key="indoor" text="Indoor" default="off" />
     4284            <check key="indoor" text="Indoor" />
    46704285            <optional>
    46714286                <text key="name" text="Name" />
     
    46874302            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
    46884303            <space />
    4689             <text key="name" text="Name" />
    4690             <text key="ref" text="Reference" />
     4304            <reference ref="name_ref" />
    46914305            <text key="operator" text="Operator" />
    46924306            <space />
     
    47394353            <space />
    47404354            <key key="leisure" value="golf_course" />
    4741             <text key="name" text="Name" />
    4742             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4355            <reference ref="name_oh" />
    47434356        </item>
    47444357        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
     
    47464359            <space />
    47474360            <key key="leisure" value="miniature_golf" />
    4748             <text key="name" text="Name" />
    4749             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     4361            <reference ref="name_oh" />
    47504362        </item>
    47514363    </group> <!-- Sport facilities -->
     
    49094521            <space />
    49104522            <key key="sport" value="soccer" />
    4911             <text key="name" text="Name" />
    4912             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4523            <reference ref="name_leisure_pitch" />
    49134524        </item>
    49144525        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
     
    49174528            <space />
    49184529            <key key="sport" value="australian_football" />
    4919             <text key="name" text="Name" />
    4920             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4530            <reference ref="name_leisure_pitch" />
    49214531        </item>
    49224532        <item name="American Football" icon="presets/football.png" type="node,closedway">
     
    49254535            <space />
    49264536            <key key="sport" value="american_football" />
    4927             <text key="name" text="Name" />
    4928             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4537            <reference ref="name_leisure_pitch" />
    49294538        </item>
    49304539        <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
     
    49334542            <space />
    49344543            <key key="sport" value="canadian_football" />
    4935             <text key="name" text="Name" />
    4936             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4544            <reference ref="name_leisure_pitch" />
    49374545        </item>
    49384546        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
     
    49414549            <space />
    49424550            <key key="sport" value="gaelic_games" />
    4943             <text key="name" text="Name" />
    4944             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4551            <reference ref="name_leisure_pitch" />
    49454552            <optional>
    49464553                <check key="gaelic_games:hurling" text="Hurling" />
     
    49564563            <space />
    49574564            <key key="sport" value="rugby_league" />
    4958             <text key="name" text="Name" />
    4959             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4565            <reference ref="name_leisure_pitch" />
    49604566        </item>
    49614567        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
     
    49654571            <space />
    49664572            <key key="sport" value="rugby_union" />
    4967             <text key="name" text="Name" />
    4968             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4573            <reference ref="name_leisure_pitch" />
    49694574        </item>
    49704575        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
     
    49734578            <space />
    49744579            <key key="sport" value="baseball" />
    4975             <text key="name" text="Name" />
    4976             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4580            <reference ref="name_leisure_pitch" />
    49774581        </item>
    49784582        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
     
    49814585            <space />
    49824586            <key key="sport" value="basketball" />
    4983             <text key="name" text="Name" />
    4984             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4587            <reference ref="name_leisure_pitch" />
    49854588        </item>
    49864589        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
    49874590            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
    49884591            <label text="Edit Volleyball" />
    4989             <space />           
     4592            <space />
    49904593            <key key="sport" value="volleyball" />
    4991             <text key="name" text="Name" />
    4992             <text key="operator" text="Operator" />
     4594            <reference ref="name_operator" />
    49934595            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    4994         </item> 
     4596        </item>
    49954597        <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
    49964598            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
    49974599            <label text="Edit Beachvolleyball" />
    4998             <space />           
     4600            <space />
    49994601            <key key="sport" value="beachvolleyball" />
    5000             <text key="name" text="Name" />
    5001             <text key="operator" text="Operator" />
     4602            <reference ref="name_operator" />
    50024603            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    5003         </item> 
     4604        </item>
    50044605        <item name="Golf" icon="presets/golf.png" type="node,closedway">
    50054606            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
     
    50184619            <space />
    50194620            <key key="sport" value="boules" />
    5020             <text key="name" text="Name" />
    5021             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4621            <reference ref="name_leisure_pitch" />
    50224622        </item>
    50234623        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
     
    50264626            <space />
    50274627            <key key="sport" value="bowls" />
    5028             <text key="name" text="Name" />
    5029             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4628            <reference ref="name_leisure_pitch" />
    50304629        </item>
    50314630        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
     
    50344633            <space />
    50354634            <key key="sport" value="cricket" />
    5036             <text key="name" text="Name" />
    5037             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4635            <reference ref="name_leisure_pitch" />
    50384636        </item>
    50394637        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
     
    50504648            <space />
    50514649            <key key="sport" value="croquet" />
    5052             <text key="name" text="Name" />
    5053             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4650            <reference ref="name_leisure_pitch" />
    50544651        </item>
    50554652        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
     
    50674664            <space />
    50684665            <key key="sport" value="pelota" />
    5069             <text key="name" text="Name" />
    5070             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4666            <reference ref="name_leisure_pitch" />
    50714667        </item>
    50724668        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
     
    50924688            <space />
    50934689            <key key="sport" value="tennis" />
    5094             <text key="name" text="Name" />
    5095             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4690            <reference ref="name_leisure_pitch" />
    50964691        </item>
    50974692    </group> <!-- Sport (Ball) -->
     
    52164811            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
    52174812            <label text="Edit Chimney" />
    5218             <space />           
     4813            <space />
    52194814            <key key="man_made" value="chimney" />
    5220             <text key="name" text="Name" />
    5221             <text key="operator" text="Operator" />           
    5222             <text key="height" text="Height (meters)" />           
     4815            <reference ref="name_operator" />
     4816            <text key="height" text="Height (meters)" />
    52234817        </item>
    52244818        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
     
    52734867            <text key="operator" text="Operator" />
    52744868            <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" />
    5275             <combo key="headframe" text="Visible Headframe" values="yes,no" /> 
    5276             <check key="disused" text="Disused" default="off" />                                                             
     4869            <combo key="headframe" text="Visible Headframe" values="yes,no" />
     4870            <check key="disused" text="Disused" />
    52774871        </item>
    52784872        <item name="Adit" icon="presets/adit.png" type="node">
     
    52904884            <text key="operator" text="Operator" />
    52914885            <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" />
    5292             <check key="disused" text="Disused" default="off" />                                                             
     4886            <check key="disused" text="Disused" />
    52934887        </item>
    52944888        <separator/>
     
    53064900                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
    53074901            <label text="Edit Water Works" />
    5308             <space />           
     4902            <space />
    53094903            <key key="man_made" value="water_works" />
    5310             <text key="name" text="Name" />
    5311             <text key="operator" text="Operator" />           
    5312         </item>             
     4904            <reference ref="name_operator" />
     4905        </item>
    53134906        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
    53144907            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
     
    53314924                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
    53324925            <label text="Edit Watermill" />
    5333             <space />           
     4926            <space />
    53344927            <key key="man_made" value="watermill" />
    53354928            <text key="name" text="Name" />
    5336         </item>       
     4929        </item>
    53374930        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
    53384931            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
     
    53874980                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
    53884981            <label text="Edit Street Lamp" />
    5389             <space />           
     4982            <space />
    53904983            <key key="highway" value="street_lamp" />
    5391             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />                                                                                       
    5392         </item> 
     4984            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
     4985        </item>
    53934986        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
    5394             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station" 
     4987            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
    53954988                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
    53964989                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
    53974990            <label text="Edit Monitoring Station" />
    5398             <space />           
     4991            <space />
    53994992            <key key="man_made" value="monitoring_station" />
    5400             <text key="name" text="Name" />
    5401             <text key="operator" text="Operator" />             
     4993            <reference ref="name_operator" />
    54024994            <label text="Monitoring:" />
    54034995            <checkgroup columns="3">
     
    54715063            <space />
    54725064            <key key="power" value="plant" />
    5473             <text key="name" text="Name" />
    5474             <text key="operator" text="Operator" />
     5065            <reference ref="name_operator" />
    54755066            <text key="ref" text="Reference" />
    54765067            <text key="start_date" text="Start date" />
     
    55005091            <space />
    55015092            <key key="power" value="generator" />
    5502             <text key="name" text="Name" />
    5503             <text key="operator" text="Operator" />
     5093            <reference ref="name_operator" />
    55045094            <text key="ref" text="Reference" />
    55055095            <text key="start_date" text="Start date" />
     
    56785268            <space />
    56795269            <key key="historic" value="ruins" />
    5680             <text key="name" text="Name" />
    5681             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5270            <reference ref="name_oh" />
    56825271        </item>
    56835272        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
     
    56905279            <space />
    56915280            <key key="historic" value="archaeological_site" />
    5692             <text key="name" text="Name" />
    5693             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5281            <reference ref="name_oh" />
    56945282        </item>
    56955283        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
     
    57645352            <space />
    57655353            <key key="shop" value="supermarket" />
    5766             <text key="name" text="Name" />
    5767             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5354            <reference ref="name_oh" />
    57685355        </item>
    57695356        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
     
    57765363            <space />
    57775364            <key key="shop" value="convenience" />
    5778             <text key="name" text="Name" />
    5779             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5365            <reference ref="name_oh" />
    57805366        </item>
    57815367        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
     
    57895375            <space />
    57905376            <key key="shop" value="kiosk" />
    5791             <text key="name" text="Name" />
    5792             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5377            <reference ref="name_oh" />
    57935378        </item>
    57945379        <separator/>
     
    58065391            <space />
    58075392            <key key="shop" value="bakery" />
    5808             <text key="name" text="Name" />
    5809             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5393            <reference ref="name_oh" />
    58105394        </item>
    58115395        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
     
    58205404            <space />
    58215405            <key key="shop" value="butcher" />
    5822             <text key="name" text="Name" />
    5823             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5406            <reference ref="name_oh" />
    58245407        </item>
    58255408        <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
     
    58295412                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
    58305413            <label text="Edit Seafood Shop" />
    5831             <space />           
     5414            <space />
    58325415            <key key="shop" value="seafood" />
    5833             <text key="name" text="Name" />
    5834             <text key="operator" text="Operator" />
    5835             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5416            <reference ref="name_operator_oh" />
    58365417        </item>
    58375418        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
     
    58455426            <space />
    58465427            <key key="shop" value="deli" />
    5847             <text key="name" text="Name" />
    5848             <text key="operator" text="Operator" />
    5849             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    5850         </item>                     
     5428            <reference ref="name_operator_oh" />
     5429        </item>
    58515430        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
    58525431            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
     
    58605439            <space />
    58615440            <key key="shop" value="confectionery" />
    5862             <text key="name" text="Name" />
    5863             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5441            <reference ref="name_oh" />
    58645442        </item>
    58655443        <separator/>
     
    58745452                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=marketplace" />
    58755453            <label text="Edit Marketplace" />
    5876             <space />           
     5454            <space />
    58775455            <key key="amenity" value="marketplace" />
    5878             <text key="name" text="Name" />
    5879             <text key="operator" text="Operator" />
    5880             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5456            <reference ref="name_operator_oh" />
    58815457            <text key="website" text="Website" />
    58825458            <combo key="organic" text="Organic" values="only,yes,no" />
     
    58895465                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=greengrocer" />
    58905466            <label text="Edit Greengrocer" />
    5891             <space />           
     5467            <space />
    58925468            <key key="shop" value="greengrocer" />
    5893             <text key="name" text="Name" />
    5894             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5469            <reference ref="name_oh" />
    58955470            <text key="website" text="Website" />
    58965471            <combo key="organic" text="Organic" values="only,yes,no" />
     
    59045479            <space />
    59055480            <key key="shop" value="farm" />
    5906             <text key="name" text="Name" />
     5481            <reference ref="name_oh" />
    59075482            <text key="description" text="Description" />
    5908             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    59095483            <text key="phone" text="Phone Number" match="key" />
    59105484            <text key="website" text="Website" />
     
    59365510            <space />
    59375511            <key key="shop" value="alcohol" />
    5938             <text key="name" text="Name" />
    5939             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5512            <reference ref="name_oh" />
    59405513        </item>
    59415514        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
     
    59475520            <space />
    59485521            <key key="shop" value="beverages" />
    5949             <text key="name" text="Name" />
    5950             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5522            <reference ref="name_oh" />
    59515523        </item>
    59525524    </group> <!-- Food -->
     
    59625534            <space />
    59635535            <key key="shop" value="clothes" />
    5964             <text key="name" text="Name" />
    5965             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5536            <reference ref="name_oh" />
    59665537            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    59675538            <combo key="organic" text="Organic" values="only,yes,no" />
     
    59765547            <space />
    59775548            <key key="shop" value="boutique" />
    5978             <text key="name" text="Name" />
    5979             <text key="operator" text="Operator" />
    5980             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5549            <reference ref="name_operator_oh" />
    59815550        </item>
    59825551        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
     
    59885557            <space />
    59895558            <key key="shop" value="shoes" />
    5990             <text key="name" text="Name" />
    5991             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5559            <reference ref="name_oh" />
    59925560            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    59935561            <combo key="organic" text="Organic" values="only,yes,no" />
     
    60015569            <space />
    60025570            <key key="shop" value="outdoor" />
    6003             <text key="name" text="Name" />
    6004             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5571            <reference ref="name_oh" />
    60055572        </item>
    60065573        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
     
    60115578            <space />
    60125579            <key key="shop" value="sports" />
    6013             <text key="name" text="Name" />
    6014             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5580            <reference ref="name_oh" />
    60155581        </item>
    60165582        <separator/>
     
    60245590            <space />
    60255591            <key key="shop" value="dry_cleaning" />
    6026             <text key="name" text="Name" />
    6027             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5592            <reference ref="name_oh" />
    60285593        </item>
    60295594        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
     
    60355600            <space />
    60365601            <key key="shop" value="laundry" />
    6037             <text key="name" text="Name" />
    6038             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5602            <reference ref="name_oh" />
    60395603        </item>
    60405604        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
     
    60425606            <space />
    60435607            <key key="shop" value="tailor" />
    6044             <text key="name" text="Name" />
    6045             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5608            <reference ref="name_oh" />
    60465609        </item>
    60475610        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
     
    60525615            <space />
    60535616            <key key="shop" value="fabric" />
    6054             <text key="name" text="Name" />
    6055             <text key="operator" text="Operator" />
    6056             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5617            <reference ref="name_operator_oh" />
    60575618        </item>
    60585619    </group> <!-- Clothes -->
     
    60665627            <space />
    60675628            <key key="shop" value="computer" />
    6068             <text key="name" text="Name" />
    6069             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5629            <reference ref="name_oh" />
    60705630        </item>
    60715631        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
     
    60775637            <space />
    60785638            <key key="shop" value="electronics" />
    6079             <text key="name" text="Name" />
    6080             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5639            <reference ref="name_oh" />
    60815640        </item>
    60825641        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
     
    60875646            <space />
    60885647            <key key="shop" value="mobile_phone" />
    6089             <text key="name" text="Name" />
    6090             <text key="operator" text="Operator" />
    6091             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5648            <reference ref="name_operator_oh" />
    60925649        </item>
    60935650        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
     
    60985655            <space />
    60995656            <key key="shop" value="vacuum_cleaner" />
    6100             <text key="name" text="Name" />
    6101             <text key="operator" text="Operator" />
    6102             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5657            <reference ref="name_operator_oh" />
    61035658        </item>
    61045659        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
     
    61105665            <space />
    61115666            <key key="shop" value="hifi" />
    6112             <text key="name" text="Name" />
    6113             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5667            <reference ref="name_oh" />
    61145668        </item>
    61155669        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
     
    61215675            <space />
    61225676            <key key="shop" value="video" />
    6123             <text key="name" text="Name" />
    6124             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5677            <reference ref="name_oh" />
    61255678        </item>
    61265679    </group> <!-- Electronic -->
     
    61405693            <space />
    61415694            <key key="amenity" value="bank" />
    6142             <text key="name" text="Name" />
    6143             <text key="brand" text="Brand" />
    6144             <text key="operator" text="Operator" />
    6145             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5695            <reference ref="name_brand_operator_oh" />
    61465696            <check key="atm" text="Automated Teller Machine" default="on" />
    61475697        </item>
     
    61565706            <space />
    61575707            <key key="amenity" value="bureau_de_change" />
    6158             <text key="name" text="Name" />
    6159             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5708            <reference ref="name_oh" />
    61605709        </item>
    61615710        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
     
    61765725            <text key="brand" text="Brand" />
    61775726            <text key="operator" text="Operator" />
    6178             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5727            <reference ref="oh" />
    61795728        </item>
    61805729        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
     
    61855734            <space />
    61865735            <key key="shop" value="pawnbroker" />
    6187             <text key="name" text="Name" />
    6188             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5736            <reference ref="name_oh" />
    61895737        </item>
    61905738    </group> <!-- Cash -->
     
    61995747            <space />
    62005748            <key key="shop" value="department_store" />
    6201             <text key="name" text="Name" />
    6202             <text key="operator" text="Operator" />
    6203             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5749            <reference ref="name_operator_oh" />
    62045750        </item>
    62055751        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
     
    62115757            <space />
    62125758            <key key="shop" value="mall" />
    6213             <text key="name" text="Name" />
    6214             <text key="operator" text="Operator" />
    6215             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5759            <reference ref="name_operator_oh" />
    62165760        </item>
    62175761        <separator/>
     
    62255769            <space />
    62265770            <key key="shop" value="chemist" />
    6227             <text key="name" text="Name" />
    6228             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5771            <reference ref="name_oh" />
    62295772        </item>
    62305773        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
     
    62385781            <space />
    62395782            <key key="shop" value="hairdresser" />
    6240             <text key="name" text="Name" />
    6241             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5783            <reference ref="name_oh" />
    62425784        </item>
    62435785        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
     
    62485790            <space />
    62495791            <key key="shop" value="optician" />
    6250             <text key="name" text="Name" />
    6251             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5792            <reference ref="name_oh" />
    62525793        </item>
    62535794        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
     
    62585799            <space />
    62595800            <key key="shop" value="jewelry" />
    6260             <text key="name" text="Name" />
    6261             <text key="operator" text="Operator" />
    6262             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5801            <reference ref="name_operator_oh" />
    62635802        </item>
    62645803        <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
     
    62725811            <space />
    62735812            <key key="shop" value="gift" />
    6274             <text key="name" text="Name" />
    6275             <text key="operator" text="Operator" />
    6276             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5813            <reference ref="name_operator_oh" />
    62775814            <optional>
    62785815                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
     
    62875824            <space />
    62885825            <key key="shop" value="erotic" />
    6289             <text key="name" text="Name" />
    6290             <text key="operator" text="Operator" />
    6291             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5826            <reference ref="name_operator_oh" />
    62925827        </item>
    62935828        <separator/>
     
    63025837            <space />
    63035838            <key key="shop" value="florist" />
    6304             <text key="name" text="Name" />
    6305             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5839            <reference ref="name_oh" />
    63065840        </item>
    63075841        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
     
    63165850            <space />
    63175851            <key key="shop" value="garden_centre" />
    6318             <text key="name" text="Name" />
    6319             <text key="brand" text="Brand" />
    6320             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5852            <reference ref="name_brand_oh" />
    63215853        </item>
    63225854        <separator/>
     
    63315863            <space />
    63325864            <key key="shop" value="doityourself" />
    6333             <text key="name" text="Name" />
    6334             <text key="brand" text="Brand" />
    6335             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5865            <reference ref="name_brand_oh" />
    63365866        </item>
    63375867        <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
     
    63435873            <space />
    63445874            <key key="shop" value="hardware" />
    6345             <text key="name" text="Name" />
    6346             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5875            <reference ref="name_oh" />
    63475876        </item>
    63485877        <item name="Paint" icon="presets/paint.png" type="node,closedway">
     
    63545883            <space />
    63555884            <key key="shop" value="paint" />
    6356             <text key="name" text="Name" />
    6357             <text key="operator" text="Operator" />
    6358             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5885            <reference ref="name_operator_oh" />
    63595886        </item>
    63605887        <separator/>
     
    63635890            <space />
    63645891            <key key="shop" value="furniture" />
    6365             <text key="name" text="Name" />
    6366             <text key="brand" text="Brand" />
    6367             <text key="operator" text="Operator" />
    6368             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5892            <reference ref="name_brand_operator_oh" />
    63695893        </item>
    63705894        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
     
    63775901            <space />
    63785902            <key key="shop" value="kitchen" />
    6379             <text key="name" text="Name" />
    6380             <text key="brand" text="Brand" />
    6381             <text key="operator" text="Operator" />
    6382             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5903            <reference ref="name_brand_operator_oh" />
    63835904        </item>
    63845905        <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
     
    63895910            <space />
    63905911            <key key="shop" value="curtain" />
    6391             <text key="name" text="Name" />
    6392             <text key="operator" text="Operator" />
    6393             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5912            <reference ref="name_operator_oh" />
    63945913        </item>
    63955914        <item name="Frame" icon="presets/frame.png" type="node,closedway">
     
    64015920            <space />
    64025921            <key key="shop" value="frame" />
    6403             <text key="name" text="Name" />
    6404             <text key="operator" text="Operator" />
    6405             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5922            <reference ref="name_operator_oh" />
    64065923        </item>
    64075924        <separator/>
     
    64145931            <space />
    64155932            <key key="shop" value="stationery" />
    6416             <text key="name" text="Name" />
    6417             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5933            <reference ref="name_oh" />
    64185934        </item>
    64195935        <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
     
    64255941            <space />
    64265942            <key key="shop" value="copyshop" />
    6427             <text key="name" text="Name" />
    6428             <text key="operator" text="Operator" />
    6429             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5943            <reference ref="name_operator_oh" />
    64305944        </item>
    64315945        <item name="Book Store" icon="presets/book.png" type="node,closedway">
     
    64385952            <space />
    64395953            <key key="shop" value="books" />
    6440             <text key="name" text="Name" />
    6441             <text key="brand" text="Brand" />
    6442             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5954            <reference ref="name_brand_oh" />
    64435955            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    64445956        </item>
     
    64525964            <space />
    64535965            <key key="shop" value="newsagent" />
    6454             <text key="name" text="Name" />
    6455             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5966            <reference ref="name_oh" />
    64565967        </item>
    64575968        <separator/>
     
    64625973            <space />
    64635974            <key key="shop" value="travel_agency" />
    6464             <text key="name" text="Name" />
    6465             <text key="brand" text="Brand" />
    6466             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5975            <reference ref="name_brand_oh" />
    64675976        </item>
    64685977        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
     
    64735982            <space />
    64745983            <key key="shop" value="musical_instrument" />
    6475             <text key="name" text="Name" />
    6476             <text key="operator" text="Operator" />
    6477             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5984            <reference ref="name_operator_oh" />
    64785985        </item>
    64795986        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
     
    64825989                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=toy" />
    64835990            <label text="Edit Toy Shop" />
    6484             <space />           
     5991            <space />
    64855992            <key key="shop" value="toys" />
    6486             <text key="name" text="Name" />
    6487             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     5993            <reference ref="name_oh" />
    64885994        </item>
    64895995        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
     
    64946000            <space />
    64956001            <key key="shop" value="variety_store" />
    6496             <text key="name" text="Name" />
    6497             <text key="operator" text="Operator" />
    6498             <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
     6002            <reference ref="name_operator_oh" />
    64996003        </item>
    65006004    </group> <!-- Other -->
     
    65056009                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
    65066010        <label text="Edit Vending machine" />
    6507         <space />           
     6011        <space />
    65086012        <key key="amenity" value="vending_machine" />
    65096013        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
     
    65116015        <text key="ref" text="Reference number" />
    65126016        <text key="note" text="Note" />
    6513         <check key="payment:coins" text="Coins" default="off" />
    6514         <check key="payment:notes" text="Notes" default="off" />
    6515         <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    6516         <check key="payment:debit_cards" text="Debit cards" default="off" />
    6517         <check key="payment:credit_cards" text="Credit cards" default="off" />
    6518         <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     6017        <check key="payment:coins" text="Coins" />
     6018        <check key="payment:notes" text="Notes" />
     6019        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     6020        <check key="payment:debit_cards" text="Debit cards" />
     6021        <check key="payment:credit_cards" text="Credit cards" />
     6022        <check key="payment:account_cards" text="Account or loyalty cards" />
    65196023    </item>
    65206024  </group> <!-- Shops -->
     
    69416445                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
    69426446            <label text="Edit Greenhouse Horticulture" />
    6943             <space />           
     6447            <space />
    69446448            <key key="landuse" value="greenhouse_horticulture" />
    6945             <text key="name" text="Name" /> 
    6946             <text key="operator" text="Operator" />                                                               
    6947         </item>       
     6449            <text key="name" text="Name" />
     6450            <text key="operator" text="Operator" />
     6451        </item>
    69486452        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
    69496453            <label text="Edit Allotments Landuse" />
     
    70846588                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
    70856589            <label text="Edit Garages" />
    7086             <space />           
     6590            <space />
    70876591            <key key="landuse" value="garages" />
    7088             <text key="name" text="Name" />                                                   
     6592            <text key="name" text="Name" />
    70896593            <text key="operator" text="Operator" />
    7090         </item> 
     6594        </item>
    70916595        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
    70926596            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
     
    71636667            <space />
    71646668            <key key="landuse" value="quarry" />
    7165             <text key="name" text="Name" />
    7166             <text key="operator" text="Operator" />
     6669            <reference ref="name_operator" />
    71676670        </item>
    71686671    </group> <!-- Landuse -->
     
    73906893            <key key="type" value="route" />
    73916894            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type" values_searchable="true" />
    7392             <text key="name" text="Name" />
    7393             <text key="ref" text="Reference" />
     6895            <reference ref="name_ref" />
    73946896            <text key="symbol" text="Symbol description" />
    73956897            <text key="description" text="Description" />
     
    75147016            <key key="type" value="bridge" />
    75157017            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    7516             <text key="name" text="Name" />
    7517             <text key="ref" text="Reference" />
     7018            <reference ref="name_ref" />
    75187019            <text key="height" text="Height (meters)" />
    75197020            <text key="length" text="Length (meters)" />
     
    75327033            <key key="type" value="tunnel" />
    75337034            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    7534             <text key="name" text="Name" />
    7535             <text key="ref" text="Reference" />
     7035            <reference ref="name_ref" />
    75367036            <text key="length" text="Length (meters)" />
    75377037            <text key="operator" text="Operator" />
  • trunk/data/tagging-preset.xsd

    r6425 r6558  
    100100    </complexType>
    101101
    102         <group name="optional_elements">
     102    <group name="optional_elements">
    103103                <choice>
    104104                        <element name="label" type="tns:label" />
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

    r6552 r6558  
    1010import java.io.InputStreamReader;
    1111import java.io.Reader;
     12import java.util.ArrayList;
    1213import java.util.Collection;
     14import java.util.HashMap;
     15import java.util.Iterator;
    1316import java.util.LinkedList;
    1417import java.util.List;
     18import java.util.Map;
    1519
    1620import javax.swing.JOptionPane;
     
    4448
    4549        return sources;
     50    }
     51
     52    /**
     53     * Holds a reference to a chunk of  items/objects.
     54     */
     55    public static class Chunk {
     56        public String id;
     57    }
     58
     59    /**
     60     * Holds a reference to an earlier item/object.
     61     */
     62    public static class Reference {
     63        public String ref;
    4664    }
    4765   
     
    6583        parser.map("list_entry", TaggingPresetItems.PresetListEntry.class);
    6684        parser.map("item_separator", TaggingPresetItems.ItemSeparator.class);
    67        
     85        parser.mapBoth("chunk", Chunk.class);
     86        parser.map("reference", Reference.class);
     87
    6888        LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
    6989        TaggingPresetMenu lastmenu = null;
     
    7191        final List<TaggingPresetItems.Check> checks = new LinkedList<TaggingPresetItems.Check>();
    7292        List<TaggingPresetItems.PresetListEntry> listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
     93        final Map<String, List<Object>> byId = new HashMap<String, List<Object>>();
     94        String lastId = null;
     95        Iterator<Object> lastIdIterator = null;
    7396
    7497        if (validate) {
     
    78101        }
    79102        while (parser.hasNext()) {
    80             Object o = parser.next();
     103            final Object o;
     104            if (lastIdIterator != null && lastIdIterator.hasNext()) {
     105                // obtain elements from lastIdIterator with higher priority
     106                o = lastIdIterator.next();
     107            } else {
     108                o = parser.next();
     109            }
     110            if (o instanceof Chunk) {
     111                if (((Chunk) o).id.equals(lastId)) {
     112                    // reset last id on end of object, don't process further
     113                    lastId = null;
     114                    ((Chunk) o).id = null;
     115                    continue;
     116                } else if (lastId == null) {
     117                    // if preset item contains an id, store a mapping for later usage
     118                    lastId = ((Chunk) o).id;
     119                    byId.put(lastId, new ArrayList<Object>());
     120                    continue;
     121                } else {
     122                    throw new IllegalStateException("Cannot deal with nested id objects (lastId was expected to be null)");
     123                }
     124            } else if (lastId != null) {
     125                // add object to mapping for later usage
     126                byId.get(lastId).add(o);
     127                continue;
     128            }
     129            if (o instanceof Reference) {
     130                // if o is a reference, obtain the corresponding objects from the mapping,
     131                // and iterate over those before consuming the next element from parser.
     132                final String ref = ((Reference) o).ref;
     133                if (byId.get(ref) == null) {
     134                    throw new SAXException(tr("Reference {0} is being used before it was defined", ref));
     135                }
     136                lastIdIterator = byId.get(ref).iterator();
     137                continue;
     138            }
    81139            if (!(o instanceof TaggingPresetItem) && !checks.isEmpty()) {
    82140                all.getLast().data.addAll(checks);
Note: See TracChangeset for help on using the changeset viewer.