From 83f135f2bac8b6a1589f0b23526bfcad50c1d241 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 5 Dec 2017 13:37:13 -0500
Subject: [PATCH] Recycling Center / Recycling Container preset cleanups
 (closes #4569)

---
 data/presets.yaml                             | 12 ++--------
 data/presets/fields.json                      | 12 ----------
 data/presets/fields/recycling_type.json       | 12 ----------
 data/presets/presets.json                     | 22 ++++++++++++++++---
 data/presets/presets/amenity/recycling.json   | 15 +++++++++++--
 .../presets/amenity/recycling_centre.json     |  7 +++++-
 dist/locales/en.json                          |  9 +-------
 7 files changed, 41 insertions(+), 48 deletions(-)
 delete mode 100644 data/presets/fields/recycling_type.json

diff --git a/data/presets.yaml b/data/presets.yaml
index a2b4e464d..1802ed669 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1114,14 +1114,6 @@ en:
       recycling_accepts:
         # 'recycling:=*'
         label: Accepts
-      recycling_type:
-        # recycling_type=*
-        label: Recycling Type
-        options:
-          # recycling_type=centre
-          centre: Recycling Center
-          # recycling_type=container
-          container: Container
       ref:
         # ref=*
         label: Reference Code
@@ -2103,9 +2095,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Ranger Station'', separated by commas>'
       amenity/recycling:
         # amenity=recycling
-        name: Recycling
+        name: Recycling Container
         # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
-        terms: '<translate with synonyms or related terms for ''Recycling'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
       amenity/recycling_centre:
         # 'amenity=recycling, recycling_type=centre'
         name: Recycling Center
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 39ad76e68..d3c833ac9 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1489,18 +1489,6 @@
             "type": "multiCombo",
             "label": "Accepts"
         },
-        "recycling_type": {
-            "key": "recycling_type",
-            "default": "container",
-            "type": "combo",
-            "label": "Recycling Type",
-            "strings": {
-                "options": {
-                    "container": "Container",
-                    "centre": "Recycling Center"
-                }
-            }
-        },
         "ref_aeroway_gate": {
             "key": "ref",
             "type": "text",
diff --git a/data/presets/fields/recycling_type.json b/data/presets/fields/recycling_type.json
deleted file mode 100644
index e8195f105..000000000
--- a/data/presets/fields/recycling_type.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "key": "recycling_type",
-    "default": "container",
-    "type": "combo",
-    "label": "Recycling Type",
-    "strings": {
-        "options": {
-            "container": "Container",
-            "centre": "Recycling Center"
-        }
-    }
-}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 283bef41d..7a4beec6e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2541,11 +2541,12 @@
             "name": "Ranger Station"
         },
         "amenity/recycling_centre": {
-            "icon": "waste-basket",
+            "icon": "recycling",
             "fields": [
                 "name",
                 "operator",
                 "address",
+                "building",
                 "opening_hours",
                 "recycling_accepts"
             ],
@@ -2567,12 +2568,15 @@
                 "amenity": "recycling",
                 "recycling_type": "centre"
             },
+            "reference": {
+                "key": "recycling_type",
+                "value": "*"
+            },
             "name": "Recycling Center"
         },
         "amenity/recycling": {
             "icon": "recycling",
             "fields": [
-                "recycling_type",
                 "recycling_accepts",
                 "collection_times"
             ],
@@ -2593,7 +2597,19 @@
             "tags": {
                 "amenity": "recycling"
             },
-            "name": "Recycling"
+            "addTags": {
+                "amenity": "recycling",
+                "recycling_type": "container"
+            },
+            "removeTags": {
+                "amenity": "recycling",
+                "recycling_type": "container"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "recycling"
+            },
+            "name": "Recycling Container"
         },
         "amenity/restaurant": {
             "icon": "restaurant",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 4648e3b62..f2000bab7 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,7 +1,6 @@
 {
     "icon": "recycling",
     "fields": [
-        "recycling_type",
         "recycling_accepts",
         "collection_times"
     ],
@@ -22,5 +21,17 @@
     "tags": {
         "amenity": "recycling"
     },
-    "name": "Recycling"
+    "addTags": {
+        "amenity": "recycling",
+        "recycling_type": "container"
+    },
+    "removeTags": {
+        "amenity": "recycling",
+        "recycling_type": "container"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "recycling"
+    },
+    "name": "Recycling Container"
 }
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
index 3ab57bd17..aa5abdc5c 100644
--- a/data/presets/presets/amenity/recycling_centre.json
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -1,9 +1,10 @@
 {
-    "icon": "waste-basket",
+    "icon": "recycling",
     "fields": [
         "name",
         "operator",
         "address",
+        "building",
         "opening_hours",
         "recycling_accepts"
     ],
@@ -25,5 +26,9 @@
         "amenity": "recycling",
         "recycling_type": "centre"
     },
+    "reference": {
+        "key": "recycling_type",
+        "value": "*"
+    },
     "name": "Recycling Center"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d29e3656f..b60bed795 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2184,13 +2184,6 @@
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
-                "recycling_type": {
-                    "label": "Recycling Type",
-                    "options": {
-                        "container": "Container",
-                        "centre": "Recycling Center"
-                    }
-                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
@@ -3073,7 +3066,7 @@
                     "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/recycling": {
-                    "name": "Recycling",
+                    "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/restaurant": {