From d31fa9ae700a6ef36ab5156066197f11216ae6d8 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 23 Apr 2013 17:31:53 -0700 Subject: [PATCH] Don't redraw vertices during pan/zoom transform --- js/id/renderer/map.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js index 72a389bfa..0bf576aa1 100644 --- a/js/id/renderer/map.js +++ b/js/id/renderer/map.js @@ -56,12 +56,12 @@ iD.Map = function(context) { surface.on('mouseover.vertices', function() { vertices.hover(d3.event.target.__data__); - surface.call(vertices, context.graph(), map.zoom()); + if (!isTransformed()) surface.call(vertices, context.graph(), map.zoom()); }); surface.on('mouseout.vertices', function() { vertices.hover(d3.event.relatedTarget && d3.event.relatedTarget.__data__); - surface.call(vertices, context.graph(), map.zoom()); + if (!isTransformed()) surface.call(vertices, context.graph(), map.zoom()); }); map.size(selection.size()); @@ -169,9 +169,13 @@ iD.Map = function(context) { dispatch.move(map); } - function resetTransform() { + function isTransformed() { var prop = surface.node().style[transformProp]; - if (!prop || prop === 'none') return false; + return prop && prop !== 'none'; + } + + function resetTransform() { + if (!isTransformed()) return false; surface.node().style[transformProp] = ''; layergroup.node().style[transformProp] = ''; return true;