fix #11471 - add sport=billiards to preset and mappaint style

git-svn-id: http://josm.openstreetmap.de/svn/trunk@8428 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · May 26, 2015 · fad7103 · fad7103
1 parent 6f3c0e0
commit fad7103
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
@@ -5087,6 +5087,13 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Beach Volleyball -->
+            <item name="Billiards" icon="styles/standard/sport/billiards.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=billiards" />
+            <space />
+            <key key="sport" value="billiards" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+        </item> <!-- Billiards -->
         <item name="Golf" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"

diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
@@ -475,4 +475,13 @@ relation[/^..$/][!to] {
   throwWarning: tr("{0} is inaccurate", "{0.tag}");
   suggestAlternative: "sport=field_hockey";
   suggestAlternative: "sport=ice_hockey";
+}
+
+/* see #11471 */
+*[sport=billard],
+*[sport=billards],
+*[sport=billiard] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sport=billiards";
+  fixAdd: "sport=billiards";
 }
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
@@ -3803,6 +3803,7 @@ area[sport=squash],
 area[sport=shooting],
 area[sport=volleyball],
 area[sport=beachvolleyball],
+area[sport=billiards],
 area[sport=bowling],
 area[sport=handball],
 area[sport=rowing],
@@ -3832,6 +3833,11 @@ node[sport=beachvolleyball] {
     set icon_z17;
     text: auto;
 }
+node[sport=billiards] {
+    icon-image: "sport/billiards.svg";
+    set icon_z17;
+    text: auto;
+}
 node[sport=bowling] {
     icon-image: "sport/10pin.png";
     set icon_z17;