From 4544167b507be87a24af6c4e963da28fa647aef5 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon, 8 Jun 2015 15:26:02 -0700
Subject: [PATCH] [Telemetry] Provide latest telemetry datum

Provide latest telemetry as a datum to begin transitioning
toward revised telemetry API, particularly as used from limits;
WTD-1223.
---
 .../telemetry/src/TelemetrySubscription.js    | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/platform/telemetry/src/TelemetrySubscription.js b/platform/telemetry/src/TelemetrySubscription.js
index 844f1ab62b..ead25915b3 100644
--- a/platform/telemetry/src/TelemetrySubscription.js
+++ b/platform/telemetry/src/TelemetrySubscription.js
@@ -26,7 +26,6 @@ define(
     function (TelemetryQueue, TelemetryTable, TelemetryDelegator) {
         "use strict";
 
-
         /**
          * A TelemetrySubscription tracks latest values for streaming
          * telemetry data and handles notifying interested observers.
@@ -92,10 +91,38 @@ define(
                 updatePending = false;
             }
 
+
+            // Look up metadata associated with an object's telemetry
+            function lookupMetadata(domainObject) {
+                var telemetryCapability =
+                    domainObject.getCapability("telemetry");
+                return telemetryCapability &&
+                        telemetryCapability.getMetadata();
+            }
+
+            // From a telemetry series, retrieve a single data point
+            // containing all fields for domains/ranges
+            function makeDatum(domainObject, series, index) {
+                var metadata = lookupMetadata(domainObject),
+                    result = {};
+
+                (metadata.domains || []).forEach(function (domain) {
+                    result[domain.key] =
+                        series.getDomainValue(index, domain.key);
+                });
+
+                (metadata.ranges || []).forEach(function (range) {
+                    result[range.key] =
+                        series.getRangeValue(index, range.key);
+                });
+
+                return result;
+            }
+
             // Update the latest telemetry data for a specific
             // domain object. This will notify listeners.
-            function update(domainObject, telemetry) {
-                var count = telemetry && telemetry.getPointCount();
+            function update(domainObject, series) {
+                var count = series && series.getPointCount();
 
                 // Only schedule notification if there isn't already
                 // a notification pending (and if we actually have
@@ -108,8 +135,9 @@ define(
                 // Update the latest-value table
                 if (count > 0) {
                     pool.put(domainObject.getId(), {
-                        domain: telemetry.getDomainValue(count - 1),
-                        range: telemetry.getRangeValue(count - 1)
+                        domain: series.getDomainValue(count - 1),
+                        range: series.getRangeValue(count - 1),
+                        datum: makeDatum(domainObject, series, count - 1)
                     });
                 }
             }
@@ -124,14 +152,6 @@ define(
                 });
             }
 
-            // Look up metadata associated with an object's telemetry
-            function lookupMetadata(domainObject) {
-                var telemetryCapability =
-                    domainObject.getCapability("telemetry");
-                return telemetryCapability &&
-                        telemetryCapability.getMetadata();
-            }
-
             // Prepare subscriptions to all relevant telemetry-providing
             // domain objects.
             function subscribeAll(domainObjects) {
@@ -214,6 +234,16 @@ define(
                     var id = domainObject.getId();
                     return (latestValues[id] || {}).range;
                 },
+                /**
+                 * Get the latest telemetry datum for this domain object.
+                 *
+                 * @param {DomainObject} domainObject the object of interest
+                 * @returns {TelemetryDatum} the most recent datum
+                 */
+                getDatum: function (domainObject) {
+                    var id = domainObject.getId();
+                    return (latestValues[id] || {}).datum;
+                },
                 /**
                  * Get all telemetry-providing domain objects which are
                  * being observed as part of this subscription.