For ice rinks, prefer the "sport" values "ice_hockey" and "ice_skating" instead of "hockey" and "skating" since that latter are ambiguous

Don't remove other values when upgrading a tag value within a semicolon-delimited list

data/deprecated.json

@@ -447,6 +447,14 @@
       "old": {"leisure": "club"},
       "replace": {"club": "*"}
     },
+    {
+      "old": {"leisure": "ice_rink", "sport": "hockey"},
+      "replace": {"leisure": "ice_rink", "sport": "ice_hockey"}
+    },
+    {
+      "old": {"leisure": "ice_rink", "sport": "skating"},
+      "replace": {"leisure": "ice_rink", "sport": "ice_skating"}
+    },
     {
       "old": {"leisure": "social_club"},
       "replace": {"club": "*"}

data/presets/fields.json

@@ -337,7 +337,7 @@
     "social_facility_for": {"key": "social_facility:for", "type": "combo", "label": "People Served"},
     "social_facility": {"key": "social_facility", "type": "combo", "label": "Type"},
     "source": {"key": "source", "type": "semiCombo", "icon": "source", "universal": true, "label": "Sources", "snake_case": false, "caseSensitive": true, "options": ["survey", "local knowledge", "gps", "aerial imagery", "streetlevel imagery"]},
-    "sport_ice": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["skating", "hockey", "multi", "curling", "ice_stock"]},
+    "sport_ice": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["ice_skating", "ice_hockey", "multi", "curling", "ice_stock"]},
     "sport_racing_motor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["motor", "karting", "motocross"]},
     "sport_racing_nonmotor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["bmx", "cycling", "dog_racing", "horse_racing", "running"]},
     "sport": {"key": "sport", "type": "semiCombo", "label": "Sports"},

data/presets/fields/sport_ice.json

@@ -3,8 +3,8 @@
     "type": "semiCombo",
     "label": "Sports",
     "options": [
-        "skating",
-        "hockey",
+        "ice_skating",
+        "ice_hockey",
         "multi",
         "curling",
         "ice_stock"