Changeset 3360 in josm for trunk


Ignore:
Timestamp:
2010-06-30T13:15:58+02:00 (14 years ago)
Author:
ce
Message:

fixes #5199

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r3321 r3360  
    19111911            <label text="select sport:" />
    19121912            <space />
    1913             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
     1913            <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_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
    19141914        </item>
    19151915        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
    … …  
    19201920            <label text="select sport:" />
    19211921            <space />
    1922             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
     1922            <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_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
    19231923        </item>
    19241924        <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
    … …  
    19291929            <label text="select sport:" />
    19301930            <space />
    1931             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
     1931            <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_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
    19321932        </item>
    19331933        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
    … …  
    19381938            <label text="select sport:" />
    19391939            <space />
    1940             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
     1940            <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_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
    19411941        </item>
    19421942        <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
    … …  
    20682068            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    20692069        </item>
    2070         <item name="Football" icon="presets/football.png" type="node,closedway">
    2071             <label text="Edit Football" />
    2072             <key key="sport" value="football" />
    2073             <text key="name" text="Name" default="" delete_if_empty="true" />
    2074             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    2075         </item>
    2076         <item name="Australian Football" icon="presets/football.png" type="node,closedway">
     2070        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
    20772071            <label text="Edit Australian Football" />
    20782072            <key key="sport" value="australian_football" />
     2073            <text key="name" text="Name" default="" delete_if_empty="true" />
     2074            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2075        </item>
     2076        <item name="American Football" icon="presets/soccer.png" type="node,closedway">
     2077            <label text="Edit American Football" />
     2078            <key key="sport" value="american_football" />
     2079            <text key="name" text="Name" default="" delete_if_empty="true" />
     2080            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2081        </item>
     2082        <item name="Canadian Football" icon="presets/soccer.png" type="node,closedway">
     2083            <label text="Edit Canadian Football" />
     2084            <key key="sport" value="canadian_football" />
     2085            <text key="name" text="Name" default="" delete_if_empty="true" />
     2086            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2087        </item>
     2088        <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
     2089            <label text="Edit Gaelic Football" />
     2090            <key key="sport" value="gaelic_football" />
     2091            <text key="name" text="Name" default="" delete_if_empty="true" />
     2092            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2093        </item>
     2094        <item name="Rugby League" icon="presets/football.png" type="node,closedway">
     2095            <label text="Edit Rugby League" />
     2096            <key key="sport" value="rugby_league" />
     2097            <text key="name" text="Name" default="" delete_if_empty="true" />
     2098            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
     2099        </item>
     2100        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
     2101            <label text="Edit Rugby Union" />
     2102            <key key="sport" value="rugby_union" />
    20792103            <text key="name" text="Name" default="" delete_if_empty="true" />
    20802104            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    … …  
    21432167            <label text="Edit Racquet" />
    21442168            <key key="sport" value="racquet" />
    2145             <text key="name" text="Name" default="" delete_if_empty="true" />
    2146             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
    2147         </item>
    2148         <item name="Rugby" icon="presets/football.png" type="node,closedway">
    2149             <label text="Edit Rugby" />
    2150             <key key="sport" value="rugby" />
    21512169            <text key="name" text="Name" default="" delete_if_empty="true" />
    21522170            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />

  • trunk/styles/standard/elemstyles.xml

    r3357 r3360  
    37593759
    37603760        <rule>
     3761                <condition k="sport" v="soccer"/>
     3762                <area colour="sport#bde3cb"/>
     3763                <icon src="sport/soccer.png"/>
     3764                <scale_min>1</scale_min>
     3765                <scale_max>50000</scale_max>
     3766        </rule>
     3767
     3768        <rule>
    37613769                <condition k="sport" v="australian_football"/>
    37623770                <area colour="sport#bde3cb"/>
     3771                <icon src="sport/soccer.png"/>
     3772                <scale_min>1</scale_min>
     3773                <scale_max>50000</scale_max>
     3774        </rule>
     3775
     3776        <rule>
     3777                <condition k="sport" v="american_football"/>
     3778                <area colour="sport#bde3cb"/>
     3779                <icon src="sport/soccer.png"/>
     3780                <scale_min>1</scale_min>
     3781                <scale_max>50000</scale_max>
     3782        </rule>
     3783
     3784        <rule>
     3785                <condition k="sport" v="canadian_football"/>
     3786                <area colour="sport#bde3cb"/>
     3787                <icon src="sport/soccer.png"/>
     3788                <scale_min>1</scale_min>
     3789                <scale_max>50000</scale_max>
     3790        </rule>
     3791
     3792        <rule>
     3793                <condition k="sport" v="gaelic_football"/>
     3794                <area colour="sport#bde3cb"/>
     3795                <icon src="sport/soccer.png"/>
     3796                <scale_min>1</scale_min>
     3797                <scale_max>50000</scale_max>
     3798        </rule>
     3799
     3800        <rule>
     3801                <condition k="sport" v="rugby_league"/>
     3802                <area colour="sport#bde3cb"/>
    37633803                <icon src="sport/football.png"/>
    37643804                <scale_min>1</scale_min>
    … …  
    37673807
    37683808        <rule>
     3809                <condition k="sport" v="rugby_union"/>
     3810                <area colour="sport#bde3cb"/>
     3811                <icon src="sport/football.png"/>
     3812                <scale_min>1</scale_min>
     3813                <scale_max>50000</scale_max>
     3814        </rule>
     3815
     3816        <rule>
    37693817                <condition k="sport" v="baseball"/>
    37703818                <area colour="sport#bde3cb"/>
    … …  
    38713919
    38723920        <rule>
    3873                 <condition k="sport" v="football"/>
    3874                 <area colour="sport#bde3cb"/>
    3875                 <icon src="sport/football.png"/>
    3876                 <scale_min>1</scale_min>
    3877                 <scale_max>50000</scale_max>
    3878         </rule>
    3879 
    3880         <rule>
    38813921                <condition k="sport" v="golf"/>
    38823922                <area colour="sport#bde3cb"/>
    … …  
    39433983
    39443984        <rule>
    3945                 <condition k="sport" v="rugby"/>
    3946                 <area colour="sport#bde3cb"/>
    3947                 <icon src="sport/football.png"/>
    3948                 <scale_min>1</scale_min>
    3949                 <scale_max>50000</scale_max>
    3950         </rule>
    3951 
    3952         <rule>
    39533985                <condition k="sport" v="skating"/>
    39543986                <area colour="sport#bde3cb"/>
    … …  
    39623994                <area colour="sport#bde3cb"/>
    39633995                <icon src="sport/skateboard.png"/>
    3964                 <scale_min>1</scale_min>
    3965                 <scale_max>50000</scale_max>
    3966         </rule>
    3967 
    3968         <rule>
    3969                 <condition k="sport" v="soccer"/>
    3970                 <area colour="sport#bde3cb"/>
    3971                 <icon src="sport/soccer.png"/>
    39723996                <scale_min>1</scale_min>
    39733997                <scale_max>50000</scale_max>
Note: See TracChangeset for help on using the changeset viewer.