From be7900cd87aa6140c19334e938782918e2cf51d8 Mon Sep 17 00:00:00 2001
From: c727 <crusader727@gmx.de>
Date: Wed, 27 Jun 2018 17:16:16 +0200
Subject: [PATCH] Fix air pressure uom in weather cards (#1346)

* Fix aire pressure uom in weather cards

* Feedback

* Lint
---
 src/cards/ha-weather-card.js                     | 15 +++++++++++----
 .../more-info/controls/more-info-weather.js      | 16 +++++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index aaa58babf9..093c41a771 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -104,7 +104,7 @@ class HaWeatherCard extends
               <template is="dom-if" if="[[_showValue(stateObj.attributes.pressure)]]">
                 <div>
                   [[localize('ui.card.weather.attributes.air_pressure')]]:
-                  [[stateObj.attributes.pressure]] hPa
+                  [[stateObj.attributes.pressure]] [[getUnit('air_pressure')]]
                 </div>
               </template>
               <template is="dom-if" if="[[_showValue(stateObj.attributes.humidity)]]">
@@ -203,10 +203,17 @@ class HaWeatherCard extends
   }
 
   getUnit(measure) {
-    if (measure === 'precipitation') {
-      return this.getUnit('length') === 'km' ? 'mm' : 'in';
+    const lengthUnit = this.hass.config.core.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.core.unit_system[measure] || '';
     }
-    return this.hass.config.core.unit_system[measure] || '';
   }
 
   computeState(state, localize) {
diff --git a/src/dialogs/more-info/controls/more-info-weather.js b/src/dialogs/more-info/controls/more-info-weather.js
index d273a55653..e783c53f45 100644
--- a/src/dialogs/more-info/controls/more-info-weather.js
+++ b/src/dialogs/more-info/controls/more-info-weather.js
@@ -56,7 +56,7 @@ class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
       <div class="flex">
         <iron-icon icon="hass:gauge"></iron-icon>
         <div class="main">[[localize('ui.card.weather.attributes.air_pressure')]]</div>
-        <div>[[stateObj.attributes.pressure]] hPa</div>
+        <div>[[stateObj.attributes.pressure]] [[getUnit('air_pressure')]]</div>
       </div>
     </template>
     <template is="dom-if" if="[[stateObj.attributes.humidity]]">
@@ -155,8 +155,18 @@ class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
     );
   }
 
-  getUnit(unit) {
-    return this.hass.config.core.unit_system[unit] || '';
+  getUnit(measure) {
+    const lengthUnit = this.hass.config.core.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.core.unit_system[measure] || '';
+    }
   }
 
   windBearingToText(degree) {