eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-14 15:49:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

hazards only on first run through after load/refresh

Browse Source 
sorting of hazards based on type tornado, hurricane, etc

5.13.0
This commit is contained in:
Matt Walsh
2024-10-08 09:52:04 -05:00
parent 019908684b
commit 80a68caa27
6 changed files with 1014 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resources/ws.min.js vendored
View File

File diff suppressed because one or more lines are too long

1544
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "ws4kp", "name": "ws4kp",
"version": "5.12.0", "version": "5.13.0",
"description": "Welcome to the WeatherStar 4000+ project page!", "description": "Welcome to the WeatherStar 4000+ project page!",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@@ -48,4 +48,4 @@
"express": "^4.17.1", "express": "^4.17.1",
"ejs": "^3.1.5" "ejs": "^3.1.5"
} }
} }

32
server/scripts/modules/hazards.mjs
View File

@@ -3,13 +3,19 @@
import STATUS from './status.mjs'; import STATUS from './status.mjs';
import { json } from './utils/fetch.mjs'; import { json } from './utils/fetch.mjs';
import WeatherDisplay from './weatherdisplay.mjs'; import WeatherDisplay from './weatherdisplay.mjs';
import { registerDisplay } from './navigation.mjs'; import { registerDisplay, msg } from './navigation.mjs';
const hazardLevels = { const hazardLevels = {
Extreme: 10, Extreme: 10,
Severe: 5, Severe: 5,
}; };
const hazardModifiers = {
'Hurricane Warning': 2,
'Tornado Warning': 3,
'Severe Thunderstorm Warning': 1,
}
class Hazards extends WeatherDisplay { class Hazards extends WeatherDisplay {
constructor(navId, elemId, defaultActive) { constructor(navId, elemId, defaultActive) {
// special height and width for scrolling // special height and width for scrolling
@@ -34,8 +40,9 @@ class Hazards extends WeatherDisplay {
url.searchParams.append('limit', 5); url.searchParams.append('limit', 5);
const alerts = await json(url, { retryCount: 3, stillWaiting: () => this.stillWaiting() }); const alerts = await json(url, { retryCount: 3, stillWaiting: () => this.stillWaiting() });
const unsortedAlerts = alerts.features ?? []; const unsortedAlerts = alerts.features ?? [];
const sortedAlerts = unsortedAlerts.sort((a, b) => (hazardLevels[b.properties.severity] ?? 0) - (hazardLevels[a.properties.severity] ?? 0)); const hasImmediate = unsortedAlerts.reduce((acc, hazard) => acc || hazard.properties.urgency === 'Immediate', false);
const filteredAlerts = sortedAlerts.filter((hazard) => hazard.properties.severity !== 'Unknown'); const sortedAlerts = unsortedAlerts.sort((a, b) => (calcSeverity(b.properties.severity, b.properties.event)) - (calcSeverity(a.properties.severity, a.properties.event)));
const filteredAlerts = sortedAlerts.filter((hazard) => hazard.properties.severity !== 'Unknown' && (!hasImmediate || (hazard.properties.urgency === 'Immediate')));
this.data = filteredAlerts; this.data = filteredAlerts;
// show alert indicator // show alert indicator
@@ -134,6 +141,25 @@ class Hazards extends WeatherDisplay {
this.getDataCallbacks.push(() => resolve(this.data)); this.getDataCallbacks.push(() => resolve(this.data));
}); });
} }
// after we roll through the hazards once, don't display again until the next refresh (10 minutes)
screenIndexFromBaseCount() {
const superValue = super.screenIndexFromBaseCount();
// false is returned when we reach the end of the scroll
if (superValue === false) {
// set total screens to zero to take this out of the rotation
this.timing.totalScreens = 0;
}
// return the value as expected
return superValue;
}
}
const calcSeverity = (severity, event) => {
// base severity plus some modifiers for specific types of warnings
const baseSeverity = hazardLevels[severity] ?? 0;
const modifiedSeverity = hazardModifiers[event] ?? 0;
return baseSeverity + modifiedSeverity;
} }
// register display // register display

