@signalk/freeboard-sk 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG: Freeboard
 
+### v2.2.1
+
+- **Fixed**: Issue where waypoint was not centered on the screen when the center waypoint button was clicked from the entry in the waypoint list.
+
+- **Fixed**: Issue where invalid fixed location postion was being written to settings.
+
+
 ### v2.2.0
 
 - **Added**: Ability to center a vessel in the Vessels List.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/freeboard-sk",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Openlayers chart plotter implementation for Signal K",
   "keywords": [
     "signalk-webapp",
@@ -20,9 +20,7 @@
     "build": "ng build",
     "test": "ng test",
     "format": "prettier --ignore-path .gitignore --write \"src/**/*.+(ts|html)\"",
-    "format:projects": "prettier --ignore-path .gitignore --write \"projects/**/*.+(ts|html)\"",
     "format:helper": "prettier --ignore-path .gitignore --write \"helper/**/*.+(ts|html)\"",
-    "e2e": "ng e2e",
     "build:helper": "tsc -p tsconfig-helper.json",
     "build:web": "ng build -c production --output-hashing all",
     "build:all": "npm run build:helper && npm run build:web",
@@ -44,19 +42,19 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.0.1",
-    "@angular/animations": "^14.0.1",
-    "@angular/cdk": "^14.0.1",
-    "@angular/cli": "^14.0.1",
-    "@angular/common": "^14.0.1",
-    "@angular/compiler": "^14.0.1",
-    "@angular/compiler-cli": "^14.0.1",
-    "@angular/core": "^14.0.1",
-    "@angular/forms": "^14.0.1",
-    "@angular/language-service": "^14.0.1",
-    "@angular/material": "^14.0.1",
-    "@angular/platform-browser": "^14.0.1",
-    "@angular/platform-browser-dynamic": "^14.0.1",
+    "@angular-devkit/build-angular": "^16.2.0",
+    "@angular/animations": "^16.2.0",
+    "@angular/cdk": "^16.2.0",
+    "@angular/cli": "^16.2.0",
+    "@angular/common": "^16.2.0",
+    "@angular/compiler": "^16.2.0",
+    "@angular/compiler-cli": "^16.2.0",
+    "@angular/core": "^16.2.0",
+    "@angular/forms": "^16.2.0",
+    "@angular/language-service": "^16.2.0",
+    "@angular/material": "^16.2.0",
+    "@angular/platform-browser": "^16.2.0",
+    "@angular/platform-browser-dynamic": "^16.2.0",
     "@kolkov/angular-editor": "^2.1.0",
     "@signalk/server-api": "^2.0.0",
     "@types/arcgis-rest-api": "^10.4.5",
@@ -78,7 +76,7 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^14.0.2",
+    "ng-packagr": "^16.2.0",
     "ngeohash": "^0.6.3",
     "ol": "^7.4.0",
     "pmtiles": "^2.7.0",
@@ -91,7 +89,7 @@
     "signalk-worker-angular": "^1.1.4",
     "simplify-ts": "^1.0.2",
     "ts-node": "~7.0.0",
-    "typescript": "~4.7.3",
-    "zone.js": "~0.11.4"
+    "typescript": "~4.9.5",
+    "zone.js": "~0.13.1"
   }
-}
+}

package/plugin/alarms/alarms.js

