fixup cone autorange pad computation

Author: etpinard

src/plots/gl3d/scene.js

@@ -507,8 +507,9 @@ proto.plot = function(sceneData, fullLayout, layout) {
             for(j = 0; j < objects.length; j++) {
                 var obj = objects[j];
                 var objBounds = obj.bounds;
-                // add worse-case pad for cone traces
-                var pad = 0.75 * (obj._trace.data._compMax || 0) * dataScale[i];
+                var fullTrace = obj._trace.data;
+                var pad = fullTrace._pad ? fullTrace._pad / dataScale[i] : 0;
+
                 sceneBounds[0][i] = Math.min(sceneBounds[0][i], objBounds[0][i] / dataScale[i] - pad);
                 sceneBounds[1][i] = Math.max(sceneBounds[1][i], objBounds[1][i] / dataScale[i] + pad);
             }

src/traces/cone/calc.js

@@ -35,8 +35,8 @@ module.exports = function calc(gd, trace) {
 
     // stash max norm value to convert cmix/cmax -> vertexIntensityBounds
     trace._normMax = normMax;
-    // stash max 'component' value for autorange pad
-    trace._compMax = Math.sqrt(compMax);
+    // stash autorange pad using max 'component' value
+    trace._pad = Math.sqrt(compMax) / (normMax || 1);
 
     colorscaleCalc(trace, [normMin, normMax], '', 'c');
 };

test/jasmine/tests/cone_test.js

@@ -60,6 +60,69 @@ describe('Test cone defaults', function() {
     });
 });
 
+describe('@gl Test cone autorange', function() {
+    var gd;
+
+    beforeEach(function() {
+        gd = createGraphDiv();
+    });
+
+    afterEach(function() {
+        Plotly.purge(gd);
+        destroyGraphDiv();
+    });
+
+    function _assertAxisRanges(msg, xrng, yrng, zrng) {
+        var sceneLayout = gd._fullLayout.scene;
+        expect(sceneLayout.xaxis.range).toBeCloseToArray(xrng, 2, 'xaxis range -' + msg);
+        expect(sceneLayout.yaxis.range).toBeCloseToArray(yrng, 2, 'yaxis range -' + msg);
+        expect(sceneLayout.zaxis.range).toBeCloseToArray(zrng, 2, 'zaxis range -' + msg);
+    }
+
+    it('should add pad around cone position to make sure they fit on the scene', function(done) {
+        var fig = Lib.extendDeep({}, require('@mocks/gl3d_cone-autorange.json'));
+
+        // the resulting image should be independent of what I multiply by here
+        function makeScaleFn(s) {
+            return function(v) { return v * s; };
+        }
+
+        Plotly.plot(gd, fig).then(function() {
+            _assertAxisRanges('base',
+                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+            );
+
+            var trace = fig.data[0];
+            var m = makeScaleFn(10);
+            var u = trace.u.map(m);
+            var v = trace.v.map(m);
+            var w = trace.w.map(m);
+
+            return Plotly.restyle(gd, {u: [u], v: [v], w: [w]});
+        })
+        .then(function() {
+            _assertAxisRanges('scaled up',
+                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+            );
+
+            var trace = fig.data[0];
+            var m = makeScaleFn(0.2);
+            var u = trace.u.map(m);
+            var v = trace.v.map(m);
+            var w = trace.w.map(m);
+
+            return Plotly.restyle(gd, {u: [u], v: [v], w: [w]});
+        })
+        .then(function() {
+            _assertAxisRanges('scaled down',
+                [-0.39, 4.39], [-0.39, 4.39], [-0.39, 4.39]
+            );
+        })
+        .catch(failTest)
+        .then(done);
+    });
+});
+
 describe('@gl Test cone interactions', function() {
     var gd;