364
server/scripts/modules/icons.mjs
View File

@@ -20,57 +20,57 @@ const getWeatherRegionalIconFromIconLink = (link, _isNightTime) => {
// find the icon // find the icon
switch (conditionName + (isNightTime ? '-n' : '')) { switch (conditionName + (isNightTime ? '-n' : '')) {
case 'skc': case 'skc':
case 'hot': case 'hot':
case 'haze': case 'haze':
return addPath('Sunny.gif'); return addPath('Sunny.gif');
case 'skc-n': case 'skc-n':
case 'nskc': case 'nskc':
case 'nskc-n': case 'nskc-n':
case 'cold-n': case 'cold-n':
return addPath('Clear-1992.gif'); return addPath('Clear-1992.gif');
case 'bkn': case 'bkn':
return addPath('Mostly-Cloudy-1994-2.gif'); return addPath('Mostly-Cloudy-1994-2.gif');
case 'bkn-n': case 'bkn-n':
case 'few-n': case 'few-n':
case 'nfew-n': case 'nfew-n':
case 'nfew': case 'nfew':
return addPath('Partly-Clear-1994-2.gif'); return addPath('Partly-Clear-1994-2.gif');
case 'sct': case 'sct':
case 'few': case 'few':
return addPath('Partly-Cloudy.gif'); return addPath('Partly-Cloudy.gif');
case 'sct-n': case 'sct-n':
case 'nsct': case 'nsct':
case 'nsct-n': case 'nsct-n':
return addPath('Mostly-Clear.gif'); return addPath('Mostly-Clear.gif');
case 'ovc': case 'ovc':
case 'ovc-n': case 'ovc-n':
return addPath('Cloudy.gif'); return addPath('Cloudy.gif');
case 'fog': case 'fog':
case 'fog-n': case 'fog-n':
return addPath('Fog.gif'); return addPath('Fog.gif');
case 'rain_sleet': case 'rain_sleet':
return addPath('Sleet.gif'); return addPath('Sleet.gif');
case 'rain_showers': case 'rain_showers':
case 'rain_showers_high': case 'rain_showers_high':
return addPath('Scattered-Showers-1994-2.gif'); return addPath('Scattered-Showers-1994-2.gif');
case 'rain_showers-n': case 'rain_showers-n':
case 'rain_showers_high-n': case 'rain_showers_high-n':
return addPath('Scattered-Showers-Night-1994-2.gif'); return addPath('Scattered-Showers-Night-1994-2.gif');
case 'rain': case 'rain':
case 'rain-n': case 'rain-n':
return addPath('Rain-1992.gif'); return addPath('Rain-1992.gif');
// case 'snow': // case 'snow':
// return addPath('Light-Snow.gif'); // return addPath('Light-Snow.gif');
@@ -81,75 +81,75 @@ const getWeatherRegionalIconFromIconLink = (link, _isNightTime) => {
// return addPath('AM-Snow-1994.gif'); // return addPath('AM-Snow-1994.gif');
// break; // break;
case 'snow': case 'snow':
case 'snow-n': case 'snow-n':
if (value > 50) return addPath('Heavy-Snow-1994-2.gif'); if (value > 50) return addPath('Heavy-Snow-1994-2.gif');
return addPath('Light-Snow.gif'); return addPath('Light-Snow.gif');
case 'rain_snow': case 'rain_snow':
case 'rain_snow-n': case 'rain_snow-n':
return addPath('Rain-Snow-1992.gif'); return addPath('Rain-Snow-1992.gif');
case 'snow_fzra': case 'snow_fzra':
case 'snow_fzra-n': case 'snow_fzra-n':
return addPath('Freezing-Rain-Snow-1992.gif'); return addPath('Freezing-Rain-Snow-1992.gif');
case 'fzra': case 'fzra':
case 'fzra-n': case 'fzra-n':
case 'rain_fzra': case 'rain_fzra':
case 'rain_fzra-n': case 'rain_fzra-n':
return addPath('Freezing-Rain-1992.gif'); return addPath('Freezing-Rain-1992.gif');
case 'snow_sleet': case 'snow_sleet':
case 'snow_sleet-n': case 'snow_sleet-n':
return addPath('Snow and Sleet.gif'); return addPath('Snow and Sleet.gif');
case 'sleet': case 'sleet':
case 'sleet-n': case 'sleet-n':
return addPath('Sleet.gif'); return addPath('Sleet.gif');
case 'tsra_sct': case 'tsra_sct':
case 'tsra': case 'tsra':
return addPath('Scattered-Tstorms-1994-2.gif'); return addPath('Scattered-Tstorms-1994-2.gif');
case 'tsra_sct-n': case 'tsra_sct-n':
case 'tsra-n': case 'tsra-n':
return addPath('Scattered-Tstorms-Night-1994-2.gif'); return addPath('Scattered-Tstorms-Night-1994-2.gif');
case 'tsra_hi': case 'tsra_hi':
case 'tsra_hi-n': case 'tsra_hi-n':
case 'hurricane': case 'hurricane':
case 'tropical_storm': case 'tropical_storm':
return addPath('Thunderstorm.gif'); return addPath('Thunderstorm.gif');
case 'wind': case 'wind':
case 'wind_few': case 'wind_few':
case 'wind_sct': case 'wind_sct':
case 'wind_bkn': case 'wind_bkn':
case 'wind_ovc': case 'wind_ovc':
case 'wind-n': case 'wind-n':
case 'wind_few-n': case 'wind_few-n':
case 'wind_bkn-n': case 'wind_bkn-n':
case 'wind_ovc-n': case 'wind_ovc-n':
return addPath('Wind.gif'); return addPath('Wind.gif');
case 'wind_skc': case 'wind_skc':
return addPath('Sunny-Wind-1994.gif'); return addPath('Sunny-Wind-1994.gif');
case 'wind_skc-n': case 'wind_skc-n':
case 'wind_sct-n': case 'wind_sct-n':
return addPath('Clear-Wind-1994.gif'); return addPath('Clear-Wind-1994.gif');
case 'blizzard': case 'blizzard':
case 'blizzard-n': case 'blizzard-n':
return addPath('Blowing Snow.gif'); return addPath('Blowing Snow.gif');
case 'cold': case 'cold':
return addPath('cold.gif'); return addPath('cold.gif');
default: default:
console.log(`Unable to locate regional icon for ${conditionName} ${link} ${isNightTime}`); console.log(`Unable to locate regional icon for ${conditionName} ${link} ${isNightTime}`);
return false; return false;
} }
}; };
@@ -175,58 +175,58 @@ const getWeatherIconFromIconLink = (link, _isNightTime) => {
// find the icon // find the icon
switch (conditionName + (isNightTime ? '-n' : '')) { switch (conditionName + (isNightTime ? '-n' : '')) {
case 'skc': case 'skc':
case 'hot': case 'hot':
case 'haze': case 'haze':
case 'cold': case 'cold':
return addPath('CC_Clear1.gif'); return addPath('CC_Clear1.gif');
case 'skc-n': case 'skc-n':
case 'nskc': case 'nskc':
case 'nskc-n': case 'nskc-n':
case 'cold-n': case 'cold-n':
return addPath('CC_Clear0.gif'); return addPath('CC_Clear0.gif');
case 'sct': case 'sct':
case 'few': case 'few':
case 'bkn': case 'bkn':
return addPath('CC_PartlyCloudy1.gif'); return addPath('CC_PartlyCloudy1.gif');
case 'bkn-n': case 'bkn-n':
case 'few-n': case 'few-n':
case 'nfew-n': case 'nfew-n':
case 'nfew': case 'nfew':
case 'sct-n': case 'sct-n':
case 'nsct': case 'nsct':
case 'nsct-n': case 'nsct-n':
return addPath('CC_PartlyCloudy0.gif'); return addPath('CC_PartlyCloudy0.gif');
case 'ovc': case 'ovc':
case 'novc': case 'novc':
case 'ovc-n': case 'ovc-n':
return addPath('CC_Cloudy.gif'); return addPath('CC_Cloudy.gif');
case 'fog': case 'fog':
case 'fog-n': case 'fog-n':
return addPath('CC_Fog.gif'); return addPath('CC_Fog.gif');
case 'rain_sleet': case 'rain_sleet':
case 'rain_sleet-n': case 'rain_sleet-n':
case 'sleet': case 'sleet':
case 'sleet-n': case 'sleet-n':
return addPath('Sleet.gif'); return addPath('Sleet.gif');
case 'rain_showers': case 'rain_showers':
case 'rain_showers_high': case 'rain_showers_high':
return addPath('CC_Showers.gif'); return addPath('CC_Showers.gif');
case 'rain_showers-n': case 'rain_showers-n':
case 'rain_showers_high-n': case 'rain_showers_high-n':
return addPath('CC_Showers.gif'); return addPath('CC_Showers.gif');
case 'rain': case 'rain':
case 'rain-n': case 'rain-n':
return addPath('CC_Rain.gif'); return addPath('CC_Rain.gif');
// case 'snow': // case 'snow':
// return addPath('Light-Snow.gif'); // return addPath('Light-Snow.gif');
@@ -237,58 +237,60 @@ const getWeatherIconFromIconLink = (link, _isNightTime) => {
// return addPath('AM-Snow-1994.gif'); // return addPath('AM-Snow-1994.gif');
// break; // break;
case 'snow': case 'snow':
case 'snow-n': case 'snow-n':
if (value > 50) return addPath('CC_Snow.gif'); if (value > 50) return addPath('CC_Snow.gif');
return addPath('CC_SnowShowers.gif'); return addPath('CC_SnowShowers.gif');
case 'rain_snow': case 'rain_snow':
return addPath('CC_RainSnow.gif'); return addPath('CC_RainSnow.gif');
case 'snow_fzra': case 'snow_fzra':
case 'snow_fzra-n': case 'snow_fzra-n':
case 'fzra': case 'fzra':
case 'fzra-n': case 'fzra-n':
case 'rain_fzra': case 'rain_fzra':
case 'rain_fzra-n': case 'rain_fzra-n':
return addPath('CC_FreezingRain.gif'); return addPath('CC_FreezingRain.gif');
case 'snow_sleet': case 'snow_sleet':
return addPath('Snow-Sleet.gif'); return addPath('Snow-Sleet.gif');
case 'tsra_sct': case 'tsra_sct':
case 'tsra': case 'tsra':
return addPath('EF_ScatTstorms.gif'); return addPath('EF_ScatTstorms.gif');
case 'tsra_sct-n': case 'tsra_sct-n':
case 'tsra-n': case 'tsra-n':
return addPath('CC_TStorm.gif'); return addPath('CC_TStorm.gif');
case 'tsra_hi': case 'tsra_hi':
case 'tsra_hi-n': case 'tsra_hi-n':
case 'hurricane': case 'hurricane':
case 'tropical_storm': case 'tropical_storm':
return addPath('CC_TStorm.gif'); case 'hurricane-n':
case 'tropical_storm-n':
return addPath('CC_TStorm.gif');
case 'wind_few': case 'wind_few':
case 'wind_sct': case 'wind_sct':
case 'wind_bkn': case 'wind_bkn':
case 'wind_ovc': case 'wind_ovc':
case 'wind_skc': case 'wind_skc':
case 'wind_few-n': case 'wind_few-n':
case 'wind_bkn-n': case 'wind_bkn-n':
case 'wind_ovc-n': case 'wind_ovc-n':
case 'wind_skc-n': case 'wind_skc-n':
case 'wind_sct-n': case 'wind_sct-n':
return addPath('CC_Windy.gif'); return addPath('CC_Windy.gif');
case 'blizzard': case 'blizzard':
case 'blizzard-n': case 'blizzard-n':
return addPath('Blowing-Snow.gif'); return addPath('Blowing-Snow.gif');
default: default:
console.log(`Unable to locate icon for ${conditionName} ${link} ${isNightTime}`); console.log(`Unable to locate icon for ${conditionName} ${link} ${isNightTime}`);
return false; return false;
} }
}; };