use '' valueformat as dflt

- use ax.setScale and Axes.calcTicks with mocked range [0, 1.5 * value]
  or the gauge.axis one to make that work.
- fixup jasmine tests and baselines

Author: etpinard

src/traces/indicator/attributes.js

@@ -162,7 +162,7 @@ module.exports = {
     number: {
         valueformat: {
             valType: 'string',
-            dflt: '.3s',
+            dflt: '',
             role: 'info',
             editType: 'plot',
             description: [

src/traces/indicator/defaults.js

@@ -33,13 +33,13 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     traceOut._hasGauge = traceOut.mode.indexOf('gauge') !== -1;
 
     coerce('value');
+    traceOut._range = [0, 1.5 * traceOut.value];
 
     // Number attributes
     var auto = new Array(2);
     var bignumberFontSize;
     if(traceOut._hasNumber) {
         coerce('number.valueformat');
-        if(!traceOut.number.valueformat) traceOut.number.valueformat = attributes.number.valueformat.dflt;
         coerce('number.font.color', layout.font.color);
         coerce('number.font.family', layout.font.family);
         coerce('number.font.size');
@@ -64,8 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
         }
         coerce('delta.reference', traceOut.value);
         coerce('delta.relative');
-        coerce('delta.valueformat');
-        if(!traceOut.delta.valueformat) traceOut.delta.valueformat = traceOut.delta.relative ? '2%' : '.3s';
+        coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
         coerce('delta.increasing.symbol');
         coerce('delta.increasing.color');
         coerce('delta.decreasing.symbol');
@@ -89,6 +88,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     function coerceGaugeAxis(attr, dflt) {
         return Lib.coerce(axisIn, axisOut, attributes.gauge.axis, attr, dflt);
     }
+
     if(traceOut._hasGauge) {
         gaugeIn = traceIn.gauge;
         if(!gaugeIn) gaugeIn = {};
@@ -132,7 +132,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
         if(gaugeIn) axisIn = gaugeIn.axis || {};
         axisOut = Template.newContainer(gaugeOut, 'axis');
         coerceGaugeAxis('visible');
-        coerceGaugeAxis('range', [0, 1.5 * traceOut.value]);
+        traceOut._range = coerceGaugeAxis('range', traceOut._range);
 
         var opts = {outerTicks: true};
         handleTickValueDefaults(axisIn, axisOut, coerceGaugeAxis, 'linear');

src/traces/indicator/plot.js

@@ -256,7 +256,7 @@ function drawBulletGauge(gd, plotGroup, cd, opts) {
     var bulletLeft = domain.x[0];
     var bulletRight = domain.x[0] + (domain.x[1] - domain.x[0]) * ((trace._hasNumber || trace._hasDelta) ? (1 - cn.bulletNumberDomainSize) : 1);
 
-    ax = mockAxis(gd, trace.gauge.axis, trace.gauge.axis.range);
+    ax = mockAxis(gd, trace.gauge.axis);
     ax._id = 'xbulletaxis';
     ax.domain = [bulletLeft, bulletRight];
     ax.setScale();
@@ -567,8 +567,10 @@ function drawNumbers(gd, plotGroup, cd, opts) {
     }
 
     function drawBignumber() {
-        // bignumber
-        var bignumberAx = mockAxis(gd, {tickformat: trace.number.valueformat});
+        var bignumberAx = mockAxis(gd, {tickformat: trace.number.valueformat}, trace._range);
+        bignumberAx.setScale();
+        Axes.calcTicks(bignumberAx);
+
         var fmt = function(v) { return Axes.tickText(bignumberAx, v).text;};
         var bignumberSuffix = trace.number.suffix;
         var bignumberPrefix = trace.number.prefix;
@@ -607,8 +609,10 @@ function drawNumbers(gd, plotGroup, cd, opts) {
     }
 
     function drawDelta() {
-        // delta
-        var deltaAx = mockAxis(gd, {tickformat: trace.delta.valueformat});
+        var deltaAx = mockAxis(gd, {tickformat: trace.delta.valueformat}, trace._range);
+        deltaAx.setScale();
+        Axes.calcTicks(deltaAx);
+
         var deltaFmt = function(v) { return Axes.tickText(deltaAx, v).text;};
         var deltaValue = function(d) {
             var value = trace.delta.relative ? d.relativeDelta : d.delta;
@@ -797,34 +801,12 @@ function arcTween(arc, endAngle, newAngle) {
 function mockAxis(gd, opts, zrange) {
     var fullLayout = gd._fullLayout;
 
-    var axisIn = {
-        visible: opts.visible,
+    var axisIn = Lib.extendFlat({
         type: 'linear',
         ticks: 'outside',
         range: zrange,
-        tickmode: opts.tickmode,
-        nticks: opts.nticks,
-        tick0: opts.tick0,
-        dtick: opts.dtick,
-        tickvals: opts.tickvals,
-        ticktext: opts.ticktext,
-        ticklen: opts.ticklen,
-        tickwidth: opts.tickwidth,
-        tickcolor: opts.tickcolor,
-        showticklabels: opts.showticklabels,
-        tickfont: opts.tickfont,
-        tickangle: opts.tickangle,
-        tickformat: opts.tickformat,
-        exponentformat: opts.exponentformat,
-        separatethousands: opts.separatethousands,
-        showexponent: opts.showexponent,
-        showtickprefix: opts.showtickprefix,
-        tickprefix: opts.tickprefix,
-        showticksuffix: opts.showticksuffix,
-        ticksuffix: opts.ticksuffix,
-        title: opts.title,
         showline: true
-    };
+    }, opts);
 
     var axisOut = {
         type: 'linear',

test/image/baselines/gl3d_indicator_scatter3d.png

@@ -39,21 +39,22 @@ describe('Indicator defaults', function() {
         });
     });
 
-    it('defaults to formatting numbers using SI prefix', function() {
-        var out = _supply({type: 'indicator', mode: 'number+delta', value: 1});
-        expect(out.number.valueformat).toBe('.3s');
-        expect(out.delta.valueformat).toBe('.3s');
+    it('defaults to blank formatting', function() {
+        var out = _supply({type: 'indicator', mode: 'number+delta+gauge', value: 1});
+        expect(out.number.valueformat).toBe('');
+        expect(out.delta.valueformat).toBe('');
+        expect(out.gauge.axis.tickformat).toBe('');
     });
 
     it('defaults to displaying relative changes in percentage', function() {
         var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
         expect(out.delta.valueformat).toBe('2%');
     });
 
-    it('ignores empty valueformat', function() {
+    it('should not ignore empty valueformat', function() {
         var out = _supply({type: 'indicator', mode: 'number+delta', number: {valueformat: ''}, delta: {valueformat: ''}, value: 1});
-        expect(out.delta.valueformat).toBe('.3s');
-        expect(out.number.valueformat).toBe('.3s');
+        expect(out.delta.valueformat).toBe('');
+        expect(out.number.valueformat).toBe('');
     });
 
     it('defaults delta.reference to current value', function() {
@@ -298,7 +299,7 @@ describe('Indicator plot', function() {
                 delta: {reference: 200}
             }], {width: 400, height: 400})
             .then(function() {
-                assertContent(gd._fullData[0].delta.increasing.symbol + '20.0');
+                assertContent(gd._fullData[0].delta.increasing.symbol + '20');
                 return Plotly.restyle(gd, 'delta.relative', true);
             })
             .then(function() {