plotly#189 reworking the order code because it converted numbers to strings (with test cases)

Author: monfera

src/plots/cartesian/ordered_categories.js

@@ -14,23 +14,27 @@ var d3 = require('d3');
 // flattenUnique :: String -> [[String]] -> Object
 function flattenUnique(axisLetter, data) {
     var traceLines = data.map(function(d) {return d[axisLetter];});
-    var categoryMap = {}; // hashmap is O(1);
+    // Can't use a hashmap, which is O(1), because ES5 maps coerce keys to strings. If it ever becomes a bottleneck,
+    // code can be separated: a hashmap (JS object) based version if all values encountered are strings; and
+    // downgrading to this O(log(n)) array on the first encounter of a non-string value.
+    var categoryArray = [];
     var i, j, tracePoints, category;
     for(i = 0; i < traceLines.length; i++) {
         tracePoints = traceLines[i];
         for(j = 0; j < tracePoints.length; j++) {
             category = tracePoints[j];
-            if(!categoryMap[category]) {
-                categoryMap[category] = true;
+            if(category === null || category === undefined) continue;
+            if(categoryArray.indexOf(category) === -1) {
+                categoryArray.push(category);
             }
         }
     }
-    return categoryMap;
+    return categoryArray;
 }
 
 // flattenUniqueSort :: String -> Function -> [[String]] -> [String]
 function flattenUniqueSort(axisLetter, sortFunction, data) {
-    return Object.keys(flattenUnique(axisLetter, data)).sort(sortFunction);
+    return flattenUnique(axisLetter, data).sort(sortFunction);
 }
 
 
@@ -50,7 +54,7 @@ function flattenUniqueSort(axisLetter, sortFunction, data) {
 module.exports = function orderedCategories(axisLetter, categorymode, categorylist, data) {
 
     switch(categorymode) {
-        case 'array': return Array.isArray(categorylist) ? categorylist : [];
+        case 'array': return Array.isArray(categorylist) ? categorylist.slice() : [];
         case 'category ascending': return flattenUniqueSort(axisLetter, d3.ascending, data);
         case 'category descending': return flattenUniqueSort(axisLetter, d3.descending, data);
         case 'trace': return [];

test/jasmine/tests/calcdata_test.js

@@ -96,6 +96,20 @@ describe('calculated data and points', function() {
                 expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 1, y: 14}));
             });
 
+            it('should output categories in ascending domain alphanumerical order even if categories are all numbers', function() {
+
+                Plotly.plot(gd, [{x: [3,1,5,2,4], y: [15,11,12,13,14]}], { xaxis: {
+                    type: 'category',
+                    categorymode: 'category ascending'
+                }});
+
+                expect(gd.calcdata[0][0]).toEqual(jasmine.objectContaining({x: 2, y: 15}));
+                expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({x: 0, y: 11}));
+                expect(gd.calcdata[0][2]).toEqual(jasmine.objectContaining({x: 4, y: 12}));
+                expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({x: 1, y: 13}));
+                expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 3, y: 14}));
+            });
+
             it('should output categories in categorymode order even if category array is defined', function() {
 
                 Plotly.plot(gd, [{x: ['c','a','e','b','d'], y: [15,11,12,13,14]}], { xaxis: {
@@ -189,6 +203,21 @@ describe('calculated data and points', function() {
                 expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 2, y: 14}));
             });
 
+            it('should output categories in explicitly supplied order even if category values are all numbers', function() {
+
+                Plotly.plot(gd, [{x: [3,1,5,2,4], y: [15,11,12,13,14]}], { xaxis: {
+                    type: 'category',
+                    categorymode: 'array',
+                    categorylist: [2,1,4,5,3]
+                }});
+
+                expect(gd.calcdata[0][0]).toEqual(jasmine.objectContaining({x: 4, y: 15}));
+                expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({x: 1, y: 11}));
+                expect(gd.calcdata[0][2]).toEqual(jasmine.objectContaining({x: 3, y: 12}));
+                expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({x: 0, y: 13}));
+                expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 2, y: 14}));
+            });
+
             it('should output categories in explicitly supplied order, independent of trace order, pruned', function() {
 
                 Plotly.plot(gd, [{x: ['c',undefined,'e','b','d'], y: [15,11,12,null,14]}], { xaxis: {