@@ -77,7 +77,6 @@ const initAlarmEndpoints = () => {
     });
 };
 const handlePutAlarmState = (context, path, value) => {
-    var _a, _b;
     server.debug(context);
     server.debug(path);
     server.debug(JSON.stringify(value));
@@ -95,7 +94,7 @@ const handlePutAlarmState = (context, path, value) => {
     server.debug(JSON.stringify(alarmType));
     let noti;
     if (value) {
-        noti = new types_1.Notification(alarmType, buildAlarmMessage(value.message, alarmType), (_a = value.state) !== null && _a !== void 0 ? _a : null, (_b = value.method) !== null && _b !== void 0 ? _b : null);
+        noti = new types_1.Notification(alarmType, buildAlarmMessage(value.message, alarmType), value.state ?? null, value.method ?? null);
     }
     else {
         noti = {
@@ -123,7 +122,7 @@ const buildAlarmMessage = (message, alarmType) => {
     if (['mob', 'sinking'].includes(alarmType)) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const pos = server.getSelfPath('navigation.position');
-        msgAttrib = pos ? JSON.stringify(pos === null || pos === void 0 ? void 0 : pos.value) : '';
+        msgAttrib = pos ? JSON.stringify(pos?.value) : '';
     }
     return `${message}\n\r${msgAttrib}`;
 };

package/plugin/index.js

@@ -122,32 +122,31 @@ module.exports = (server) => {
     };
     // ************************************
     const doStartup = (options) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         try {
             server.debug(`${plugin.name} starting.......`);
             if (typeof options !== 'undefined') {
                 settings = options;
             }
-            settings.weather = (_a = options.weather) !== null && _a !== void 0 ? _a : {
+            settings.weather = options.weather ?? {
                 enable: false,
                 apiKey: '',
                 service: 'openweather'
             };
-            settings.weather.enable = (_b = options.weather.enable) !== null && _b !== void 0 ? _b : false;
-            settings.weather.apiKey = (_c = options.weather.apiKey) !== null && _c !== void 0 ? _c : '';
-            settings.weather.service = (_d = options.weather.service) !== null && _d !== void 0 ? _d : 'openweather';
-            settings.alarms = (_e = options.alarms) !== null && _e !== void 0 ? _e : {
+            settings.weather.enable = options.weather.enable ?? false;
+            settings.weather.apiKey = options.weather.apiKey ?? '';
+            settings.weather.service = options.weather.service ?? 'openweather';
+            settings.alarms = options.alarms ?? {
                 enable: true
             };
-            settings.alarms.enable = (_f = options.alarms.enable) !== null && _f !== void 0 ? _f : true;
-            settings.pypilot = (_g = options.pypilot) !== null && _g !== void 0 ? _g : {
+            settings.alarms.enable = options.alarms.enable ?? true;
+            settings.pypilot = options.pypilot ?? {
                 enable: false,
                 host: 'localhost',
                 port: 8000
             };
-            settings.pypilot.enable = (_h = options.pypilot.enable) !== null && _h !== void 0 ? _h : false;
-            settings.pypilot.host = (_j = options.pypilot.host) !== null && _j !== void 0 ? _j : 'localhost';
-            settings.pypilot.port = (_k = options.pypilot.port) !== null && _k !== void 0 ? _k : 8000;
+            settings.pypilot.enable = options.pypilot.enable ?? false;
+            settings.pypilot.host = options.pypilot.host ?? 'localhost';
+            settings.pypilot.port = options.pypilot.port ?? 8000;
             server.debug(`Applied config: ${JSON.stringify(settings)}`);
             if (settings.alarms.enable) {
                 (0, alarms_1.initAlarms)(server, plugin.id);

package/plugin/lib/noaa.js

@@ -2,7 +2,6 @@
 // NOAA
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NOAA = void 0;
-const tslib_1 = require("tslib");
 const fetch_1 = require("./fetch");
 var CARDINAL_POINTS;
 (function (CARDINAL_POINTS) {
@@ -24,55 +23,8 @@ var CARDINAL_POINTS;
     CARDINAL_POINTS[CARDINAL_POINTS["NNW"] = 337.5] = "NNW";
 })(CARDINAL_POINTS || (CARDINAL_POINTS = {}));
 class NOAA {
+    settings;
     constructor(config) {
-        this.fetchData = (position) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
-            const url = this.getUrl(position);
-            try {
-                //console.log(`url`, url)
-                const response = yield (0, fetch_1.fetch)(url);
-                let forecasts = [];
-                let observations = [];
-                // observations
-                if ((_a = response === null || response === void 0 ? void 0 : response.properties) === null || _a === void 0 ? void 0 : _a.observationStations) {
-                    const stations = yield (0, fetch_1.fetch)(response.properties.observationStations);
-                    observations = yield (0, fetch_1.fetch)(`${stations.features[0].id}/observations/latest`);
-                    //console.log(`observations`, observations)
-                }
-                // forecasts
-                if ((_b = response === null || response === void 0 ? void 0 : response.properties) === null || _b === void 0 ? void 0 : _b.forecastHourly) {
-                    forecasts = yield (0, fetch_1.fetch)(response.properties.forecastHourly);
-                    //console.log(`forecasts`, forecasts)
-                }
-                // warnings
-                const warnings = yield (0, fetch_1.fetch)(`https://api.weather.gov/alerts/active?point=${position.latitude.toFixed(4)},${position.longitude.toFixed(4)}`);
-                //console.log(`warnings`, warnings)
-                return this.parseResponse({
-                    position: position,
-                    forecasts: (_d = (_c = forecasts === null || forecasts === void 0 ? void 0 : forecasts.properties) === null || _c === void 0 ? void 0 : _c.periods) !== null && _d !== void 0 ? _d : [],
-                    observations: (_e = observations === null || observations === void 0 ? void 0 : observations.properties) !== null && _e !== void 0 ? _e : null,
-                    warnings: (_f = warnings === null || warnings === void 0 ? void 0 : warnings.features) !== null && _f !== void 0 ? _f : []
-                });
-            }
-            catch (error) {
-                throw error;
-            }
-        });
-        this.parseResponse = (wData) => {
-            return {
-                self: {
-                    id: 'self',
-                    name: 'Weather data relative to supplied position.',
-                    position: {
-                        latitude: wData.latitude,
-                        longitude: wData.longitude
-                    },
-                    observations: this.parseNoaaObservations(wData.observations),
-                    forecasts: this.parseNoaaForecasts(wData.forecasts),
-                    warnings: this.parseNoaaWarnings(wData.warnings)
-                }
-            };
-        };
         this.settings = config;
     }
     getUrl(position) {
@@ -84,14 +36,60 @@ class NOAA {
             return `${api}/${position.latitude.toFixed(4)},${position.longitude.toFixed(4)}`;
         }
     }
+    fetchData = async (position) => {
+        const url = this.getUrl(position);
+        try {
+            //console.log(`url`, url)
+            const response = await (0, fetch_1.fetch)(url);
+            let forecasts = [];
+            let observations = [];
+            // observations
+            if (response?.properties?.observationStations) {
+                const stations = await (0, fetch_1.fetch)(response.properties.observationStations);
+                observations = await (0, fetch_1.fetch)(`${stations.features[0].id}/observations/latest`);
+                //console.log(`observations`, observations)
+            }
+            // forecasts
+            if (response?.properties?.forecastHourly) {
+                forecasts = await (0, fetch_1.fetch)(response.properties.forecastHourly);
+                //console.log(`forecasts`, forecasts)
+            }
+            // warnings
+            const warnings = await (0, fetch_1.fetch)(`https://api.weather.gov/alerts/active?point=${position.latitude.toFixed(4)},${position.longitude.toFixed(4)}`);
+            //console.log(`warnings`, warnings)
+            return this.parseResponse({
+                position: position,
+                forecasts: forecasts?.properties?.periods ?? [],
+                observations: observations?.properties ?? null,
+                warnings: warnings?.features ?? []
+            });
+        }
+        catch (error) {
+            throw error;
+        }
+    };
+    parseResponse = (wData) => {
+        return {
+            self: {
+                id: 'self',
+                name: 'Weather data relative to supplied position.',
+                position: {
+                    latitude: wData.latitude,
+                    longitude: wData.longitude
+                },
+                observations: this.parseNoaaObservations(wData.observations),
+                forecasts: this.parseNoaaForecasts(wData.forecasts),
+                warnings: this.parseNoaaWarnings(wData.warnings)
+            }
+        };
+    };
     parseNoaaObservations(wData) {
-        var _a, _b;
         const data = [];
         const obs = {};
         let v;
         if (wData) {
-            obs.timestamp = (_a = wData.timestamp) !== null && _a !== void 0 ? _a : null;
-            obs.description = (_b = wData.textDescription) !== null && _b !== void 0 ? _b : null;
+            obs.timestamp = wData.timestamp ?? null;
+            obs.description = wData.textDescription ?? null;
             v = wData.visibility.value
                 ? wData.visibility.unitCode === 'wmoUnit:m'
                     ? wData.visibility.value
@@ -176,10 +174,9 @@ class NOAA {
         const data = [];
         if (forecasts && Array.isArray(forecasts)) {
             forecasts.forEach((f) => {
-                var _a, _b, _c;
                 const forecast = {};
-                forecast.timestamp = (_a = f.startTime) !== null && _a !== void 0 ? _a : null;
-                forecast.description = (_b = f.shortForecast) !== null && _b !== void 0 ? _b : null;
+                forecast.timestamp = f.startTime ?? null;
+                forecast.description = f.shortForecast ?? null;
                 forecast.temperature = {};
                 forecast.temperature.air = {
                     value: typeof f.temperature !== 'undefined'
@@ -189,7 +186,7 @@ class NOAA {
                 };
                 forecast.wind = {};
                 forecast.wind.speed = {
-                    value: (_c = parseInt(f.windSpeed.split(' ')[0]) / 2.237) !== null && _c !== void 0 ? _c : null,
+                    value: parseInt(f.windSpeed.split(' ')[0]) / 2.237 ?? null,
                     units: 'm/s'
                 };
                 const wd = f.windDirection
@@ -208,13 +205,12 @@ class NOAA {
         const data = [];
         if (alerts && Array.isArray(alerts)) {
             alerts.forEach((alert) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 const warn = {
-                    startTime: (_b = (_a = alert === null || alert === void 0 ? void 0 : alert.properties) === null || _a === void 0 ? void 0 : _a.effective) !== null && _b !== void 0 ? _b : null,
-                    endTime: (_d = (_c = alert === null || alert === void 0 ? void 0 : alert.properties) === null || _c === void 0 ? void 0 : _c.ends) !== null && _d !== void 0 ? _d : null,
-                    details: (_f = (_e = alert === null || alert === void 0 ? void 0 : alert.properties) === null || _e === void 0 ? void 0 : _e.description) !== null && _f !== void 0 ? _f : null,
-                    source: (_h = (_g = alert === null || alert === void 0 ? void 0 : alert.properties) === null || _g === void 0 ? void 0 : _g.senderName) !== null && _h !== void 0 ? _h : null,
-                    type: (_k = (_j = alert === null || alert === void 0 ? void 0 : alert.properties) === null || _j === void 0 ? void 0 : _j.messageType) !== null && _k !== void 0 ? _k : null
+                    startTime: alert?.properties?.effective ?? null,
+                    endTime: alert?.properties?.ends ?? null,
+                    details: alert?.properties?.description ?? null,
+                    source: alert?.properties?.senderName ?? null,
+                    type: alert?.properties?.messageType ?? null
                 };
                 data.push(warn);
             });

package/plugin/lib/openweather.js

@@ -2,35 +2,10 @@
 // OpenWeather
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenWeather = void 0;
-const tslib_1 = require("tslib");
 const fetch_1 = require("./fetch");
 class OpenWeather {
+    settings;
     constructor(config) {
-        this.fetchData = (position) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const url = this.getUrl(position);
-            try {
-                const response = yield (0, fetch_1.fetch)(url);
-                return this.parseResponse(response);
-            }
-            catch (error) {
-                throw error;
-            }
-        });
-        this.parseResponse = (owData) => {
-            return {
-                self: {
-                    id: 'self',
-                    name: 'Weather data relative to supplied position.',
-                    position: {
-                        latitude: owData.lat,
-                        longitude: owData.lon
-                    },
-                    observations: this.parseOWObservations(owData),
-                    forecasts: this.parseOWForecasts(owData),
-                    warnings: this.parseOWWarnings(owData)
-                }
-            };
-        };
         this.settings = config;
     }
     getUrl(position) {
@@ -42,8 +17,32 @@ class OpenWeather {
             return `${api}?lat=${position.latitude}&lon=${position.longitude}&exclude=minutely,daily&appid=${this.settings.apiKey}`;
         }
     }
+    fetchData = async (position) => {
+        const url = this.getUrl(position);
+        try {
+            const response = await (0, fetch_1.fetch)(url);
+            return this.parseResponse(response);
+        }
+        catch (error) {
+            throw error;
+        }
+    };
+    parseResponse = (owData) => {
+        return {
+            self: {
+                id: 'self',
+                name: 'Weather data relative to supplied position.',
+                position: {
+                    latitude: owData.lat,
+                    longitude: owData.lon
+                },
+                observations: this.parseOWObservations(owData),
+                forecasts: this.parseOWForecasts(owData),
+                warnings: this.parseOWWarnings(owData)
+            }
+        };
+    };
     parseOWObservations(owData) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         //server.debug(JSON.stringify(weatherData.current))
         const data = [];
         const obs = {};
@@ -52,32 +51,32 @@ class OpenWeather {
             obs.timestamp = current.dt
                 ? new Date(current.dt * 1000).toISOString()
                 : null;
-            obs.description = (_a = current.weather[0].description) !== null && _a !== void 0 ? _a : null;
-            obs.sunrise = (_b = new Date(current.sunrise * 1000).toISOString()) !== null && _b !== void 0 ? _b : null;
-            obs.sunset = (_c = new Date(current.sunset * 1000).toISOString()) !== null && _c !== void 0 ? _c : null;
+            obs.description = current.weather[0].description ?? null;
+            obs.sunrise = new Date(current.sunrise * 1000).toISOString() ?? null;
+            obs.sunset = new Date(current.sunset * 1000).toISOString() ?? null;
             obs.uvIndex = {
-                value: (_d = current.uvi) !== null && _d !== void 0 ? _d : null,
+                value: current.uvi ?? null,
                 units: null
             };
             obs.clouds = {
-                value: (_e = current.clouds) !== null && _e !== void 0 ? _e : null,
+                value: current.clouds ?? null,
                 units: '%'
             };
             obs.visibility = {
-                value: (_f = current.visibility) !== null && _f !== void 0 ? _f : null,
+                value: current.visibility ?? null,
                 units: 'm'
             };
             obs.temperature = {};
             obs.temperature.air = {
-                value: (_g = current.temp) !== null && _g !== void 0 ? _g : null,
+                value: current.temp ?? null,
                 units: 'K'
             };
             obs.temperature.feelsLike = {
-                value: (_h = current.feels_like) !== null && _h !== void 0 ? _h : null,
+                value: current.feels_like ?? null,
                 units: 'K'
             };
             obs.temperature.dewPoint = {
-                value: (_j = current.dew_point) !== null && _j !== void 0 ? _j : null,
+                value: current.dew_point ?? null,
                 units: 'K'
             };
             obs.pressure = {};
@@ -87,12 +86,12 @@ class OpenWeather {
             };
             obs.humidity = {};
             obs.humidity.absolute = {
-                value: (_k = current.humidity) !== null && _k !== void 0 ? _k : null,
+                value: current.humidity ?? null,
                 units: '%'
             };
             obs.wind = {};
             obs.wind.speed = {
-                value: (_l = current.wind_speed) !== null && _l !== void 0 ? _l : null,
+                value: current.wind_speed ?? null,
                 units: 'm/s'
             };
             obs.wind.direction = {
@@ -127,47 +126,46 @@ class OpenWeather {
         if (owData && owData[period] && Array.isArray(owData[period])) {
             const forecasts = owData[period];
             forecasts.forEach((f) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
                 const forecast = {};
                 forecast.timestamp = f.dt ? new Date(f.dt * 1000).toISOString() : null;
-                forecast.description = (_a = f.weather[0].description) !== null && _a !== void 0 ? _a : null;
+                forecast.description = f.weather[0].description ?? null;
                 forecast.temperature = {};
                 forecast.temperature.air = {
-                    value: (_b = f.temp) !== null && _b !== void 0 ? _b : null,
+                    value: f.temp ?? null,
                     units: 'K'
                 };
                 if (period === 'daily') {
-                    forecast.sunrise = (_c = new Date(f.sunrise * 1000).toISOString()) !== null && _c !== void 0 ? _c : null;
-                    forecast.sunset = (_d = new Date(f.sunset * 1000).toISOString()) !== null && _d !== void 0 ? _d : null;
+                    forecast.sunrise = new Date(f.sunrise * 1000).toISOString() ?? null;
+                    forecast.sunset = new Date(f.sunset * 1000).toISOString() ?? null;
                     forecast.temperature.minimum = {
-                        value: (_e = f.temp.min) !== null && _e !== void 0 ? _e : null,
+                        value: f.temp.min ?? null,
                         units: 'K'
                     };
                     forecast.temperature.maximum = {
-                        value: (_f = f.temp.max) !== null && _f !== void 0 ? _f : null,
+                        value: f.temp.max ?? null,
                         units: 'K'
                     };
                     forecast.temperature.feelsLike = {
-                        value: (_g = f.feels_like.day) !== null && _g !== void 0 ? _g : null,
+                        value: f.feels_like.day ?? null,
                         units: 'K'
                     };
                 }
                 else {
                     forecast.temperature.feelsLike = {
-                        value: (_h = f.feels_like) !== null && _h !== void 0 ? _h : null,
+                        value: f.feels_like ?? null,
                         units: 'K'
                     };
                 }
                 forecast.temperature.dewPoint = {
-                    value: (_j = f.dew_point) !== null && _j !== void 0 ? _j : null,
+                    value: f.dew_point ?? null,
                     units: 'K'
                 };
                 forecast.uvIndex = {
-                    value: (_k = f.uvi) !== null && _k !== void 0 ? _k : null,
+                    value: f.uvi ?? null,
                     units: null
                 };
                 forecast.clouds = {
-                    value: (_l = f.clouds) !== null && _l !== void 0 ? _l : null,
+                    value: f.clouds ?? null,
                     units: '%'
                 };
                 forecast.pop = {
@@ -180,12 +178,12 @@ class OpenWeather {
                 };
                 forecast.humidity = {};
                 forecast.humidity.absolute = {
-                    value: (_m = f.humidity) !== null && _m !== void 0 ? _m : null,
+                    value: f.humidity ?? null,
                     units: '%'
                 };
                 forecast.wind = {};
                 forecast.wind.speed = {
-                    value: (_o = f.wind_speed) !== null && _o !== void 0 ? _o : null,
+                    value: f.wind_speed ?? null,
                     units: 'm/s'
                 };
                 forecast.wind.direction = {
@@ -195,7 +193,7 @@ class OpenWeather {
                     units: 'rad'
                 };
                 forecast.wind.gust = {
-                    value: (_p = f.wind_gust) !== null && _p !== void 0 ? _p : null,
+                    value: f.wind_gust ?? null,
                     units: 'm/s'
                 };
                 forecast.precipitation = {
@@ -221,7 +219,6 @@ class OpenWeather {
         if (owData && owData.alerts) {
             const alerts = owData.alerts;
             alerts.forEach((alert) => {
-                var _a, _b, _c;
                 const warn = {
                     startTime: alert.start
                         ? new Date(alert.start * 1000).toISOString()
@@ -229,9 +226,9 @@ class OpenWeather {
                     endTime: alert.end
                         ? new Date(alert.start * 1000).toISOString()
                         : null,
-                    details: (_a = alert.description) !== null && _a !== void 0 ? _a : null,
-                    source: (_b = alert.sender_name) !== null && _b !== void 0 ? _b : null,
-                    type: (_c = alert.event) !== null && _c !== void 0 ? _c : null
+                    details: alert.description ?? null,
+                    source: alert.sender_name ?? null,
+                    type: alert.event ?? null
                 };
                 data.push(warn);
             });

package/plugin/lib/types.js

@@ -18,15 +18,15 @@ var ALARM_METHOD;
 })(ALARM_METHOD = exports.ALARM_METHOD || (exports.ALARM_METHOD = {}));
 // Class encapsulating Signal K Notification
 class Notification {
+    _message = {
+        path: `notifications.`,
+        value: {
+            state: ALARM_STATE.alarm,
+            method: [ALARM_METHOD.sound, ALARM_METHOD.visual],
+            message: 'Alarm!'
+        }
+    };
     constructor(path, msg, state, method) {
-        this._message = {
-            path: `notifications.`,
-            value: {
-                state: ALARM_STATE.alarm,
-                method: [ALARM_METHOD.sound, ALARM_METHOD.visual],
-                message: 'Alarm!'
-            }
-        };
         this._message.path += path;
         this._message.value.message = msg;
         if (state) {

package/plugin/weather.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWeather = exports.listWeather = exports.stopWeather = exports.initWeather = exports.WEATHER_SERVICES = void 0;
-const tslib_1 = require("tslib");
 const types_1 = require("./lib/types");
 const openweather_1 = require("./lib/openweather");
 const noaa_1 = require("./lib/noaa");
@@ -41,7 +40,7 @@ const stopWeather = () => {
 };
 exports.stopWeather = stopWeather;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const listWeather = (params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const listWeather = async (params) => {
     server.debug(`getWeather ${JSON.stringify(params)}`);
     const res = {};
     if (weatherData) {
@@ -51,11 +50,11 @@ const listWeather = (params) => tslib_1.__awaiter(void 0, void 0, void 0, functi
         }
     }
     return res;
-});
+};
 exports.listWeather = listWeather;
-const getWeather = (path, property
+const getWeather = async (path, property
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+) => {
     server.debug(`getWeather ${path}, ${property}`);
     if (!weatherData) {
         return {};
@@ -68,12 +67,12 @@ const getWeather = (path, property
         const value = property.split('.').reduce((acc, val) => {
             return acc[val];
         }, station);
-        return value !== null && value !== void 0 ? value : {};
+        return value ?? {};
     }
     else {
         return station;
     }
-});
+};
 exports.getWeather = getWeather;
 const fetchWeatherData = () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -155,7 +154,6 @@ const checkForWarnings = () => {
 };
 // emit weather warning notification
 const emitWarningNotification = (warning) => {
-    var _a;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let delta;
     if (warning) {
@@ -168,7 +166,7 @@ const emitWarningNotification = (warning) => {
                 method: [types_1.ALARM_METHOD.visual],
                 message: warning.details
                     ? warning.details
-                    : (_a = warning.type) !== null && _a !== void 0 ? _a : warning.source
+                    : warning.type ?? warning.source
             }
         };
     }