Ticket #21907: josm_21907_preset_v2.patch

File josm_21907_preset_v2.patch, 67.0 KB (added by skyper, 4 years ago)

preset part version 2 including changes for #21963 and #21964

  • resources/data/defaultpresets.xml

     
    2525        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground" />
    2626    </chunk>
    2727    <chunk id="riding_surface">
    28         <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
    2928        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
    3029    </chunk>
    3130    <chunk id="highway_base">
    … …  
    232231            <text key="operator" text="Operator" />
    233232        </optional>
    234233    </chunk>
     234    <chunk id="pitch_sports-hall_sports-centre_stadium">
     235        <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     236        <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     237        <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     238        <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     239    </chunk>
     240    <chunk id="pitch_sports-hall_sports-centre_stadium_track">
     241        <reference ref="pitch_sports-hall_sports-centre_stadium" />
     242        <list_entry value="track" display_value="Racetrack" icon="presets/sport/track.svg" />
     243    </chunk>
    235244    <chunk id="name_leisure_pitch">
    236         <text key="name" text="Name" />
    237         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     245        <reference ref="name_operator" />
     246        <combo key="leisure" text="Type" default="pitch">
     247            <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     248            <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     249            <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     250        </combo>
    238251    </chunk>
    239252    <chunk id="sport">
    240         <multiselect key="sport" text="Sport" values="10pin;9pin;american_football;archery;athletics;australian_football;baseball;basketball;beachvolleyball;billiards;boules;bowls;canadian_football;canoe;chess;climbing;cricket;croquet;curling;cycling;dog_racing;equestrian;field_hockey;fitness;gaelic_games;golf;gymnastics;handball;horse_racing;ice_hockey;ice_skating;karting;model_aerodrome;motocross;motor;multi;pelota;racquet;rc_car;roller_skating;rowing;rugby_league;rugby_union;running;safety_training;scuba_diving;shooting;skateboard;soccer;surfing;swimming;table_tennis;tennis;volleyball" values_context="sport" />
     253        <multiselect key="sport" text="Sport" values_context="sport">
     254            <list_entry value="10pin" display_value="10pin" icon="presets/sport/10pin.svg" />
     255            <list_entry value="9pin" display_value="9pin" icon="presets/sport/9pin.svg" />
     256            <list_entry value="american_football" display_value="American Football" icon="presets/sport/football.svg" icon_size="16" />
     257            <list_entry value="archery" display_value="Archery" icon="presets/sport/archery.svg" icon_size="16" />
     258            <list_entry value="athletics" display_value="Athletics" icon="presets/sport/athletics.svg" icon_size="16" />
     259            <list_entry value="australian_football" display_value="Australian Football" icon="presets/sport/football.svg" icon_size="16" />
     260            <list_entry value="baseball" display_value="Baseball" icon="presets/sport/baseball.svg" icon_size="16" />
     261            <list_entry value="basketball" display_value="Basketball" icon="presets/sport/basketball.svg" icon_size="16" />
     262            <list_entry value="beachvolleyball" display_value="Beachvolleyball" icon="presets/sport/beachvolleyball.svg" icon_size="16" />
     263            <list_entry value="billiards" display_value="Billiards" icon="presets/sport/billiards.svg" icon_size="16" />
     264            <list_entry value="boules" display_value="Boules" icon="presets/sport/boule.svg" icon_size="16" />
     265            <list_entry value="bowls" display_value="Lawn Bowling" icon="presets/sport/boule.svg" icon_size="16" />
     266            <list_entry value="canadian_football" display_value="Canadian Football" icon="presets/sport/football.svg" icon_size="16" />
     267            <list_entry value="canoe" display_value="Canoe" icon="presets/sport/canoe.svg" icon_size="16" />
     268            <list_entry value="chess" display_value="Chess" icon="presets/sport/chess.svg" />
     269            <list_entry value="climbing" display_value="Climbing" icon="presets/sport/climbing.svg" icon_size="16" />
     270            <list_entry value="cricket" display_value="Cricket" icon="presets/sport/cricket.svg" icon_size="16" />
     271            <list_entry value="croquet" display_value="Croquet" icon="presets/sport/croquet.svg" icon_size="16" />
     272            <list_entry value="curling" display_value="Curling" icon="presets/sport/curling.svg" />
     273            <list_entry value="cycling" display_value="Cycling" icon="presets/sport/cycling.svg" icon_size="16" />
     274            <list_entry value="dog_racing" display_value="Dog Racing" icon="presets/sport/dog_racing.svg" />
     275            <list_entry value="equestrian" display_value="Equestrian" icon="presets/sport/equestrian.svg" />
     276            <list_entry value="field_hockey" display_value="Field Hockey" icon="presets/sport/field_hockey.svg" />
     277            <list_entry value="fitness" display_value="Fitness" />
     278            <list_entry value="gaelic_games" display_value="Gaelic Games" icon="presets/sport/soccer.svg" icon_size="16" />
     279            <list_entry value="golf" display_value="Golf" icon="presets/sport/golf.svg" icon_size="16" />
     280            <list_entry value="gymnastics" display_value="Gymnastics" icon="presets/sport/gymnastics.svg" icon_size="16" />
     281            <list_entry value="handball" display_value="Handball" icon="presets/sport/handball.svg" icon_size="16" />
     282            <list_entry value="horse_racing" display_value="Horse Racing" icon="presets/sport/riding.svg" icon_size="16" />
     283            <list_entry value="ice_hockey" display_value="Ice Hockey" icon="presets/sport/ice_hockey.svg" />
     284            <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
     285            <list_entry value="karting" display_value="Karting" icon="presets/sport/karting.svg" />
     286            <list_entry value="model_aerodrome" display_value="Model_aerodrome" icon="presets/sport/airport.svg" />
     287            <list_entry value="motocross" display_value="Motocross" icon="presets/sport/motocross.svg" icon_size="16" />
     288            <list_entry value="motor" display_value="Motor" icon="presets/sport/motor.svg" />
     289            <list_entry value="multi" display_value="Multi" icon="presets/sport/multi.svg" icon_size="16" />
     290            <list_entry value="pelota" display_value="Pelota" icon="presets/sport/pelota.svg" />
     291            <list_entry value="racquet" display_value="Racquet" icon="presets/sport/racquetball.svg" icon_size="16" />
     292            <list_entry value="rc_car" display_value="RC Car" icon="presets/sport/rc_car.svg" />
     293            <list_entry value="roller_skating" display_value="Roller Skating" icon="presets/sport/roller_skating.svg" />
     294            <list_entry value="rowing" display_value="Rowing" icon="presets/sport/rowing.svg" icon_size="16" />
     295            <list_entry value="rugby_league" display_value="Rugby League" icon="presets/sport/football.svg" icon_size="16" />
     296            <list_entry value="rugby_union" display_value="Rugby Union" icon="presets/sport/football.svg" icon_size="16" />
     297            <list_entry value="running" display_value="Running" icon="presets/sport/running.svg" icon_size="16" />
     298            <list_entry value="safety_training" display_value="Safety Training" />
     299            <list_entry value="scuba_diving" display_value="Scuba Diving" icon="presets/sport/scuba_diving.svg" icon_size="16" />
     300            <list_entry value="shooting" display_value="Shooting" icon="presets/sport/range.svg" icon_size="16" />
     301            <list_entry value="skateboard" display_value="Skateboard" icon="presets/sport/skateboard.svg" icon_size="16" />
     302            <list_entry value="soccer" display_value="Soccer" icon="presets/sport/soccer.svg" icon_size="16" />
     303            <list_entry value="surfing" display_value="Surfing" />
     304            <list_entry value="swimming" display_value="Swimming" icon="presets/sport/swimming.svg" />
     305            <list_entry value="table_tennis" display_value="Table Tennis" icon="presets/sport/table_tennis.svg" icon_size="16" />
     306            <list_entry value="tennis" display_value="Tennis" icon="presets/sport/tennis.svg" icon_size="16" />
     307            <list_entry value="volleyball" display_value="Volleyball" icon="presets/sport/volleyball.svg" icon_size="16" />
     308        </multiselect>
    241309    </chunk>
    242310    <chunk id="highway_access">
    243311        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_sort="false" />
    … …  
    9791047            <space />
    9801048            <key key="highway" value="raceway" />
    9811049            <text key="name" text="Name" />
     1050            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
     1051            <multiselect key="sport" text="Sport" values_context="sport">
     1052                <list_entry value="karting" display_value="Karting" icon="presets/sport/karting.svg" />
     1053                <list_entry value="motocross" display_value="Motocross" icon="presets/sport/motocross.svg" icon_size="16" />
     1054                <list_entry value="motor" display_value="Motor" icon="presets/sport/motor.svg" />
     1055                <list_entry value="rc_car" display_value="RC Car" icon="presets/sport/rc_car.svg" />
     1056            </multiselect>
    9821057        </item> <!-- Raceway -->
    9831058        <item name="Road (Unknown Type)" icon="presets/transport/way/way_road.svg" type="way,closedway" preset_name_label="true">
    9841059            <link wiki="Tag:highway=road" />
    … …  
    22582333                <reference ref="oh_wheelchair" />
    22592334                <reference ref="POI_access" />
    22602335                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
    2261                 <multiselect key="sport" text="Sport" values="swimming;surfing" rows="2"/>
     2336                <multiselect key="sport" text="Sport" rows="2">
     2337                    <list_entry value="surfing" display_value="Surfing" />
     2338                    <list_entry value="swimming" display_value="Swimming" icon="presets/sport/swimming.svg" />
     2339                </multiselect>
    22622340                <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
    22632341            </optional>
    22642342        </item> <!-- Beach -->
    … …  
    28402918            <key key="shop" value="car" />
    28412919            <reference ref="car_brands" />
    28422920            <reference ref="name_operator_oh_wheelchair" />
    2843             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     2921            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
    28442922            <reference ref="link_contact_address_payment" />
    28452923        </item> <!-- Car Dealer -->
    28462924        <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    29182996            <reference ref="motorcycle_brands" />
    29192997            <text key="operator" text="Operator" />
    29202998            <reference ref="oh_wheelchair" />
    2921             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     2999            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
    29223000            <optional text="Services:">
    29233001                <combo key="sale" text="Sale" values="yes,brand,no" />
    29243002                <combo key="rental" text="Rental" values="yes,brand,no" />
    … …  
    39444022            <reference ref="name_operator_oh_wheelchair" />
    39454023            <reference ref="link_contact_address_payment" />
    39464024            <preset_link preset_name="Public bath" text="Similar but different tags:" />
    3947             <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
     4025            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
    39484026        </item> <!-- Water Park -->
    39494027        <item name="Water Slide" icon="presets/attraction/water_slide.svg" type="node,way" preset_name_label="true">
    39504028            <link wiki="Tag:attraction=water_slide" />
    … …  
    39684046            <reference ref="fee" />
    39694047            <reference ref="link_contact_address_payment" />
    39704048            <preset_link preset_name="Water Park" text="Similar but different tags:" />
    3971             <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
     4049            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
    39724050        </item> <!-- Public bath -->
    39734051        <item name="Resort" icon="presets/leisure/resort.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39744052            <link wiki="Tag:leisure=resort" />
    … …  
    39964074            <space />
    39974075            <reference ref="POI_access" />
    39984076        </item> <!-- Swimming Pool -->
    3999         <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4077        <item name="Dive Center" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40004078            <link wiki="Tag:amenity=dive_centre" />
    40014079            <space />
    40024080            <key key="amenity" value="dive_centre" />
    40034081            <reference ref="name_operator_oh_wheelchair" />
    40044082            <reference ref="link_contact_address_payment" />
    4005         </item> <!-- Dive centre -->
     4083        </item> <!-- Dive Center -->
    40064084        <item name="Fitness Station" icon="presets/leisure/fitness_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40074085            <link wiki="Tag:leisure=fitness_station" />
    40084086            <space />
    … …  
    40194097            <reference ref="POI_access" />
    40204098            <reference ref="link_contact_address_payment" />
    40214099        </item> <!-- Sauna -->
    4022         <item name="Horse Riding" icon="presets/leisure/horse_riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4100        <item name="Horseback Riding Facility" icon="presets/leisure/horse_riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40234101            <link wiki="Tag:leisure=horse_riding" />
    40244102            <space />
    40254103            <key key="leisure" value="horse_riding" />
    40264104            <reference ref="name_operator_oh_wheelchair" />
    40274105            <reference ref="fee" />
    40284106            <reference ref="link_contact_address_payment" />
    4029         </item> <!-- Horse Riding -->
     4107        </item> <!-- Horseback Riding Facility -->
    40304108        <item name="Club" icon="presets/leisure/club.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40314109            <link wiki="Key:club" />
    40324110            <space />
    … …  
    41104188            <reference ref="name_ref_operator" />
    41114189        </item> <!-- Bird Hide -->
    41124190        <separator/>
    4113         <item name="Amusement arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4191        <item name="Amusement Arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41144192            <link wiki="Tag:leisure=amusement_arcade" />
    41154193            <space />
    41164194            <key key="leisure" value="amusement_arcade" />
    … …  
    41194197            <space />
    41204198            <reference ref="internet_smoking" />
    41214199            <reference ref="link_contact_address_payment" />
    4122             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     4200            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    41234201            <preset_link preset_name="Gambling" text="Similar but different tags:" />
    41244202            <preset_link preset_name="Casino" text="Similar but different tags:" />
    41254203            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
    41264204            <preset_link preset_name="Lottery" text="Similar but different tags:" />
    4127         </item> <!-- Amusement arcade -->
    4128         <item name="Adult gaming centre" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4205        </item> <!-- Amusement Arcade -->
     4206        <item name="Adult Gaming Center" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41294207            <link wiki="Tag:leisure=adult_gaming_centre" />
    41304208            <space />
    41314209            <key key="leisure" value="adult_gaming_centre" />
    … …  
    41344212            <space />
    41354213            <reference ref="internet_smoking" />
    41364214            <reference ref="link_contact_address_payment" />
    4137             <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
    4138             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     4215            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
     4216            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    41394217            <preset_link preset_name="Gambling" text="Similar but different tags:" />
    41404218            <preset_link preset_name="Casino" text="Similar but different tags:" />
    41414219            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
    41424220            <preset_link preset_name="Lottery" text="Similar but different tags:" />
    4143         </item> <!-- Adult gaming centre -->
     4221        </item> <!-- Adult Gaming Center -->
    41444222        <item name="Gambling" icon="presets/leisure/gambling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41454223            <link wiki="Tag:amenity=gambling" />
    41464224            <space />
    … …  
    41514229            <space />
    41524230            <reference ref="internet_smoking" />
    41534231            <reference ref="link_contact_address_payment" />
    4154             <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
    4155             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     4232            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
     4233            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    41564234            <preset_link preset_name="Casino" text="Similar but different tags:" />
    41574235            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
    41584236            <preset_link preset_name="Lottery" text="Similar but different tags:" />
    … …  
    41664244            <space />
    41674245            <reference ref="internet_smoking" />
    41684246            <reference ref="link_contact_address_payment" />
    4169             <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
    4170             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     4247            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
     4248            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    41714249            <preset_link preset_name="Gambling" text="Similar but different tags:" />
    41724250            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
    41734251            <preset_link preset_name="Lottery" text="Similar but different tags:" />
    … …  
    42494327            <reference ref="oh_wheelchair" />
    42504328            <reference ref="POI_access" />
    42514329        </item> <!-- Public bookcase -->
    4252         <item name="Arts Centre" icon="presets/sightseeing/arts_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4330        <item name="Arts Center" icon="presets/sightseeing/arts_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    42534331            <link wiki="Tag:amenity=arts_centre" />
    42544332            <space />
    42554333            <key key="amenity" value="arts_centre" />
    42564334            <reference ref="name_operator_oh_wheelchair" />
    42574335            <reference ref="link_contact_address_payment" />
    42584336            <preset_link preset_name="Building" />
    4259         </item> <!-- Arts Centre -->
     4337        </item> <!-- Arts Center -->
    42604338        <item name="Artwork" icon="presets/sightseeing/arts_centre.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    42614339            <link wiki="Tag:tourism=artwork" />
    42624340            <space />
    … …  
    43874465            <reference ref="link_contact_address" />
    43884466            <preset_link preset_name="Building" />
    43894467        </item> <!-- Town Hall -->
    4390         <item name="Community Centre" icon="presets/service/community_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4468        <item name="Community Center" icon="presets/service/community_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    43914469            <link wiki="Tag:amenity=community_centre" />
    43924470            <space />
    4393             <label text="Community Centre" />
     4471            <label text="Community Center" />
    43944472            <space />
    43954473            <key key="amenity" value="community_centre" />
    43964474            <reference ref="name_operator_oh_wheelchair" />
    … …  
    43984476            <multiselect key="community_centre:for" text="For" values="child;juvenile;student;girl;boy;man;woman;senior;family;homosexual;multigeneration;disabled;athlete;immigrant;lgbtq" />
    43994477            <reference ref="link_contact_address" />
    44004478            <preset_link preset_name="Building" />
    4401         </item> <!-- Community Centre -->
     4479        </item> <!-- Community Center -->
    44024480        <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
    44034481            <link wiki="Tag:amenity=courthouse" />
    44044482            <space />
    … …  
    49305008                <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    49315009            </checkgroup>
    49325010        </item> <!-- Recycling Container-->
    4933         <item name="Recycling Centre" icon="presets/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5011        <item name="Recycling Center" icon="presets/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    49345012           <link wiki="Tag:amenity=recycling" />
    49355013            <space />
    49365014            <key key="amenity" value="recycling" />
    … …  
    49625040                <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    49635041            </checkgroup>
    49645042            <reference ref="link_contact_address_payment" />
    4965         </item> <!-- Recycling Centre-->
     5043        </item> <!-- Recycling Center-->
    49665044        <item name="Waste Basket/Trash Can" icon="presets/service/recycling/waste_basket.svg" type="node" preset_name_label="true">
    49675045            <link wiki="Tag:amenity=waste_basket" />
    49685046            <key key="amenity" value="waste_basket" />
    … …  
    50915169            <link wiki="Tag:leisure=stadium" />
    50925170            <space />
    50935171            <key key="leisure" value="stadium" />
    5094             <text key="name" text="Name" />
    50955172            <reference ref="sport" />
     5173            <reference ref="name_operator_oh_wheelchair" />
    50965174            <reference ref="link_contact_address_payment" />
    50975175        </item> <!-- Stadium -->
    5098         <item name="Sports Centre" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5176        <item name="Sports Center" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    50995177            <link wiki="Tag:leisure=sports_centre" />
    51005178            <space />
    51015179            <key key="leisure" value="sports_centre" />
    5102             <text key="name" text="Name" />
    51035180            <reference ref="sport" />
     5181            <reference ref="name_operator_oh_wheelchair" />
     5182            <reference ref="link_contact_address_payment" />
     5183            <preset_link preset_name="Building" />
     5184            <preset_link preset_name="Sports Hall" text="Similar but different tags:" />
     5185        </item> <!-- Sports Center -->
     5186        <item name="Sports Hall" icon="presets/sport/sports_hall.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5187            <link wiki="Tag:leisure=sports_hall" />
     5188            <space />
     5189            <key key="leisure" value="sports_hall" />
     5190            <reference ref="sport" />
     5191            <reference ref="name_operator_oh_wheelchair" />
    51045192            <reference ref="link_contact_address_payment" />
    51055193            <preset_link preset_name="Building" />
    5106         </item> <!-- Sports Centre -->
    5107         <item name="Fitness Centre" icon="presets/sport/fitness_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5194            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
     5195        </item> <!-- Sports Hall -->
     5196        <item name="Fitness Center" icon="presets/sport/fitness_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    51085197            <link wiki="Tag:leisure=fitness_centre" />
    51095198            <space />
    51105199            <key key="leisure" value="fitness_centre" />
    5111             <text key="name" text="Name" />
    51125200            <reference ref="sport" />
     5201            <reference ref="name_operator_oh_wheelchair" />
    51135202            <reference ref="link_contact_address_payment" />
    51145203            <preset_link preset_name="Building" />
    5115         </item> <!-- Fitness Centre -->
     5204        </item> <!-- Fitness Center -->
     5205        <item name="Ice Rink" icon="presets/sport/ice_rink.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5206            <link wiki="Tag:leisure=ice_rink" />
     5207            <space />
     5208            <key key="leisure" value="ice_rink" />
     5209            <multiselect key="sport">
     5210                 <list_entry value="curling" display_value="Curling" icon="presets/sport/curling.svg" />
     5211                 <list_entry value="ice_hockey" display_value="Ice Hockey" icon="presets/sport/ice_hockey.svg" />
     5212                 <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
     5213            </multiselect>
     5214            <reference ref="name_operator_oh_wheelchair" />
     5215            <reference ref="link_contact_address_payment" />
     5216            <preset_link preset_name="Building" />
     5217        </item> <!-- Fitness Center -->
    51165218        <item name="Pitch" icon="presets/sport/pitch.svg" type="node,closedway,multipolygon" preset_name_label="true">
    51175219            <link wiki="Tag:leisure=pitch" />
    51185220            <space />
    51195221            <key key="leisure" value="pitch" />
    5120             <text key="name" text="Name" />
    51215222            <reference ref="sport" />
     5223            <reference ref="name_operator" />
    51225224            <reference ref="sport_surface" />
    51235225            <reference ref="link_contact_address_payment" />
    51245226        </item> <!-- Pitch -->
    … …  
    51265228            <link wiki="Tag:leisure=track" />
    51275229            <space />
    51285230            <key key="leisure" value="track" />
    5129             <text key="name" text="Name" />
    5130             <multiselect key="sport" text="Sport" values="athletics;cycling;dog_racing;equestrian;horse_racing;running;roller_skating;ice_skating" values_context="sport" />
     5231            <multiselect key="sport" text="Sport" values_context="sport">
     5232                <list_entry value="athletics" display_value="Athletics" icon="presets/sport/athletics.svg" icon_size="16" />
     5233                <list_entry value="cycling" display_value="Cycling" icon="presets/sport/cycling.svg" icon_size="16" />
     5234                <list_entry value="dog_racing" display_value="Dog Racing" icon="presets/sport/dog_racing.svg" />
     5235                <list_entry value="equestrian" display_value="Equestrian" icon="presets/sport/equestrian.svg" />
     5236                <list_entry value="horse_racing" display_value="Horse Racing" icon="presets/sport/riding.svg" icon_size="16" />
     5237                <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
     5238                <list_entry value="roller_skating" display_value="Roller Skating" icon="presets/sport/roller_skating.svg" />
     5239                <list_entry value="running" display_value="Running" icon="presets/sport/running.svg" icon_size="16" />
     5240            </multiselect>
     5241            <reference ref="name_operator" />
    51315242            <reference ref="sport_surface" />
    51325243            <check key="area" text="Area" />
    51335244        </item> <!-- Racetrack -->
    51345245        <group name="Golf" icon="presets/sport/golf/golf.svg">
    5135                 <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5136                     <link wiki="Tag:leisure=golf_course" />
    5137                     <space />
    5138                     <key key="leisure" value="golf_course" />
    5139                     <reference ref="name_oh_wheelchair" />
    5140                 </item> <!-- Golf Course -->
     5246            <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5247                <link wiki="Tag:leisure=golf_course" />
     5248                <space />
     5249                <key key="leisure" value="golf_course" />
     5250                <reference ref="name_operator_oh_wheelchair" />
     5251            </item> <!-- Golf Course -->
    51415252            <separator/>
    51425253            <item name="Tee" name_context="golf" icon="presets/sport/golf/tee.svg" type="node,closedway" preset_name_label="true">
    51435254                <link wiki="Tag:leisure=golf_course" />
    … …  
    51685279                <key key="golf" value="bunker" />
    51695280                <combo key="natural" text="Natural" text_context="golf" values="sand" default="sand" />
    51705281            </item> <!-- Bunker -->
    5171              <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
     5282            <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
    51725283                <link wiki="Tag:leisure=golf_course" />
    51735284                <space />
    51745285                <key key="golf" value="water_hazard" />
    51755286                <key key="natural" value="water" match="keyvalue" />
    51765287            </item> <!-- Frontal Water hazard -->
    5177              <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
     5288            <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
    51785289                <link wiki="Tag:leisure=golf_course" />
    51795290                <space />
    51805291                <key key="golf" value="lateral_water_hazard" />
    … …  
    52085319            <link wiki="Tag:leisure=miniature_golf" />
    52095320            <space />
    52105321            <key key="leisure" value="miniature_golf" />
    5211             <reference ref="name_oh_wheelchair" />
     5322            <reference ref="name_operator_oh_wheelchair" />
    52125323        </item> <!-- Miniature Golf -->
    52135324    </group> <!-- Sport Facilities -->
    52145325    <group name="Sport" icon="presets/sport/multi.svg">
    … …  
    52165327            <link wiki="Tag:sport=multi" />
    52175328            <space />
    52185329            <key key="sport" value="multi" />
    5219             <text key="name" text="Name" />
    5220             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
     5330            <reference ref="name_operator" />
     5331            <combo key="leisure" text="Type" values_context="running">
     5332                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5333                <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
     5334            </combo>
    52215335            <reference ref="sport_surface" />
    52225336        </item> <!-- Multi -->
    52235337        <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    52245338            <link wiki="Tag:sport=9pin" />
    52255339            <space />
    52265340            <key key="sport" value="9pin" />
    5227             <text key="name" text="Name" />
    5228             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5341            <reference ref="name_operator" />
     5342            <combo key="leisure" text="Type">
     5343                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5344            </combo>
    52295345            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
    52305346        </item> <!-- Nine-pin Bowling -->
    52315347        <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    52325348            <link wiki="Tag:sport=10pin" />
    52335349            <space />
    52345350            <key key="sport" value="10pin" />
    5235             <text key="name" text="Name" />
    5236             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5351            <reference ref="name_operator" />
     5352            <combo key="leisure" text="Type">
     5353                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5354            </combo>
    52375355            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
    52385356        </item> <!-- Ten-pin Bowling -->
    52395357        <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    52405358            <link wiki="Tag:sport=archery" />
    52415359            <space />
    52425360            <key key="sport" value="archery" />
    5243             <text key="name" text="Name" />
    5244             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5361            <reference ref="name_operator" />
     5362            <combo key="leisure" text="Type">
     5363                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5364            </combo>
    52455365        </item> <!-- Archery -->
    52465366        <item name="Track and Field Athletics" icon="presets/sport/athletics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    52475367            <link wiki="Tag:sports=athletics" />
    52485368            <space />
    52495369            <key key="sport" value="athletics" />
    5250             <text key="name" text="Name" />
    5251             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
     5370            <reference ref="name_operator" />
     5371            <combo key="leisure" text="Type" values_context="running" default="track">
     5372                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5373            </combo>
    52525374            <reference ref="sport_surface" />
    52535375        </item> <!-- Track and Field Athletics -->
    52545376        <item name="Running" icon="presets/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    52565378            <space />
    52575379            <key key="sport" value="running" />
    52585380            <reference ref="name_operator" />
    5259             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
     5381            <combo key="leisure" text="Type" values_context="running">
     5382                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5383            </combo>
    52605384            <reference ref="sport_surface" />
    52615385        </item> <!-- Running -->
    52625386        <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    52635387            <link wiki="Tag:sport=climbing" />
    52645388            <space />
    52655389            <key key="sport" value="climbing" />
    5266             <text key="name" text="Name" />
    5267             <combo key="leisure" text="Type" values="sports_centre" />
     5390            <reference ref="name_operator" />
     5391            <combo key="leisure" text="Type">
     5392                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     5393                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5394            </combo>
    52685395            <reference ref="climbing_styles" />
    52695396            <text key="climbing:routes" text="Number of routes" />
    52705397            <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
    … …  
    53075434            <link wiki="Tag:sport=canoe" />
    53085435            <space />
    53095436            <key key="sport" value="canoe" />
    5310             <text key="name" text="Name" />
     5437            <reference ref="name_operator" />
    53115438        </item> <!-- Canoeing/Kayaking -->
    53125439        <item name="Rowing" icon="presets/sport/rowing.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53135440            <link wiki="Tag:sport=rowing" />
    53145441            <space />
    53155442            <key key="sport" value="rowing" />
    5316             <text key="name" text="Name" />
     5443            <reference ref="name_operator" />
    53175444        </item> <!-- Rowing -->
    53185445        <item name="Cycling" icon="presets/sport/cycling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53195446            <link wiki="Tag:sport=cycling" />
    53205447            <space />
    53215448            <key key="sport" value="cycling" />
    5322             <text key="name" text="Name" />
    5323             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5449            <reference ref="name_operator" />
     5450            <combo key="leisure" text="Type" values_context="racing">
     5451                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5452            </combo>
    53245453            <reference ref="sport_surface" />
    53255454        </item> <!-- Cycling -->
    53265455        <item name="Dog Racing" icon="presets/sport/dog_racing.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53275456            <link wiki="Tag:sport=dog_racing" />
    53285457            <space />
    53295458            <key key="sport" value="dog_racing" />
    5330             <text key="name" text="Name" />
    5331             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5459            <reference ref="name_operator" />
     5460            <combo key="leisure" text="Type" values_context="racing">
     5461                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5462            </combo>
    53325463            <reference ref="sport_surface" />
    53335464        </item> <!-- Dog Racing -->
    53345465        <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53355466            <link wiki="Tag:sport=equestrian" />
    53365467            <space />
    53375468            <key key="sport" value="equestrian" />
    5338             <text key="name" text="Name" />
     5469            <reference ref="name_operator" />
     5470            <combo key="leisure" text="Type" values_context="riding">
     5471                <list_entry value="horse_riding" display_value="Horseback Riding Facility" icon="presets/leisure/horse_riding.svg" />
     5472                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5473            </combo>
    53395474            <reference ref="riding_surface" />
    53405475        </item> <!-- Equestrian -->
    53415476        <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53425477            <link wiki="Tag:sport=horse_racing" />
    53435478            <space />
    53445479            <key key="sport" value="horse_racing" />
    5345             <text key="name" text="Name" />
     5480            <reference ref="name_operator" />
     5481            <combo key="leisure" text="Type" values_context="riding">
     5482                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5483                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5484                <list_entry value="track" display_value="Racetrack" icon="presets/sport/track.svg" />
     5485            </combo>
    53465486            <reference ref="riding_surface" />
    53475487        </item> <!-- Horse Racing -->
    53485488        <item name="Gymnastics" icon="presets/sport/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53495489            <link wiki="Tag:sport=gymnastics" />
    53505490            <space />
    53515491            <key key="sport" value="gymnastics" />
    5352             <text key="name" text="Name" />
    5353             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
     5492            <reference ref="name_operator" />
     5493            <combo key="leisure" text="Type" >
     5494                <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
     5495                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5496            </combo>
    53545497        </item> <!-- Gymnastics -->
    53555498        <item name="Ice Skating" icon="presets/sport/ice_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53565499            <link wiki="Tag:sport=ice_skating" />
    53575500            <space />
    53585501            <key key="sport" value="ice_skating" />
    5359             <text key="name" text="Name" />
    5360             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
     5502            <reference ref="name_operator" />
     5503            <combo key="leisure" text="Type" default="ice_rink">
     5504                <list_entry value="ice_rink" display_value="Ice rink" icon="presets/sport/ice_rink.svg" />
     5505                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5506            </combo>
    53615507        </item> <!-- Ice Skating -->
    53625508        <item name="Roller Skating" icon="presets/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53635509            <link wiki="Tag:sport=roller_skating"/>
    53645510            <space />
    53655511            <key key="sport" value="roller_skating" />
    5366             <text key="name" text="Name" />
    5367             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5512            <reference ref="name_operator" />
     5513            <combo key="leisure" text="Type">
     5514                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
     5515            </combo>
    53685516            <combo key="surface" text="Surface" values="asphalt,concrete" />
    53695517        </item> <!-- Roller Skating -->
    53705518        <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53715519            <link wiki="Tag:sport=skateboard" />
    53725520            <space />
    53735521            <key key="sport" value="skateboard" />
    5374             <text key="name" text="Name" />
    5375             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
     5522            <reference ref="name_operator" />
     5523            <combo key="leisure" text="Type" default="pitch" values_context="racing">
     5524                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5525            </combo>
    53765526            <combo key="surface" text="Surface" values="asphalt,concrete" />
    53775527        </item> <!-- Skateboard -->
    53785528        <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53795529            <link wiki="Tag:sport=swimming" />
    53805530            <space />
    53815531            <key key="sport" value="swimming" />
    5382             <text key="name" text="Name" />
    5383             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
     5532            <reference ref="name_operator" />
     5533            <combo key="leisure" text="Type" default="swimming_pool" values_searchable="true">
     5534                <list_entry value="swimming_pool" display_value="Swimming Pool" icon="presets/sport/swimming.svg" />
     5535                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     5536                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5537                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5538                <list_entry value="water_park" display_value="Water Park" icon="presets/leisure/water_park.svg" />
     5539            </combo>
    53845540        </item> <!-- Swimming -->
    53855541        <item name="Scuba Diving" icon="presets/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53865542            <link wiki="Tag:sport=scuba_diving" />
    … …  
    53915547        <item name="Skiing" icon="presets/sport/skiing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    53925548            <link wiki="Piste_Maps" />
    53935549            <space />
    5394             <text key="name" text="Name" />
     5550            <reference ref="name_operator" />
    53955551            <combo key="piste:type" text="Piste type" values="connection,downhill,hike,ice_skate,nordic,playground,skitour,sled,sleigh,snow_park" values_searchable="true" match="keyvalue"/>
    53965552            <optional>
    53975553                <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" values_sort="false" />
    … …  
    54025558            <link wiki="Tag:sport=shooting" />
    54035559            <space />
    54045560            <key key="sport" value="shooting" />
    5405             <text key="name" text="Name" />
    5406             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5561            <reference ref="name_operator" />
     5562            <combo key="leisure" text="Type">
     5563                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5564            </combo>
    54075565        </item> <!-- Shooting -->
    54085566        <item name="Chess" icon="presets/sport/chess.svg" type="node,closedway,multipolygon" preset_name_label="true">
    54095567            <link wiki="Tag:sport=chess" />
    54105568            <space />
    54115569            <key key="sport" value="chess" />
    5412             <text key="name" text="Name" />
    5413             <combo key="leisure" text="Type" values="pitch,picnic_table" />
     5570            <reference ref="name_operator" />
     5571            <combo key="leisure" text="Type">
     5572                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5573                <list_entry value="picnic_table" display_value="Picnic Table" icon="presets/leisure/picnic.svg" />
     5574            </combo>
    54145575        </item> <!-- Chess -->
    54155576    </group> <!-- Sport -->
    54165577    <group name="Sport (Ball)" icon="presets/sport/soccer.svg">
    … …  
    54185579            <link wiki="Tag:sport=soccer" />
    54195580            <space />
    54205581            <key key="sport" value="soccer" />
    5421             <reference ref="name_leisure_pitch" />
     5582            <reference ref="name_operator" />
     5583            <combo key="leisure" text="Type" default="pitch">
     5584                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5585            </combo>
    54225586            <reference ref="sport_surface" />
    54235587        </item> <!-- Soccer -->
    54245588        <item name="Australian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    54395603            <link wiki="Tag:sport=canadian_football" />
    54405604            <space />
    54415605            <key key="sport" value="canadian_football" />
    5442             <reference ref="name_leisure_pitch" />
     5606            <reference ref="name_operator" />
     5607            <combo key="leisure" text="Type" default="pitch">
     5608                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5609            </combo>
    54435610            <reference ref="sport_surface" />
    54445611        </item> <!-- Canadian Football -->
    54455612        <item name="Gaelic Games" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    54745641            <link wiki="Tag:sport=baseball" />
    54755642            <space />
    54765643            <key key="sport" value="baseball" />
    5477             <reference ref="name_leisure_pitch" />
     5644            <reference ref="name_operator" />
     5645            <combo key="leisure" text="Type" default="pitch">
     5646                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5647            </combo>
    54785648            <reference ref="sport_surface" />
    54795649        </item> <!-- Baseball -->
    54805650        <item name="Basketball" icon="presets/sport/basketball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    54815651            <link wiki="Tag:sport=basketball" />
    54825652            <space />
    54835653            <key key="sport" value="basketball" />
    5484             <reference ref="name_leisure_pitch" />
     5654            <reference ref="name_operator" />
     5655            <combo key="leisure" text="Type" default="pitch">
     5656                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5657            </combo>
    54855658            <reference ref="sport_surface" />
    54865659            <combo key="hoops" text="Hoops" values="1,2,3,4" />
    54875660        </item> <!-- Basketball -->
    … …  
    54905663            <space />
    54915664            <key key="sport" value="handball" />
    54925665            <reference ref="name_operator" />
    5493             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5666            <combo key="leisure" text="Type">
     5667                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5668            </combo>
    54945669            <reference ref="sport_surface" />
    54955670        </item> <!-- Handball -->
    54965671        <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    54985673            <space />
    54995674            <key key="sport" value="volleyball" />
    55005675            <reference ref="name_operator" />
    5501             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5676            <combo key="leisure" text="Type">
     5677                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5678            </combo>
    55025679            <reference ref="sport_surface" />
    55035680        </item> <!-- Volleyball -->
    55045681        <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55065683            <space />
    55075684            <key key="sport" value="beachvolleyball" />
    55085685            <reference ref="name_operator" />
    5509             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5686            <combo key="leisure" text="Type">
     5687                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5688                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5689                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5690            </combo>
    55105691        </item> <!-- Beach Volleyball -->
    55115692        <item name="Billiards" icon="presets/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55125693            <link wiki="Tag:sport=billiards" />
    55135694            <space />
    55145695            <key key="sport" value="billiards" />
    55155696            <reference ref="name_operator" />
    5516             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5697            <combo key="leisure" text="Type">
     5698                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5699                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     5700                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5701            </combo>
    55175702        </item> <!-- Billiards -->
    55185703        <item name="Golf" icon="presets/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55195704            <link wiki="Tag:sport=golf" />
    55205705            <space />
    55215706            <key key="sport" value="golf" />
    5522             <text key="name" text="Name" />
    5523             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
     5707            <reference ref="name_operator" />
     5708            <combo key="leisure" text="Type" default="golf_course">
     5709                <list_entry value="golf_course" display_value="Golf course" icon="presets/sport/golf/golf.svg" />
     5710                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5711                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5712                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5713            </combo>
    55245714        </item> <!-- Golf -->
    55255715        <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55265716            <link wiki="Tag:sport=boules" />
    … …  
    55545744            <link wiki="Tag:sport=field_hockey" />
    55555745            <space />
    55565746            <key key="sport" value="field_hockey" />
    5557             <text key="name" text="Name" />
    5558             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5747            <reference ref="name_operator" />
     5748            <combo key="leisure" text="Type">
     5749                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5750            </combo>
    55595751            <reference ref="sport_surface" />
    55605752        </item> <!-- Field Hockey -->
    55615753        <item name="Ice Hockey" icon="presets/sport/ice_hockey.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55625754            <link wiki="Tag:sport=ice_hockey" />
    55635755            <space />
    55645756            <key key="sport" value="ice_hockey" />
    5565             <text key="name" text="Name" />
    5566             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
     5757            <reference ref="name_operator" />
     5758            <combo key="leisure" text="Type">
     5759                <list_entry value="ice_rink" display_value="Ice rink" icon="presets/sport/ice_rink.svg" />
     5760                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5761            </combo>
    55675762        </item> <!-- Ice Hockey -->
    55685763        <item name="Curling" icon="presets/sport/curling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55695764            <link wiki="Tag:sport=curling" />
    55705765            <space />
    55715766            <key key="sport" value="curling" />
    5572             <text key="name" text="Name" />
    5573             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
     5767            <reference ref="name_operator" />
     5768            <combo key="leisure" text="Type">
     5769                <list_entry value="ice_rink" display_value="Ice rink" icon="presets/sport/ice_rink.svg" />
     5770                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5771            </combo>
    55745772        </item> <!-- Curling -->
    55755773        <item name="Pelota" icon="presets/sport/pelota.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55765774            <link wiki="Tag:sport=pelota" />
    … …  
    55835781            <link wiki="Tag:sport=racquet" />
    55845782            <space />
    55855783            <key key="sport" value="racquet" />
    5586             <text key="name" text="Name" />
    5587             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5784            <reference ref="name_operator" />
     5785            <combo key="leisure" text="Type">
     5786                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5787            </combo>
    55885788            <reference ref="sport_surface" />
    55895789        </item> <!-- Racquetball -->
    55905790        <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55915791            <link wiki="Tag:sport=table_tennis" />
    55925792            <space />
    55935793            <key key="sport" value="table_tennis" />
    5594             <text key="name" text="Name" />
    5595             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5794            <reference ref="name_operator" />
     5795            <combo key="leisure" text="Type">
     5796                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5797            </combo>
    55965798        </item> <!-- Table Tennis/Ping-Pong -->
    55975799        <item name="Tennis" icon="presets/sport/tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55985800            <link wiki="Tag:sport=tennis" />
    55995801            <space />
    56005802            <key key="sport" value="tennis" />
    5601             <reference ref="name_leisure_pitch" />
     5803            <reference ref="name_operator" />
     5804            <combo key="leisure" text="Type" default="pitch">
     5805                <reference ref="pitch_sports-hall_sports-centre_stadium" />
     5806            </combo>
    56025807            <reference ref="sport_surface" />
    56035808        </item> <!-- Tennis -->
    56045809    </group> <!-- Sport (Ball) -->
    … …  
    56075812            <link wiki="Tag:sport=motor" />
    56085813            <space />
    56095814            <key key="sport" value="motor" />
    5610             <text key="name" text="Name" />
    5611             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5815            <reference ref="name_operator" />
     5816            <combo key="leisure" text="Type" values_context="racing">
     5817                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5818                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5819                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5820            </combo>
    56125821            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
     5822            <preset_link preset_name="Raceway" />
    56135823        </item> <!-- Motorsport -->
    56145824        <item name="Kart Racing" icon="presets/sport/karting.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56155825            <link wiki="Tag:sport=karting" />
    56165826            <space />
    56175827            <key key="sport" value="karting" />
    5618             <text key="name" text="Name" />
    5619             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5828            <reference ref="name_operator" />
     5829            <combo key="leisure" text="Type" values_context="racing">
     5830                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5831                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5832                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5833            </combo>
    56205834            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
     5835            <preset_link preset_name="Raceway" />
    56215836        </item> <!-- Kart Racing -->
    56225837        <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56235838            <link wiki="Tag:sport=motocross" />
    56245839            <space />
    56255840            <key key="sport" value="motocross" />
    5626             <text key="name" text="Name" />
    5627             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5841            <reference ref="name_operator" />
     5842            <combo key="leisure" text="Type" values_context="racing">
     5843                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5844                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5845                <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5846            </combo>
     5847            <preset_link preset_name="Raceway" />
    56285848        </item> <!-- Motocross -->
    56295849        <separator/>
    56305850        <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56315851            <link wiki="Tag:sport=model_aerodrome" />
    56325852            <space />
    56335853            <key key="sport" value="model_aerodrome" />
    5634             <text key="name" text="Name" />
    5635             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
     5854            <reference ref="name_operator" />
     5855            <combo key="leisure" text="Type" values_context="aerialway">
     5856                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5857                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     5858                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5859            </combo>
    56365860            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
    56375861        </item> <!-- Model Aerodrome -->
    56385862        <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56395863            <link wiki="Tag:sport=rc_car" />
    56405864            <space />
    56415865            <key key="sport" value="rc_car" />
    5642             <text key="name" text="Name" />
    5643             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5866            <reference ref="name_operator" />
     5867            <combo key="leisure" text="Type" values_context="racing">
     5868                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5869                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
     5870                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5871            </combo>
    56445872            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
     5873            <preset_link preset_name="Raceway" />
    56455874        </item> <!-- RC Car -->
    56465875    </group> <!-- Motorsport -->
    56475876  </group> <!-- Sports -->
    … …  
    72967525            <space />
    72977526            <key key="shop" value="clothes" />
    72987527            <reference ref="name_oh_wheelchair" />
    7299             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     7528            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
    73007529            <combo key="organic" text="Organic" values="yes,no,only" />
    73017530            <multiselect key="clothes" text="Clothes" values="babies;children;costumes;denim;fashion;fur;hats;leather;maternity;men;motorcycle;oversize;schoolwear;sports;suits;swimwear;traditional;underwear;wedding;women;workwear" values_context="clothes" values_searchable="true" />
    73027531            <reference ref="link_contact_address_payment" />
    … …  
    73137542            <space />
    73147543            <key key="shop" value="shoes" />
    73157544            <reference ref="name_oh_wheelchair" />
    7316             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     7545            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
    73177546            <combo key="organic" text="Organic" values="yes,no,only" />
    73187547            <check key="shoes:repair" text="Offers repairs" text_context="shoes" />
    73197548            <reference ref="link_contact_address_payment" />
    … …  
    75987827            <space />
    75997828            <key key="shop" value="books" />
    76007829            <reference ref="name_brand_oh_wheelchair" />
    7601             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     7830            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
    76027831            <reference ref="link_contact_address_payment" />
    76037832        </item> <!-- Book Store -->
    76047833        <item name="Newspaper Stand" icon="presets/shop/news.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    77537982            <reference ref="name_oh_wheelchair" />
    77547983            <reference ref="link_contact_address_payment" />
    77557984        </item> <!-- Florist -->
    7756         <item name="Garden Centre" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     7985        <item name="Garden Center" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    77577986            <link wiki="Tag:shop=garden_centre" />
    77587987            <space />
    77597988            <key key="shop" value="garden_centre" />
    77607989            <reference ref="name_brand_oh_wheelchair" />
    77617990            <reference ref="link_contact_address_payment" />
    7762         </item> <!-- Garden Centre -->
     7991        </item> <!-- Garden Center -->
    77637992        <separator/>
    77647993        <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.svg" type="node,closedway,multipolygon" preset_name_label="true">
    77657994            <link wiki="Tag:shop=doityourself" />
    … …  
    78768105            <reference ref="name_operator_oh_wheelchair" />
    78778106            <reference ref="link_contact_address_payment" />
    78788107        </item> <!-- Charity -->
    7879         <item name="Second hand" icon="presets/shop/second_hand.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8108        <item name="Second Hand" icon="presets/shop/second_hand.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78808109            <link wiki="Tag:shop=second_hand" />
    78818110            <space />
    78828111            <key key="shop" value="second_hand" />
    … …  
    78848113            <space />
    78858114            <label text="Alternative tagging: `shop=*` + `second_hand=yes` or `second_hand=only`" />
    78868115            <reference ref="link_contact_address_payment" />
    7887         </item> <!-- Second hand -->
     8116        </item> <!-- Second Hand -->
    78888117        <item name="Bookmaker" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78898118            <link wiki="Tag:shop=bookmaker" />
    78908119            <space />
    78918120            <key key="shop" value="bookmaker" />
    78928121            <reference ref="name_operator_oh_wheelchair" />
    78938122            <reference ref="link_contact_address_payment" />
    7894             <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
    7895             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     8123            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
     8124            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    78968125            <preset_link preset_name="Gambling" text="Similar but different tags:" />
    78978126            <preset_link preset_name="Casino" text="Similar but different tags:" />
    78988127            <preset_link preset_name="Lottery" text="Similar but different tags:" />
    … …  
    79038132            <key key="shop" value="lottery" />
    79048133            <reference ref="name_operator_oh_wheelchair" />
    79058134            <reference ref="link_contact_address_payment" />
    7906             <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
    7907             <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
     8135            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
     8136            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
    79088137            <preset_link preset_name="Gambling" text="Similar but different tags:" />
    79098138            <preset_link preset_name="Casino" text="Similar but different tags:" />
    79108139            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
    … …  
    92379466                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
    92389467                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
    92399468                <role key="subarea" text="Sub area" requisite="optional" type="relation" />
    9240                 <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
     9469                <role key="admin_centre" text="Administration center" requisite="optional" type="node" count="1" />
    92419470                <role key="label" text="Label point" requisite="optional" type="node" count="1" />
    92429471            </roles>
    92439472        </item> <!-- Boundary -->