merge
This commit is contained in:
commit
88b8b4a82e
10 changed files with 43 additions and 35 deletions
|
|
@ -29,6 +29,9 @@ module.exports = {
|
||||||
indent: [
|
indent: [
|
||||||
'error',
|
'error',
|
||||||
'tab',
|
'tab',
|
||||||
|
{
|
||||||
|
SwitchCase: 1
|
||||||
|
},
|
||||||
],
|
],
|
||||||
'no-tabs': 0,
|
'no-tabs': 0,
|
||||||
'no-console': 0,
|
'no-console': 0,
|
||||||
|
|
|
||||||
7
.vscode/settings.json
vendored
7
.vscode/settings.json
vendored
|
|
@ -7,8 +7,6 @@
|
||||||
"format": "compressed",
|
"format": "compressed",
|
||||||
"extensionName": ".css",
|
"extensionName": ".css",
|
||||||
"savePath": "/server/styles",
|
"savePath": "/server/styles",
|
||||||
"savePathSegmentKeys": null,
|
|
||||||
"savePathReplaceSegmentsWith": null
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"search.exclude": {
|
"search.exclude": {
|
||||||
|
|
@ -21,5 +19,8 @@
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": "explicit"
|
"source.fixAll.eslint": "explicit"
|
||||||
}
|
},
|
||||||
|
"eslint.validate": [
|
||||||
|
"javascript"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
2
dist/index.html
vendored
2
dist/index.html
vendored
File diff suppressed because one or more lines are too long
2
dist/resources/ws.min.js
vendored
2
dist/resources/ws.min.js
vendored
File diff suppressed because one or more lines are too long
4
package-lock.json
generated
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ws4kp",
|
"name": "ws4kp",
|
||||||
"version": "5.13.0",
|
"version": "5.13.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ws4kp",
|
"name": "ws4kp",
|
||||||
"version": "5.13.0",
|
"version": "5.13.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ejs": "^3.1.5",
|
"ejs": "^3.1.5",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ws4kp",
|
"name": "ws4kp",
|
||||||
"version": "5.13.0",
|
"version": "5.13.3",
|
||||||
"description": "Welcome to the WeatherStar 4000+ project page!",
|
"description": "Welcome to the WeatherStar 4000+ project page!",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,9 @@ class CurrentWeather extends WeatherDisplay {
|
||||||
|| observations.features[0].properties.windSpeed.value === null
|
|| observations.features[0].properties.windSpeed.value === null
|
||||||
|| observations.features[0].properties.textDescription === null
|
|| observations.features[0].properties.textDescription === null
|
||||||
|| observations.features[0].properties.textDescription === ''
|
|| observations.features[0].properties.textDescription === ''
|
||||||
|| observations.features[0].properties.icon === null) {
|
|| observations.features[0].properties.icon === null
|
||||||
|
|| observations.features[0].properties.dewpoint.value === null
|
||||||
|
|| observations.features[0].properties.barometricPressure.value === null) {
|
||||||
observations = undefined;
|
observations = undefined;
|
||||||
throw new Error(`Unable to get observations: ${station.properties.stationIdentifier}, trying next station`);
|
throw new Error(`Unable to get observations: ${station.properties.stationIdentifier}, trying next station`);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,8 @@ const getWeatherRegionalIconFromIconLink = (link, _isNightTime) => {
|
||||||
case 'tsra_hi-n':
|
case 'tsra_hi-n':
|
||||||
case 'hurricane':
|
case 'hurricane':
|
||||||
case 'tropical_storm':
|
case 'tropical_storm':
|
||||||
|
case 'hurricane-n':
|
||||||
|
case 'tropical_storm-n':
|
||||||
return addPath('Thunderstorm.gif');
|
return addPath('Thunderstorm.gif');
|
||||||
|
|
||||||
case 'wind':
|
case 'wind':
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ class Radar extends WeatherDisplay {
|
||||||
minute,
|
minute,
|
||||||
}, {
|
}, {
|
||||||
zone: 'UTC',
|
zone: 'UTC',
|
||||||
}).setZone();
|
}).setZone(timeZone());
|
||||||
} else {
|
} else {
|
||||||
time = DateTime.fromHTTP(response.headers.get('last-modified')).setZone(timeZone());
|
time = DateTime.fromHTTP(response.headers.get('last-modified')).setZone(timeZone());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue