fixups and add polar tests

Author: archmoj

src/plots/cartesian/axis_autotype.js

@@ -18,7 +18,7 @@ module.exports = function autoType(array, calendar, opts) {
     var convertNumeric = opts.convertNumeric;
 
     if(!opts.noMultiCategory && multiCategory(array)) return 'multicategory';
-    if(moreDates(array, calendar, convertNumeric)) return 'date';
+    if(convertNumeric && moreDates(array, calendar)) return 'date';
     if(category(array)) return 'category';
     if(linearOK(array, convertNumeric)) return 'linear';
     else return convertNumeric ? '-' : 'category';
@@ -46,7 +46,7 @@ function linearOK(array, convertNumeric) {
 // 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, convertNumeric) {
+function moreDates(a, calendar) {
     // test at most 1000 points, evenly spaced
     var inc = Math.max(1, (a.length - 1) / 1000);
     var dcnt = 0;
@@ -60,7 +60,7 @@ function moreDates(a, calendar, convertNumeric) {
         seen[stri] = 1;
 
         if(Lib.isDateTime(ai, calendar)) dcnt += 1;
-        if(hasTypeNumber(ai, convertNumeric)) ncnt += 1;
+        if(isNumeric(ai)) ncnt += 1;
     }
 
     return (dcnt > ncnt * 2);

src/plots/polar/layout_attributes.js

@@ -180,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, opts.convertnumericDflt);
+        var axType = handleAxisTypeDefaults(axIn, axOut, coerceAxis, subplotData, dataAttr, opts);
 
         handleCategoryOrderDefaults(axIn, axOut, coerceAxis, {
             axData: subplotData,
@@ -188,7 +188,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 }
 
 function handleAxisTypeDefaults(axIn, axOut, coerce, subplotData, dataAttr, options) {
-    var convertnumeric = dataAttr.convertnumeric ? coerce('convertnumeric', options.convertnumericDflt) : false;
+    var convertnumeric = coerce('convertnumeric', options.convertnumericDflt);
     var axType = coerce('type');
 
     if(axType === '-') {
@@ -203,7 +203,7 @@ function handleAxisTypeDefaults(axIn, axOut, coerce, subplotData, dataAttr, opti
 
         if(trace && trace[dataAttr]) {
             axOut.type = autoType(trace[dataAttr], 'gregorian', {
-                convertNumeric: !convertnumeric
+                convertNumeric: convertnumeric
             });
         }
 

src/traces/box/defaults.js

@@ -109,7 +109,7 @@ function handleSampleDefaults(traceIn, traceOut, coerce, layout) {
     var yLen = yDims && Lib.minRowLength(y);
     var xLen = xDims && Lib.minRowLength(x);
 
-    var calendar = null; // TODO: should we use ax.calendar here?
+    var calendar = 'gregorian'; // TODO: should we use ax.calendar here?
     var opts = {
         convertNumeric: true // TODO: should we use ax.convertnumeric here?
     };

test/jasmine/tests/axes_test.js

@@ -347,10 +347,12 @@ describe('Test axes', function() {
                     type: 'scatter',
                     xaxis: 'x',
                     yaxis: 'y',
-                    x: ['0', '1'],
-                    y: ['0', '1']
+                    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');
             });
@@ -367,10 +369,12 @@ describe('Test axes', function() {
                     type: 'scatter',
                     xaxis: 'x',
                     yaxis: 'y',
-                    x: ['0', '1'],
-                    y: ['0', '1']
+                    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');
             });

test/jasmine/tests/polar_test.js

@@ -74,6 +74,7 @@ describe('Test polar plots defaults:', function() {
         }];
 
         layoutOut = {
+            axesconvertnumeric: true,
             font: {color: 'red'},
             _subplots: {polar: ['polar']}
         };
@@ -209,6 +210,56 @@ describe('Test polar plots defaults:', function() {
         expect(layoutOut.polar.radialaxis.hoverformat).toBe('g');
         expect(layoutOut.polar.angularaxis.hoverformat).toBe('g');
     });
+
+    it('should disable converting numeric strings using axis.convertnumeric', function() {
+        _supply({
+            polar: {
+                radialaxis: {
+                    convertnumeric: false
+                },
+                angularaxis: {
+                    convertnumeric: false
+                }
+            }
+        }, [{
+            visible: true,
+            type: 'scatterpolar',
+            r: ['0', '1', '1970', '2000'],
+            theta: ['0', '1', '1970', '2000'],
+            subplot: 'polar'
+        }]);
+
+        expect(layoutOut.polar.angularaxis.convertnumeric).toBe(false);
+        expect(layoutOut.polar.radialaxis.convertnumeric).toBe(false);
+        expect(layoutOut.polar.radialaxis.type).toBe('category');
+        expect(layoutOut.polar.angularaxis.type).toBe('category');
+    });
+
+    it('should enable converting numeric strings using axis.convertnumeric and inherit defaults from layout.axesconvertnumeric', function() {
+        layoutOut.axesconvertnumeric = false;
+
+        _supply({
+            polar: {
+                radialaxis: {
+                    convertnumeric: true
+                },
+                angularaxis: {
+                    convertnumeric: true
+                }
+            }
+        }, [{
+            visible: true,
+            type: 'scatterpolar',
+            r: ['0', '1', '1970', '2000'],
+            theta: ['0', '1', '1970', '2000'],
+            subplot: 'polar'
+        }]);
+
+        expect(layoutOut.polar.angularaxis.convertnumeric).toBe(true);
+        expect(layoutOut.polar.radialaxis.convertnumeric).toBe(true);
+        expect(layoutOut.polar.radialaxis.type).toBe('linear');
+        expect(layoutOut.polar.angularaxis.type).toBe('linear');
+    });
 });
 
 describe('Test relayout on polar subplots:', function() {