Changeset 8121 in josm
- Timestamp:
- 2015-03-08T22:14:10+01:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r8119 r8121 178 178 <chunk id="optional_sport"> 179 179 <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,s kiing,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" /> 181 181 </optional> 182 182 </chunk> … … 4774 4774 ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" /> 4775 4775 <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> 4781 4782 </item> <!-- Skiing --> 4782 4783 <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true"> -
trunk/data/validator/combinations.mapcss
r8120 r8121 46 46 *[border_type ][!boundary], 47 47 *[bridge:structure ][!bridge], 48 *[piste:difficulty ][!piste:type], 48 49 *[source:date ][!source], 49 50 *[source:name ][!name], … … 239 240 240 241 /* 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"] { 242 243 throwWarning: tr("sport without physical feature"); 243 244 assertMatch: "node sport=tennis"; -
trunk/data/validator/deprecated.mapcss
r8023 r8121 392 392 throwWarning: tr("Unspecific tag {0}", "{0.tag}"); 393 393 } 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 1079 1079 color: piste_novice#00ff00; 1080 1080 } 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] {1081 node[piste:type=downhill], 1082 node[piste:type=nordic], 1083 node[piste:type=skitour], 1084 node[piste:type=sled], 1085 node[piste:type=sleigh], 1086 node[piste:type=snow_park] { 1087 1087 icon-image: "sport/skiing.png"; 1088 1088 set icon_z17; … … 3725 3725 text: auto; 3726 3726 } 3727 area[sport=skiing],3728 3727 area[sport=table_tennis], 3729 3728 area[sport=tennis], 3730 3729 area[sport=paintball] { 3731 3730 fill-color: sport#bde3cb; 3732 }3733 node[sport=skiing] {3734 icon-image: "sport/skiing.png";3735 set icon_z17;3736 text: auto;3737 3731 } 3738 3732 node[sport=table_tennis] {
Note:
See TracChangeset
for help on using the changeset viewer.