Changeset 9835 in josm


Ignore:
Timestamp:
2016-02-19T18:24:58+01:00 (9 years ago)
Author:
Klumbumbus
Message:

fix #12500 - deprecate sport=skating in favor of sport=ice_skating and sport=roller_skating; roller_skating icon see [o32077]

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r9792 r9835  
    187187    </chunk>
    188188    <chunk id="sport">
    189             <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     189            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
    190190    </chunk>
    191191    <chunk id="fee">
     
    53965396            <key key="leisure" value="track" />
    53975397            <text key="name" text="Name" />
    5398             <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,skating" values_context="sport" />
     5398            <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,roller_skating,ice_skating" values_context="sport" />
    53995399        </item> <!-- Racetrack -->
    54005400        <group name="Golf" icon="styles/standard/sport/golf/golf.svg">
     
    56355635            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    56365636        </item> <!-- Gymnastics -->
    5637         <item name="Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
    5638             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
    5639                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
    5640             <space />
    5641             <key key="sport" value="skating" />
     5637        <item name="Ice Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
     5638            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_skating" />
     5639            <space />
     5640            <key key="sport" value="ice_skating" />
    56425641            <text key="name" text="Name" />
    56435642            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
    5644         </item> <!-- Skating -->
     5643        </item> <!-- Ice Skating -->
     5644        <item name="Roller Skating" icon="styles/standard/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5645            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=roller_skating"/>
     5646            <space />
     5647            <key key="sport" value="roller_skating" />
     5648            <text key="name" text="Name" />
     5649            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5650        </item> <!-- Roller Skating -->
    56455651        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
    56465652            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
  • trunk/data/validator/deprecated.mapcss

    r9747 r9835  
    792792  throwWarning: tr("questionable key (ending with a number): {0}", "{0.key}");
    793793}
     794
     795/* #12500 */
     796*[sport=skating] {
     797  throwWarning: tr("{0} is deprecated", "{0.tag}");
     798  suggestAlternative: "sport=ice_skating";
     799  suggestAlternative: "sport=roller_skating";
     800}
  • trunk/styles/standard/elemstyles.mapcss

    r9725 r9835  
    43014301area[sport=pelota],
    43024302area[sport=racquet],
    4303 area[sport=skating],
     4303area[sport=ice_skating],
     4304area[sport=roller_skating],
    43044305area[sport=skateboard] {
    43054306    fill-color: sport#bde3cb;
     
    43204321    text: auto;
    43214322}
     4323node[sport=ice_skating] {
     4324    icon-image: "sport/skating.png";
     4325    set icon_z17;
     4326    text: auto;
     4327}
     4328node[sport=roller_skating] {
     4329    icon-image: "sport/roller_skating.svg";
     4330    set icon_z17;
     4331    text: auto;
     4332}
    43224333node[sport=skating] {
    4323     icon-image: "sport/skating.png";
     4334    icon-image: "misc/deprecated.png";
    43244335    set icon_z17;
    43254336    text: auto;
Note: See TracChangeset for help on using the changeset viewer.