Merge branch 'localstorage-restore' into conflict-resolution

data/presets.yaml

@@ -114,6 +114,8 @@ en:
         label: Backrest
       barrier:
         label: Type
+      bench:
+        label: Bench
       bicycle_parking:
         label: Type
       boundary:

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",

data/presets/fields/bench.json

@@ -0,0 +1,5 @@
+{
+    "key": "bench",
+    "type": "check",
+    "label": "Bench"
+}

data/presets/presets.json

@@ -3697,7 +3697,9 @@
         "icon": "bus",
         "fields": [
             "operator",
-            "shelter"
+            "bench",
+            "shelter",
+            "covered"
         ],
         "geometry": [
             "point",

data/presets/presets/highway/bus_stop.json

@@ -2,7 +2,9 @@
     "icon": "bus",
     "fields": [
         "operator",
-        "shelter"
+        "bench",
+        "shelter",
+        "covered"
     ],
     "geometry": [
         "point",

dist/locales/en.json

@@ -664,6 +664,9 @@
             "barrier": {
                 "label": "Type"
             },
+            "bench": {
+                "label": "Bench"
+            },
             "bicycle_parking": {
                 "label": "Type"
             },

dist/locales/ru.json

@@ -572,6 +572,9 @@
             "barrier": {
                 "label": "Тип"
             },
+            "bench": {
+                "label": "Скамейка"
+            },
             "bicycle_parking": {
                 "label": "Тип"
             },

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);
                 }

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();