Changeset 8383 in josm for trunk


Ignore:
Timestamp:
2015-05-17T13:56:37+02:00 (4 years ago)
Author:
Klumbumbus
Message:

fix #11439 - split hockey into field_hockey and ice_hockey

Location:
trunk
Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r8381 r8383  
    50395039            <reference ref="name_leisure_pitch" />
    50405040        </item> <!-- Croquet -->
    5041         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway" preset_name_label="true">
    5042             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
    5043             <space />
    5044             <key key="sport" value="hockey" />
     5041        <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway" preset_name_label="true">
     5042            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=field_hockey" />
     5043            <space />
     5044            <key key="sport" value="field_hockey" />
     5045            <text key="name" text="Name" />
     5046            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
     5047        </item> <!-- Field Hockey -->
     5048        <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway" preset_name_label="true">
     5049            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_hockey" />
     5050            <space />
     5051            <key key="sport" value="ice_hockey" />
    50455052            <text key="name" text="Name" />
    50465053            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
    5047         </item> <!-- Hockey -->
     5054        </item> <!-- Ice Hockey -->
    50485055        <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
    50495056            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
  • trunk/data/validator/combinations.mapcss

    r8302 r8383  
    241241
    242242/* see #9593, #11183 */
    243 *[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"] {
     243*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"] {
    244244    throwWarning: tr("sport without physical feature");
    245245    assertMatch: "node sport=tennis";
  • trunk/data/validator/deprecated.mapcss

    r8204 r8383  
    470470  fixAdd: "pole=transition";
    471471}
     472
     473/* see #11439 */
     474*[sport=hockey] {
     475  throwWarning: tr("{0} is inaccurate", "{0.tag}");
     476  suggestAlternative: "sport=field_hockey";
     477  suggestAlternative: "sport=ice_hockey";
     478}
  • trunk/styles/standard/elemstyles.mapcss

    r8362 r8383  
    16321632}
    16331633node[leisure=ice_rink] {
    1634     icon-image: "sport/hockey.png";
     1634    icon-image: "sport/ice_hockey.png";
    16351635    set icon_z17;
    16361636    text: auto;
     
    36613661area[sport=golf],
    36623662area[sport=gymnastics],
    3663 area[sport=hockey],
     3663area[sport=field_hockey],
     3664area[sport=ice_hockey],
    36643665area[sport=horse_racing],
    36653666area[sport=karting][highway!=raceway],
     
    36983699    text: auto;
    36993700}
    3700 node[sport=hockey] {
    3701     icon-image: "sport/hockey.png";
     3701node[sport=field_hockey] {
     3702    icon-image: "sport/field_hockey.png";
     3703    set icon_z17;
     3704    text: auto;
     3705}
     3706node[sport=ice_hockey] {
     3707    icon-image: "sport/ice_hockey.png";
    37023708    set icon_z17;
    37033709    text: auto;
Note: See TracChangeset for help on using the changeset viewer.