Merge pull request #1934 from plotly/sankey-multilink

Sankey fix for 4+ multilinks

Author: monfera

src/traces/sankey/render.js

@@ -155,8 +155,8 @@ function linkModel(uniqueKeys, d, l) {
     var tc = tinycolor(l.color);
     var basicKey = l.source.label + '|' + l.target.label;
     var foundKey = uniqueKeys[basicKey];
-    uniqueKeys[basicKey] = (foundKey === void(0) ? foundKey : 0) + 1;
-    var key = basicKey + (foundKey === void(0) ? '' : '__' + foundKey);
+    uniqueKeys[basicKey] = (foundKey || 0) + 1;
+    var key = basicKey + '__' + uniqueKeys[basicKey];
 
     // for event data
     l.trace = d.trace;
@@ -186,8 +186,8 @@ function nodeModel(uniqueKeys, d, n) {
 
     var basicKey = n.label;
     var foundKey = uniqueKeys[basicKey];
-    uniqueKeys[basicKey] = (foundKey === void(0) ? foundKey : 0) + 1;
-    var key = basicKey + (foundKey === void(0) ? '' : '__' + foundKey);
+    uniqueKeys[basicKey] = (foundKey || 0) + 1;
+    var key = basicKey + '__' + uniqueKeys[basicKey];
 
     // for event data
     n.trace = d.trace;

test/image/baselines/sankey_energy.png

@@ -192,7 +192,9 @@
                     44,
                     45,
                     46,
-                    47
+                    47,
+                    35,
+                    35
                 ],
                 "target": [
                     1,
@@ -263,7 +265,9 @@
                     15,
                     1,
                     15,
-                    15
+                    15,
+                    26,
+                    26
                 ],
                 "value": [
                     124.729,
@@ -313,7 +317,7 @@
                     14.375,
                     122.952,
                     500,
-                    339.978,
+                    139.978,
                     504.287,
                     107.703,
                     611.99,
@@ -334,7 +338,9 @@
                     9.452,
                     182.01,
                     19.013,
-                    289.366
+                    289.366,
+                    100,
+                    100
                 ],
                 "color": [
                     "rgba(0,0,96,0.2)",
@@ -405,7 +411,9 @@
                     "rgba(0,0,96,0.2)",
                     "rgba(0,0,96,0.2)",
                     "rgba(0,0,96,0.2)",
-                    "rgba(0,0,96,0.2)"
+                    "rgba(0,0,96,0.2)",
+                    "lightgreen",
+                    "goldenrod"
                 ],
                 "label": [
                     "stream 1",
@@ -476,6 +484,8 @@
                     "",
                     "",
                     "",
+                    "",
+                    "",
                     ""
                 ]
             }