From 69df630f21170283a1a01dbba89c9aebe1c6e5c3 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 24 Jan 2020 09:20:23 -0500
Subject: [PATCH] Support multiple values in the `beauty` field (close #7215)

---
 data/presets.yaml               | 2 +-
 data/presets/fields.json        | 2 +-
 data/presets/fields/beauty.json | 4 ++--
 data/taginfo.json               | 2 +-
 dist/locales/en.json            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 820eb17a2..bb6feb1f4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -285,7 +285,7 @@ en:
           onsen: Japanese Onsen
       beauty:
         # beauty=*
-        label: Beauty Specialty
+        label: Services
       bench:
         # bench=*
         label: Bench
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 47caac3a2..695524647 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -37,7 +37,7 @@
     "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},
     "bath/sand_bath": {"key": "bath:sand_bath", "label": "Sand Bath", "type": "check"},
     "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty", "strings": {"options": {"onsen": "Japanese Onsen", "foot_bath": "Foot Bath", "hot_spring": "Hot Spring"}}},
-    "beauty": {"key": "beauty", "type": "combo", "label": "Beauty Specialty"},
+    "beauty": {"key": "beauty", "type": "semiCombo", "label": "Services"},
     "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
     "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
     "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
diff --git a/data/presets/fields/beauty.json b/data/presets/fields/beauty.json
index b8eead61d..60faf3024 100644
--- a/data/presets/fields/beauty.json
+++ b/data/presets/fields/beauty.json
@@ -1,5 +1,5 @@
 {
     "key": "beauty",
-    "type": "combo",
-    "label": "Beauty Specialty"
+    "type": "semiCombo",
+    "label": "Services"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 104ef416e..428c4a8d2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1340,7 +1340,7 @@
     {"key": "bath:type", "value": "onsen", "description": "🄵 Specialty"},
     {"key": "bath:type", "value": "foot_bath", "description": "🄵 Specialty"},
     {"key": "bath:type", "value": "hot_spring", "description": "🄵 Specialty"},
-    {"key": "beauty", "description": "🄵 Beauty Specialty"},
+    {"key": "beauty", "description": "🄵 Services"},
     {"key": "bench", "description": "🄵 Bench"},
     {"key": "bicycle_parking", "description": "🄵 Type"},
     {"key": "bin", "description": "🄵 Waste Bin"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 17b96203c..2e35da4e7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2799,7 +2799,7 @@
                     }
                 },
                 "beauty": {
-                    "label": "Beauty Specialty"
+                    "label": "Services"
                 },
                 "bench": {
                     "label": "Bench",