Changeset 7379 in josm for trunk/data


Ignore:
Timestamp:
2014-08-12T23:45:20+02:00 (10 years ago)
Author:
bastiK
Message:

see #10351 - use <chunk> in defaultpresets (patch by frankthetankk)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7374 r7379  
    166166        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
    167167    </chunk>
     168    <chunk id="riding_surface">
     169        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
     170        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     171    </chunk>
    168172    <chunk id="highway_base">
    169173        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
    … …  
    232236        <text key="fax" text="Fax Number"/>
    233237        <text key="website" text="Website"/>
    234     <text key="email" text="Email Address"/>
     238        <text key="email" text="Email Address"/>
    235239    </chunk>
    236240    <chunk id="name_ref">
    … …  
    301305        <text key="name" text="Name" />
    302306        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     307    </chunk>
     308    <chunk id="optional_sport">
     309        <optional text="Select sport:">
     310            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
     311        </optional>
    303312    </chunk>
    304313    <chunk id="payment_base">
    … …  
    32183227            <reference ref="contact" />
    32193228        </item>
    3220     </group> <!-- Accomodation -->
     3229    </group> <!-- Accommodation -->
    32213230    <group name="Food+Drinks" icon="presets/restaurant.png">
    32223231        <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
    … …  
    33923401            <key key="tourism" value="viewpoint" />
    33933402            <text key="name" text="Name" />
    3394 <!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
     3403            <!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
    33953404        </item>
    33963405        <separator/>
    … …  
    45034512            <key key="leisure" value="stadium" />
    45044513            <text key="name" text="Name" />
    4505             <optional text="Select sport:">
    4506                 <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
    4507             </optional>
     4514            <reference ref="optional_sport" />
    45084515        </item>
    45094516        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
    … …  
    45174524            <key key="leisure" value="sports_centre" />
    45184525            <text key="name" text="Name" />
    4519             <optional text="Select sport:">
    4520                 <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
    4521             </optional>
     4526            <reference ref="optional_sport" />
    45224527        </item>
    45234528        <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
    … …  
    45344539            <key key="leisure" value="pitch" />
    45354540            <text key="name" text="Name" />
    4536             <optional text="Select sport:">
    4537                 <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
    4538             </optional>
     4541            <reference ref="optional_sport" />
    45394542        </item>
    45404543        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
    … …  
    45494552            <key key="leisure" value="track" />
    45504553            <text key="name" text="Name" />
    4551             <optional text="Select sport:">
    4552                 <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
    4553             </optional>
     4554            <reference ref="optional_sport" />
    45544555        </item>
    45554556        <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
    … …  
    46464647            <key key="sport" value="equestrian" />
    46474648            <text key="name" text="Name" />
    4648             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
    4649             <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     4649            <reference ref="riding_surface" />
    46504650        </item>
    46514651        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
    … …  
    46544654            <key key="sport" value="horse_racing" />
    46554655            <text key="name" text="Name" />
    4656             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
    4657             <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     4656            <reference ref="riding_surface" />
    46584657        </item>
    46594658        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
    … …  
    47854784            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    47864785        </item>
    4787         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
     4786        <item name="Beach volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
    47884787            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
    47894788            <space />
Note: See TracChangeset for help on using the changeset viewer.