Merge pull request #46 from KNXBroker/master

Added optional wind sensor; removed '+' infront of wind icon
Yevgenium · Oct 19, 2020 · b006d73 · b006d73
2 parents f302098 + 8803cef
commit b006d73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -26,5 +26,6 @@ Then you can add the card to the view:
 | type    | **No**   | Should be `'custom:weather-card-chart'`                                                            |
 | title   | **No**   | Card title                                                                                         |
 | weather | **No**   | An entity_id with the `weather` domain                                                             |
+| wind    | Yes      | Entity_id of the wind sensor. Show wind value from sensor instead                                  |
 | temp    | Yes      | Entity_id of the temperature sensor. Show temperature value from sensor instead                    |
 | mode    | Yes      | Default value: `daily`. Set mode to `hourly` to display hours instead weekdays on the chart        |
diff --git a/weather-card-chart.js b/weather-card-chart.js
@@ -168,8 +168,14 @@ class WeatherCardChart extends Polymer.Element {
               </template>
             </div>
             <div>
-+             <ha-icon icon="[[getWindDirIcon(windBearing)]]"></ha-icon> [[getWindDir(windBearing)]]<br>
-              <ha-icon icon="hass:weather-windy"></ha-icon> [[computeWind(weatherObj.attributes.wind_speed)]] [[ll('uSpeed')]]
+              <ha-icon icon="[[getWindDirIcon(windBearing)]]"></ha-icon> [[getWindDir(windBearing)]]<br>
+              <ha-icon icon="hass:weather-windy"></ha-icon>
+              <template is="dom-if" if="[[windObj]]">
+                [[roundNumber(windObj.state)]] [[ll('uSpeed')]]                
+              </template>
+              <template is="dom-if" if="[[!windObj]]">
+                [[computeWind(weatherObj.attributes.wind_speed)]] [[ll('uSpeed')]]
+              </template>
             </div>
           </div>
           <ha-chart-base hass="[[_hass]]" data="[[ChartData]]"></ha-chart-base>
@@ -190,6 +196,7 @@ class WeatherCardChart extends Polymer.Element {
       config: Object,
       sunObj: Object,
       tempObj: Object,
+      windObj: Object,
       mode: String,
       weatherObj: {
         type: Object,
@@ -229,6 +236,7 @@ class WeatherCardChart extends Polymer.Element {
     this.title = config.title;
     this.weatherObj = config.weather;
     this.tempObj = config.temp;
+    this.windObj = config.wind;
     this.mode = config.mode;
     if (!config.weather) {
       throw new Error('Please define "weather" entity in the card config');
@@ -241,6 +249,7 @@ class WeatherCardChart extends Polymer.Element {
     this.weatherObj = this.config.weather in hass.states ? hass.states[this.config.weather] : null;
     this.sunObj = 'sun.sun' in hass.states ? hass.states['sun.sun'] : null;
     this.tempObj = this.config.temp in hass.states ? hass.states[this.config.temp] : null;
+    this.windObj = this.config.wind in hass.states ? hass.states[this.config.wind] : null;
     this.forecast = this.weatherObj.attributes.forecast.slice(0,9);
     this.windBearing = this.weatherObj.attributes.wind_bearing;
   }