From 5df8d1268f6c96ae8756379ed47ba7ae7590feb0 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 29 Apr 2017 08:59:32 -0400
Subject: [PATCH] Add preset for beach volleyball pitch (closes #3983)

---
 data/presets.yaml                             |  5 +++
 data/presets/presets.json                     | 31 ++++++++++++++++++-
 .../leisure/pitch/beachvolleyball.json        | 29 +++++++++++++++++
 .../presets/leisure/pitch/volleyball.json     |  2 +-
 data/taginfo.json                             |  4 +++
 dist/locales/en.json                          |  4 +++
 6 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/presets/leisure/pitch/beachvolleyball.json

diff --git a/data/presets.yaml b/data/presets.yaml
index cbcd25009..2c159f11a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3062,6 +3062,11 @@ en:
         # 'leisure=pitch, sport=basketball'
         name: Basketball Court
         terms: '<translate with synonyms or related terms for ''Basketball Court'', separated by commas>'
+      leisure/pitch/beachvolleyball:
+        # 'leisure=pitch, sport=beachvolleyball'
+        name: Beach Volleyball Court
+        # 'terms: volleyball'
+        terms: '<translate with synonyms or related terms for ''Beach Volleyball Court'', separated by commas>'
       leisure/pitch/bowls:
         # 'leisure=pitch, sport=bowls'
         name: Bowling Green
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 60adadf29..7fdc895b5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7419,6 +7419,35 @@
             "terms": [],
             "name": "Basketball Court"
         },
+        "leisure/pitch/beachvolleyball": {
+            "icon": "basketball",
+            "fields": [
+                "surface",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "beachvolleyball"
+            },
+            "addTags": {
+                "leisure": "pitch",
+                "sport": "beachvolleyball",
+                "surface": "sand"
+            },
+            "removeTags": {
+                "leisure": "pitch",
+                "sport": "beachvolleyball",
+                "surface": "sand"
+            },
+            "terms": [
+                "volleyball"
+            ],
+            "name": "Beach Volleyball Court"
+        },
         "leisure/pitch/bowls": {
             "icon": "pitch",
             "fields": [
@@ -7584,7 +7613,7 @@
             "name": "Tennis Court"
         },
         "leisure/pitch/volleyball": {
-            "icon": "pitch",
+            "icon": "basketball",
             "fields": [
                 "surface",
                 "lit"
diff --git a/data/presets/presets/leisure/pitch/beachvolleyball.json b/data/presets/presets/leisure/pitch/beachvolleyball.json
new file mode 100644
index 000000000..bbb7272bb
--- /dev/null
+++ b/data/presets/presets/leisure/pitch/beachvolleyball.json
@@ -0,0 +1,29 @@
+{
+    "icon": "basketball",
+    "fields": [
+        "surface",
+        "lit"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "beachvolleyball"
+    },
+    "addTags": {
+        "leisure": "pitch",
+        "sport": "beachvolleyball",
+        "surface": "sand"
+    },
+    "removeTags": {
+        "leisure": "pitch",
+        "sport": "beachvolleyball",
+        "surface": "sand"
+    },
+    "terms": [
+        "volleyball"
+    ],
+    "name": "Beach Volleyball Court"
+}
diff --git a/data/presets/presets/leisure/pitch/volleyball.json b/data/presets/presets/leisure/pitch/volleyball.json
index 4ffdabc38..a368387d2 100644
--- a/data/presets/presets/leisure/pitch/volleyball.json
+++ b/data/presets/presets/leisure/pitch/volleyball.json
@@ -1,5 +1,5 @@
 {
-    "icon": "pitch",
+    "icon": "basketball",
     "fields": [
         "surface",
         "lit"
diff --git a/data/taginfo.json b/data/taginfo.json
index ac37b503b..987007467 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1562,6 +1562,10 @@
             "key": "sport",
             "value": "basketball"
         },
+        {
+            "key": "sport",
+            "value": "beachvolleyball"
+        },
         {
             "key": "sport",
             "value": "bowls"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 152c22a54..8745dbf9c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3622,6 +3622,10 @@
                     "name": "Basketball Court",
                     "terms": ""
                 },
+                "leisure/pitch/beachvolleyball": {
+                    "name": "Beach Volleyball Court",
+                    "terms": "volleyball"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowling Green",
                     "terms": ""