Implement strict autotypenumbers

src/plots/cartesian/axes.js

@@ -216,7 +216,9 @@ var getDataConversions = axes.getDataConversions = function(gd, trace, target, t
     // setup the data-to-calc method.
     if(Array.isArray(d2cTarget)) {
         ax = {
-            type: autoType(targetArray),
+            type: autoType(targetArray, undefined, {
+                convertNumeric: gd._fullLayout.axesconvertnumeric
+            }),
             _categories: []
         };
         axes.setConvert(ax);

src/plots/cartesian/axis_autotype.js

@@ -15,22 +15,26 @@ var Lib = require('../../lib');
 var BADNUM = require('../../constants/numerical').BADNUM;
 
 module.exports = function autoType(array, calendar, opts) {
-    opts = opts || {};
+    var convertNumeric = opts.convertNumeric;
 
     if(!opts.noMultiCategory && multiCategory(array)) return 'multicategory';
-    if(moreDates(array, calendar)) return 'date';
+    if(convertNumeric && moreDates(array, calendar)) return 'date';
     if(category(array)) return 'category';
-    if(linearOK(array)) return 'linear';
-    else return '-';
+    if(linearOK(array, convertNumeric)) return 'linear';
+    else return convertNumeric ? '-' : 'category';
 };
 
+function hasTypeNumber(v, convertNumeric) {
+    return convertNumeric ? isNumeric(v) : typeof v === 'number';
+}
+
 // is there at least one number in array? If not, we should leave
 // ax.type empty so it can be autoset later
-function linearOK(array) {
+function linearOK(array, convertNumeric) {
     if(!array) return false;
 
     for(var i = 0; i < array.length; i++) {
-        if(isNumeric(array[i])) return true;
+        if(hasTypeNumber(array[i], convertNumeric)) return true;
     }
 
     return false;

src/plots/cartesian/layout_attributes.js

@@ -97,11 +97,21 @@ module.exports = {
         _noTemplating: true,
         description: [
             'Sets the axis type.',
-            'By default, plotly attempts to determined the axis type',
+            'By default, plotly.js attempts to determined the axis type',
             'by looking into the data of the traces that referenced',
             'the axis in question.'
         ].join(' ')
     },
+    convertnumeric: {
+        valType: 'boolean',
+        role: 'info',
+        editType: 'calc',
+        description: [
+            'Determines whether or not a numeric string in this axis may be',
+            'treated as a number during automatic axis `type` detection.',
+            'Defaults to layout.axesconvertnumeric.'
+        ].join(' ')
+    },
     autorange: {
         valType: 'enumerated',
         values: [true, false, 'reversed'],

src/plots/cartesian/layout_defaults.js

@@ -38,6 +38,8 @@ function appendList(cont, k, item) {
 }
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
+    var convertnumericDflt = layoutOut.axesconvertnumeric;
+
     var ax2traces = {};
     var xaMayHide = {};
     var yaMayHide = {};
@@ -246,6 +248,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
             automargin: true,
             visibleDflt: visibleDflt,
             reverseDflt: reverseDflt,
+            convertnumericDflt: convertnumericDflt,
             splomStash: ((layoutOut._splomAxes || {})[axLetter] || {})[axId]
         };
 
@@ -310,6 +313,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
             automargin: true,
             visibleDflt: false,
             reverseDflt: false,
+            convertnumericDflt: convertnumericDflt,
             splomStash: ((layoutOut._splomAxes || {})[axLetter] || {})[axId]
         };
 

src/plots/cartesian/type_defaults.js

@@ -16,6 +16,7 @@ var autoType = require('./axis_autotype');
  *  name: axis object name (ie 'xaxis') if one should be stored
  */
 module.exports = function handleTypeDefaults(containerIn, containerOut, coerce, options) {
+    coerce('convertnumeric', options.convertnumericDflt);
     var axType = coerce('type', (options.splomStash || {}).type);
 
     if(axType === '-') {
@@ -68,6 +69,8 @@ function setAutoType(ax, data) {
         opts.noMultiCategory = true;
     }
 
+    opts.convertNumeric = ax.convertnumeric;
+
     // check all boxes on this x axis to see
     // if they're dates, numbers, or categories
     if(isBoxWithoutPositionCoords(d0, axLetter)) {

src/plots/gl3d/layout/axis_attributes.js

@@ -78,6 +78,7 @@ module.exports = overrideAll({
     type: extendFlat({}, axesAttrs.type, {
         values: ['-', 'linear', 'log', 'date', 'category']
     }),
+    convertnumeric: axesAttrs.convertnumeric,
     autorange: axesAttrs.autorange,
     rangemode: axesAttrs.rangemode,
     range: extendFlat({}, axesAttrs.range, {

src/plots/gl3d/layout/defaults.js

@@ -40,6 +40,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         font: layoutOut.font,
         fullData: fullData,
         getDfltFromLayout: getDfltFromLayout,
+        convertnumericDflt: layoutOut.axesconvertnumeric,
         paper_bgcolor: layoutOut.paper_bgcolor,
         calendar: layoutOut.calendar
     });
@@ -109,6 +110,7 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
         data: fullGl3dData,
         bgColor: bgColorCombined,
         calendar: opts.calendar,
+        convertnumericDflt: opts.convertnumericDflt,
         fullLayout: opts.fullLayout
     });
 

src/plots/layout_attributes.js

@@ -292,6 +292,16 @@ module.exports = {
             'Sets the background color of the plotting area in-between x and y axes.'
         ].join(' ')
     },
+    axesconvertnumeric: {
+        valType: 'boolean',
+        dflt: true,
+        role: 'info',
+        editType: 'calc',
+        description: [
+            'Determines whether or not a numeric string in axes of the plot may be',
+            'treated as a number during automatic axis `type` detection.'
+        ].join(' ')
+    },
     separators: {
         valType: 'string',
         role: 'style',

src/plots/plots.js

@@ -1476,6 +1476,8 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
         layoutOut._dataTemplate = template.data;
     }
 
+    coerce('axesconvertnumeric');
+
     var globalFont = Lib.coerceFont(coerce, 'font');
 
     coerce('title.text', layoutOut._dfltTitle.plot);

src/plots/polar/layout_attributes.js

@@ -61,6 +61,7 @@ var radialAxisAttrs = {
     type: extendFlat({}, axesAttrs.type, {
         values: ['-', 'linear', 'log', 'date', 'category']
     }),
+    convertnumeric: axesAttrs.convertnumeric,
 
     autorange: extendFlat({}, axesAttrs.autorange, {editType: 'plot'}),
     rangemode: {
@@ -179,6 +180,7 @@ var angularAxisAttrs = {
             'If *category, use `period` to set the number of integer coordinates around polar axis.'
         ].join(' ')
     },
+    convertnumeric: axesAttrs.convertnumeric,
 
     categoryorder: axesAttrs.categoryorder,
     categoryarray: axesAttrs.categoryarray,

src/plots/polar/layout_defaults.js

@@ -57,7 +57,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         axOut._traceIndices = subplotData.map(function(t) { return t._expandedIndex; });
 
         var dataAttr = constants.axisName2dataArray[axName];
-        var axType = handleAxisTypeDefaults(axIn, axOut, coerceAxis, subplotData, dataAttr);
+        var axType = handleAxisTypeDefaults(axIn, axOut, coerceAxis, subplotData, dataAttr, opts);
 
         handleCategoryOrderDefaults(axIn, axOut, coerceAxis, {
             axData: subplotData,
@@ -187,7 +187,8 @@ function handleDefaults(contIn, contOut, coerce, opts) {
     }
 }
 
-function handleAxisTypeDefaults(axIn, axOut, coerce, subplotData, dataAttr) {
+function handleAxisTypeDefaults(axIn, axOut, coerce, subplotData, dataAttr, options) {
+    var convertnumeric = coerce('convertnumeric', options.convertnumericDflt);
     var axType = coerce('type');
 
     if(axType === '-') {
@@ -201,7 +202,9 @@ function handleAxisTypeDefaults(axIn, axOut, coerce, subplotData, dataAttr) {
         }
 
         if(trace && trace[dataAttr]) {
-            axOut.type = autoType(trace[dataAttr], 'gregorian');
+            axOut.type = autoType(trace[dataAttr], 'gregorian', {
+                convertNumeric: convertnumeric
+            });
         }
 
         if(axOut.type === '-') {
@@ -224,6 +227,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         attributes: layoutAttributes,
         handleDefaults: handleDefaults,
         font: layoutOut.font,
+        convertnumericDflt: layoutOut.axesconvertnumeric,
         paper_bgcolor: layoutOut.paper_bgcolor,
         fullData: fullData,
         layoutOut: layoutOut

src/plots/ternary/layout_defaults.js

@@ -27,6 +27,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         attributes: layoutAttributes,
         handleDefaults: handleTernaryDefaults,
         font: layoutOut.font,
+        convertnumericDflt: layoutOut.axesconvertnumeric,
         paper_bgcolor: layoutOut.paper_bgcolor
     });
 };

src/traces/box/defaults.js

@@ -109,6 +109,11 @@ function handleSampleDefaults(traceIn, traceOut, coerce, layout) {
     var yLen = yDims && Lib.minRowLength(y);
     var xLen = xDims && Lib.minRowLength(x);
 
+    var calendar = 'gregorian'; // TODO: should we use ax.calendar here?
+    var opts = {
+        convertNumeric: true // TODO: should we use ax.convertnumeric here?
+    };
+
     var defaultOrientation, len;
     if(traceOut._hasPreCompStats) {
         switch(String(xDims) + String(yDims)) {
@@ -160,7 +165,7 @@ function handleSampleDefaults(traceIn, traceOut, coerce, layout) {
                 var hasCategories = false;
                 var i;
                 for(i = 0; i < x.length; i++) {
-                    if(autoType(x[i]) === 'category') {
+                    if(autoType(x[i], calendar, opts) === 'category') {
                         hasCategories = true;
                         break;
                     }
@@ -171,7 +176,7 @@ function handleSampleDefaults(traceIn, traceOut, coerce, layout) {
                     len = Math.min(sLen, xLen, y.length);
                 } else {
                     for(i = 0; i < y.length; i++) {
-                        if(autoType(y[i]) === 'category') {
+                        if(autoType(y[i], calendar, opts) === 'category') {
                             hasCategories = true;
                             break;
                         }

src/traces/carpet/axis_attributes.js

@@ -83,11 +83,12 @@ module.exports = {
         editType: 'calc',
         description: [
             'Sets the axis type.',
-            'By default, plotly attempts to determined the axis type',
+            'By default, plotly.js attempts to determined the axis type',
             'by looking into the data of the traces that referenced',
             'the axis in question.'
         ].join(' ')
     },
+    convertnumeric: axesAttrs.convertnumeric,
     autorange: {
         valType: 'enumerated',
         values: [true, false, 'reversed'],

src/traces/carpet/axis_defaults.js

@@ -51,6 +51,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
     }
 
     // now figure out type and do some more initialization
+    coerce('convertnumeric', options.convertnumericDflt);
     var axType = coerce('type');
     if(axType === '-') {
         if(options.data) setAutoType(containerOut, options.data);
@@ -219,5 +220,7 @@ function setAutoType(ax, data) {
     var calAttr = axLetter + 'calendar';
     var calendar = ax[calAttr];
 
-    ax.type = autoType(data, calendar);
+    ax.type = autoType(data, calendar, {
+        convertNumeric: ax.convertnumeric
+    });
 }

src/traces/sunburst/attributes.js

@@ -34,7 +34,7 @@ module.exports = {
             'Empty string items \'\' are understood to reference',
             'the root node in the hierarchy.',
             'If `ids` is filled, `parents` items are understood to be "ids" themselves.',
-            'When `ids` is not set, plotly attempts to find matching items in `labels`,',
+            'When `ids` is not set, plotly.js attempts to find matching items in `labels`,',
             'but beware they must be unique.'
         ].join(' ')
     },
@@ -83,7 +83,7 @@ module.exports = {
         description: [
             'Sets the level from which this trace hierarchy is rendered.',
             'Set `level` to `\'\'` to start from the root node in the hierarchy.',
-            'Must be an "id" if `ids` is filled in, otherwise plotly attempts to find a matching',
+            'Must be an "id" if `ids` is filled in, otherwise plotly.js attempts to find a matching',
             'item in `labels`.'
         ].join(' ')
     },

test/jasmine/tests/axes_test.js

@@ -190,6 +190,7 @@ describe('Test axes', function() {
 
         beforeEach(function() {
             layoutOut = {
+                axesconvertnumeric: true,
                 _has: Plots._hasPlotType,
                 _basePlotModules: [],
                 _dfltTitle: {x: 'x', y: 'y'},
@@ -335,6 +336,50 @@ describe('Test axes', function() {
             });
         });
 
+        describe('autotype disable/enable converting numeric strings', function() {
+            it('should disable converting numeric strings using axis.convertnumeric', function() {
+                layoutIn = {
+                    xaxis: {},
+                    yaxis: { convertnumeric: false }
+                };
+
+                supplyLayoutDefaults(layoutIn, layoutOut, [{
+                    type: 'scatter',
+                    xaxis: 'x',
+                    yaxis: 'y',
+                    x: ['0', '1', '1970', '2000'],
+                    y: ['0', '1', '1970', '2000']
+                }]);
+
+                expect(layoutOut.xaxis.convertnumeric).toBe(true);
+                expect(layoutOut.yaxis.convertnumeric).toBe(false);
+                expect(layoutOut.xaxis.type).toBe('linear');
+                expect(layoutOut.yaxis.type).toBe('category');
+            });
+
+            it('should enable converting numeric strings using axis.convertnumeric and inherit defaults from layout.axesconvertnumeric', function() {
+                layoutOut.axesconvertnumeric = false;
+
+                layoutIn = {
+                    xaxis: { convertnumeric: true },
+                    yaxis: {}
+                };
+
+                supplyLayoutDefaults(layoutIn, layoutOut, [{
+                    type: 'scatter',
+                    xaxis: 'x',
+                    yaxis: 'y',
+                    x: ['0', '1', '1970', '2000'],
+                    y: ['0', '1', '1970', '2000']
+                }]);
+
+                expect(layoutOut.xaxis.convertnumeric).toBe(true);
+                expect(layoutOut.yaxis.convertnumeric).toBe(false);
+                expect(layoutOut.xaxis.type).toBe('linear');
+                expect(layoutOut.yaxis.type).toBe('category');
+            });
+        });
+
         it('should set undefined linewidth/linecolor if linewidth, linecolor or showline is not supplied', function() {
             layoutIn = {
                 xaxis: {},