Fix off-by-one error with linear color scales (#3452)

* Fix off-by-one error with linear color scales * linting
apache · Sep 12, 2017 · 90e46cb · 90e46cb
1 parent fe77534
commit 90e46cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -166,6 +166,7 @@ export const controls = {
       ['black_white', 'black/white'],
     ],
     default: 'blue_white_yellow',
+    clearable: false,
     description: '',
     renderTrigger: true,
     schemes: spectrums,

diff --git a/superset/assets/javascripts/modules/colors.js b/superset/assets/javascripts/modules/colors.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import d3 from 'd3';
 
 // Color related utility functions go in this object
@@ -127,10 +126,7 @@ export const colorScalerFactory = function (colors, data, accessor) {
   if (data !== undefined) {
     ext = d3.extent(data, accessor);
   }
-  const points = [];
-  const chunkSize = (ext[1] - ext[0]) / colors.length;
-  $.each(colors, function (i) {
-    points.push(i * chunkSize);
-  });
+  const chunkSize = (ext[1] - ext[0]) / (colors.length - 1);
+  const points = colors.map((col, i) => i * chunkSize);
   return d3.scale.linear().domain(points).range(colors);
 };