filter points cascading simplification

Author: monfera

src/transforms/filter.js

@@ -205,34 +205,21 @@ exports.calcTransform = function(gd, trace, opts) {
     // copy all original array attribute values, and clear arrays in trace
     forAllAttrs(initFn);
 
-    // loop through filter array, fill trace arrays if passed
-
     var prevTransforms = trace.transforms.filter(function(tr) {return tr.indexToPoints;});
+    var originalPointsAccessor = prevTransforms.length ?
+        function(i) {return prevTransforms[prevTransforms.length - 1].indexToPoints[i];} :
+        function(i) {return [i];};
 
-    if(prevTransforms.length > 0) {
-
-        var prevTransform = prevTransforms[prevTransforms.length - 1];
-        var prevIndexToPoints = prevTransform.indexToPoints;
-
-        for(var i = 0; i < len; i++) {
-            var passed = filterFunc(targetArray[i]);
-            if(passed) {
-                forAllAttrs(fillFn, i);
-                indexToPoints[index++] = prevIndexToPoints[i];
-            }
-        }
-    } else {
-        for(var i = 0; i < len; i++) {
-            var passed = filterFunc(targetArray[i]);
-            if(passed) {
-                forAllAttrs(fillFn, i);
-                indexToPoints[index++] = [i];
-            }
+    // loop through filter array, fill trace arrays if passed
+    for(var i = 0; i < len; i++) {
+        var passed = filterFunc(targetArray[i]);
+        if(passed) {
+            forAllAttrs(fillFn, i);
+            indexToPoints[index++] = originalPointsAccessor(i);
         }
     }
 
     opts.indexToPoints = indexToPoints;
-    console.log(indexToPoints)
 };
 
 function getFilterFunc(opts, d2c, targetCalendar) {

test/jasmine/tests/transform_filter_test.js

@@ -143,7 +143,7 @@ describe('filter transforms calc:', function() {
         expect(out[0].x).toEqual([0, 1]);
         expect(out[0].y).toEqual([1, 2]);
         expect(out[0].z).toEqual(['2016-10-21', '2016-12-02']);
-        expect(out[0].transforms[0].indexToPoints).toEqual({0: [3], 1 :[4]});
+        expect(out[0].transforms[0].indexToPoints).toEqual({0: [3], 1: [4]});
     });
 
     it('should use the calendar from the target attribute if target is a string', function() {
@@ -262,7 +262,7 @@ describe('filter transforms calc:', function() {
         expect(out[0].x).toEqual([-2, 2, 3]);
         expect(out[0].y).toEqual([3, 3, 1]);
         expect(out[0].marker.color).toEqual([0.3, 0.3, 0.4]);
-        expect(out[0].transforms[0].indexToPoints).toEqual({0: [2], 1 :[5], 2: [6]});
+        expect(out[0].transforms[0].indexToPoints).toEqual({0: [2], 1: [5], 2: [6]});
     });
 
     it('filters should handle array on base trace attributes', function() {
@@ -316,8 +316,8 @@ describe('filter transforms calc:', function() {
 
         expect(out[0].x).toEqual([1, 2]);
         expect(out[0].y).toEqual([2, 3]);
-        expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1 :[5], 2: [6]});
-        expect(out[0].transforms[1].indexToPoints).toEqual({0: [4], 1 :[5]});
+        expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
+        expect(out[0].transforms[1].indexToPoints).toEqual({0: [4], 1: [5]});
     });
 
     it('filters should chain as AND (case 2)', function() {
@@ -343,7 +343,7 @@ describe('filter transforms calc:', function() {
 
         expect(out[0].x).toEqual([3]);
         expect(out[0].y).toEqual([1]);
-        expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1 :[5], 2: [6]});
+        expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
         expect(out[0].transforms[2].indexToPoints).toEqual({0: [6]});
     });