From 9a7042b5302b30daf2f000f49cdf4550f835e1b8 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 30 Jul 2015 09:52:06 -0400
Subject: [PATCH] Add recycling:glass_bottles, recycling:plastic (closes #2730)

---
 data/presets.yaml                                |  6 ++++++
 data/presets/fields.json                         | 10 ++++++++++
 data/presets/fields/recycling/glass_bottles.json |  5 +++++
 data/presets/fields/recycling/plastic.json       |  5 +++++
 data/presets/presets.json                        |  4 +++-
 data/presets/presets/amenity/recycling.json      |  4 +++-
 dist/locales/en.json                             |  6 ++++++
 7 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/recycling/glass_bottles.json
 create mode 100644 data/presets/fields/recycling/plastic.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 83d0e8e52..d7d154aff 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -748,9 +748,15 @@ en:
       recycling/glass:
         # 'recycling:glass=*'
         label: Accepts Glass
+      recycling/glass_bottles:
+        # 'recycling:glass_bottles=*'
+        label: Accepts Glass Bottles
       recycling/paper:
         # 'recycling:paper=*'
         label: Accepts Paper
+      recycling/plastic:
+        # 'recycling:plastic=*'
+        label: Accepts Plastic
       recycling/type:
         # 'recycling_type=*'
         label: Recycling Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ab2dae6f8..d11a50ccf 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -964,11 +964,21 @@
         "type": "check",
         "label": "Accepts Glass"
     },
+    "recycling/glass_bottles": {
+        "key": "recycling:glass_bottles",
+        "type": "check",
+        "label": "Accepts Glass Bottles"
+    },
     "recycling/paper": {
         "key": "recycling:paper",
         "type": "check",
         "label": "Accepts Paper"
     },
+    "recycling/plastic": {
+        "key": "recycling:plastic",
+        "type": "check",
+        "label": "Accepts Plastic"
+    },
     "recycling/type": {
         "key": "recycling_type",
         "type": "combo",
diff --git a/data/presets/fields/recycling/glass_bottles.json b/data/presets/fields/recycling/glass_bottles.json
new file mode 100644
index 000000000..ab4621f7b
--- /dev/null
+++ b/data/presets/fields/recycling/glass_bottles.json
@@ -0,0 +1,5 @@
+{
+    "key": "recycling:glass_bottles",
+    "type": "check",
+    "label": "Accepts Glass Bottles"
+}
diff --git a/data/presets/fields/recycling/plastic.json b/data/presets/fields/recycling/plastic.json
new file mode 100644
index 000000000..2bb43abd4
--- /dev/null
+++ b/data/presets/fields/recycling/plastic.json
@@ -0,0 +1,5 @@
+{
+    "key": "recycling:plastic",
+    "type": "check",
+    "label": "Accepts Plastic"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 99d3db962..7c95fab27 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1510,8 +1510,10 @@
             "address",
             "recycling/type",
             "recycling/cans",
-            "recycling/glass",
+            "recycling/glass_bottles",
             "recycling/paper",
+            "recycling/glass",
+            "recycling/plastic",
             "recycling/clothes"
         ],
         "geometry": [
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 5a19e20f3..5651c5774 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -5,8 +5,10 @@
         "address",
         "recycling/type",
         "recycling/cans",
-        "recycling/glass",
+        "recycling/glass_bottles",
         "recycling/paper",
+        "recycling/glass",
+        "recycling/plastic",
         "recycling/clothes"
     ],
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 552b3e8ec..2be9d2050 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1207,9 +1207,15 @@
             "recycling/glass": {
                 "label": "Accepts Glass"
             },
+            "recycling/glass_bottles": {
+                "label": "Accepts Glass Bottles"
+            },
             "recycling/paper": {
                 "label": "Accepts Paper"
             },
+            "recycling/plastic": {
+                "label": "Accepts Plastic"
+            },
             "recycling/type": {
                 "label": "Recycling Type",
                 "options": {