From f182d1f2c42810291b9dd466fdbde092a6eeedb9 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed, 23 Sep 2015 17:14:40 -0700
Subject: [PATCH] [Time Conductor] Include domain selection in requests

...as well as use as default in a telemetry series.
---
 .../features/conductor/src/ConductorTelemetryDecorator.js     | 4 +++-
 platform/features/conductor/src/ConductorTelemetrySeries.js   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/features/conductor/src/ConductorTelemetryDecorator.js b/platform/features/conductor/src/ConductorTelemetryDecorator.js
index 9c8126c33f..0038c7ccd9 100644
--- a/platform/features/conductor/src/ConductorTelemetryDecorator.js
+++ b/platform/features/conductor/src/ConductorTelemetryDecorator.js
@@ -71,12 +71,14 @@ define(
         ConductorTelemetryDecorator.prototype.amendRequests = function (requests) {
             var conductor = this.conductorService.getConductor(),
                 start = conductor.displayStart(),
-                end = conductor.displayEnd();
+                end = conductor.displayEnd(),
+                domain = conductor.activeDomain();
 
             function amendRequest(request) {
                 request = request || {};
                 request.start = start;
                 request.end = end;
+                request.domain = domain;
                 return request;
             }
 
diff --git a/platform/features/conductor/src/ConductorTelemetrySeries.js b/platform/features/conductor/src/ConductorTelemetrySeries.js
index aa6ec0ec63..98cebe0907 100644
--- a/platform/features/conductor/src/ConductorTelemetrySeries.js
+++ b/platform/features/conductor/src/ConductorTelemetrySeries.js
@@ -52,6 +52,7 @@ define(
             this.startIndex = binSearch(0, max, conductor.displayStart());
             this.endIndex = binSearch(0, max, conductor.displayEnd());
             this.series = series;
+            this.domain = conductor.activeDomain();
         }
 
         ConductorTelemetrySeries.prototype.getPointCount = function () {
@@ -59,6 +60,7 @@ define(
         };
 
         ConductorTelemetrySeries.prototype.getDomainValue = function (i, d) {
+            d = d || this.domain;
             return this.series.getDomainValue(i + this.startIndex, d);
         };