sync: wunderground with addons repo

1 files changed, 24 insertions, 2 deletions

diff --git a/addons/weather.wunderground/default.py b/addons/weather.wunderground/default.py
index 632224ae85..c00e6d3ac6 100644
--- a/addons/weather.wunderground/default.py
+++ b/addons/weather.wunderground/default.py
@@ -129,7 +129,29 @@ if sys.argv[1].startswith('Location'):
 else:
     location = __addon__.getSetting('Location%sid' % sys.argv[1])
     aik = base64.b64decode(A_I_K)
-    forecast(location)
+    if not location == '':
+        forecast(location)
+        refresh_locations()
+    else:
+        # workaround to fix incrementing values on each weather refresh when no locations are set up:
+        set_property('Current.Condition'     , 'N/A')
+        set_property('Current.Temperature'   , '0')
+        set_property('Current.Wind'          , '0')
+        set_property('Current.WindDirection' , 'N/A')
+        set_property('Current.Humidity'      , '0')
+        set_property('Current.FeelsLike'     , '0')
+        set_property('Current.UVIndex'       , '0')
+        set_property('Current.DewPoint'      , '0')
+        set_property('Current.OutlookIcon'   , 'na.png')
+        set_property('Current.FanartCode'    , 'na')
+        for count in range (0, 3):
+            set_property('Day%i.Title'       % count, 'N/A')
+            set_property('Day%i.HighTemp'    % count, '0')
+            set_property('Day%i.LowTemp'     % count, '0')
+            set_property('Day%i.Outlook'     % count, 'N/A')
+            set_property('Day%i.OutlookIcon' % count, 'na.png')
+            set_property('Day%i.FanartCode'  % count, 'na')
+        # workaround to stop xbmc from running the script in a loop when no locations are set up:
+        set_property('Locations', '1')
 
-refresh_locations()
 set_property('WeatherProvider', 'Weather Underground')