From 20e1181b7a063cd5ae201dfaa406def3dfb349f9 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Fri, 8 Feb 2013 10:08:30 -0500
Subject: [PATCH] Use a trueObj for filtering labels, add fastMouse

---
 js/id/svg/labels.js | 11 ++++++++---
 js/id/util.js       | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/js/id/svg/labels.js b/js/id/svg/labels.js
index 31d2f03d5..5c817a712 100644
--- a/js/id/svg/labels.js
+++ b/js/id/svg/labels.js
@@ -203,11 +203,13 @@ iD.svg.Labels = function(projection) {
 
     }
 
+
     function hideOnMouseover() {
-        var mouse = d3.mouse(this),
+        var mouse = mousePosition(d3.event),
             pad = 50,
             rect = new RTree.Rectangle(mouse[0] - pad, mouse[1] - pad, 2*pad, 2*pad),
             labels = _.pluck(rtree.search(rect, this), 'leaf'),
+            containsLabel = iD.util.trueObj(labels),
             selection = d3.select(this);
 
         selection.selectAll('.layer-label text, .layer-halo path, .layer-halo rect')
@@ -216,16 +218,19 @@ iD.svg.Labels = function(projection) {
         if (!labels.length) return;
         selection.selectAll('.layer-label text, .layer-halo path, .layer-halo rect')
             .filter(function(d) {
-                return _.contains(labels, d.id);
+                return containsLabel[d.id];
             })
             .style('opacity', 0);
     }
 
     var rtree = new RTree(),
-        rectangles = {};
+        rectangles = {},
+        mousePosition;
 
     return function drawLabels(surface, graph, entities, filter, dimensions, fullRedraw) {
 
+        mousePosition = iD.util.fastMouse(surface.node().parentNode);
+
         d3.select(surface.node().parentNode)
             .on('mousemove.hidelabels', hideOnMouseover);
 
diff --git a/js/id/util.js b/js/id/util.js
index 9ebd4d761..bec8bc075 100644
--- a/js/id/util.js
+++ b/js/id/util.js
@@ -75,4 +75,18 @@ iD.util.getStyle = function(selector) {
     }
 };
 
+// a d3.mouse-alike which
+// 1. Only works on HTML elements, not SVG
+// 2. Does not cause style recalculation
+iD.util.fastMouse = function(container) {
+    var rect = _.clone(container.getBoundingClientRect()),
+        clientLeft = +container.clientLeft,
+        clientTop = +container.clientTop;
+    return function(e) {
+        return [
+            e.clientX - rect.left - container.clientLeft,
+            e.clientY - rect.top - container.clientTop];
+    };
+};
+
 iD.util.getPrototypeOf = Object.getPrototypeOf || function(obj) { return obj.__proto__; };