Changeset 8121 in josm for trunk


Ignore:
Timestamp:
2015-03-08T22:14:10+01:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #11183 - rework skiing sports

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r8119 r8121  
    178178    <chunk id="optional_sport">
    179179        <optional text="Select sport:">
    180             <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,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
     180            <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,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis" values_context="sport" />
    181181        </optional>
    182182    </chunk>
     
    47744774                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" />
    47754775            <space />
    4776             <key key="sport" value="skiing" />
    4777             <text key="name" text="Name" />
    4778             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
    4779             <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
    4780             <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
     4776            <text key="name" text="Name" />
     4777            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,sled,sleigh,snow_park" match="keyvalue"/>
     4778            <optional>
     4779                <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
     4780                <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
     4781            </optional>
    47814782        </item> <!-- Skiing -->
    47824783        <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
  • trunk/data/validator/combinations.mapcss

    r8120 r8121  
    4646*[border_type                  ][!boundary],
    4747*[bridge:structure             ][!bridge],
     48*[piste:difficulty             ][!piste:type],
    4849*[source:date                  ][!source],
    4950*[source:name                  ][!name],
     
    239240
    240241/* see #9593, #11183 */
    241 *[sport][!building][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)$/] {
     242*[sport][!building][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"] {
    242243    throwWarning: tr("sport without physical feature");
    243244    assertMatch: "node sport=tennis";
  • trunk/data/validator/deprecated.mapcss

    r8023 r8121  
    392392  throwWarning: tr("Unspecific tag {0}", "{0.tag}");
    393393}
     394
     395/* unclear definition, see #11183 */
     396*[sport=skiing][!piste:type] {
     397  throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
     398  suggestAlternative: {1.key};
     399}
  • trunk/styles/standard/elemstyles.mapcss

    r8062 r8121  
    10791079    color: piste_novice#00ff00;
    10801080}
    1081 node[piste:difficulty=easy],
    1082 node[piste:difficulty=intermediate],
    1083 node[piste:difficulty=advanced],
    1084 node[piste:difficulty=expert],
    1085 node[piste:difficulty=freeride],
    1086 node[piste:difficulty=novice] {
     1081node[piste:type=downhill],
     1082node[piste:type=nordic],
     1083node[piste:type=skitour],
     1084node[piste:type=sled],
     1085node[piste:type=sleigh],
     1086node[piste:type=snow_park] {
    10871087    icon-image: "sport/skiing.png";
    10881088    set icon_z17;
     
    37253725    text: auto;
    37263726}
    3727 area[sport=skiing],
    37283727area[sport=table_tennis],
    37293728area[sport=tennis],
    37303729area[sport=paintball] {
    37313730    fill-color: sport#bde3cb;
    3732 }
    3733 node[sport=skiing] {
    3734     icon-image: "sport/skiing.png";
    3735     set icon_z17;
    3736     text: auto;
    37373731}
    37383732node[sport=table_tennis] {
Note: See TracChangeset for help on using the changeset viewer.