From 9bd46af6adb8f0536f1eeafabf52933b6e382bc8 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Tue, 12 Feb 2013 17:22:25 -0500
Subject: [PATCH] Tree intersect now works with changes

---
 js/id/core/difference.js | 43 ++++++++++++++++++++++++----------------
 js/id/core/history.js    | 37 +++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/js/id/core/difference.js b/js/id/core/difference.js
index e2159271a..5470762c5 100644
--- a/js/id/core/difference.js
+++ b/js/id/core/difference.js
@@ -25,6 +25,18 @@ iD.Difference = function (base, head) {
         }
     });
 
+    function addParents(parents, result) {
+        for (var i = 0; i < parents.length; i++) {
+            var parent = parents[i];
+
+            if (parent.id in result)
+                continue;
+
+            result[parent.id] = parent;
+            addParents(head.parentRelations(parent), result);
+        }
+    }
+
     var difference = {};
 
     difference.length = function () {
@@ -67,21 +79,18 @@ iD.Difference = function (base, head) {
         return result;
     };
 
+    difference.addParents = function(entities) {
+
+        for (var i in entities) {
+            addParents(head.parentWays(entities[i]), entities);
+            addParents(head.parentRelations(entities[i]), entities);
+        }
+        return entities;
+    },
+
     difference.complete = function(extent) {
         var result = {}, id, change;
 
-        function addParents(parents) {
-            for (var i = 0; i < parents.length; i++) {
-                var parent = parents[i];
-
-                if (parent.id in result)
-                    continue;
-
-                result[parent.id] = parent;
-                addParents(head.parentRelations(parent));
-            }
-        }
-
         for (id in changes) {
             change = changes[id];
 
@@ -97,21 +106,21 @@ iD.Difference = function (base, head) {
             if (entity.type === 'way') {
                 var nh = h ? h.nodes : [],
                     nb = b ? b.nodes : [],
-                    diff;
+                    diff, i;
 
                 diff = _.difference(nh, nb);
-                for (var i = 0; i < diff.length; i++) {
+                for (i = 0; i < diff.length; i++) {
                     result[diff[i]] = head.entity(diff[i]);
                 }
 
                 diff = _.difference(nb, nh);
-                for (var i = 0; i < diff.length; i++) {
+                for (i = 0; i < diff.length; i++) {
                     result[diff[i]] = head.entity(diff[i]);
                 }
             }
+            addParents(head.parentWays(entity), result);
+            addParents(head.parentRelations(entity), result);
 
-            addParents(head.parentWays(entity));
-            addParents(head.parentRelations(entity));
         }
 
         return result;
diff --git a/js/id/core/history.js b/js/id/core/history.js
index 3e7aa137d..415d78093 100644
--- a/js/id/core/history.js
+++ b/js/id/core/history.js
@@ -40,14 +40,10 @@ iD.History = function(context) {
 
     function rebaseTree(entities) {
         for (var i = 0; i < entities.length; i++) {
-            insert(treeGraph.entities[entities[i]]);
+            insert(stack[index].graph.entities[entities[i]]);
         }
     }
 
-    function getRectangle(entity) {
-        return extentRectangle(entity.extent(treeGraph));
-    }
-
     function extentRectangle(extent) {
         var m = 1000 * 1000 * 100,
             x = m * extent[0][0],
@@ -58,11 +54,16 @@ iD.History = function(context) {
     }
 
     function insert(entity) {
-        rtree.insert(getRectangle(entity), entity.id);
+        rtree.insert(extentRectangle(entity.extent(stack[index].graph)), entity.id);
     }
 
     function remove(entity) {
-        rtree.remove(getRectangle(entity), entity.id);
+        var r= rtree.remove(extentRectangle(entity.extent(treeGraph)), entity.id);
+    }
+
+    function reinsert(entity) {
+        remove(treeGraph.entities[entity.id]);
+        insert(entity);
     }
 
     var history = {
@@ -161,8 +162,26 @@ iD.History = function(context) {
         },
 
         intersects: function(extent) {
+            if (treeGraph !== stack[index].graph) {
+                var diff = iD.Difference(treeGraph, stack[index].graph),
+                    modified = {};
+
+                diff.modified().forEach(function(d) {
+                    var loc = treeGraph.entities[d.id].loc;
+                    if (!loc || loc[0] !== d.loc[0] || loc[1] !== d.loc[1]) {
+                        modified[d.id] = d;
+                    }
+                });
+
+                d3.values(diff.addParents(modified)).map(reinsert);
+                diff.created().forEach(insert);
+                diff.deleted().forEach(remove);
+
+                treeGraph = stack[index].graph;
+            }
+
             return rtree.search(extentRectangle(extent))
-                .map(function(id) { return treeGraph.entity(id) });
+                .map(function(id) { return treeGraph.entity(id); });
         },
 
         difference: function() {
@@ -185,7 +204,7 @@ iD.History = function(context) {
             }
 
             return {
-                modified: difference.modified().map(discardTags),
+                modified: d3.values(difference.modified()).map(discardTags),
                 created: difference.created().map(discardTags),
                 deleted: difference.deleted()
             };