issue 5195 - implement convertnumeric for axes and inherit from layout

Author: archmoj

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(moreDates(array, calendar, convertNumeric)) return 'date';
     if(category(array)) return 'category';
-    if(linearOK(array)) return 'linear';
+    if(linearOK(array, convertNumeric)) return 'linear';
     else return '-';
 };
 
+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;
@@ -42,7 +46,7 @@ function linearOK(array) {
 // dates as non-dates, to exclude cases with mostly 2 & 4 digit
 // numbers and a few dates
 // as with categories, consider DISTINCT values only.
-function moreDates(a, calendar) {
+function moreDates(a, calendar, convertNumeric) {
     // test at most 1000 points, evenly spaced
     var inc = Math.max(1, (a.length - 1) / 1000);
     var dcnt = 0;
@@ -56,7 +60,7 @@ function moreDates(a, calendar) {
         seen[stri] = 1;
 
         if(Lib.isDateTime(ai, calendar)) dcnt += 1;
-        if(isNumeric(ai)) ncnt += 1;
+        if(hasTypeNumber(ai, convertNumeric)) ncnt += 1;
     }
 
     return (dcnt > ncnt * 2);

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: {