Ticket #17818: josm_17818_small.patch

File josm_17818_small.patch, 59.5 KB (added by skyper, 5 years ago)

smaller patch for preset for #17818 and #16898

  • src/org/openstreetmap/josm/resources/data/defaultpresets.xml

     
    174174        <reference ref="internet" />
    175175        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" />
    176176    </chunk>
     177    <chunk id="height">
     178        <text key="height" text="Height (meters)" length="7" />
     179    </chunk> <!-- height -->
    177180    <chunk id="optional_height">
    178181        <optional>
    179             <text key="height" text="Height (meters)" length="7" />
     182            <reference ref="height" />
    180183        </optional>
    181     </chunk>
     184    </chunk> <!-- optional height -->
    182185    <chunk id="optional_maxwidth">
    183186        <optional>
    184187            <text key="maxwidth" text="Max. width (meters)" length="7" />
     
    208211    <chunk id="sport">
    209212        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
    210213    </chunk>
     214    <chunk id="general_access">
     215        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_sort="false" />
     216    </chunk> <!-- general access -->
     217    <chunk id="site_access">
     218        <combo key="access" text="General Access" values="yes,permissive,customers,private,no" values_sort="false" />
     219    </chunk> <!-- site access -->
    211220    <chunk id="fee">
    212         <combo key="fee" text="Fee" values="yes,no" />
    213     </chunk>
     221        <combo key="fee" text="Fee" values="yes,no" values_sort="false" />
     222    </chunk> <!-- fee -->
    214223    <chunk id="fee_interval">
    215         <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    216     </chunk>
     224        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
     225    </chunk> <!-- fee interval-->
    217226    <chunk id="parking_name_type_ref">
    218227        <text key="name" text="Name" />
    219228        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
    220229        <text key="ref" text="Reference number" />
    221     </chunk>
     230    </chunk> <!-- parking name type ref -->
    222231    <chunk id="parking_access_fee_operator_surface_smoothness">
    223232        <space />
    224         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
     233        <reference ref="site_access" />
    225234        <reference ref="fee_interval" />
    226235        <text key="operator" text="Operator" />
    227236        <reference ref="surface_smoothness" />
    228     </chunk>
     237    </chunk> <!-- parking access fee operator surface smoothness -->
    229238    <chunk id="maxstay">
    230239        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
    231     </chunk>
     240    </chunk> <!-- maxstay -->
    232241    <chunk id="supervised">
    233         <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    234     </chunk>
     242        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
     243    </chunk> <!-- supervised -->
    235244    <chunk id="supervised_lit_oh">
    236245        <reference ref="supervised" />
    237         <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
     246        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
    238247        <reference ref="oh" />
    239     </chunk>
    240     <chunk id="general_access">
    241         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
    242     </chunk>
     248    </chunk> <!-- supervised lit oh -->
    243249    <chunk id="name_wikipedia">
    244250        <text key="name" text="Name" />
    245251        <text key="wikipedia" text="Wikipedia" />
     
    252258    <chunk id="route_hikebike_optionals">
    253259        <text key="ref" text="Reference" />
    254260        <text key="operator" text="Operator" />
    255         <text key="distance" text="Distance (km)"/>
    256         <text key="ascent" text="Ascent (m)"/>
    257         <text key="descent" text="Descent (m)"/>
     261        <text key="distance" text="Distance (kilometers)"/>
     262        <text key="ascent" text="Ascent (meters)"/>
     263        <text key="descent" text="Descent (meters)"/>
    258264        <check key="roundtrip" text="Roundtrip"/>
    259265        <text key="symbol" text="Symbol description"/>
    260266        <text key="description" text="Description"/>
     
    265271        <text key="taxon" text="Taxon" />
    266272    </chunk>
    267273    <chunk id="leaf">
    268         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
    269         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     274        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" values_sort="false" />
     275        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
    270276            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    271277            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
    272278            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
     
    275281        </combo>
    276282    </chunk>
    277283    <chunk id="leaf_without_mixed">
    278         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
    279         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     284        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" values_sort="false" />
     285        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
    280286            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    281287            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
    282288            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
     
    284290        </combo>
    285291    </chunk>
    286292    <!-- start of religions and denominations -->
    287         <chunk id="religious"> <!-- all religions and denominations -->
    288             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
    289             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
    290         </chunk>
    291         <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
    292             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
    293             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    294         </chunk>
    295         <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    296             <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    297         </chunk>
    298         <chunk id="christian_denominations"> <!-- christian denominations -->
    299             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    300         </chunk>
    301         <chunk id="muslim_denominations"> <!-- muslim denominations -->
    302             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    303         </chunk>
    304         <chunk id="jewish_denominations"> <!-- jewish denominations -->
    305             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
    306         </chunk>
    307         <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
    308             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    309         </chunk>
    310         <chunk id="hindu_denominations"> <!-- hindu denominations -->
    311             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    312         </chunk>
    313         <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     293    <chunk id="religious"> <!-- all religions and denominations -->
     294        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
     295        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
     296    </chunk>
     297    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     298        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
     299        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     300    </chunk>
     301    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     302        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     303    </chunk>
     304    <chunk id="christian_denominations"> <!-- christian denominations -->
     305        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
     306    </chunk>
     307    <chunk id="muslim_denominations"> <!-- muslim denominations -->
     308        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     309    </chunk>
     310    <chunk id="jewish_denominations"> <!-- jewish denominations -->
     311        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     312    </chunk>
     313    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     314        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     315    </chunk>
     316    <chunk id="hindu_denominations"> <!-- hindu denominations -->
     317        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     318    </chunk>
     319    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    314320    <!-- end of religions and denominations -->
    315321    <chunk id="voltage">
    316322        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
     
    370376        </optional>
    371377    </chunk>
    372378    <chunk id="power_pole">
    373         <text key="height" text="Height (meters)" />
     379        <reference ref="height" />
    374380        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    375381        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    376382        <check key="location:transition" text="Location transition" disable_off="true" />
     
    451457    </chunk>
    452458    <chunk id="car_brands">
    453459    <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
    454   </chunk>
    455   <chunk id="motorcycle_brands">
    456     <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
    457   </chunk>
    458   <chunk id="walking_routes_roles">
    459      <roles>
    460          <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    461          <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    462          <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    463          <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    464      </roles>
    465   </chunk>
    466   <chunk id="route_segment_roles">
    467      <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    468      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    469      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    470      <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    471   </chunk>
    472   <chunk id="route_start_stop_roles">
    473      <role key="start" text="start endpoint" requisite="optional" type="node" />
    474      <role key="stop" text="stop endpoint" requisite="optional" type="node" />
    475      <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    476   </chunk>
    477   <!-- Link chunks -->
    478   <chunk id="link_contact_address">
    479     <preset_link preset_name="Contact (Common Schema)" />
    480     <preset_link preset_name="Address" />
    481   </chunk>
    482   <chunk id="link_contact_address_payment">
    483     <preset_link preset_name="Contact (Common Schema)" />
    484     <preset_link preset_name="Address" />
    485     <preset_link preset_name="Payment Methods" />
    486   </chunk>
    487   <chunk id="public_transport_route_optionals">
    488     <text key="from" text="From (initial stop)" />
    489     <text key="to" text="To (terminal stop)" />
    490     <text key="via" text="Via (intermediate stops)" />
    491     <text key="operator" text="Operator" />
    492     <text key="network" text="Network" />
    493     <text key="description" text="Description" />
    494     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    495     <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    496     <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    497   </chunk>
    498   <chunk id="climbing_styles">
    499     <label text="Climbing styles:" />
    500     <checkgroup columns="2">
    501       <check key="climbing:boulder" text="Boulders" />
    502       <check key="climbing:sport" text="Sport climbing" />
    503          <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
    504          <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
    505       <check key="climbing:multipitch" text="Multi-pitch climbing" />
    506       <check key="climbing:ice" text="Ice climbing" />
    507       <check key="climbing:mixed" text="Mixed climbing" />
    508       <check key="climbing:deepwater" text="Deep Water Soloing" />
    509     </checkgroup>
    510   </chunk>
    511   <chunk id="climbing_optional_attributes">
    512     <optional>
    513       <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
    514       <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
    515       <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
    516       <check key="climbing:summit_log" text="Summit/route log/register" />
    517       <check key="indoor" text="Climbing routes indoor" />
    518       <check key="outdoor" text="Climbing routes outdoor" />           
    519       <text key="website" text="Official web site (e.g. operator)" />
    520       <text key="url" text="Unofficial web site" />
    521       <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true"/>
    522       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
    523       <combo key="access" text="Access" values="yes,no,customers,private" />
    524     </optional>
    525   </chunk>
    526   <chunk id="nudism">
    527     <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
    528   </chunk>
    529   <chunk id="wall_material">
    530     <combo key="material" text="Material" values="adobe,brick,concrete,masonry,reinforced_concrete,stone" />
    531   </chunk>
     460    </chunk>
     461    <chunk id="motorcycle_brands">
     462        <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
     463    </chunk>
     464    <chunk id="walking_routes_roles">
     465        <roles>
     466            <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
     467            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     468            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
     469            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     470        </roles>
     471    </chunk>
     472    <chunk id="route_segment_roles">
     473        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     474        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     475        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     476        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     477    </chunk>
     478    <chunk id="route_start_stop_roles">
     479        <role key="start" text="start endpoint" requisite="optional" type="node" />
     480        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     481        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
     482    </chunk>
     483    <!-- Link chunks -->
     484    <chunk id="link_contact_address">
     485        <preset_link preset_name="Contact (Common Schema)" />
     486        <preset_link preset_name="Address" />
     487    </chunk>
     488    <chunk id="link_contact_address_payment">
     489        <preset_link preset_name="Contact (Common Schema)" />
     490        <preset_link preset_name="Address" />
     491        <preset_link preset_name="Payment Methods" />
     492    </chunk>
     493    <chunk id="public_transport_route_optionals">
     494        <text key="from" text="From (initial stop)" />
     495        <text key="to" text="To (terminal stop)" />
     496        <text key="via" text="Via (intermediate stops)" />
     497        <text key="operator" text="Operator" />
     498        <text key="network" text="Network" />
     499        <text key="description" text="Description" />
     500        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     501        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
     502        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
     503    </chunk>
     504    <chunk id="climbing_styles">
     505        <label text="Climbing styles:" />
     506        <checkgroup columns="2">
     507            <check key="climbing:boulder" text="Boulders" />
     508            <check key="climbing:sport" text="Sport climbing" />
     509                 <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
     510                 <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
     511            <check key="climbing:multipitch" text="Multi-pitch climbing" />
     512            <check key="climbing:ice" text="Ice climbing" />
     513            <check key="climbing:mixed" text="Mixed climbing" />
     514            <check key="climbing:deepwater" text="Deep Water Soloing" />
     515        </checkgroup>
     516    </chunk>
     517    <chunk id="climbing_optional_attributes">
     518        <optional>
     519            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
     520            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
     521            <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
     522            <check key="climbing:summit_log" text="Summit/route log/register" />
     523            <check key="indoor" text="Climbing routes indoor" />
     524            <check key="outdoor" text="Climbing routes outdoor" />           
     525            <text key="website" text="Official web site (e.g. operator)" />
     526            <text key="url" text="Unofficial web site" />
     527            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" />
     528            <reference ref="fee_interval" />
     529            <reference ref="site_access" />
     530        </optional>
     531    </chunk>
     532    <chunk id="nudism">
     533        <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
     534    </chunk> <!-- Nudism -->
     535    <chunk id="wall_material">
     536        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" values_searchable="true" />
     537    </chunk> <!-- Wall material -->
     538    <chunk id="ele">
     539        <text key="ele" text="Elevation from sea level (meters)" lenght="10" />
     540    </chunk> <!-- Elevation -->
     541    <chunk id="optional_public_building">
     542        <optional>
     543            <reference ref="name_ref_operator" />
     544            <reference ref="height" />
     545            <reference ref="ele" />
     546            <reference ref="wall_material" />
     547            <reference ref="site_access" />
     548            <reference ref="oh" />
     549            <reference ref="fee_interval" />
     550        </optional>
     551    </chunk> <!-- Public building optional attributes -->
    532552  <!--  Groups -->
    533553  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    534554    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
     
    857877        <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
    858878            <link wiki="Key:construction" />
    859879            <key key="highway" value="construction" />
    860             <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" />
     880            <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" values_sort="false" />
    861881            <optional>
    862882                <text key="name" text="Name" />
    863883                <reference ref="highway_base" />
     
    882902            </checkgroup>
    883903            <space />
    884904            <label text="Transport mode restrictions" />
    885             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
    886             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    887             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
     905            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
     906            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     907            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
    888908            <space />
    889909            <label text="Vehicles per type" />
    890             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    891             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
    892             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    893             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    894             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    895             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    896             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    897             <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    898             <combo key="4wd_only" text="4WD only" values="yes,recommended,no" match="key" />
     910            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     911            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
     912            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     913            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     914            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     915            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     916            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     917            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     918            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    899919            <space />
    900920            <label text="Vehicles per use" />
    901             <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
    902             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    903             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    904             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
     921            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
     922            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     923            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     924            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    905925            <space />
    906926            <text key="maxspeed" text="Max. speed (km/h)" />
    907927            <text key="maxspeed:forward" text="Max. speed in way direction" />
     
    913933            <text key="maxheight" text="Max. height (meters)" match="key" />
    914934            <text key="maxwidth" text="Max. width (meters)" match="key" />
    915935            <text key="maxlength" text="Max. length (meters)" match="key" />
    916             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" match="key" />
     936            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
    917937        </item> <!-- Road Restrictions -->
    918938        <separator/>
    919939        <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
     
    13071327                <check key="indoor" text="Indoor" />
    13081328                <reference ref="fee" />
    13091329                <combo key="goods" text="Freight elevator" values="yes,designated,no" />
    1310                 <combo key="access" text="Access" values="yes,no,customers,private" />
     1330                <reference ref="site_access" />
    13111331                <combo key="surveillance" text="Surveillance Camera" values="indoor,outdoor" />
    13121332            </optional>
    13131333        </item> <!-- Elevator -->
     
    13221342            <key key="mountain_pass" value="yes" />
    13231343            <optional>
    13241344                <text key="name" text="Name" />
    1325                 <text key="ele" text="Elevation" />
     1345                <reference ref="ele" />
    13261346                <text key="wikipedia" text="Wikipedia" />
    13271347            </optional>
    13281348        </item> <!-- Mountain Pass -->
     
    13901410            <reference ref="leaf" />
    13911411            <optional>
    13921412                <reference ref="genus_species_taxon" />
    1393                 <text key="height" text="Height (meters)" length="7" />
     1413                <reference ref="height" />
    13941414            </optional>
    13951415        </item> <!-- Hedge -->
    13961416        <item name="Fence" icon="presets/barrier/fence.svg" type="way,closedway" preset_name_label="true">
     
    13981418            <key key="barrier" value="fence" />
    13991419            <optional>
    14001420                <combo key="fence_type" text="Type" values="barbed_wire,bars,chain_link,concrete,electric,metal,pole,railing,split_rail,wire,wood" />
    1401                 <text key="height" text="Height (meters)" length="7" />
     1421                <reference ref="height" />
    14021422            </optional>
    14031423        </item> <!-- Fence -->
    14041424        <item name="Handrail" icon="presets/barrier/handrail.svg" type="way,closedway" preset_name_label="true">
     
    16801700            <space />
    16811701            <key key="waterway" value="waterfall" />
    16821702            <reference ref="name_wikipedia" />
    1683             <text key="height" text="Height (meters)" />
     1703            <reference ref="height" />
    16841704        </item> <!-- Waterfall -->
    16851705        <item name="Weir" icon="presets/nautical/weir.svg" type="node,way" preset_name_label="true">
    16861706            <link wiki="Tag:waterway=weir" />
     
    17671787            <check key="salt" text="Salt Water" disable_off="true" />
    17681788            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
    17691789            <check key="tidal" text="In the tidal range" disable_off="true" />
    1770             <text key="ele" text="Elevation" />
     1790            <reference ref="ele" />
    17711791            <text key="wikipedia" text="Wikipedia" />
    17721792            <reference ref="water_access" />
    17731793        </item> <!-- Water -->
     
    18121832            <optional>
    18131833                <reference ref="supervised" />
    18141834                <reference ref="oh_wheelchair" />
    1815                 <reference ref="general_access" />
     1835                <reference ref="site_access" />
    18161836                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
    18171837                <combo key="sport" text="Sport" values="swimming,surfing" />
    18181838                <reference ref="nudism" />
     
    29122932            <space />
    29132933            <key key="tourism" value="alpine_hut" />
    29142934            <reference ref="name_operator" />
    2915             <text key="ele" text="Elevation" />
     2935            <reference ref="ele" />
    29162936            <text key="rooms" text="Rooms" />
    29172937            <text key="beds" text="Beds" />
    29182938            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
     
    29272947            <space />
    29282948            <key key="tourism" value="wilderness_hut" />
    29292949            <reference ref="name_operator" />
    2930             <combo key="access" text="Access rights" values="yes,permissive,customers,private" />
     2950            <reference ref="site_access" />
    29312951            <text key="capacity" text="Capacity" />
    29322952            <reference ref="fee" />
    29332953            <check key="toilets" text="Toilets" />
    29342954            <check key="shower" text="Shower" />
    29352955            <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
    29362956            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
    2937             <text key="ele" text="Elevation" />
     2957            <reference ref="ele" />
    29382958            <text key="description" text="Closer description" />
    29392959            <space />
    29402960            <reference ref="link_contact_address_payment" />
     
    32083228            <key key="tourism" value="information" />
    32093229            <key key="information" value="guidepost" />
    32103230            <reference ref="name_ref_operator" />
    3211             <text key="ele" text="Elevation" />
     3231            <reference ref="ele" />
    32123232            <optional text="Routes shown for:">
    32133233                <check key="hiking" text="Hiking" />
    32143234                <check key="bicycle" text="Cycling" />
     
    32743294            <space />
    32753295            <key key="leisure" value="bandstand" />
    32763296            <reference ref="name_operator_oh_wheelchair" />
    3277             <combo key="access" text="Access" values="yes,permissive,private" />
     3297            <reference ref="site_access" />
    32783298        </item> <!-- Bandstand -->
    32793299        <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
    32803300            <link wiki="Tag:tourism=zoo" />
     
    33433363            <space />
    33443364            <label text="Used for the water area only." />
    33453365            <space />
    3346             <combo key="access" text="Access" values="yes,customers,private" />
     3366            <reference ref="site_access" />
    33473367        </item> <!-- Swimming Pool -->
    33483368        <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33493369            <link wiki="Tag:amenity=dive_centre" />
     
    33663386            <space />
    33673387            <key key="leisure" value="sauna" />
    33683388            <reference ref="name_operator_oh_wheelchair" />
    3369             <combo key="access" text="Access" values="yes,permissive,private" />
     3389            <reference ref="site_access" />
    33703390            <space />
    33713391            <reference ref="link_contact_address_payment" />
    33723392        </item> <!-- Sauna -->
     
    38383858            <text key="defibrillator:location" text="Location description" />
    38393859            <text key="phone" text="Phone number" />
    38403860            <label text="Use E.123 format, e.g. +49 11223 456 7890" />
    3841             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
     3861            <reference ref="site_access" />
    38423862            <check key="indoor" text="Located inside a building?" />
    38433863            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
    38443864            <optional>
     
    40214041            <space />
    40224042            <key key="amenity" value="toilets" />
    40234043            <optional>
    4024                 <combo key="access" text="Access rights" values="yes,permissive,customers" />
     4044                <reference ref="site_access" />
    40254045                <checkgroup columns="3">
    40264046                    <check key="female" text="Female" text_context="restroom" />
    40274047                    <check key="male" text="Male" text_context="restroom" />
     
    40414061            <link wiki="Tag:amenity=shower" />
    40424062            <space />
    40434063            <key key="amenity" value="shower" />
    4044             <combo key="access" text="Access rights" values="yes,permissive,customers" />
     4064            <reference ref="site_access" />
    40454065            <optional>
    40464066                <checkgroup columns="3">
    40474067                    <check key="female" text="Female" text_context="restroom" />
     
    41944214            <check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
    41954215            <check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
    41964216            <check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
    4197             <combo key="access" text="Access" values="yes,customers,no" />
     4217            <reference ref="site_access" />
    41984218            <reference ref="fee" />
    41994219            <text key="operator" text="Operator" />
    42004220            <combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
     
    42284248            <link wiki="Tag:amenity=hunting_stand" />
    42294249            <space />
    42304250            <key key="amenity" value="hunting_stand" />
    4231             <text key="height" text="Height (meters)" />
     4251            <reference ref="height" />
    42324252            <check key="shelter" text="Shelter" />
    42334253            <check key="hide" text="Hide" text_context="hunting stand" />
    42344254            <check key="lockable" text="Lockable" />
     
    42674287            <link wiki="Tag:amenity=compressed_air" />
    42684288            <space />
    42694289            <key key="amenity" value="compressed_air" />
    4270             <reference ref="name_ref" />
    4271             <text key="operator" text="Operator" />
     4290            <reference ref="name_ref_operator" />
    42724291            <reference ref="fee" />
    42734292            <multiselect key="valves" text="Valves" values="dunlop;schrader;sclaverand;regina" display_values="Dunlop (Woods);Schrader;Sclaverand (Presta);Regina" values_searchable="true" />
    42744293        </item> <!-- Compressed Air -->
     
    44674486            <combo key="leisure" text="Type" values="sports_centre" />
    44684487            <reference ref="climbing_styles" />
    44694488            <text key="climbing:routes" text="Number of routes" />
    4470             <text key="ele" text="Usual elevation at the bottom of the routes" />
     4489            <text key="ele" text="Usual elevation at the bottom of the routes" lenght="10" />
    44714490            <space />
    44724491            <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    44734492            <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     
    48124831            <optional>
    48134832                <text key="name" text="Name" />
    48144833                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4815                 <text key="height" text="Height (meters)" />
     4834                <reference ref="height" />
    48164835            </optional>
    48174836            <preset_link preset_name="Address" />
    48184837        </item> <!-- Building -->
     
    48234842            <optional>
    48244843                <text key="name" text="Name" />
    48254844                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4826                 <text key="height" text="Height (meters)" />
     4845                <reference ref="height" />
    48274846            </optional>
    48284847            <preset_link preset_name="Address" />
    48294848        </item> <!-- Residential Building -->
     
    48324851            <space />
    48334852            <combo key="building:part" text="Building part" values="allotment_house,bakehouse,barn,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,greenhouse,hangar,hospital,industrial,office,retail,roof,ruins,school,shed,supermarket,toilets,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    48344853            <text key="name" text="Name" />
    4835             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4836             <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" />
    4837             <text key="height" text="Height (meters)" />
     4854            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" values_searchable="false" />
     4855            <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" values_searchable="false" />
     4856            <reference ref="height" />
    48384857            <text key="min_height" text="Skipped height (meters)" />
    48394858        </item> <!-- Building part -->
    48404859        <item name="Entrance" icon="presets/misc/entrance_yes.svg" type="node" preset_name_label="true">
     
    48494868                <list_entry value="staircase" icon="presets/misc/entrance_yes.svg" />
    48504869                <list_entry value="home" icon="presets/misc/entrance_yes.svg" />
    48514870            </combo>
    4852             <combo key="access" text="Access" values="yes,delivery,private,no" />
     4871            <combo key="access" text="Access" values="yes,delivery,permissive,customers,private,no" values_sort="false" />
    48534872            <reference ref="wheelchair" />
    48544873            <optional>
    48554874                <text key="ref" text="Entrance number" />
     
    48664885            </optional>
    48674886            <reference ref="link_contact_address" />
    48684887        </item> <!-- Non-public police facility -->
    4869         <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
     4888        <item name="Tower" icon="presets/landmark/Tower_dome.svg" type="node,closedway,multipolygon" preset_name_label="true">
    48704889            <link wiki="Tag:man_made=tower" />
    48714890            <space />
     4891            <label text=" See Man_Made/Big Communication Tower preset" />
     4892            <label text="  for big communication towers !" />
     4893            <preset_link preset_name="Big Communication Tower" />
     4894            <label text=" Consider using man_made=mast for smaller constructions !" />
     4895            <space />
    48724896            <key key="man_made" value="tower" />
    4873             <text key="name" text="Name" />
    4874             <combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
    4875             <optional>
    4876                 <text key="height" text="Height (meters)" />
    4877                 <text key="operator" text="Operator" />
    4878             </optional>
     4897            <combo key="tower:type" text="Type of tower" values="communication,observation,watchtower,defensive,cooling,radar,lighting,bell_tower,minaret" display_values="Communication tower,Observation tower,Watch Tower,Fortified defensive tower,Cooling tower,Radar tower,Lighting tower,Bell tower or church tower,Minaret" values_searchable="true" values_sort="false" />
     4898            <reference ref="optional_public_building" />
     4899            <reference ref="link_contact_address" />
    48794900        </item> <!-- Tower -->
     4901        <item name="Big Communication Tower" icon="presets/landmark/Communication_tower-14.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4902            <link wiki="Tag:man_made=communications_tower" />
     4903            <space />
     4904            <label text=" Big communication tower, usually 100 meters or higher." />
     4905            <space />
     4906            <label text="  Use Man_Made/Tower preset for smaller ones ! " />
     4907            <preset_link preset_name="Tower" />
     4908            <space />
     4909            <key key="man_made" value="communications_tower" />
     4910            <key key="tower:type" value="communication" match="none"/>
     4911            <reference ref="optional_public_building" />
     4912            <reference ref="link_contact_address" />
     4913        </item> <!-- Big Communication Tower -->
    48804914        <item name="Flagpole" icon="presets/misc/flag.svg" type="node" preset_name_label="true">
    48814915            <link wiki="Tag:man_made=flagpole" />
    48824916            <key key="man_made" value="flagpole" />
     
    48974931            <space />
    48984932            <key key="man_made" value="chimney" />
    48994933            <reference ref="name_operator" />
    4900             <text key="height" text="Height (meters)" />
     4934            <reference ref="height" />
    49014935        </item> <!-- Chimney -->
    49024936        <item name="Kiln" icon="presets/misc/kiln.svg" type="node,closedway" preset_name_label="true">
    49034937            <link wiki="Tag:man_made=kiln" />
     
    49194953            <optional>
    49204954                <reference ref="name_operator" />
    49214955                <combo key="building" text="Building" values="gasometer" values_context="building" />
    4922                 <text key="height" text="Height (meters)" length="7" />
     4956                <reference ref="height" />
    49234957            </optional>
    49244958        </item> <!-- Gasometer -->
    49254959        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
     
    49294963            <optional>
    49304964                <reference ref="name_operator" />
    49314965                <combo key="building" text="Building" values="silo" values_context="building" />
    4932                 <text key="height" text="Height (meters)" length="7" />
     4966                <reference ref="height" />
    49334967            </optional>
    49344968        </item> <!-- Silo -->
    49354969        <item name="Storage Tank" icon="presets/landmark/storage_tank.svg" type="node,closedway">
     
    49394973                <reference ref="name_operator" />
    49404974                <combo key="building" text="Building" values="storage_tank" values_context="building" />
    49414975                <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
    4942                 <text key="height" text="Height (meters)" length="7" />
     4976                <reference ref="height" />
    49434977            </optional>
    49444978        </item> <!-- Storage Tank -->
    49454979        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
     
    50355069            <key key="man_made" value="water_tower" />
    50365070             <optional>
    50375071                <reference ref="name_operator" />
    5038                 <text key="height" text="Height (meters)" length="7" />
     5072                <reference ref="height" />
    50395073            </optional>
    50405074        </item> <!-- Water Tower -->
    50415075        <item name="Water Works" icon="presets/landmark/water_works.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    51415175            <link wiki="Tag:man_made=survey_point" />
    51425176            <space />
    51435177            <key key="man_made" value="survey_point" />
    5144             <text key="name" text="Name" />
    5145             <text key="ref" text="Reference" />
    5146             <text key="ele" text="Elevation" />
     5178            <reference ref="name_ref" />
     5179            <reference ref="ele" />
    51475180            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
    51485181        </item> <!-- Survey Point -->
    51495182        <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
     
    51665199            <optional>
    51675200                <text key="camera:direction" text="Direction in degrees" match="key" />
    51685201                <text key="camera:angle" text="Inclination in degrees" match="key" />
    5169                 <text key="height" text="Height (meters)" />
     5202                <reference ref="height" />
    51705203            </optional>
    51715204        </item> <!-- Surveillance Camera -->
    51725205    </group> <!-- Man Made -->
     
    55085541            <link wiki="Tag:building=transformer_tower" />
    55095542            <space />
    55105543            <key key="building" value="transformer_tower" />
    5511             <text key="height" text="Height (meters)" />
     5544            <reference ref="height" />
    55125545            <reference ref="ref_operator" />
    55135546            <preset_link preset_name="Power Substation" />
    55145547        </item> <!-- Transformer Tower -->
     
    55265559            <link wiki="Tag:power=portal" />
    55275560            <space />
    55285561            <key key="power" value="portal" />
    5529             <text key="height" text="Height (meters)" />
     5562            <reference ref="height" />
    55305563            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    55315564            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    55325565            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     
    55385571            <link wiki="Tag:power=tower" />
    55395572            <space />
    55405573            <key key="power" value="tower" />
    5541             <text key="height" text="Height (meters)" />
     5574            <reference ref="height" />
    55425575            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    55435576            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    55445577            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     
    70627095            <space />
    70637096            <key key="natural" value="peak" />
    70647097            <reference ref="name_wikipedia" />
    7065             <text key="ele" text="Elevation" />
     7098            <reference ref="ele" />
    70667099        </item> <!-- Peak -->
    70677100        <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
    70687101            <link wiki="Tag:natural=saddle" />
     
    70707103            <space/>
    70717104            <key key="natural" value="saddle" />
    70727105            <reference ref="name_wikipedia" />
    7073             <text key="ele" text="Elevation" />
     7106            <reference ref="ele" />
    70747107        </item> <!-- Saddle -->
    70757108        <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
    70767109            <link wiki="Tag:natural=glacier" />
     
    70787111            <space />
    70797112            <key key="natural" value="glacier" />
    70807113            <reference ref="name_wikipedia" />
    7081             <text key="ele" text="Elevation" />
     7114            <reference ref="ele" />
    70827115        </item> <!-- Glacier -->
    70837116        <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
    70847117            <link wiki="Tag:natural=volcano" />
     
    70867119            <space />
    70877120            <key key="natural" value="volcano" />
    70887121            <reference ref="name_wikipedia" />
    7089             <text key="ele" text="Elevation" />
     7122            <reference ref="ele" />
    70907123            <optional>
    70917124                <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
    70927125                <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
     
    70987131            <space />
    70997132            <key key="natural" value="ridge" />
    71007133            <reference ref="name_wikipedia" />
    7101             <text key="ele" text="Elevation" />
     7134            <reference ref="ele" />
    71027135        </item> <!-- Ridge -->
    71037136        <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
    71047137            <link wiki="Tag:natural=valley" />
     
    71137146            <space />
    71147147            <key key="natural" value="cliff" />
    71157148            <text key="name" text="Name" />
    7116             <text key="height" text="Height (meters)" />
     7149            <reference ref="height" />
    71177150        </item> <!-- Cliff -->
    71187151        <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
    71197152            <link wiki="Tag:natural=cave_entrance" />
     
    71227155            <key key="natural" value="cave_entrance" />
    71237156            <reference ref="name_wikipedia" />
    71247157            <reference ref="oh_wheelchair" />
    7125             <reference ref="general_access" />
     7158            <reference ref="site_access" />
    71267159            <reference ref="fee" />
    71277160        </item> <!-- Cave Entrance -->
    71287161        <separator/>
     
    71637196            <optional>
    71647197                <reference ref="genus_species_taxon" />
    71657198                <space />
    7166                 <text key="height" text="Height (meters)" />
     7199                <reference ref="height" />
    71677200                <text key="diameter_crown" text="Diameter crown (meters)" />
    71687201                <text key="circumference" text="Circumference (meters)" />
    71697202                <space />
     
    71797212            <reference ref="leaf" />
    71807213            <optional>
    71817214                <reference ref="genus_species_taxon" />
    7182                 <text key="height" text="Height (meters)" />
     7215                <reference ref="height" />
    71837216            </optional>
    71847217        </item> <!-- Tree Row -->
    71857218        <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
     
    72877320            <key key="natural" value="stone" />
    72887321            <reference ref="name_wikipedia" />
    72897322            <optional>
    7290                 <text key="height" text="Height (meters)" length="7" />
     7323                <reference ref="height" />
    72917324                <text key="width" text="Width (meters)" />
    72927325            </optional>
    72937326        </item> <!-- Stone -->
     
    75677600            <space />
    75687601            <text key="wikipedia" text="Wikipedia" />
    75697602            <text key="image" text="Image" />
     7603            <space />
     7604            <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" />
    75707605        </item> <!-- Contact (Common Schema) -->
    75717606        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    75727607            <link wiki="Key:contact" />
     
    75807615            <space />
    75817616            <text key="wikipedia" text="Wikipedia" />
    75827617            <text key="image" text="Image" />
     7618            <space />
     7619            <preset_link preset_name="Contact (Common Schema)" />
    75837620        </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
    75847621        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    75857622            <link wiki="Key:description" />
     
    79928029            <key key="type" value="bridge" />
    79938030            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    79948031            <reference ref="name_ref" />
    7995             <text key="height" text="Height (meters)" />
     8032            <reference ref="height" />
    79968033            <text key="length" text="Length (meters)" />
    79978034            <text key="operator" text="Operator" />
    79988035            <roles>