Compare commits
1 Commits
couchdb-ob
...
open1200
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
007d125489 |
@@ -44,31 +44,31 @@ define(
|
|||||||
{
|
{
|
||||||
"name": "Min. Air Temperature",
|
"name": "Min. Air Temperature",
|
||||||
"identifier": "min_temp",
|
"identifier": "min_temp",
|
||||||
"units": "degrees",
|
"units": "Degrees (C)",
|
||||||
"type": "float"
|
"type": "float"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Max. Air Temperature",
|
"name": "Max. Air Temperature",
|
||||||
"identifier": "max_temp",
|
"identifier": "max_temp",
|
||||||
"units": "degrees",
|
"units": "Degrees (C)",
|
||||||
"type": "float"
|
"type": "float"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Atmospheric Pressure",
|
"name": "Atmospheric Pressure",
|
||||||
"identifier": "pressure",
|
"identifier": "pressure",
|
||||||
"units": "pascals",
|
"units": "Millibars",
|
||||||
"type": "float"
|
"type": "float"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Min. Ground Temperature",
|
"name": "Min. Ground Temperature",
|
||||||
"identifier": "min_gts_temp",
|
"identifier": "min_gts_temp",
|
||||||
"units": "degrees",
|
"units": "Degrees (C)",
|
||||||
"type": "float"
|
"type": "float"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Max. Ground Temperature",
|
"name": "Max. Ground Temperature",
|
||||||
"identifier": "max_gts_temp",
|
"identifier": "max_gts_temp",
|
||||||
"units": "degrees",
|
"units": "Degrees (C)",
|
||||||
"type": "float"
|
"type": "float"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -44,12 +44,18 @@ define(
|
|||||||
*/
|
*/
|
||||||
function RemsTelemetryServerAdapter($q, $http, $log, REMS_WS_URL) {
|
function RemsTelemetryServerAdapter($q, $http, $log, REMS_WS_URL) {
|
||||||
this.localDataURI = module.uri.substring(0, module.uri.lastIndexOf('/') + 1) + LOCAL_DATA;
|
this.localDataURI = module.uri.substring(0, module.uri.lastIndexOf('/') + 1) + LOCAL_DATA;
|
||||||
this.deferreds = {};
|
|
||||||
this.REMS_WS_URL = REMS_WS_URL;
|
this.REMS_WS_URL = REMS_WS_URL;
|
||||||
this.$q = $q;
|
this.$q = $q;
|
||||||
this.$http = $http;
|
this.$http = $http;
|
||||||
this.$log = $log;
|
this.$log = $log;
|
||||||
this.cache = undefined;
|
this.cache = undefined;
|
||||||
|
|
||||||
|
this.dataTransforms = {
|
||||||
|
//Convert from pascals to millibars
|
||||||
|
'pressure': function pascalsToMillibars(pascals) {
|
||||||
|
return pascals / 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -64,9 +70,10 @@ define(
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
|
RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
|
||||||
var self = this,
|
var self = this;
|
||||||
id = request.key,
|
var id = request.key;
|
||||||
deferred = this.$q.defer();
|
var deferred = this.$q.defer();
|
||||||
|
var dataTransforms = this.dataTransforms;
|
||||||
|
|
||||||
function processResponse(response){
|
function processResponse(response){
|
||||||
var data = [];
|
var data = [];
|
||||||
@@ -82,13 +89,14 @@ define(
|
|||||||
* Check that valid data exists
|
* Check that valid data exists
|
||||||
*/
|
*/
|
||||||
if (!isNaN(solData[id])) {
|
if (!isNaN(solData[id])) {
|
||||||
|
var dataTransform = dataTransforms[id];
|
||||||
/*
|
/*
|
||||||
* Append each data point to the array of values
|
* Append each data point to the array of values
|
||||||
* for this data point property (min. temp, etc).
|
* for this data point property (min. temp, etc).
|
||||||
*/
|
*/
|
||||||
data.unshift({
|
data.unshift({
|
||||||
date: Date.parse(solData[TERRESTRIAL_DATE]),
|
date: Date.parse(solData[TERRESTRIAL_DATE]),
|
||||||
value: solData[id]
|
value: dataTransform ? dataTransform(solData[id]) : solData[id]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user