Home-Assistant/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-12-20 02:38:53 +00:00
Code Activity

Weather card: Add wind speed direction (#7202)

Browse Source 
Co-authored-by: Zack Barett <zackbarett@hey.com>
This commit is contained in:
Daniel Martin Gonzalez
2020-10-10 23:19:40 +02:00
committed by GitHub
parent b8a67d530f
commit 26b476ab3c
4 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/dialogs/more-info/controls/more-info-weather.ts
View File

@@ -11,6 +11,8 @@ import {
import { html, TemplateResult } from "lit-html";
import { HomeAssistant } from "../../../types";
import { getWind, getWeatherUnit } from "../../../data/weather";
import {
mdiAlertCircleOutline,
mdiEye,
@@ -33,26 +35,6 @@ import {
mdiWeatherWindyVariant,
} from "@mdi/js";
const cardinalDirections = [
"N",
"NNE",
"NE",
"ENE",
"E",
"ESE",
"SE",
"SSE",
"S",
"SSW",
"SW",
"WSW",
"W",
"WNW",
"NW",
"NNW",
"N",
];
const weatherIcons = {
"clear-night": mdiWeatherNight,
cloudy: mdiWeatherCloudy,
@@ -106,7 +88,8 @@ class MoreInfoWeather extends LitElement {
${this.hass.localize("ui.card.weather.attributes.temperature")}
</div>
<div>
${this.stateObj.attributes.temperature} ${this.getUnit("temperature")}
${this.stateObj.attributes.temperature}
${getWeatherUnit(this.hass, "temperature")}
</div>
</div>
${this._showValue(this.stateObj.attributes.pressure)
@@ -118,7 +101,7 @@ class MoreInfoWeather extends LitElement {
</div>
<div>
${this.stateObj.attributes.pressure}
${this.getUnit("air_pressure")}
${getWeatherUnit(this.hass, "air_pressure")}
</div>
</div>
`
@@ -142,7 +125,8 @@ class MoreInfoWeather extends LitElement {
${this.hass.localize("ui.card.weather.attributes.wind_speed")}
</div>
<div>
${this.getWind(
${getWind(
this.hass,
this.stateObj.attributes.wind_speed,
this.stateObj.attributes.wind_bearing
)}
@@ -158,7 +142,8 @@ class MoreInfoWeather extends LitElement {
${this.hass.localize("ui.card.weather.attributes.visibility")}
</div>
<div>
${this.stateObj.attributes.visibility} ${this.getUnit("length")}
${this.stateObj.attributes.visibility}
${getWeatherUnit(this.hass, "length")}
</div>
</div>
`
@@ -191,12 +176,14 @@ class MoreInfoWeather extends LitElement {
${this.computeDate(item.datetime)}
</div>
<div class="templow">
${item.templow} ${this.getUnit("temperature")}
${item.templow}
${getWeatherUnit(this.hass, "temperature")}
</div>
`
: ""}
<div class="temp">
${item.temperature} ${this.getUnit("temperature")}
${item.temperature}
${getWeatherUnit(this.hass, "temperature")}
</div>
</div>
`;
@@ -269,41 +256,6 @@ class MoreInfoWeather extends LitElement {
});
}
private getUnit(measure: string): string {
const lengthUnit = this.hass.config.unit_system.length || "";
switch (measure) {
case "air_pressure":
return lengthUnit === "km" ? "hPa" : "inHg";
case "length":
return lengthUnit;
case "precipitation":
return lengthUnit === "km" ? "mm" : "in";
default:
return this.hass.config.unit_system[measure] || "";
}
}
private windBearingToText(degree: string): string {
const degreenum = parseInt(degree, 10);
if (isFinite(degreenum)) {
// eslint-disable-next-line no-bitwise
return cardinalDirections[(((degreenum + 11.25) / 22.5) | 0) % 16];
}
return degree;
}
private getWind(speed: string, bearing: string) {
if (bearing != null) {
const cardinalDirection = this.windBearingToText(bearing);
return `${speed} ${this.getUnit("length")}/h (${
this.hass.localize(
`ui.card.weather.cardinal_direction.${cardinalDirection.toLowerCase()}`
) || cardinalDirection
})`;
}
return `${speed} ${this.getUnit("length")}/h`;
}
private _showValue(item: string): boolean {
return typeof item !== "undefined" && item !== null;
}