From 837b297ec61daf94e2a2de71a626edfaa4153b35 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 5 Mar 2018 01:01:22 -0500
Subject: [PATCH] Add Dance Styles field, change icon to music notes (re:
 https://github.com/openstreetmap/iD/pull/4846#issuecomment-370317305)

---
 data/presets.yaml                                | 9 ++++++---
 data/presets/fields.json                         | 5 +++++
 data/presets/fields/dance/style.json             | 5 +++++
 data/presets/presets.json                        | 7 ++++---
 data/presets/presets/leisure/dancing_school.json | 7 ++++---
 dist/locales/en.json                             | 5 ++++-
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 data/presets/fields/dance/style.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 1cb8247d6..15da6dba4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -402,6 +402,9 @@ en:
         types:
           'cycleway:left': Left side
           'cycleway:right': Right side
+      dance/style:
+        # 'dance:style=*'
+        label: Dance Styles
       date:
         # date=*
         label: Date
@@ -3618,10 +3621,10 @@ en:
         # 'terms: ballroom,jive,swing,tango,waltz'
         terms: '<translate with synonyms or related terms for ''Dance Hall'', separated by commas>'
       leisure/dancing_school:
-        # leisure=dance, dance:teaching=yes
-        name: Dancing School
+        # 'leisure=dance, dance:teaching=yes'
+        name: Dance School
         # 'terms: jive,swing,tango,waltz,dance teaching'
-        terms: '<translate with synonyms or related terms for ''Dancing School'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Dance School'', separated by commas>'
       leisure/dog_park:
         # leisure=dog_park
         name: Dog Park
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 24ad0e858..6b9369f03 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -548,6 +548,11 @@
                 }
             }
         },
+        "dance/style": {
+            "key": "dance:style",
+            "type": "semiCombo",
+            "label": "Dance Styles"
+        },
         "date": {
             "key": "date",
             "type": "check",
diff --git a/data/presets/fields/dance/style.json b/data/presets/fields/dance/style.json
new file mode 100644
index 000000000..38e2513cc
--- /dev/null
+++ b/data/presets/fields/dance/style.json
@@ -0,0 +1,5 @@
+{
+    "key": "dance:style",
+    "type": "semiCombo",
+    "label": "Dance Styles"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index da6f01fa8..4deab4ccd 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9425,12 +9425,13 @@
             "name": "Dance Hall"
         },
         "leisure/dancing_school": {
-            "icon": "school",
+            "icon": "music",
             "fields": [
                 "name",
                 "operator",
                 "address",
-                "opening_hours"
+                "opening_hours",
+                "dance/style"
             ],
             "geometry": [
                 "point",
@@ -9451,7 +9452,7 @@
                 "key": "leisure",
                 "value": "dance"
             },
-            "name": "Dancing School"
+            "name": "Dance School"
         },
         "leisure/dog_park": {
             "icon": "dog-park",
diff --git a/data/presets/presets/leisure/dancing_school.json b/data/presets/presets/leisure/dancing_school.json
index a316a26cf..af8bbb9a2 100644
--- a/data/presets/presets/leisure/dancing_school.json
+++ b/data/presets/presets/leisure/dancing_school.json
@@ -1,10 +1,11 @@
 {
-    "icon": "school",
+    "icon": "music",
     "fields": [
         "name",
         "operator",
         "address",
-        "opening_hours"
+        "opening_hours",
+        "dance/style"
     ],
     "geometry": [
         "point",
@@ -25,5 +26,5 @@
         "key": "leisure",
         "value": "dance"
     },
-    "name": "Dancing School"
+    "name": "Dance School"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a0796fd6c..ca16b9f29 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1703,6 +1703,9 @@
                         }
                     }
                 },
+                "dance/style": {
+                    "label": "Dance Styles"
+                },
                 "date": {
                     "label": "Date"
                 },
@@ -4526,7 +4529,7 @@
                     "terms": "ballroom,jive,swing,tango,waltz"
                 },
                 "leisure/dancing_school": {
-                    "name": "Dancing School",
+                    "name": "Dance School",
                     "terms": "jive,swing,tango,waltz,dance teaching"
                 },
                 "leisure/dog_park": {