Skip to content

Use unit system definitions for weather units #10657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 6 commits into from
Dec 2, 2021
Merged

Use unit system definitions for weather units #10657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4162dd
Use unit system definitions for weather units
rianadon Nov 19, 2021
ad6f315
Merge remote-tracking branch 'upstream/dev' into backend-units
rianadon Nov 29, 2021
36475c3
Upgrade home-assistant-js-websocket
rianadon Nov 29, 2021
912d3d0
Add yarn.lock
rianadon Nov 29, 2021
d082904
Fix units in fake data
rianadon Nov 29, 2021
719b5ab
Remove cases that can be handled by the default
rianadon Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 2 additions & 8 deletions src/data/weather.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "%";
Expand Down
3 changes: 3 additions & 0 deletions src/fake_data/demo_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -9183,10 +9183,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

Expand Down