From f1f4835848db73ad3b7310fea5c0140e537378af Mon Sep 17 00:00:00 2001
From: Aleksandr Zykov <alexandrz@gmail.com>
Date: Sun, 23 Nov 2014 12:52:14 +0500
Subject: [PATCH 1/3] added bench field added bench and covered fields to
 bus_stop preset

---
 data/presets.yaml                          | 2 ++
 data/presets/fields.json                   | 5 +++++
 data/presets/fields/bench.json             | 5 +++++
 data/presets/presets.json                  | 4 +++-
 data/presets/presets/highway/bus_stop.json | 4 +++-
 dist/locales/en.json                       | 3 +++
 dist/locales/ru.json                       | 3 +++
 7 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/bench.json

diff --git a/data/presets.yaml b/data/presets.yaml
index e82239dc8..c4b14add5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -114,6 +114,8 @@ en:
         label: Backrest
       barrier:
         label: Type
+      bench:
+        label: Bench
       bicycle_parking:
         label: Type
       boundary:
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2d6ddcd0f..d42f0c1b6 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -202,6 +202,11 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "bench": {
+        "key": "bench",
+        "type": "check",
+        "label": "Bench"
+    },
     "bicycle_parking": {
         "key": "bicycle_parking",
         "type": "combo",
diff --git a/data/presets/fields/bench.json b/data/presets/fields/bench.json
new file mode 100644
index 000000000..34f95c9e2
--- /dev/null
+++ b/data/presets/fields/bench.json
@@ -0,0 +1,5 @@
+{
+    "key": "bench",
+    "type": "check",
+    "label": "Bench"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 49391a134..8a194f323 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3697,7 +3697,9 @@
         "icon": "bus",
         "fields": [
             "operator",
-            "shelter"
+            "bench",
+            "shelter",
+            "covered"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json
index b881460d8..84697d9d4 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/bus_stop.json
@@ -2,7 +2,9 @@
     "icon": "bus",
     "fields": [
         "operator",
-        "shelter"
+        "bench",
+        "shelter",
+        "covered"
     ],
     "geometry": [
         "point",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index eb741328a..acd84156f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -664,6 +664,9 @@
             "barrier": {
                 "label": "Type"
             },
+            "bench": {
+                "label": "Bench"
+            },
             "bicycle_parking": {
                 "label": "Type"
             },
diff --git a/dist/locales/ru.json b/dist/locales/ru.json
index 6ae062d18..013e18459 100644
--- a/dist/locales/ru.json
+++ b/dist/locales/ru.json
@@ -572,6 +572,9 @@
             "barrier": {
                 "label": "Тип"
             },
+            "bench": {
+                "label": "Скамейка"
+            },
             "bicycle_parking": {
                 "label": "Тип"
             },

From 1d580d3ca297d0f3e11fd82ceb92bafc98cad604 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian.schwarz@refactory.at>
Date: Sun, 30 Nov 2014 22:16:03 +0100
Subject: [PATCH 2/3] Fixed address input while nominatim is not available

---
 js/id/ui/preset/address.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js
index cbd42a2f8..16e9b1521 100644
--- a/js/id/ui/preset/address.js
+++ b/js/id/ui/preset/address.js
@@ -95,6 +95,8 @@ iD.ui.preset.address = function(field, context) {
     }
 
     function address(selection) {
+        isInitialized = false;
+        
         selection.selectAll('.preset-input-wrap')
             .remove();
 

From 7c458513f3a0903e1b3b3ffaa8f213c00469200a Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 2 Dec 2014 22:14:31 -0500
Subject: [PATCH 3/3] Don't pass extra arguments from map to Entity initializer
 fixes #2465

---
 js/id/core/history.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/id/core/history.js b/js/id/core/history.js
index 2ca81bc8b..87c9b0075 100644
--- a/js/id/core/history.js
+++ b/js/id/core/history.js
@@ -234,7 +234,9 @@ iD.History = function(context) {
                     // this merges originals for changed entities into the base of
                     // the stack even if the current stack doesn't have them (for
                     // example when iD has been restarted in a different region)
-                    var baseEntities = h.baseEntities.map(iD.Entity);
+                    var baseEntities = h.baseEntities.map(function(entity) {
+                        return iD.Entity(entity);
+                    });
                     stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'));
                     tree.rebase(baseEntities);
                 }