From 23e9492d168152b16826190358fd6c758275b918 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 11 May 2016 00:03:19 -0400
Subject: [PATCH] data: Improved range subtraction in getTrackedIntervals

---
 src/data.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/data.cpp b/src/data.cpp
index 36fe78e2..f5ee0e7a 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -624,11 +624,28 @@ std::vector <Interval> getTrackedIntervals (
   // Get the set of expanded exclusions that overlap the range defined by the
   // timeline. If no range is defined, derive it from the set of all data.
   auto exclusions = getAllExclusions (rules, filter.range);
+  Datetime now;
 
   std::vector <Interval> intervals;
   for (auto& inclusion : subset (filter, inclusions))
-    for (auto& interval : flatten (clip (inclusion, filter.range), exclusions))
-      intervals.push_back (interval);
+    for (auto& e : exclusions)
+      if (e.start < now)
+      {
+        if (inclusion.range.encloses (e))
+        {
+          // Subtract any enclosed exclusion.
+          for (auto& result : subtractRanges (filter.range, {inclusion.range}, {e}))
+          {
+            Interval chunk {inclusion};
+            chunk.range = result;
+            intervals.push_back (chunk);
+          }
+        }
+        else
+        {
+          intervals.push_back (inclusion);
+        }
+      }
 
   return intervals;
 }