Ticket #21907: josm_21907.patch

File josm_21907.patch, 30.7 KB (added by skyper, 4 years ago)

patch

  • 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="sport_leisure_values">
     235        <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     236        <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     237        <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium" />
     238    </chunk>
    235239    <chunk id="name_leisure_pitch">
    236240        <text key="name" text="Name" />
    237         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     241        <combo key="leisure" text="Type" default="pitch">
     242            <reference ref="sport_leisure_values" />
     243        </combo>
    238244    </chunk>
    239245    <chunk id="sport">
    240246        <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" />
    … …  
    39443950            <reference ref="name_operator_oh_wheelchair" />
    39453951            <reference ref="link_contact_address_payment" />
    39463952            <preset_link preset_name="Public bath" text="Similar but different tags:" />
    3947             <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
     3953            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
    39483954        </item> <!-- Water Park -->
    39493955        <item name="Water Slide" icon="presets/attraction/water_slide.svg" type="node,way" preset_name_label="true">
    39503956            <link wiki="Tag:attraction=water_slide" />
    … …  
    39683974            <reference ref="fee" />
    39693975            <reference ref="link_contact_address_payment" />
    39703976            <preset_link preset_name="Water Park" text="Similar but different tags:" />
    3971             <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
     3977            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
    39723978        </item> <!-- Public bath -->
    39733979        <item name="Resort" icon="presets/leisure/resort.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39743980            <link wiki="Tag:leisure=resort" />
    … …  
    50955101            <reference ref="sport" />
    50965102            <reference ref="link_contact_address_payment" />
    50975103        </item> <!-- Stadium -->
    5098         <item name="Sports Centre" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5104        <item name="Sports Center" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    50995105            <link wiki="Tag:leisure=sports_centre" />
    51005106            <space />
    51015107            <key key="leisure" value="sports_centre" />
    … …  
    51035109            <reference ref="sport" />
    51045110            <reference ref="link_contact_address_payment" />
    51055111            <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">
     5112        </item> <!-- Sports Center -->
     5113        <item name="Fitness Center" icon="presets/sport/fitness_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    51085114            <link wiki="Tag:leisure=fitness_centre" />
    51095115            <space />
    51105116            <key key="leisure" value="fitness_centre" />
    … …  
    51125118            <reference ref="sport" />
    51135119            <reference ref="link_contact_address_payment" />
    51145120            <preset_link preset_name="Building" />
    5115         </item> <!-- Fitness Centre -->
     5121        </item> <!-- Fitness Center -->
    51165122        <item name="Pitch" icon="presets/sport/pitch.svg" type="node,closedway,multipolygon" preset_name_label="true">
    51175123            <link wiki="Tag:leisure=pitch" />
    51185124            <space />
    … …  
    51325138            <check key="area" text="Area" />
    51335139        </item> <!-- Racetrack -->
    51345140        <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 -->
     5141            <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5142                <link wiki="Tag:leisure=golf_course" />
     5143                <space />
     5144                <key key="leisure" value="golf_course" />
     5145                <reference ref="name_oh_wheelchair" />
     5146            </item> <!-- Golf Course -->
    51415147            <separator/>
    51425148            <item name="Tee" name_context="golf" icon="presets/sport/golf/tee.svg" type="node,closedway" preset_name_label="true">
    51435149                <link wiki="Tag:leisure=golf_course" />
    … …  
    51685174                <key key="golf" value="bunker" />
    51695175                <combo key="natural" text="Natural" text_context="golf" values="sand" default="sand" />
    51705176            </item> <!-- Bunker -->
    5171              <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
     5177            <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
    51725178                <link wiki="Tag:leisure=golf_course" />
    51735179                <space />
    51745180                <key key="golf" value="water_hazard" />
    51755181                <key key="natural" value="water" match="keyvalue" />
    51765182            </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">
     5183            <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
    51785184                <link wiki="Tag:leisure=golf_course" />
    51795185                <space />
    51805186                <key key="golf" value="lateral_water_hazard" />
    … …  
    52175223            <space />
    52185224            <key key="sport" value="multi" />
    52195225            <text key="name" text="Name" />
    5220             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
     5226            <combo key="leisure" text="Type" values_context="running">
     5227                 <reference ref="sport_leisure_values" />
     5228                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5229                 <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
     5230            </combo>
    52215231            <reference ref="sport_surface" />
    52225232        </item> <!-- Multi -->
    52235233        <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    52255235            <space />
    52265236            <key key="sport" value="9pin" />
    52275237            <text key="name" text="Name" />
    5228             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5238            <combo key="leisure" text="Type">
     5239                 <reference ref="sport_leisure_values" />
     5240            </combo>
    52295241            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
    52305242        </item> <!-- Nine-pin Bowling -->
    52315243        <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    52335245            <space />
    52345246            <key key="sport" value="10pin" />
    52355247            <text key="name" text="Name" />
    5236             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5248            <combo key="leisure" text="Type">
     5249                 <reference ref="sport_leisure_values" />
     5250            </combo>
    52375251            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
    52385252        </item> <!-- Ten-pin Bowling -->
    52395253        <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    52415255            <space />
    52425256            <key key="sport" value="archery" />
    52435257            <text key="name" text="Name" />
    5244             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5258            <combo key="leisure" text="Type">
     5259                 <reference ref="sport_leisure_values" />
     5260            </combo>
    52455261        </item> <!-- Archery -->
    52465262        <item name="Track and Field Athletics" icon="presets/sport/athletics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    52475263            <link wiki="Tag:sports=athletics" />
    52485264            <space />
    52495265            <key key="sport" value="athletics" />
    52505266            <text key="name" text="Name" />
    5251             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
     5267            <combo key="leisure" text="Type" values_context="running" default="track">
     5268                 <reference ref="sport_leisure_values" />
     5269                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5270            </combo>
    52525271            <reference ref="sport_surface" />
    52535272        </item> <!-- Track and Field Athletics -->
    52545273        <item name="Running" icon="presets/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    52565275            <space />
    52575276            <key key="sport" value="running" />
    52585277            <reference ref="name_operator" />
    5259             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
     5278            <combo key="leisure" text="Type" values_context="running">
     5279                 <reference ref="sport_leisure_values" />
     5280                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5281            </combo>
    52605282            <reference ref="sport_surface" />
    52615283        </item> <!-- Running -->
    52625284        <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    … …  
    52645286            <space />
    52655287            <key key="sport" value="climbing" />
    52665288            <text key="name" text="Name" />
    5267             <combo key="leisure" text="Type" values="sports_centre" />
     5289            <combo key="leisure" text="Type">
     5290                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5291            </combo>
    52685292            <reference ref="climbing_styles" />
    52695293            <text key="climbing:routes" text="Number of routes" />
    52705294            <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
    … …  
    53205344            <space />
    53215345            <key key="sport" value="cycling" />
    53225346            <text key="name" text="Name" />
    5323             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5347            <combo key="leisure" text="Type" values_context="racing">
     5348                 <reference ref="sport_leisure_values" />
     5349                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5350            </combo>
    53245351            <reference ref="sport_surface" />
    53255352        </item> <!-- Cycling -->
    53265353        <item name="Dog Racing" icon="presets/sport/dog_racing.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53285355            <space />
    53295356            <key key="sport" value="dog_racing" />
    53305357            <text key="name" text="Name" />
    5331             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5358            <combo key="leisure" text="Type" values_context="racing">
     5359                 <reference ref="sport_leisure_values" />
     5360                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5361            </combo>
    53325362            <reference ref="sport_surface" />
    53335363        </item> <!-- Dog Racing -->
    53345364        <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53365366            <space />
    53375367            <key key="sport" value="equestrian" />
    53385368            <text key="name" text="Name" />
     5369            <combo key="leisure" text="Type" values_context="riding">
     5370                 <list_entry value="horse_riding" display_value="Horse Riding" icon="presets/leisure/horse_riding.svg" />
     5371                 <reference ref="sport_leisure_values" />
     5372                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5373            </combo>
    53395374            <reference ref="riding_surface" />
    53405375        </item> <!-- Equestrian -->
    53415376        <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53435378            <space />
    53445379            <key key="sport" value="horse_racing" />
    53455380            <text key="name" text="Name" />
     5381            <combo key="leisure" text="Type" values_context="riding">
     5382                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5383                 <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5384                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5385            </combo>
    53465386            <reference ref="riding_surface" />
    53475387        </item> <!-- Horse Racing -->
    53485388        <item name="Gymnastics" icon="presets/sport/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53505390            <space />
    53515391            <key key="sport" value="gymnastics" />
    53525392            <text key="name" text="Name" />
    5353             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
     5393            <combo key="leisure" text="Type" >
     5394                 <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
     5395                 <reference ref="sport_leisure_values" />
     5396            </combo>
    53545397        </item> <!-- Gymnastics -->
    53555398        <item name="Ice Skating" icon="presets/sport/ice_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53565399            <link wiki="Tag:sport=ice_skating" />
    53575400            <space />
    53585401            <key key="sport" value="ice_skating" />
    53595402            <text key="name" text="Name" />
    5360             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
     5403            <combo key="leisure" text="Type" default="ice_rink">
     5404                 <list_entry value="ice_rink" display_value="Ice rink" />
     5405                 <reference ref="sport_leisure_values" />
     5406            </combo>
    53615407        </item> <!-- Ice Skating -->
    53625408        <item name="Roller Skating" icon="presets/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53635409            <link wiki="Tag:sport=roller_skating"/>
    53645410            <space />
    53655411            <key key="sport" value="roller_skating" />
    53665412            <text key="name" text="Name" />
    5367             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5413            <combo key="leisure" text="Type">
     5414                 <reference ref="sport_leisure_values" />
     5415            </combo>
    53685416            <combo key="surface" text="Surface" values="asphalt,concrete" />
    53695417        </item> <!-- Roller Skating -->
    53705418        <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53725420            <space />
    53735421            <key key="sport" value="skateboard" />
    53745422            <text key="name" text="Name" />
    5375             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
     5423            <combo key="leisure" text="Type" default="pitch" values_context="racing">
     5424                 <reference ref="sport_leisure_values" />
     5425                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5426            </combo>
    53765427            <combo key="surface" text="Surface" values="asphalt,concrete" />
    53775428        </item> <!-- Skateboard -->
    53785429        <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    53805431            <space />
    53815432            <key key="sport" value="swimming" />
    53825433            <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" />
     5434            <combo key="leisure" text="Type" default="swimming_pool" values_searchable="true">
     5435                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5436                 <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
     5437                 <list_entry value="swimming_pool" display_value="Swimming Pool" icon="presets/sport/swimming.svg" />
     5438                 <list_entry value="water_park" display_value="Water Park" icon="presets/leisure/water_park.svg" />
     5439            </combo>
    53845440        </item> <!-- Swimming -->
    53855441        <item name="Scuba Diving" icon="presets/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
    53865442            <link wiki="Tag:sport=scuba_diving" />
    … …  
    54035459            <space />
    54045460            <key key="sport" value="shooting" />
    54055461            <text key="name" text="Name" />
    5406             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5462            <combo key="leisure" text="Type">
     5463                 <reference ref="sport_leisure_values" />
     5464            </combo>
    54075465        </item> <!-- Shooting -->
    54085466        <item name="Chess" icon="presets/sport/chess.svg" type="node,closedway,multipolygon" preset_name_label="true">
    54095467            <link wiki="Tag:sport=chess" />
    54105468            <space />
    54115469            <key key="sport" value="chess" />
    54125470            <text key="name" text="Name" />
    5413             <combo key="leisure" text="Type" values="pitch,picnic_table" />
     5471            <combo key="leisure" text="Type">
     5472                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5473                 <list_entry value="picnic_table" display_value="Picnic Table" icon="presets/leisure/picnic.svg" />
     5474            </combo>
    54145475        </item> <!-- Chess -->
    54155476    </group> <!-- Sport -->
    54165477    <group name="Sport (Ball)" icon="presets/sport/soccer.svg">
    … …  
    54905551            <space />
    54915552            <key key="sport" value="handball" />
    54925553            <reference ref="name_operator" />
    5493             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5554            <combo key="leisure" text="Type">
     5555                 <reference ref="sport_leisure_values" />
     5556            </combo>
    54945557            <reference ref="sport_surface" />
    54955558        </item> <!-- Handball -->
    54965559        <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    54985561            <space />
    54995562            <key key="sport" value="volleyball" />
    55005563            <reference ref="name_operator" />
    5501             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5564            <combo key="leisure" text="Type">
     5565                 <reference ref="sport_leisure_values" />
     5566            </combo>
    55025567            <reference ref="sport_surface" />
    55035568        </item> <!-- Volleyball -->
    55045569        <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55065571            <space />
    55075572            <key key="sport" value="beachvolleyball" />
    55085573            <reference ref="name_operator" />
    5509             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5574            <combo key="leisure" text="Type">
     5575                <reference ref="sport_leisure_values" />
     5576            </combo>
    55105577        </item> <!-- Beach Volleyball -->
    55115578        <item name="Billiards" icon="presets/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55125579            <link wiki="Tag:sport=billiards" />
    55135580            <space />
    55145581            <key key="sport" value="billiards" />
    55155582            <reference ref="name_operator" />
    5516             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
     5583            <combo key="leisure" text="Type">
     5584                <reference ref="sport_leisure_values" />
     5585            </combo>
    55175586        </item> <!-- Billiards -->
    55185587        <item name="Golf" icon="presets/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55195588            <link wiki="Tag:sport=golf" />
    55205589            <space />
    55215590            <key key="sport" value="golf" />
    55225591            <text key="name" text="Name" />
    5523             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
     5592            <combo key="leisure" text="Type" default="golf_course">
     5593                <list_entry value="golf_course" display_value="Golf course" icon="presets/sport/golf/golf.svg" />
     5594                <reference ref="sport_leisure_values" />
     5595            </combo>
    55245596        </item> <!-- Golf -->
    55255597        <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55265598            <link wiki="Tag:sport=boules" />
    … …  
    55555627            <space />
    55565628            <key key="sport" value="field_hockey" />
    55575629            <text key="name" text="Name" />
    5558             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5630            <combo key="leisure" text="Type">
     5631                <reference ref="sport_leisure_values" />
     5632            </combo>
    55595633            <reference ref="sport_surface" />
    55605634        </item> <!-- Field Hockey -->
    55615635        <item name="Ice Hockey" icon="presets/sport/ice_hockey.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55635637            <space />
    55645638            <key key="sport" value="ice_hockey" />
    55655639            <text key="name" text="Name" />
    5566             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
     5640            <combo key="leisure" text="Type">
     5641                <list_entry value="ice_rink" display_value="Ice rink" />
     5642                <reference ref="sport_leisure_values" />
     5643            </combo>
    55675644        </item> <!-- Ice Hockey -->
    55685645        <item name="Curling" icon="presets/sport/curling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55695646            <link wiki="Tag:sport=curling" />
    55705647            <space />
    55715648            <key key="sport" value="curling" />
    55725649            <text key="name" text="Name" />
    5573             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
     5650            <combo key="leisure" text="Type">
     5651                 <list_entry value="ice_rink" display_value="Ice rink" />
     5652                 <reference ref="sport_leisure_values" />
     5653            </combo>
    55745654        </item> <!-- Curling -->
    55755655        <item name="Pelota" icon="presets/sport/pelota.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55765656            <link wiki="Tag:sport=pelota" />
    … …  
    55845664            <space />
    55855665            <key key="sport" value="racquet" />
    55865666            <text key="name" text="Name" />
    5587             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5667            <combo key="leisure" text="Type">
     5668                 <reference ref="sport_leisure_values" />
     5669            </combo>
    55885670            <reference ref="sport_surface" />
    55895671        </item> <!-- Racquetball -->
    55905672        <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55925674            <space />
    55935675            <key key="sport" value="table_tennis" />
    55945676            <text key="name" text="Name" />
    5595             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5677            <combo key="leisure" text="Type">
     5678                 <reference ref="sport_leisure_values" />
     5679            </combo>
    55965680        </item> <!-- Table Tennis/Ping-Pong -->
    55975681        <item name="Tennis" icon="presets/sport/tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    55985682            <link wiki="Tag:sport=tennis" />
    … …  
    56085692            <space />
    56095693            <key key="sport" value="motor" />
    56105694            <text key="name" text="Name" />
    5611             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
     5695            <combo key="leisure" text="Type" values_context="racing">
     5696                 <reference ref="sport_leisure_values" />
     5697                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5698            </combo>
    56125699            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
    56135700        </item> <!-- Motorsport -->
    56145701        <item name="Kart Racing" icon="presets/sport/karting.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    56165703            <space />
    56175704            <key key="sport" value="karting" />
    56185705            <text key="name" text="Name" />
    5619             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5706            <combo key="leisure" text="Type" values_context="racing">
     5707                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5708                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5709                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5710            </combo>
    56205711            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
    56215712        </item> <!-- Kart Racing -->
    56225713        <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    56245715            <space />
    56255716            <key key="sport" value="motocross" />
    56265717            <text key="name" text="Name" />
    5627             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5718            <combo key="leisure" text="Type" values_context="racing">
     5719                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5720                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5721                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5722            </combo>
    56285723        </item> <!-- Motocross -->
    56295724        <separator/>
    56305725        <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    56325727            <space />
    56335728            <key key="sport" value="model_aerodrome" />
    56345729            <text key="name" text="Name" />
    5635             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
     5730            <combo key="leisure" text="Type" values_context="aerialway">
     5731                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5732                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5733                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5734            </combo>
    56365735            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
    56375736        </item> <!-- Model Aerodrome -->
    56385737        <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    56405739            <space />
    56415740            <key key="sport" value="rc_car" />
    56425741            <text key="name" text="Name" />
    5643             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
     5742            <combo key="leisure" text="Type" values_context="racing">
     5743                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
     5744                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
     5745                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
     5746            </combo>
    56445747            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
    56455748        </item> <!-- RC Car -->
    56465749    </group> <!-- Motorsport -->

  • resources/data/validator/combinations.mapcss

     
    313313  group: tr("suspicious tag combination");
    314314}
    315315
    316 /* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186, #18815, #20960 */
     316/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186, #18815, #20960, #21907 */
    317317*[barrier=kerb][kerb=no],
    318318way[highway=construction][construction][construction=~/^(yes|minor|no)$/],
    319319way[railway=construction][construction][construction=~/^(yes|minor|no)$/],
    … …  
    322322*[man_made=bridge][bridge=yes],
    323323*[man_made=tunnel][tunnel=yes],
    324324*[amenity=police][police],
     325*[leisure=horse_riding][sport=horse_racing],
    325326node[highway=crossing][crossing=no],
    326327node[railway=crossing][crossing=no],
    327328way[junction=yes][highway],