diff --git a/cypress/e2e/card.cy.ts b/cypress/e2e/card.cy.ts index 54984fa8..ddcef612 100644 --- a/cypress/e2e/card.cy.ts +++ b/cypress/e2e/card.cy.ts @@ -62,7 +62,8 @@ describe('Card', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, ]; cy.addEntity({ @@ -89,7 +90,8 @@ describe('Card', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T17:00:00+00:00", @@ -100,7 +102,8 @@ describe('Card', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 } ]; cy.addForecast('weather.fromSub', forecast2); diff --git a/cypress/e2e/config.cy.ts b/cypress/e2e/config.cy.ts index 7bc3a574..a9c2a493 100644 --- a/cypress/e2e/config.cy.ts +++ b/cypress/e2e/config.cy.ts @@ -82,7 +82,8 @@ describe('Config', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -93,7 +94,8 @@ describe('Config', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -104,7 +106,8 @@ describe('Config', () => { "wind_bearing": 'W', "condition": "cloudy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -115,7 +118,8 @@ describe('Config', () => { "wind_bearing": 'W', "condition": "partlycloudy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -126,7 +130,8 @@ describe('Config', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -137,7 +142,8 @@ describe('Config', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ] } @@ -169,7 +175,8 @@ describe('Config', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -180,7 +187,8 @@ describe('Config', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -191,7 +199,8 @@ describe('Config', () => { "wind_bearing": 'W', "condition": "cloudy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -202,7 +211,8 @@ describe('Config', () => { "wind_bearing": 'W', "condition": "partlycloudy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -213,7 +223,8 @@ describe('Config', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -224,7 +235,8 @@ describe('Config', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ] } @@ -385,7 +397,8 @@ describe('Config', () => { "wind_bearing": 255, "condition": "sunny", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -396,7 +409,8 @@ describe('Config', () => { "wind_bearing": 253, "condition": "sunny", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -407,7 +421,8 @@ describe('Config', () => { "wind_bearing": 258, "condition": "sunny", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -418,7 +433,8 @@ describe('Config', () => { "wind_bearing": 278, "condition": "sunny", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -429,7 +445,8 @@ describe('Config', () => { "wind_bearing": 297, "condition": "sunny", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -440,7 +457,8 @@ describe('Config', () => { "wind_bearing": 293, "condition": "sunny", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ] } @@ -456,7 +474,8 @@ describe('Config', () => { "wind_bearing": 255, "condition": "snowy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -467,7 +486,8 @@ describe('Config', () => { "wind_bearing": 253, "condition": "snowy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -478,7 +498,8 @@ describe('Config', () => { "wind_bearing": 258, "condition": "snowy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -489,7 +510,8 @@ describe('Config', () => { "wind_bearing": 278, "condition": "snowy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -500,7 +522,8 @@ describe('Config', () => { "wind_bearing": 297, "condition": "snowy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -511,7 +534,8 @@ describe('Config', () => { "wind_bearing": 293, "condition": "snowy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ]); @@ -547,7 +571,8 @@ describe('Config', () => { "wind_bearing": 255, "condition": "snowy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -558,7 +583,8 @@ describe('Config', () => { "wind_bearing": 253, "condition": "snowy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -569,7 +595,8 @@ describe('Config', () => { "wind_bearing": 258, "condition": "snowy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -580,7 +607,8 @@ describe('Config', () => { "wind_bearing": 278, "condition": "snowy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -591,7 +619,8 @@ describe('Config', () => { "wind_bearing": 297, "condition": "snowy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -602,7 +631,8 @@ describe('Config', () => { "wind_bearing": 293, "condition": "snowy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ]); @@ -637,7 +667,8 @@ describe('Config', () => { "wind_bearing": 255, "condition": "snowy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -648,7 +679,8 @@ describe('Config', () => { "wind_bearing": 253, "condition": "snowy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -659,7 +691,8 @@ describe('Config', () => { "wind_bearing": 258, "condition": "snowy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -670,7 +703,8 @@ describe('Config', () => { "wind_bearing": 278, "condition": "snowy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -681,7 +715,8 @@ describe('Config', () => { "wind_bearing": 297, "condition": "snowy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -692,7 +727,8 @@ describe('Config', () => { "wind_bearing": 293, "condition": "snowy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ]); @@ -720,7 +756,8 @@ describe('Config', () => { "wind_bearing": 255, "condition": "rainy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -731,7 +768,8 @@ describe('Config', () => { "wind_bearing": 253, "condition": "rainy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -742,7 +780,8 @@ describe('Config', () => { "wind_bearing": 258, "condition": "rainy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -753,7 +792,8 @@ describe('Config', () => { "wind_bearing": 278, "condition": "rainy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -764,7 +804,8 @@ describe('Config', () => { "wind_bearing": 297, "condition": "rainy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -775,7 +816,8 @@ describe('Config', () => { "wind_bearing": 293, "condition": "rainy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 } ]); diff --git a/cypress/e2e/internationalization.cy.ts b/cypress/e2e/internationalization.cy.ts index bee1704f..fa4c6580 100644 --- a/cypress/e2e/internationalization.cy.ts +++ b/cypress/e2e/internationalization.cy.ts @@ -71,7 +71,8 @@ describe('Internationalization', () => { "wind_bearing": 255, "condition": "cloudy", "clouds": 60, - "temperature": 84.2 + "temperature": 84.2, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -82,7 +83,8 @@ describe('Internationalization', () => { "wind_bearing": 253, "condition": "cloudy", "clouds": 75, - "temperature": 85.5 + "temperature": 85.5, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -93,7 +95,8 @@ describe('Internationalization', () => { "wind_bearing": 258, "condition": "cloudy", "clouds": 60, - "temperature": 85.3 + "temperature": 85.3, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -104,7 +107,8 @@ describe('Internationalization', () => { "wind_bearing": 278, "condition": "partlycloudy", "clouds": 49, - "temperature": 84.0 + "temperature": 84.0, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -115,7 +119,8 @@ describe('Internationalization', () => { "wind_bearing": 297, "condition": "partlycloudy", "clouds": 34, - "temperature": 84.1 + "temperature": 84.1, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -126,7 +131,8 @@ describe('Internationalization', () => { "wind_bearing": 293, "condition": "partlycloudy", "clouds": 19, - "temperature": 83.8 + "temperature": 83.8, + "humidity": 50 } ]} } diff --git a/cypress/e2e/weather-bar.cy.ts b/cypress/e2e/weather-bar.cy.ts index 3909d2c9..598cddc7 100644 --- a/cypress/e2e/weather-bar.cy.ts +++ b/cypress/e2e/weather-bar.cy.ts @@ -389,7 +389,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -400,7 +401,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "cloudy", "clouds": 75, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -411,7 +413,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -422,7 +425,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "partlycloudy", "clouds": 49, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -433,7 +437,8 @@ describe('Weather bar', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 34, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -444,7 +449,8 @@ describe('Weather bar', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 19, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 }, { "datetime": "2022-07-21T23:00:00+00:00", @@ -455,7 +461,8 @@ describe('Weather bar', () => { "wind_bearing": 'NW', "condition": "sunny", "clouds": 4, - "temperature": Number.NaN + "temperature": Number.NaN, + "humidity": 50 } ] } @@ -661,7 +668,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -672,7 +680,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "cloudy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -683,7 +692,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -694,7 +704,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "partlycloudy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -705,7 +716,8 @@ describe('Weather bar', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -716,7 +728,8 @@ describe('Weather bar', () => { "wind_bearing": 'WNW', "condition": "partlycloudy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 }, { "datetime": "2022-07-21T23:00:00+00:00", @@ -727,7 +740,8 @@ describe('Weather bar', () => { "wind_bearing": 'NW', "condition": "sunny", "clouds": 4, - "temperature": 79 + "temperature": 79, + "humidity": 50 } ] } @@ -765,7 +779,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -776,7 +791,8 @@ describe('Weather bar', () => { "wind_bearing": 'WSW', "condition": "cloudy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -787,7 +803,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "cloudy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -798,7 +815,8 @@ describe('Weather bar', () => { "wind_bearing": 'W', "condition": "partlycloudy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -809,7 +827,8 @@ describe('Weather bar', () => { "wind_bearing": 'ENE', "condition": "partlycloudy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -820,7 +839,8 @@ describe('Weather bar', () => { "wind_bearing": 'ENE', "condition": "partlycloudy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 }, { "datetime": "2022-07-21T23:00:00+00:00", @@ -831,7 +851,8 @@ describe('Weather bar', () => { "wind_bearing": 'NW', "condition": "sunny", "clouds": 4, - "temperature": 79 + "temperature": 79, + "humidity": 50 } ] } @@ -876,7 +897,8 @@ describe('Weather bar', () => { "wind_bearing": 'ABC', "condition": "cloudy", "clouds": 60, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T18:00:00+00:00", @@ -887,7 +909,8 @@ describe('Weather bar', () => { "wind_bearing": 'ABC', "condition": "cloudy", "clouds": 75, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T19:00:00+00:00", @@ -898,7 +921,8 @@ describe('Weather bar', () => { "wind_bearing": 'DEF', "condition": "cloudy", "clouds": 60, - "temperature": 85 + "temperature": 85, + "humidity": 50 }, { "datetime": "2022-07-21T20:00:00+00:00", @@ -909,7 +933,8 @@ describe('Weather bar', () => { "wind_bearing": 'DEF', "condition": "partlycloudy", "clouds": 49, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T21:00:00+00:00", @@ -920,7 +945,8 @@ describe('Weather bar', () => { "wind_bearing": 'GHI', "condition": "partlycloudy", "clouds": 34, - "temperature": 84 + "temperature": 84, + "humidity": 50 }, { "datetime": "2022-07-21T22:00:00+00:00", @@ -931,7 +957,8 @@ describe('Weather bar', () => { "wind_bearing": 'GHI', "condition": "partlycloudy", "clouds": 19, - "temperature": 83 + "temperature": 83, + "humidity": 50 }, { "datetime": "2022-07-21T23:00:00+00:00", @@ -942,7 +969,8 @@ describe('Weather bar', () => { "wind_bearing": 'JKL', "condition": "sunny", "clouds": 4, - "temperature": 79 + "temperature": 79, + "humidity": 50 } ] } diff --git a/src/editor.ts b/src/editor.ts index 6c323fa0..0b172350 100644 --- a/src/editor.ts +++ b/src/editor.ts @@ -66,6 +66,10 @@ export class HourlyWeatherCardEditor extends ScopedRegistryHost(LitElement) impl return showWind ?? 'false'; } + get _show_humidity(): boolean { + return this._config?.show_humidity ?? false; + } + get _show_precipitation_amounts(): boolean { return this._config?.show_precipitation_amounts ?? false; } @@ -188,6 +192,13 @@ export class HourlyWeatherCardEditor extends ScopedRegistryHost(LitElement) impl ${localize('editor.all')} ${localize('editor.on_day_boundaries')} + + + @@ -138,6 +148,7 @@ export class WeatherBar extends LitElement {
${renderedDate}
${hideHours ? null : hour}
${hideTemperature ? null : html`${displayTemperature}°`}
+
${humidity}
${wind}
${precipitation}
@@ -346,7 +357,8 @@ export class WeatherBar extends LitElement { font-size: 1.1rem; } .wind, - .precipitation { + .precipitation, + .humidity { font-size: 0.9rem; line-height: 1.1rem; padding-top: 0.1rem;