Merge pull request #2593 from plotly/scattergl-fix-n

Scattergl selection / clustering fix
plotly · May 1, 2018 · 0bb032f · 0bb032f
2 parents ef6b259 + f7dc6b3
commit 0bb032f
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 26 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -95,13 +95,13 @@
     "ndarray-fill": "^1.0.2",
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
-    "point-cluster": "^3.1.2",
+    "point-cluster": "^3.1.4",
     "polybooljs": "^1.2.0",
     "regl": "^1.3.1",
-    "regl-error2d": "^2.0.3",
-    "regl-line2d": "^3.0.8",
-    "regl-scatter2d": "^3.0.1",
-    "regl-splom": "^1.0.0",
+    "regl-error2d": "^2.0.5",
+    "regl-line2d": "^3.0.9",
+    "regl-scatter2d": "^3.0.4",
+    "regl-splom": "^1.0.3",
     "right-now": "^1.0.0",
     "robust-orientation": "^1.1.3",
     "sane-topojson": "^2.0.0",

diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
@@ -546,7 +546,7 @@ function plot(gd, subplot, cdata) {
         }
     }
 
-    // uploat viewport/range data to GPU
+    // upload viewport/range data to GPU
     if(scene.fill2d) {
         scene.fill2d.update(vpRange);
     }

diff --git a/test/image/baselines/gl2d_scatter-color-clustering.png b/test/image/baselines/gl2d_scatter-color-clustering.png
diff --git a/test/image/baselines/gl2d_scatter-continuous-clustering.png b/test/image/baselines/gl2d_scatter-continuous-clustering.png
diff --git a/test/image/mocks/gl2d_scatter-continuous-clustering.json b/test/image/mocks/gl2d_scatter-continuous-clustering.json
diff --git a/test/jasmine/tests/splom_test.js b/test/jasmine/tests/splom_test.js
@@ -549,6 +549,21 @@ describe('@gl Test splom interactions:', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should work with typed arrays', function(done) {
+        Plotly.plot(gd, [{
+            type: 'splom',
+            dimensions: [{
+                label: 'A',
+                values: new Int32Array([1, 2, 3])
+            }, {
+                label: 'B',
+                values: new Int32Array([2, 5, 6])
+            }]
+        }])
+        .catch(failTest)
+        .then(done);
+    });
 });
 
 describe('@gl Test splom hover:', function() {