emeeks / d3.layout.timeline Goto Github PK

$ git diff /tmp/timeline.old.js /tmp/timeline.new.js
diff --git a/tmp/timeline.old.js b/tmp/timeline.new.js
index cbad47fd1..339d68719 100644
--- a/tmp/timeline.old.js
+++ b/tmp/timeline.new.js
@@ -98,13 +98,27 @@ module.exports = function() {
         });
     }

-    function fitsIn(lane, band) {
+    var laneIdMap = new WeakMap();
+    var laneOutOfRangeDataMap = {};
+    var laneIdCounter = 0;
+    function addToLane(lane, band) {
+        if (!laneIdMap.has(lane)) {
+            laneIdMap.set(lane, laneIdCounter++);
+        }
+        var hasOutOfRangeData = laneOutOfRangeDataMap[laneIdMap.get(lane)];
+        if (!hasOutOfRangeData && (
+            !(lane.end < band.start || lane.start > band.end)
+        )) {
+            laneOutOfRangeDataMap[laneIdMap.get(lane)] = true;
+        }
+        lane.push(band);
+    }

+    function fitsIn(lane, band) {
       if (lane.end < band.start || lane.start > band.end) {
         return true;
       }
-      var filteredLane = lane.filter(function (d) {return d.start <= band.end && d.end >= band.start});
-      if (filteredLane.length === 0) {
+      if (!laneOutOfRangeDataMap[laneIdMap.get(lane)]) {
         return true;
       }
       return false;
@@ -118,7 +132,8 @@ module.exports = function() {
         }

         if (swimlane === undefined) {
-            swimlanes[band.parent.id] = [[band]];
+            swimlanes[band.parent.id] = [[]];
+            addToLane(swimlanes[band.parent.id][0][0], band)
             swimlane = swimlanes[band.parent.id];
             swimlaneNumber++;
             return;
@@ -128,12 +143,13 @@ module.exports = function() {

       while (x <= l) {
         if (fitsIn(swimlane[x], band)) {
-          swimlane[x].push(band);
+          addToLane(swimlane[x], band);
           return;
         }
         x++;
       }
-      swimlane[x] = [band];
+      swimlane[x] = [];
+      addToLane(swimlane[x], band);
       return;
     }