sankey: add warning if node is in multiple groups, change transition settings

Author: antoinerg

src/traces/sankey/calc.js

@@ -51,7 +51,11 @@ function convertToD3Sankey(trace) {
         for(j = 0; j < group.length; j++) {
             var nodeIndex = group[j];
             var groupIndex = nodeCount + i;
-            groupLookup[nodeIndex] = groupIndex;
+            if(groupLookup.hasOwnProperty(nodeIndex)) {
+                Lib.warn('Node ' + nodeIndex + ' is already part of a group.');
+            } else {
+                groupLookup[nodeIndex] = groupIndex;
+            }
         }
     }
 

src/traces/sankey/constants.js

@@ -15,8 +15,8 @@ module.exports = {
     sankeyIterations: 50,
     forceIterations: 5,
     forceTicksPerFrame: 10,
-    duration: 350,
-    ease: 'quart-in-out',
+    duration: 500,
+    ease: 'linear',
     cn: {
         sankey: 'sankey',
         sankeyLinks: 'sankey-links',

test/image/mocks/sankey_groups.json

@@ -8,8 +8,8 @@
                   "color": "white",
                   "width": 2
                 },
-                "color": ["black", "black", "black", "black", "black", "orange" ],
-                "label": ["process0", "process1", "process2", "process3", "process4", "Group A"],
+                "color": ["black", "black", "black", "black", "black", "orange", "orange" ],
+                "label": ["process0", "process1", "process2", "process3", "process4", "Group A", "Group B"],
                 "groups": [[2, 3, 4]]
             },
             "link": {

test/jasmine/tests/sankey_test.js

@@ -303,6 +303,30 @@ describe('sankey tests', function() {
             expect(groups.length).toBe(2);
             expect(calcData[0].circular).toBe(false);
         });
+
+        it('emits a warning if a node is part of more than one group', function() {
+            var warnings = [];
+            spyOn(Lib, 'warn').and.callFake(function(msg) {
+                warnings.push(msg);
+            });
+
+            var calcData = _calc(Lib.extendDeep({}, base, {
+                node: {
+                    label: ['a', 'b', 'c', 'd', 'e'],
+                    groups: [[0, 1], [1, 2, 3]]
+                },
+                link: {
+                    value: [1, 1, 1, 1],
+                    source: [0, 1, 2, 3],
+                    target: [1, 2, 4, 4]
+                }
+            }));
+
+            expect(warnings.length).toBe(1);
+
+            // Expect node '1' to be in the first group
+            expect(calcData[0]._groupLookup[1]).toBe(5);
+        });
     });
 
     describe('lifecycle methods', function() {