Merge branch 'open1077' into 1435-integration

This commit is contained in:
Pete Richards
2017-02-21 17:22:36 -08:00
28 changed files with 1534 additions and 1619 deletions

View File

@@ -75,8 +75,7 @@ define([
},
{
"key": "delta",
"name": "Delta",
"format": "example.delta"
"name": "Delta"
}
],
"priority": -1
@@ -103,11 +102,13 @@ define([
"domains": [
{
"key": "utc",
"name": "Time"
"name": "Time",
"format": "utc"
},
{
"key": "yesterday",
"name": "Yesterday"
"name": "Yesterday",
"format": "utc"
},
{
"key": "delta",

View File

@@ -24,6 +24,7 @@
(function () {
var FIFTEEN_MINUTES = 15 * 60 * 1000;
var handlers = {
subscribe: onSubscribe,
@@ -51,6 +52,7 @@
function onSubscribe(message) {
var data = message.data;
// Keep
var start = Date.now();
var step = 1000 / data.dataRateInHz;
var nextStep = start - (start % step) + step;
@@ -82,8 +84,11 @@
function onRequest(message) {
var data = message.data;
if (!data.start || !data.end) {
throw new Error('missing start and end!');
if (data.end == undefined) {
data.end = Date.now();
}
if (data.start == undefined){
data.start = data.end - FIFTEEN_MINUTES;
}
var now = Date.now();