Skip to content

Commit df2ce72

Browse files
authored
Merge pull request nasa#1369 from nasa/datum-fallback
Use series.getDatum when available
2 parents c2253f5 + 6f25759 commit df2ce72

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

platform/telemetry/src/TelemetryHandle.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,12 @@ define(
122122
*/
123123
self.getDatum = function (telemetryObject, index) {
124124
function makeNewDatum(series) {
125-
return series ?
126-
subscription.makeDatum(telemetryObject, series, index) :
127-
undefined;
125+
if (series) {
126+
if (series.getDatum) {
127+
return series.getDatum(index);
128+
}
129+
return subscription.makeDatum(telemetryObject, series, index);
130+
}
128131
}
129132

130133
return typeof index !== 'number' ?

src/api/telemetry/LegacyTelemetryProvider.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ define([
4545
};
4646

4747
function createDatum(domainObject, metadata, legacySeries, i) {
48+
if (legacySeries.getDatum) {
49+
return legacySeries.getDatum(i);
50+
}
4851
var datum = {};
4952

5053
metadata.domains.reduce(function (d, domain) {

0 commit comments

Comments
 (0)