Changeset 8383 in josm

Timestamp:

2015-05-17T13:56:37+02:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #11439 - split hockey into field_hockey and ice_hockey

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• images/presets/field_hockey.png (added)
• images/presets/ice_hockey.png (moved) (moved from trunk/images/presets/Hockey.png )
• styles/standard/elemstyles.mapcss (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -5039 +5039 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Croquet -->
-        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
-            <space />
-            <key key="sport" value="hockey" />
+        <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=field_hockey" />
+            <space />
+            <key key="sport" value="field_hockey" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+        </item> <!-- Field Hockey -->
+        <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_hockey" />
+            <space />
+            <key key="sport" value="ice_hockey" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
-        </item> <!-- Hockey -->
+        </item> <!-- Ice Hockey -->
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"

trunk/data/validator/combinations.mapcss

@@ -241 +241 @@
 
 /* see #9593, #11183 */
-*[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"] {
+*[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"] {
     throwWarning: tr("sport without physical feature");
     assertMatch: "node sport=tennis";

trunk/data/validator/deprecated.mapcss

@@ -470 +470 @@
   fixAdd: "pole=transition";
 }
+
+/* see #11439 */
+*[sport=hockey] {
+  throwWarning: tr("{0} is inaccurate", "{0.tag}");
+  suggestAlternative: "sport=field_hockey";
+  suggestAlternative: "sport=ice_hockey";
+}

trunk/styles/standard/elemstyles.mapcss

@@ -1632 +1632 @@
 }
 node[leisure=ice_rink] {
-    icon-image: "sport/hockey.png";
+    icon-image: "sport/ice_hockey.png";
     set icon_z17;
     text: auto;
@@ -3661 +3661 @@
 area[sport=golf],
 area[sport=gymnastics],
-area[sport=hockey],
+area[sport=field_hockey],
+area[sport=ice_hockey],
 area[sport=horse_racing],
 area[sport=karting][highway!=raceway],
@@ -3698 +3699 @@
     text: auto;
 }
-node[sport=hockey] {
-    icon-image: "sport/hockey.png";
+node[sport=field_hockey] {
+    icon-image: "sport/field_hockey.png";
+    set icon_z17;
+    text: auto;
+}
+node[sport=ice_hockey] {
+    icon-image: "sport/ice_hockey.png";
     set icon_z17;
     text: auto;