From affdc987e4552fe98324711f497beecbf47bb9eb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 16 May 2013 14:06:10 -0700
Subject: [PATCH] Rename removeMember -> removeMembersWithID

---
 js/id/actions/delete_node.js     | 2 +-
 js/id/actions/delete_relation.js | 4 ++--
 js/id/actions/delete_way.js      | 2 +-
 js/id/core/relation.js           | 2 +-
 test/spec/core/graph.js          | 2 +-
 test/spec/core/relation.js       | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/id/actions/delete_node.js b/js/id/actions/delete_node.js
index 25e2dee0d..3262f9b64 100644
--- a/js/id/actions/delete_node.js
+++ b/js/id/actions/delete_node.js
@@ -15,7 +15,7 @@ iD.actions.DeleteNode = function(nodeId) {
 
         graph.parentRelations(node)
             .forEach(function(parent) {
-                graph = graph.replace(parent.removeMember(nodeId));
+                graph = graph.replace(parent.removeMembersWithID(nodeId));
             });
 
         return graph.remove(node);
diff --git a/js/id/actions/delete_relation.js b/js/id/actions/delete_relation.js
index b19522316..08834c67c 100644
--- a/js/id/actions/delete_relation.js
+++ b/js/id/actions/delete_relation.js
@@ -11,11 +11,11 @@ iD.actions.DeleteRelation = function(relationId) {
 
         graph.parentRelations(relation)
             .forEach(function(parent) {
-                graph = graph.replace(parent.removeMember(relationId));
+                graph = graph.replace(parent.removeMembersWithID(relationId));
             });
 
         _.uniq(_.pluck(relation.members, 'id')).forEach(function(memberId) {
-            graph = graph.replace(relation.removeMember(memberId));
+            graph = graph.replace(relation.removeMembersWithID(memberId));
 
             var entity = graph.entity(memberId);
             if (deleteEntity(entity, graph)) {
diff --git a/js/id/actions/delete_way.js b/js/id/actions/delete_way.js
index 911b8ac8a..ee3254df7 100644
--- a/js/id/actions/delete_way.js
+++ b/js/id/actions/delete_way.js
@@ -11,7 +11,7 @@ iD.actions.DeleteWay = function(wayId) {
 
         graph.parentRelations(way)
             .forEach(function(parent) {
-                graph = graph.replace(parent.removeMember(wayId));
+                graph = graph.replace(parent.removeMembersWithID(wayId));
             });
 
         _.uniq(way.nodes).forEach(function(nodeId) {
diff --git a/js/id/core/relation.js b/js/id/core/relation.js
index e96858bd8..460b8ee43 100644
--- a/js/id/core/relation.js
+++ b/js/id/core/relation.js
@@ -73,7 +73,7 @@ _.extend(iD.Relation.prototype, {
         return this.update({members: members});
     },
 
-    removeMember: function(id) {
+    removeMembersWithID: function(id) {
         var members = _.reject(this.members, function(m) { return m.id === id; });
         return this.update({members: members});
     },
diff --git a/test/spec/core/graph.js b/test/spec/core/graph.js
index 4894ba63e..86f1cbab9 100644
--- a/test/spec/core/graph.js
+++ b/test/spec/core/graph.js
@@ -179,7 +179,7 @@ describe('iD.Graph', function() {
         it("avoids re-adding a modified relation as a parent relation", function() {
             var n = iD.Node({id: 'n'}),
                 r1 = iD.Relation({id: 'r1', members: [{id: 'n'}]}),
-                r2 = r1.removeMember('n'),
+                r2 = r1.removeMembersWithID('n'),
                 graph = iD.Graph([n, r1]),
                 graph2 = graph.replace(r2);
 
diff --git a/test/spec/core/relation.js b/test/spec/core/relation.js
index d257f2ff7..6af273aeb 100644
--- a/test/spec/core/relation.js
+++ b/test/spec/core/relation.js
@@ -128,10 +128,10 @@ describe('iD.Relation', function () {
         });
     });
 
-    describe("#removeMember", function () {
-        it("removes a member", function () {
-            var r = iD.Relation({members: [{id: 'a'}]});
-            expect(r.removeMember('a').members).to.eql([]);
+    describe("#removeMembersWithID", function () {
+        it("removes members with the given ID", function () {
+            var r = iD.Relation({members: [{id: 'a'}, {id: 'b'}, {id: 'a'}]});
+            expect(r.removeMembersWithID('a').members).to.eql([{id: 'b'}]);
         });
     });