From ee6cf2c146bcc9bac21f76a295e95ee28c759876 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Mon, 26 Nov 2012 14:29:54 -0500
Subject: [PATCH] Delete nodes. Fixes #112

---
 js/iD/format/XML.js    | 22 ++++++++++++++--------
 js/iD/graph/Graph.js   |  1 +
 js/iD/graph/History.js | 19 ++++++++++++-------
 js/iD/renderer/Map.js  |  5 +----
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/js/iD/format/XML.js b/js/iD/format/XML.js
index dc8811f5c..9866375e5 100644
--- a/js/iD/format/XML.js
+++ b/js/iD/format/XML.js
@@ -12,6 +12,7 @@ iD.format.XML = {
     decode: function(s) {
         return s.replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
     },
+    // Generate Changeset XML. Returns a string.
     changeset: function(comment) {
         return (new XMLSerializer()).serializeToString(
         JXON.unbuild({
@@ -27,21 +28,28 @@ iD.format.XML = {
             }
         }));
     },
-    osmChange: function(userid, changeset, changes) {
+    // Generate [osmChange](http://wiki.openstreetmap.org/wiki/OsmChange)
+    // XML. Returns a string.
+    osmChange: function(userid, changeset_id, changes) {
         return (new XMLSerializer()).serializeToString(
         JXON.unbuild({
             osmChange: {
                 '@version': 0.3,
                 '@generator': 'iD',
                 // TODO: copy elements first
-                create: changes.created.map(function(c) {
+                create: changes.create.map(function(c) {
                     var x = Object.create(c);
-                    x.changeset = changeset;
+                    x.changeset = changeset_id;
                     return x;
                 }).map(iD.format.XML.rep),
-                modify: changes.modified.map(function(c) {
+                modify: changes.modify.map(function(c) {
                     var x = Object.create(c);
-                    x.changeset = changeset;
+                    x.changeset = changeset_id;
+                    return x;
+                }).map(iD.format.XML.rep),
+                'delete': changes['delete'].map(function(c) {
+                    var x = Object.create(c);
+                    x.changeset = changeset_id;
                     return x;
                 }).map(iD.format.XML.rep)
             }
@@ -71,9 +79,7 @@ iD.format.XML = {
                         return { keyAttributes: { ref: e.id } };
                     }),
                     tag: _.map(entity.tags, function(v, k) {
-                        return {
-                            keyAttributes: { k: k, v: v }
-                        };
+                        return { keyAttributes: { k: k, v: v } };
                     })
                 }
             };
diff --git a/js/iD/graph/Graph.js b/js/iD/graph/Graph.js
index c0a586c74..ef492a005 100644
--- a/js/iD/graph/Graph.js
+++ b/js/iD/graph/Graph.js
@@ -94,4 +94,5 @@ iD.Graph.prototype = {
             return ((+entity.id.slice(1)) < 0) && entity.modified;
         });
     }
+
 };
diff --git a/js/iD/graph/History.js b/js/iD/graph/History.js
index dd489a572..a29ee5567 100644
--- a/js/iD/graph/History.js
+++ b/js/iD/graph/History.js
@@ -56,23 +56,28 @@ iD.History.prototype = {
         }
     },
 
-    modified: function() {
+    modify: function() {
         return this.stack[this.index].creations();
     },
 
-    created: function() {
+    create: function() {
         return this.stack[this.index].creations();
     },
 
-    deleted: function() {
-        // return this.stack[this.index].();
+    'delete': function() {
+        return _.difference(
+            _.pluck(this.stack[0].entities, 'id'),
+            _.pluck(this.stack[this.index].entities, 'id')
+            ).map(function(id) {
+                return this.stack[0].entity(id);
+            }.bind(this));
     },
 
     changes: function() {
         return {
-            modified: this.modified(),
-            created: this.created(),
-            deleted: this.deleted()
+            modify: this.modify(),
+            create: this.create(),
+            'delete': this['delete']()
         };
     }
 };
diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
index 458a6247c..f787012ef 100644
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js
@@ -516,10 +516,7 @@ iD.Map = function(elem, connection) {
     }
 
     function commit() {
-        connection.createChangeset({
-            modified: history.graph().modifications(),
-            created: history.graph().creations()
-        });
+        connection.createChangeset(history.changes());
     }
 
     map.download = download;