diff --git a/example/msl/src/MSLDataDictionary.js b/example/msl/src/MSLDataDictionary.js index 9e04560d45..e6b6a08415 100644 --- a/example/msl/src/MSLDataDictionary.js +++ b/example/msl/src/MSLDataDictionary.js @@ -44,31 +44,31 @@ define( { "name": "Min. Air Temperature", "identifier": "min_temp", - "units": "degrees", + "units": "Degrees (C)", "type": "float" }, { "name": "Max. Air Temperature", "identifier": "max_temp", - "units": "degrees", + "units": "Degrees (C)", "type": "float" }, { "name": "Atmospheric Pressure", "identifier": "pressure", - "units": "pascals", + "units": "Millibars", "type": "float" }, { "name": "Min. Ground Temperature", "identifier": "min_gts_temp", - "units": "degrees", + "units": "Degrees (C)", "type": "float" }, { "name": "Max. Ground Temperature", "identifier": "max_gts_temp", - "units": "degrees", + "units": "Degrees (C)", "type": "float" } ] @@ -76,4 +76,4 @@ define( ] }; } -); +); \ No newline at end of file diff --git a/example/msl/src/RemsTelemetryServerAdapter.js b/example/msl/src/RemsTelemetryServerAdapter.js index ea6a05ac27..6fd05c2289 100644 --- a/example/msl/src/RemsTelemetryServerAdapter.js +++ b/example/msl/src/RemsTelemetryServerAdapter.js @@ -48,6 +48,13 @@ define( this.$http = $http; this.$log = $log; this.promise = undefined; + + this.dataTransforms = { + //Convert from pascals to millibars + 'pressure': function pascalsToMillibars(pascals) { + return pascals / 100; + } + }; } /** @@ -65,6 +72,8 @@ define( var self = this, id = request.key; + var dataTransforms = this.dataTransforms; + function processResponse(response){ var data = []; /* @@ -75,13 +84,14 @@ define( * Check that valid data exists */ if (!isNaN(solData[id])) { + var dataTransform = dataTransforms[id]; /* * Append each data point to the array of values * for this data point property (min. temp, etc). */ data.unshift({ date: Date.parse(solData[TERRESTRIAL_DATE]), - value: solData[id] + value: dataTransform ? dataTransform(solData[id]) : solData[id] }); } });