From 8c1e0212f91d8b6720c61c292fa9fce9823ede9f Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Wed, 13 Feb 2013 16:08:39 -0500
Subject: [PATCH] Fix rebasing and test

---
 js/id/core/tree.js     | 2 +-
 test/spec/core/tree.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/id/core/tree.js b/js/id/core/tree.js
index 498ccf429..94b28f12e 100644
--- a/js/id/core/tree.js
+++ b/js/id/core/tree.js
@@ -34,7 +34,7 @@ iD.Tree = function(graph) {
 
         rebase: function(entities) {
             for (var i = 0; i < entities.length; i++) {
-                if (!graph.hasOwnProperty(entities[i])) {
+                if (!graph.entities.hasOwnProperty(entities[i])) {
                     insert(graph.entity(entities[i]), true);
                 }
             }
diff --git a/test/spec/core/tree.js b/test/spec/core/tree.js
index 4cb0cf073..8cd4e55b6 100644
--- a/test/spec/core/tree.js
+++ b/test/spec/core/tree.js
@@ -20,7 +20,8 @@ describe("iD.Tree", function() {
             expect(tree.intersects(iD.geo.Extent([9, 9], [11, 11]), g)).to.eql([node_]);
             tree.graph().rebase({ 'n': node });
             tree.rebase(['n']);
-            expect(tree.intersects(iD.geo.Extent([0, 0], [2, 2]), tree.graph())).to.eql([]);
+            expect(tree.intersects(iD.geo.Extent([0, 0], [2, 2]), g)).to.eql([]);
+            expect(tree.intersects(iD.geo.Extent([0, 0], [11, 11]), g)).to.eql([node_]);
         });
     });