add history, system, ASL

oyve · May 18, 2021 · fb1a13f · fb1a13f
1 parent 0e00619
commit fb1a13f
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 3 deletions.
diff --git a/barometer.js b/barometer.js
@@ -7,8 +7,8 @@ const ENVIRONMENT_WIND_TWD = 'environment.wind.directionTrue';
 const NAVIGATION_POSITION = 'navigation.position';
 const NAVIGATION_ALTITUDE = 'navigation.gnss.antennaAltitude';
 
-const ONE_MINUTE_MILLISECONDS = 60 * 1000;
-const TEN_SECONDS_MILLISECONDS = 10 * 1000;
+const ONE_MINUTE_MILLISECONDS = secondsToMilliseconds(60);
+const TEN_SECONDS_MILLISECONDS = secondsToMilliseconds(10);
 
 const KELVIN = 273.15;
 
@@ -20,6 +20,10 @@ const SUBSCRIPTIONS = [
     { path: ENVIRONMENT_OUTSIDE_PRESSURE, period: ONE_MINUTE_MILLISECONDS }
 ];
 
+function secondsToMilliseconds(seconds) {
+    return seconds * 1000;
+}
+
 const pathPrefix = "environment.outside.pressure.";
 
 const OUTPUT_PATHS = {
@@ -40,7 +44,17 @@ const OUTPUT_PATHS = {
 
     "PREDICTION_FRONT_TENDENCY": pathPrefix + "prediction.front.tendency",
     "PREDICTION_FRONT_PROGNOSE": pathPrefix + "prediction.front.prognose",
-    "PREDICTION_FRONT_WIND": pathPrefix + "prediction.front.wind"
+    "PREDICTION_FRONT_WIND": pathPrefix + "prediction.front.wind",
+
+    "ASL": pathPrefix + "ASL",
+    "SYSTEM": pathPrefix + "system",
+
+    "HISTORY_1HR": pathPrefix + "1hr",
+    "HISTORY_3HR": pathPrefix + "3hr",
+    "HISTORY_6HR": pathPrefix + "6hr",
+    "HISTORY_12HR": pathPrefix + "12hr",
+    "HISTORY_24HR": pathPrefix + "24hr",
+    "HISTORY_48HR": pathPrefix + "48hr",
 }
 
 const latest = {
@@ -181,9 +195,27 @@ function prepareUpdate(forecast) {
         buildDeltaUpdate(OUTPUT_PATHS.PREDICTION_FRONT_TENDENCY, forecast !== null ? forecast.predictions.front.tendency : waitingMessage),
         buildDeltaUpdate(OUTPUT_PATHS.PREDICTION_FRONT_PROGNOSE, forecast !== null ? forecast.predictions.front.prognose : waitingMessage),
         buildDeltaUpdate(OUTPUT_PATHS.PREDICTION_FRONT_WIND, forecast !== null ? forecast.predictions.front.wind : waitingMessage),
+
+        buildDeltaUpdate(OUTPUT_PATHS.SYSTEM, forecast !== null ? forecast.system.name : null),
+        buildDeltaUpdate(OUTPUT_PATHS.ASL, forecast !== null ? forecast.lastPressure.value : null),
+
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_1HR, forecast !== null ? getHistory(forecast, 1) : waitingMessage),
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_3HR, forecast !== null ? getHistory(forecast, 3) : waitingMessage),
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_6HR, forecast !== null ? getHistory(forecast, 6) : waitingMessage),
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_12HR, forecast !== null ? getHistory(forecast, 12) : waitingMessage),
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_24HR, forecast !== null ? getHistory(forecast, 24) : waitingMessage),
+        buildDeltaUpdate(OUTPUT_PATHS.HISTORY_48HR, forecast !== null ? getHistory(forecast, 48) : waitingMessage),
     ];
 }
 
+function getHistory(forecast, hour) {
+    let history = forecast.history.find((h) => h.hour === hour);
+
+    if(history === null || history.pressure === null) return null;
+
+    return history.pressure.value;
+}
+
 function buildDeltaUpdate(path, value) {
     return {
         path: path,

diff --git a/test/index-test.js b/test/index-test.js
@@ -219,6 +219,35 @@ describe("Barometer Tests", function () {
         });
     });
 
+    describe("System Tests", function () {
+        it("System is correct", function () {
+            //arrange
+            barometer.clear();
+            const expected = "Normal";
+            barometer.onDeltasUpdate(createDeltaMockPressure(101549));
+            //act
+            let actual = barometer.onDeltasUpdate(createDeltaMockPressure(101500));
+            //assert
+            assert.strictEqual(actual.find((f) => f.path === barometer.OUTPUT_PATHS.SYSTEM).value, expected);
+
+        });
+    });
+
+    describe("ASL Tests", function () {
+        it("ASL is correct", function () {
+            //arrange
+            barometer.clear();
+            const expectedASL = 102649;
+            barometer.onDeltasUpdate(createDeltaMockPressure(101500));
+            barometer.onDeltasUpdate(createDeltaMockTemperature(30));
+            barometer.onDeltasUpdate(createDeltaMockAltitude(100));
+            //act
+            let actual = barometer.onDeltasUpdate(createDeltaMockPressure(101500));
+            //assert
+            assert.strictEqual(actual.find((f) => f.path === barometer.OUTPUT_PATHS.ASL).value, expectedASL);
+
+        });
+    });
 
 });