Merge pull request #1197 from plotly/heatmapgl-primetime

`heatmapgl` in main bundle

Author: etpinard

lib/index.js

@@ -31,6 +31,7 @@ Plotly.register([
 
     require('./scattergl'),
     require('./pointcloud'),
+    require('./heatmapgl'),
 
     require('./scattermapbox'),
 

package.json

@@ -61,7 +61,7 @@
     "gl-contour2d": "^1.1.2",
     "gl-error2d": "^1.2.1",
     "gl-error3d": "^1.0.0",
-    "gl-heatmap2d": "^1.0.2",
+    "gl-heatmap2d": "^1.0.3",
     "gl-line2d": "^1.4.1",
     "gl-line3d": "^1.1.0",
     "gl-mat4": "^1.1.2",

src/traces/heatmapgl/attributes.js

@@ -10,5 +10,31 @@
 
 
 var heatmapAttrs = require('../scatter/attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
+var colorbarAttrs = require('../../components/colorbar/attributes');
 
-module.exports = heatmapAttrs;
+var extendFlat = require('../../lib/extend').extendFlat;
+
+var commonList = [
+    'z',
+    'x', 'x0', 'dx',
+    'y', 'y0', 'dy',
+    'text', 'transpose',
+    'xtype', 'ytype'
+];
+
+var attrs = {};
+
+for(var i = 0; i < commonList.length; i++) {
+    var k = commonList[i];
+    attrs[k] = heatmapAttrs[k];
+}
+
+extendFlat(
+    attrs,
+    colorscaleAttrs,
+    { autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false}) },
+    { colorbar: colorbarAttrs }
+);
+
+module.exports = attrs;

src/traces/heatmapgl/index.js

@@ -24,7 +24,7 @@ HeatmapGl.basePlotModule = require('../../plots/gl2d');
 HeatmapGl.categories = ['gl2d', '2dMap'];
 HeatmapGl.meta = {
     description: [
-        'WebGL heatmap (beta)'
+        'WebGL version of the heatmap trace type.'
     ].join(' ')
 };
 

test/image/baselines/gl2d_heatmapgl.png

@@ -0,0 +1,134 @@
+{
+  "data": [
+    {
+      "type": "heatmapgl",
+      "z": [
+        [
+          125,
+          106,
+          89,
+          74,
+          61,
+          50,
+          41,
+          34,
+          29,
+          26
+        ],
+        [
+          116,
+          97,
+          80,
+          65,
+          52,
+          41,
+          32,
+          25,
+          20,
+          17
+        ],
+        [
+          109,
+          90,
+          73,
+          58,
+          45,
+          34,
+          25,
+          18,
+          13,
+          10
+        ],
+        [
+          104,
+          85,
+          68,
+          53,
+          40,
+          29,
+          20,
+          13,
+          8,
+          5
+        ],
+        [
+          101,
+          82,
+          65,
+          50,
+          37,
+          26,
+          17,
+          10,
+          5,
+          2
+        ],
+        [
+          100,
+          81,
+          64,
+          49,
+          36,
+          25,
+          16,
+          9,
+          4,
+          1
+        ],
+        [
+          101,
+          82,
+          65,
+          50,
+          37,
+          26,
+          17,
+          10,
+          5,
+          2
+        ],
+        [
+          104,
+          85,
+          68,
+          53,
+          40,
+          29,
+          20,
+          13,
+          8,
+          5
+        ],
+        [
+          109,
+          90,
+          73,
+          58,
+          45,
+          34,
+          25,
+          18,
+          13,
+          10
+        ],
+        [
+          116,
+          97,
+          80,
+          65,
+          52,
+          41,
+          32,
+          25,
+          20,
+          17
+        ]
+      ],
+      "colorscale": "Viridis"
+    }
+  ],
+  "layout": {
+    "height": 450,
+    "width": 550
+  }
+}

test/image/mocks/gl2d_heatmapgl.json

@@ -12,6 +12,11 @@ var hasWebGLSupport = require('../assets/has_webgl_support');
 var click = require('../assets/timed_click');
 var hover = require('../assets/hover');
 
+// contourgl is not part of the dist plotly.js bundle initially
+Plotly.register([
+    require('@lib/contourgl')
+]);
+
 describe('Test hover and click interactions', function() {
 
     if(!hasWebGLSupport('gl2d_click_test')) return;

test/jasmine/tests/gl2d_click_test.js

@@ -4,9 +4,8 @@ var Plotly = require('@lib/index');
 var Lib = require('@src/lib');
 var d3 = require('d3');
 
-// heatmapgl & contourgl is not part of the dist plotly.js bundle initially
+// contourgl is not part of the dist plotly.js bundle initially
 Plotly.register([
-    require('@lib/heatmapgl'),
     require('@lib/contourgl')
 ]);