From d473f3407bea9e7065704361f9e2edb90f735607 Mon Sep 17 00:00:00 2001
From: Sean Gollschewsky <sean.gollschewsky@gmail.com>
Date: Fri, 14 Jul 2017 04:01:25 +0100
Subject: [PATCH] Remove km from visibility, add visibility_distance (#8454)

* Remove km from visibility, add visibility_distance

* Fix line length

* Fix trailing space and line break indentation

* Indentation

* More whitespace
---
 homeassistant/components/sensor/metoffice.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/metoffice.py b/homeassistant/components/sensor/metoffice.py
index a20ec8fdd5a7ab..25516eda5b1b82 100644
--- a/homeassistant/components/sensor/metoffice.py
+++ b/homeassistant/components/sensor/metoffice.py
@@ -40,6 +40,15 @@
     'exceptional': [],
 }
 
+VISIBILTY_CLASSES = {
+    'VP': '<1',
+    'PO': '1-4',
+    'MO': '4-10',
+    'GO': '10-20',
+    'VG': '20-40',
+    'EX': '>40'
+}
+
 SCAN_INTERVAL = timedelta(minutes=35)
 
 # Sensor types are defined like: Name, units
@@ -51,7 +60,8 @@
     'wind_speed': ['Wind Speed', 'm/s'],
     'wind_direction': ['Wind Direction', None],
     'wind_gust': ['Wind Gust', 'm/s'],
-    'visibility': ['Visibility', 'km'],
+    'visibility': ['Visibility', None],
+    'visibility_distance': ['Visibility Distance', 'km'],
     'uv': ['UV', None],
     'precipitation': ['Probability of Precipitation', '%'],
     'humidity': ['Humidity', '%']
@@ -119,6 +129,9 @@ def name(self):
     @property
     def state(self):
         """Return the state of the sensor."""
+        if (self._condition == 'visibility_distance' and
+                'visibility' in self.data.data.__dict__.keys()):
+            return VISIBILTY_CLASSES.get(self.data.data.visibility.value)
         if self._condition in self.data.data.__dict__.keys():
             variable = getattr(self.data.data, self._condition)
             if self._condition == "weather":