update colorscale makeScaleFunction calls

- pass noNumericCheck option in contour / heatmap
  (where a clean-z-data pass is already done) and in
  all the colorbar module (which have clean data)

Author: etpinard

src/components/drawing/index.js

@@ -332,7 +332,10 @@ drawing.tryColorscale = function(cont, contIn, prefix) {
             Lib.nestedProperty(contIn, prefix + 'cmax').set(max);
         }
 
-        return makeScaleFunction(scl, min, max);
+        return makeScaleFunction(scl, {
+            cmin: min,
+            cmax: max
+        });
     }
     else return Lib.identity;
 };

src/lib/gl_format_color.js

@@ -42,9 +42,10 @@ function formatColor(containerIn, opacityIn, len) {
     var sclFunc, getColor, getOpacity, colori, opacityi;
 
     if(containerIn.colorscale !== undefined) {
-        sclFunc = makeScaleFunction(
-            containerIn.colorscale, containerIn.cmin, containerIn.cmax
-        );
+        sclFunc = makeScaleFunction(containerIn.colorscale, {
+            cmin: containerIn.cmin,
+            cmax: containerIn.cmax
+        });
     }
     else sclFunc = validateColor;
 

src/traces/choropleth/plot.js

@@ -152,11 +152,10 @@ plotChoropleth.style = function(geo) {
                 marker = trace.marker || {},
                 markerLine = marker.line || {};
 
-            var sclFunc = makeScaleFunction(
-                trace.colorscale,
-                trace.zmin,
-                trace.zmax
-            );
+            var sclFunc = makeScaleFunction(trace.colorscale, {
+                cmin: trace.zmin,
+                cmax: trace.zmax
+            });
 
             s.selectAll('path.choroplethlocation')
                 .each(function(pt) {

src/traces/contour/make_color_map.js

@@ -67,5 +67,9 @@ module.exports = function makeColorMap(trace) {
         }
     }
 
-    return makeScaleFunction(scl, null, null, { domain: domain, range: range });
+    return makeScaleFunction(scl, {
+        domain: domain,
+        range: range,
+        noNumericCheck: true
+    });
 };

src/traces/heatmap/colorbar.js

@@ -33,8 +33,12 @@ module.exports = function colorbar(gd, cd) {
         return;
     }
 
-    var cb = cd[0].t.cb = drawColorbar(gd, cbId),
-        sclFunc = makeScaleFunction(trace.colorscale, zmin, zmax);
+    var cb = cd[0].t.cb = drawColorbar(gd, cbId);
+    var sclFunc = makeScaleFunction(trace.colorscale, {
+        cmin: zmin,
+        cmax: zmax,
+        noNumericCheck: true
+    });
 
     cb.fillcolor(sclFunc)
         .filllevels({start: zmin, end: zmax, size: (zmax - zmin) / 254})

src/traces/heatmap/plot.js

@@ -166,12 +166,12 @@ function plotOne(gd, plotinfo, cd) {
     canvas.height = canvasH;
     var context = canvas.getContext('2d');
 
-    var sclFunc = makeScaleFunction(
-        trace.colorscale,
-        trace.zmin,
-        trace.zmax,
-        { noNumericCheck: true, returnArray: true }
-    );
+    var sclFunc = makeScaleFunction(trace.colorscale, {
+        cmin: trace.zmin,
+        cmax: trace.zmax,
+        noNumericCheck: true,
+        returnArray: true
+    });
 
     // map brick boundaries to image pixels
     var xpx,

src/traces/scatter/colorbar.js

@@ -39,8 +39,12 @@ module.exports = function colorbar(gd, cd) {
     if(!isNumeric(cmin)) cmin = Lib.aggNums(Math.min, null, vals);
     if(!isNumeric(cmax)) cmax = Lib.aggNums(Math.max, null, vals);
 
-    var cb = cd[0].t.cb = drawColorbar(gd, cbId),
-        sclFunc = makeScaleFunction(marker.colorscale, cmin, cmax);
+    var cb = cd[0].t.cb = drawColorbar(gd, cbId);
+    var sclFunc = makeScaleFunction(marker.colorscale, {
+        cmin: cmin,
+        cmax: cmax,
+        noNumericCheck: true
+    });
 
     cb.fillcolor(sclFunc)
         .filllevels({start: cmin, end: cmax, size: (cmax - cmin) / 254})

src/traces/surface/colorbar.js

@@ -34,8 +34,12 @@ module.exports = function colorbar(gd, cd) {
         return;
     }
 
-    var cb = cd[0].t.cb = drawColorbar(gd, cbId),
-        sclFunc = makeScaleFunction(trace.colorscale, cmin, cmax);
+    var cb = cd[0].t.cb = drawColorbar(gd, cbId);
+    var sclFunc = makeScaleFunction(trace.colorscale, {
+        cmin: cmin,
+        cmax: cmax,
+        noNumericCheck: true
+    });
 
     cb.fillcolor(sclFunc)
         .filllevels({start: cmin, end: cmax, size: (cmax - cmin) / 254})

test/jasmine/tests/colorscale_test.js

@@ -380,14 +380,18 @@ describe('Test colorscale:', function() {
 
     describe('makeScaleFunction', function() {
         var scale = [
-                [0, 'rgb(5,10,172)'],
-                [0.35, 'rgb(106,137,247)'],
-                [0.5, 'rgb(190,190,190)'],
-                [0.6, 'rgb(220,170,132)'],
-                [0.7, 'rgb(230,145,90)'],
-                [1, 'rgb(178,10,28)']
-            ],
-            scaleFunction = Colorscale.makeScaleFunction(scale, 2, 3);
+            [0, 'rgb(5,10,172)'],
+            [0.35, 'rgb(106,137,247)'],
+            [0.5, 'rgb(190,190,190)'],
+            [0.6, 'rgb(220,170,132)'],
+            [0.7, 'rgb(230,145,90)'],
+            [1, 'rgb(178,10,28)']
+        ];
+
+        var scaleFunction = Colorscale.makeScaleFunction(scale, {
+            cmin: 2,
+            cmax: 3
+        });
 
         it('should constrain color array values between cmin and cmax', function() {
             var color1 = scaleFunction(1),