From 2ef4411923eb9a0ed452fa797a209af76e53d78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Wed, 15 Jun 2016 18:09:55 -0400
Subject: [PATCH 1/5] update only varying fields in merge selection

---
 src/traces/heatmap/plot.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
index 93a721f1fb1..3b777110006 100644
--- a/src/traces/heatmap/plot.js
+++ b/src/traces/heatmap/plot.js
@@ -373,16 +373,19 @@ function plotOne(gd, plotinfo, cd) {
 
     var image3 = plotgroup.selectAll('image')
         .data(cd);
-    image3.enter().append('svg:image');
-    image3.exit().remove();
 
-    image3.attr({
+    image3.enter().append('svg:image').attr({
         xmlns: xmlnsNamespaces.svg,
         'xlink:href': canvas.toDataURL('image/png'),
+        preserveAspectRatio: 'none'
+    });
+
+    image3.attr({
         height: imageHeight,
         width: imageWidth,
         x: left,
-        y: top,
-        preserveAspectRatio: 'none'
+        y: top
     });
+
+    image3.exit().remove();
 }

From 90d7a94dd089ecd361495a1d4f3220b0914b026b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Wed, 15 Jun 2016 18:10:25 -0400
Subject: [PATCH 2/5] make sure off-srceen heatmap traces are disposes

---
 src/traces/heatmap/plot.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
index 3b777110006..d2710bded24 100644
--- a/src/traces/heatmap/plot.js
+++ b/src/traces/heatmap/plot.js
@@ -137,10 +137,24 @@ function plotOne(gd, plotinfo, cd) {
     var imageWidth = Math.round(right - left),
         imageHeight = Math.round(bottom - top);
 
-    // now redraw
+    // setup image nodes
 
     // if image is entirely off-screen, don't even draw it
-    if(imageWidth <= 0 || imageHeight <= 0) return;
+    var isOffScreen = (imageWidth <= 0 || imageHeight <= 0);
+
+    var plotgroup = plotinfo.plot.select('.imagelayer')
+        .selectAll('g.hm.' + id)
+        .data(isOffScreen ? [] : [0]);
+
+    plotgroup.enter().append('g')
+        .classed('hm', true)
+        .classed(id, true);
+
+    plotgroup.exit().remove();
+
+    if(isOffScreen) return;
+
+    // generate image data
 
     var canvasW, canvasH;
     if(zsmooth === 'fast') {
@@ -363,14 +377,6 @@ function plotOne(gd, plotinfo, cd) {
     gd._hmpixcount = (gd._hmpixcount||0) + pixcount;
     gd._hmlumcount = (gd._hmlumcount||0) + pixcount * avgColor.getLuminance();
 
-    var plotgroup = plotinfo.plot.select('.imagelayer')
-        .selectAll('g.hm.' + id)
-        .data([0]);
-    plotgroup.enter().append('g')
-        .classed('hm', true)
-        .classed(id, true);
-    plotgroup.exit().remove();
-
     var image3 = plotgroup.selectAll('image')
         .data(cd);
 

From 48dc1912cb995f85ed403e0155df05118ea91abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Thu, 16 Jun 2016 13:25:40 -0400
Subject: [PATCH 3/5] require MAXDIST from cartesian constants not Fx

---
 src/traces/heatmap/hover.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/traces/heatmap/hover.js b/src/traces/heatmap/hover.js
index 64bab8457b2..828a9033066 100644
--- a/src/traces/heatmap/hover.js
+++ b/src/traces/heatmap/hover.js
@@ -12,10 +12,12 @@
 var Fx = require('../../plots/cartesian/graph_interact');
 var Lib = require('../../lib');
 
+var MAXDIST = require('../../plots/cartesian/constants').MAXDIST;
+
 
 module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour) {
     // never let a heatmap override another type as closest point
-    if(pointData.distance < Fx.MAXDIST) return;
+    if(pointData.distance < MAXDIST) return;
 
     var cd0 = pointData.cd[0],
         trace = cd0.trace,
@@ -46,8 +48,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
             return;
         }
     }
-    else if(Fx.inbox(xval - x[0], xval - x[x.length - 1]) > Fx.MAXDIST ||
-            Fx.inbox(yval - y[0], yval - y[y.length - 1]) > Fx.MAXDIST) {
+    else if(Fx.inbox(xval - x[0], xval - x[x.length - 1]) > MAXDIST ||
+            Fx.inbox(yval - y[0], yval - y[y.length - 1]) > MAXDIST) {
         return;
     }
     else {
@@ -69,10 +71,12 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
         nx = Math.max(0, Math.min(x2.length - 2, Lib.findBin(xval, x2)));
         ny = Math.max(0, Math.min(y2.length - 2, Lib.findBin(yval, y2)));
     }
+
     var x0 = xa.c2p(x[nx]),
         x1 = xa.c2p(x[nx + 1]),
         y0 = ya.c2p(y[ny]),
         y1 = ya.c2p(y[ny + 1]);
+
     if(contour) {
         x1 = x0;
         xl = x[nx];
@@ -99,7 +103,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
     return [Lib.extendFlat(pointData, {
         index: [ny, nx],
         // never let a 2D override 1D type as closest point
-        distance: Fx.MAXDIST + 10,
+        distance: MAXDIST + 10,
         x0: x0,
         x1: x1,
         y0: y0,

From 221a5a12551ab7853daf11c7469a1a5b136c88cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Thu, 16 Jun 2016 14:50:47 -0400
Subject: [PATCH 4/5] add multi-trace heatmap mock

---
 test/image/baselines/heatmap_multi-trace.png | Bin 0 -> 23575 bytes
 test/image/mocks/heatmap_multi-trace.json    | 193 +++++++++++++++++++
 2 files changed, 193 insertions(+)
 create mode 100644 test/image/baselines/heatmap_multi-trace.png
 create mode 100644 test/image/mocks/heatmap_multi-trace.json

diff --git a/test/image/baselines/heatmap_multi-trace.png b/test/image/baselines/heatmap_multi-trace.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ab01075b4b6c5d1689e6ca41c5af5052b7883e
GIT binary patch
literal 23575
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
Ye7)O*#$7qM@S9Fo%TTjG{kKd14>OrHL;wH)

literal 0
HcmV?d00001

diff --git a/test/image/mocks/heatmap_multi-trace.json b/test/image/mocks/heatmap_multi-trace.json
new file mode 100644
index 00000000000..4bd6f5d065b
--- /dev/null
+++ b/test/image/mocks/heatmap_multi-trace.json
@@ -0,0 +1,193 @@
+{
+  "data": [
+    {
+      "x": [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1
+      ],
+      "y": [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5
+      ],
+      "z": [
+        3,
+        4,
+        2,
+        5,
+        3,
+        1
+      ],
+      "type": "heatmap",
+      "showlegend": false,
+      "showscale": false,
+      "zmax": 5,
+      "zmin": 1
+    },
+    {
+      "x": [
+        2,
+        2,
+        2,
+        2,
+        2
+      ],
+      "y": [
+        0.2,
+        1.2,
+        2.2,
+        3.2,
+        4.2
+      ],
+      "z": [
+        6,
+        1,
+        3,
+        2,
+        4
+      ],
+      "type": "heatmap",
+      "showlegend": false,
+      "showscale": false,
+      "zmax": 6,
+      "zmin": 1
+    },
+    {
+      "x": [
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3
+      ],
+      "y": [
+        0,
+        0.5,
+        1,
+        1.5,
+        2,
+        2.5,
+        3,
+        3.5,
+        4,
+        4.5,
+        5
+      ],
+      "z": [
+        6,
+        1,
+        3,
+        2,
+        4,
+        2,
+        7,
+        4,
+        3,
+        2,
+        5
+      ],
+      "type": "heatmap",
+      "showlegend": false,
+      "showscale": false,
+      "zmax": 7,
+      "zmin": 1
+    },
+    {
+      "x": [
+        4,
+        4,
+        4,
+        4,
+        4,
+        4
+      ],
+      "y": [
+        0,
+        0.2,
+        0.5,
+        1.2,
+        3.5,
+        4
+      ],
+      "z": [
+        2,
+        4,
+        7,
+        3,
+        2,
+        1
+      ],
+      "type": "heatmap",
+      "showlegend": false,
+      "showscale": false,
+      "zmax": 7,
+      "zmin": 1
+    },
+    {
+      "x": [
+        5.2,
+        5.2,
+        5.2,
+        5.2,
+        5.2,
+        5.2
+      ],
+      "y": [
+        0,
+        0.2,
+        0.5,
+        1.2,
+        3.5,
+        4
+      ],
+      "z": [
+        2,
+        4,
+        7,
+        3,
+        2,
+        1
+      ],
+      "type": "heatmap",
+      "showlegend": false,
+      "showscale": true,
+      "zmax": 10,
+      "zmin": 0
+    }
+  ],
+  "layout": {
+    "hovermode": "closest",
+    "xaxis": {
+      "type": "linear",
+      "range": [
+        0.5,
+        5.7
+      ],
+      "autorange": true
+    },
+    "yaxis": {
+      "type": "linear",
+      "range": [
+        -0.5,
+        5.5
+      ],
+      "autorange": true
+    },
+    "height": 450,
+    "width": 1100,
+    "autosize": true
+  }
+}

From 5084daf240a10869891d524faf28c434eaf9fd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Thu, 16 Jun 2016 14:54:18 -0400
Subject: [PATCH 5/5] add heatmap plot and hover tests

---
 test/jasmine/tests/heatmap_test.js | 98 ++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/test/jasmine/tests/heatmap_test.js b/test/jasmine/tests/heatmap_test.js
index dae549a81b0..32c6aea150a 100644
--- a/test/jasmine/tests/heatmap_test.js
+++ b/test/jasmine/tests/heatmap_test.js
@@ -1,9 +1,13 @@
+var Plotly = require('@lib/index');
 var Plots = require('@src/plots/plots');
 var Lib = require('@src/lib');
 
 var convertColumnXYZ = require('@src/traces/heatmap/convert_column_xyz');
 var Heatmap = require('@src/traces/heatmap');
 
+var d3 = require('d3');
+var createGraphDiv = require('../assets/create_graph_div');
+var destroyGraphDiv = require('../assets/destroy_graph_div');
 var customMatchers = require('../assets/custom_matchers');
 
 
@@ -299,3 +303,97 @@ describe('heatmap calc', function() {
         expect(out.z).toBeCloseTo2DArray([[1, 2, 3], [3, 1, 2]]);
     });
 });
+
+describe('heatmap plot', function() {
+    'use strict';
+
+    afterEach(destroyGraphDiv);
+
+    it('should not draw traces that are off-screen', function(done) {
+        var mock = require('@mocks/heatmap_multi-trace.json'),
+            mockCopy = Lib.extendDeep({}, mock),
+            gd = createGraphDiv();
+
+        function assertImageCnt(cnt) {
+            var images = d3.selectAll('.hm').select('image');
+
+            expect(images.size()).toEqual(cnt);
+        }
+
+        Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function() {
+            assertImageCnt(5);
+
+            return Plotly.relayout(gd, 'xaxis.range', [2, 3]);
+        }).then(function() {
+            assertImageCnt(2);
+
+            return Plotly.relayout(gd, 'xaxis.autorange', true);
+        }).then(function() {
+            assertImageCnt(5);
+
+            done();
+        });
+    });
+});
+
+describe('heatmap hover', function() {
+    'use strict';
+
+    var gd;
+
+    beforeAll(function(done) {
+        jasmine.addMatchers(customMatchers);
+
+        gd = createGraphDiv();
+
+        var mock = require('@mocks/heatmap_multi-trace.json'),
+            mockCopy = Lib.extendDeep({}, mock);
+
+        Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(done);
+    });
+
+    afterAll(destroyGraphDiv);
+
+    function _hover(gd, xval, yval) {
+        var fullLayout = gd._fullLayout,
+            calcData = gd.calcdata,
+            hoverData = [];
+
+        for(var i = 0; i < calcData.length; i++) {
+            var pointData = {
+                index: false,
+                distance: 20,
+                cd: calcData[i],
+                trace: calcData[i][0].trace,
+                xa: fullLayout.xaxis,
+                ya: fullLayout.yaxis
+            };
+
+            var hoverPoint = Heatmap.hoverPoints(pointData, xval, yval);
+            if(hoverPoint) hoverData.push(hoverPoint[0]);
+        }
+
+        return hoverData;
+    }
+
+    function assertLabels(hoverPoint, xLabel, yLabel, zLabel) {
+        expect(hoverPoint.xLabelVal).toEqual(xLabel, 'have correct x label');
+        expect(hoverPoint.yLabelVal).toEqual(yLabel, 'have correct y label');
+        expect(hoverPoint.zLabelVal).toEqual(zLabel, 'have correct z label');
+    }
+
+    it('should find closest point (case 1) and should', function() {
+        var pt = _hover(gd, 0.5, 0.5)[0];
+
+        expect(pt.index).toEqual([1, 0], 'have correct index');
+        assertLabels(pt, 1, 1, 4);
+    });
+
+    it('should find closest point (case 2) and should', function() {
+        var pt = _hover(gd, 1.5, 0.5)[0];
+
+        expect(pt.index).toEqual([0, 0], 'have correct index');
+        assertLabels(pt, 2, 0.2, 6);
+    });
+
+});