From 56f8b9e4a9e53966fb0ad4685d48855bb15ce093 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 28 May 2013 16:56:49 -0700
Subject: [PATCH] Fixup after merge

---
 js/id/actions/merge_polygon.js     | 2 +-
 test/spec/actions/merge_polygon.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/id/actions/merge_polygon.js b/js/id/actions/merge_polygon.js
index 85579e79b..a771d7c1f 100644
--- a/js/id/actions/merge_polygon.js
+++ b/js/id/actions/merge_polygon.js
@@ -1,7 +1,7 @@
 iD.actions.MergePolygon = function(ids, newRelationId) {
 
     function groupEntities(graph) {
-        var entities = ids.map(graph.getEntity);
+        var entities = ids.map(function (id) { return graph.entity(id); });
         return _.extend({
                 closedWay: [],
                 multipolygon: [],
diff --git a/test/spec/actions/merge_polygon.js b/test/spec/actions/merge_polygon.js
index a972cc8f8..e5819d50c 100644
--- a/test/spec/actions/merge_polygon.js
+++ b/test/spec/actions/merge_polygon.js
@@ -54,7 +54,7 @@ describe("iD.actions.MergePolygon", function () {
         graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
         var r = graph.entity('r');
         expect(!!r).to.equal(true);
-        expect(r.geometry()).to.equal('area');
+        expect(r.geometry(graph)).to.equal('area');
         expect(r.isMultipolygon()).to.equal(true);
         expect(r.members.length).to.equal(2);
         expect(find(r, 'w0').role).to.equal('outer');
@@ -76,7 +76,7 @@ describe("iD.actions.MergePolygon", function () {
         graph = iD.actions.MergePolygon(['r', 'r2'])(graph);
         
         // Delete other relation
-        expect(graph.entity('r2')).to.equal(undefined);
+        expect(graph.hasEntity('r2')).to.equal(undefined);
 
         var r = graph.entity('r');
         expect(find(r, 'w0').role).to.equal('outer');