diff --git a/package.json b/package.json index df1ce7d236..5b05a0ddcd 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "fuse.js": "^6.0.0", "google-timezones-json": "^1.0.2", "hls.js": "^1.0.11", - "home-assistant-js-websocket": "^5.11.1", + "home-assistant-js-websocket": "^5.11.3", "idb-keyval": "^5.1.3", "intl-messageformat": "^9.9.1", "js-yaml": "^4.1.0", diff --git a/src/data/weather.ts b/src/data/weather.ts index 17e91ccf6c..be668288d1 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -152,17 +152,11 @@ export const getWeatherUnit = ( hass: HomeAssistant, measure: string ): string => { - const lengthUnit = hass.config.unit_system.length || ""; switch (measure) { - case "pressure": - return lengthUnit === "km" ? "hPa" : "inHg"; - case "wind_speed": - return `${lengthUnit}/h`; case "visibility": - case "length": - return lengthUnit; + return hass.config.unit_system.length || ""; case "precipitation": - return lengthUnit === "km" ? "mm" : "in"; + return hass.config.unit_system.accumulated_precipitation || ""; case "humidity": case "precipitation_probability": return "%"; diff --git a/src/fake_data/demo_config.ts b/src/fake_data/demo_config.ts index b1a4d9837f..ae5a528ff3 100644 --- a/src/fake_data/demo_config.ts +++ b/src/fake_data/demo_config.ts @@ -10,6 +10,9 @@ export const demoConfig: HassConfig = { mass: "kg", temperature: "°C", volume: "L", + pressure: "Pa", + wind_speed: "m/s", + accumulated_precipitation: "mm", }, components: [ "notify.html5", diff --git a/yarn.lock b/yarn.lock index 1322aea8a2..e40476833a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9113,7 +9113,7 @@ fsevents@^1.2.7: gulp-rename: ^2.0.0 gulp-zopfli-green: ^3.0.1 hls.js: ^1.0.11 - home-assistant-js-websocket: ^5.11.1 + home-assistant-js-websocket: ^5.11.3 html-minifier: ^4.0.0 husky: ^1.3.1 idb-keyval: ^5.1.3 @@ -9184,10 +9184,10 @@ fsevents@^1.2.7: languageName: unknown linkType: soft -"home-assistant-js-websocket@npm:^5.11.1": - version: 5.11.1 - resolution: "home-assistant-js-websocket@npm:5.11.1" - checksum: 4b3f4310ea15f758a47082ddde06ed46eeddcae490a59a16dbcec4fb798507a5cc4761b9e880261aed9f83335475abea8356d5239c081774caa335e5e76fba50 +"home-assistant-js-websocket@npm:^5.11.3": + version: 5.11.3 + resolution: "home-assistant-js-websocket@npm:5.11.3" + checksum: 3ab90e5105c5f379d77fb23ab53eaec2789be7bf1fd507a7520d9cf329d36942b8e978a591b822cff96100630d43bd036a4e25e2f49c40d0c56a111808fb90a5 languageName: node linkType: hard