fix issue with color levels being computed incorrectly

Author: mikolalysenko

src/traces/surface/calc.js

@@ -14,9 +14,9 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 
 // Compute auto-z and autocolorscale if applicable
 module.exports = function calc(gd, trace) {
-    if(trace.intensity) {
+    if(trace.surfacecolor) {
         colorscaleCalc(trace, trace.surfacecolor, '', 'c');
     } else {
-        colorscaleCalc(trace, trace.z, '', 'z');
+        colorscaleCalc(trace, trace.z, '', 'c');
     }
 };

src/traces/surface/colorbar.js

@@ -0,0 +1,47 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var d3 = require('d3');
+var isNumeric = require('fast-isnumeric');
+
+var Lib = require('../../lib');
+var Plots = require('../../plots/plots');
+var getColorscale = require('../../components/colorscale/get_scale');
+var drawColorbar = require('../../components/colorbar/draw');
+
+
+module.exports = function colorbar(gd, cd) {
+    var trace = cd[0].trace,
+        cbId = 'cb' + trace.uid,
+        scl = getColorscale(trace.colorscale),
+        zmin = trace.cmin,
+        zmax = trace.cmax,
+        vals = trace.surfacecolor || trace.z;
+
+    if(!isNumeric(zmin)) zmin = Lib.aggNums(Math.min, null, vals);
+    if(!isNumeric(zmax)) zmax = Lib.aggNums(Math.max, null, vals);
+
+    gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
+
+    if(!trace.showscale) {
+        Plots.autoMargin(gd, cbId);
+        return;
+    }
+
+    var cb = cd[0].t.cb = drawColorbar(gd, cbId);
+    cb.fillcolor(d3.scale.linear()
+            .domain(scl.map(function(v) { return zmin + v[0]*(zmax-zmin); }))
+            .range(scl.map(function(v) { return v[1]; })))
+        .filllevels({start: zmin, end: zmax, size: (zmax-zmin)/254})
+        .options(trace.colorbar)();
+
+    Lib.markTime('done colorbar');
+};

src/traces/surface/convert.js

@@ -248,10 +248,6 @@ proto.update = function(data) {
         opacity: 1
     };
 
-    if('cmin' in data && 'cmax' in data) {
-        params.intensityBounds = [ data.cmin, data.cmax ];
-    }
-
     //Refine if necessary
     if(data.surfacecolor) {
         var intensity = ndarray(

src/traces/surface/index.js

@@ -13,7 +13,7 @@ var Surface = {};
 
 Surface.attributes = require('./attributes');
 Surface.supplyDefaults = require('./defaults');
-Surface.colorbar = require('../heatmap/colorbar');
+Surface.colorbar = require('./colorbar');
 Surface.calc = require('./calc');
 Surface.plot = require('./convert');
 

test/image/mocks/gl3d_autocolorscale.json

@@ -25,8 +25,8 @@
                 ["zero two", "one two", "two two"]
             ],
             "autocolorscale": true,
-            "zmin": 0,
-            "zmax": "50"
+            "cmin": 0,
+            "cmax": "50"
         }
     ],
     "layout": {