Move node removal into removeNodeWay action

js/id/actions/actions.js

@@ -37,9 +37,8 @@ iD.actions.addWayNode = function(way, node, index) {
 
 iD.actions.removeWayNode = function(way, node) {
     return function(graph) {
-        return graph.replace(way.update({
-            nodes: way.nodes.slice()
-        })).remove(node, 'removed from a road');
+        var nodes = _.without(way.nodes, node.id);
+        return graph.replace(way.update({nodes: nodes}), 'removed from a road');
     };
 };
 

js/id/renderer/map.js

@@ -367,7 +367,6 @@ iD.Map = function() {
         history.graph().parents(entity.id)
             .filter(function(d) { return d.type === 'way'; })
             .forEach(function(parent) {
-                parent.nodes = _.without(parent.nodes, entity.id);
                 history.perform(iD.actions.removeWayNode(parent, entity));
             });
         deselectClick();

test/index.html

@@ -64,6 +64,7 @@
 
     <!-- include spec files here... -->
     <script src="spec/actions/add_way_node.js"></script>
+    <script src="spec/actions/remove_way_node.js"></script>
     <script src="spec/format/geojson.js"></script>
     <script src="spec/format/xml.js"></script>
     <script src="spec/graph/graph.js"></script>

test/index_packaged.html

@@ -26,6 +26,7 @@
 
     <!-- include spec files here... -->
     <script src="spec/actions/add_way_node.js"></script>
+    <script src="spec/actions/remove_way_node.js"></script>
     <script src="spec/format/geojson.js"></script>
     <script src="spec/format/xml.js"></script>
     <script src="spec/graph/graph.js"></script>

test/spec/actions/remove_way_node.js

@@ -0,0 +1,8 @@
+describe("iD.actions.removeWayNode", function () {
+    it("removes a node from a way", function () {
+        var node = iD.Node({id: "n1"}),
+            way = iD.Way({id: "w1", nodes: ["n1"]}),
+            graph = iD.actions.removeWayNode(way, node)(iD.Graph({n1: node, w1: way}));
+        expect(graph.entity(way.id).nodes).to.eql([]);
+    });
+});