Merge lp:~tenpou/my-weather-indicator/my-weather-indicator into lp:my-weather-indicator

[ten]

A small batch of fixes, as described in the commits: some new statuses and a timezone calculation fix.

Fixes an annoying bug, which cropped up for a lot of people as "Error: %s intensity shower rain" etc., but that code block probably should be reworked altogether? Glueing a string as 'Heavy'/'Light'+%s doesn't localize well separately, if at all, to most languages. I'd drop that part of search if I wasn't afraid about the description string array being incomplete.

Unmerged revisions

214. By ten on 2015-09-28

* Fixed timezone calculation (bug #1474480)
* Added some new conditions (bug #1437003)

213. By ten on 2015-09-28

Fix for precipitation "Error:%s"

212. By ten on 2015-09-28

Added some OwM statuses

=== modified file 'src/geocodeapi.py'
--- src/geocodeapi.py	2014-07-14 04:21:00 +0000
+++ src/geocodeapi.py	2015-10-22 19:11:49 +0000
@@ -119,10 +119,8 @@
 		try:
 			timezone = pytz.timezone(timezoneId)
 			timeinzone = timezone.localize(datetime.datetime.now())
-			nowdt = timeinzone.strftime('%z')
-			h = s2f(nowdt)
-			m = (h - int(h))/60.0
-			h = int(h/100.0)+m
+			nowdelta = timeinzone.utcoffset()
+			h = nowdelta.total_seconds() / 3600
 			return h
 		except Exception as e:
 			print('Error calculating rawOffset: %s'%(str(e)))
 
=== modified file 'src/weatherservice.py'
--- src/weatherservice.py	2014-07-14 04:21:00 +0000
+++ src/weatherservice.py	2015-10-22 19:11:49 +0000
@@ -86,7 +86,9 @@
 CONDITIONS['intensity drizzle'] = {'text':_('Intensity drizzle'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['intensity drizzle rain'] = {'text':_('Intensity drizzle rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['intensity rain'] = {'text':_('Intensity rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
+CONDITIONS['intensity shower rain'] = {'text':_('Intensity shower rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['isolated showers']={'text':_('Isolated showers'),'image':'mwig-chance-of-rain.png','image-night':'mwig-chance-of-rain-night.png','icon-dark':'mwid-chance-of-rain.png','icon-night-dark':'mwid-chance-of-rain-night.png','icon-light':'mwil-chance-of-rain.png','icon-night-light':'mwil-chance-of-rain-night.png'}
+CONDITIONS['isolated thundershowers']={'text':_('Isolated thundershowers'),'image':'mwig-chance-of-thunderstorms.png','image-night':'mwig-chance-of-thunderstorms-night.png','icon-dark':'mwid-chance-of-thunderstorms.png','icon-night-dark':'mwid-chance-of-thunderstorms-night.png','icon-light':'mwil-chance-of-thunderstorms.png','icon-night-light':'mwil-chance-of-thunderstorms-night.png'}
 CONDITIONS['isolated thunderstorms']={'text':_('Isolated thunderstorms'),'image':'mwig-chance-of-thunderstorms.png','image-night':'mwig-chance-of-thunderstorms-night.png','icon-dark':'mwid-chance-of-thunderstorms.png','icon-night-dark':'mwid-chance-of-thunderstorms-night.png','icon-light':'mwil-chance-of-thunderstorms.png','icon-night-light':'mwil-chance-of-thunderstorms-night.png'}
 CONDITIONS['light drizzle']={'text':_('Light drizzle'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['light freezing rain']={'text':_('Light freezing rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
@@ -95,10 +97,10 @@
 CONDITIONS['light intensity shower rain'] = {'text':_('Light intensity shower rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['light rain shower']={'text':_('Light rain shower'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['light rain']={'text':_('Light rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
-CONDITIONS['light showers of ice pellets.png',]={'text':_('Light showers of ice pellets'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
-CONDITIONS['light sleet showers.png',]={'text':_('Light sleet showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
+CONDITIONS['light showers of ice pellets',]={'text':_('Light showers of ice pellets'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
+CONDITIONS['light sleet showers',]={'text':_('Light sleet showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['light sleet']={'text':_('Light sleet'),'image':'mwig-snow.png','image-night':'mwig-snow.png','icon-dark':'mwid-snow.png','icon-night-dark':'mwid-snow.png','icon-light':'mwil-snow.png','icon-night-light':'mwil-snow.png'}
-CONDITIONS['light snow showers.png',]={'text':_('Light snow showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
+CONDITIONS['light snow showers',]={'text':_('Light snow showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['light snow']={'text':_('Light snow'),'image':'mwig-snow.png','image-night':'mwig-snow.png','icon-dark':'mwid-snow.png','icon-night-dark':'mwid-snow.png','icon-light':'mwil-snow.png','icon-night-light':'mwil-snow.png'}
 CONDITIONS['light thunderstorm'] = {'text':_('Light thunderstorm'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['low drifting sand']={'text':_('Low drifting sand'),'image':'mwig-fog.png','image-night':'mwig-fog-night.png','icon-dark':'mwid-fog.png','icon-night-dark':'mwid-fog-night.png','icon-light':'mwil-fog.png','icon-night-light':'mwil-fog-night.png'}
@@ -112,7 +114,7 @@
 CONDITIONS['moderate or heavy rain in area with thunder']={'text':_('Moderate or heavy rain in area with thunder'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['moderate or heavy rain shower']={'text':_('Moderate or heavy rain shower'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['moderate or heavy showers of ice pellets']={'text':_('Moderate or heavy showers of ice pellets'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
-CONDITIONS['moderate or heavy sleet showers.png',]={'text':_('Moderate or heavy sleet showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
+CONDITIONS['moderate or heavy sleet showers',]={'text':_('Moderate or heavy sleet showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['moderate or heavy sleet']={'text':_('Moderate or heavy sleet'),'image':'mwig-snow.png','image-night':'mwig-snow.png','icon-dark':'mwid-snow.png','icon-night-dark':'mwid-snow.png','icon-light':'mwil-snow.png','icon-night-light':'mwil-snow.png'}
 CONDITIONS['moderate or heavy snow in area with thunder']={'text':_('Moderate or heavy snow in area with thunder'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['moderate or heavy snow showers']={'text':_('Moderate or heavy snow showers'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
@@ -138,6 +140,7 @@
 CONDITIONS['patchy rain nearby']={'text':_('Patchy rain nearby'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['patchy sleet nearby']={'text':_('Patchy sleet nearby'),'image':'mwig-snow.png','image-night':'mwig-snow.png','icon-dark':'mwid-snow.png','icon-night-dark':'mwid-snow.png','icon-light':'mwil-snow.png','icon-night-light':'mwil-snow.png'}
 CONDITIONS['patchy snow nearby']={'text':_('Patchy snow nearby'),'image':'mwig-snow.png','image-night':'mwig-snow.png','icon-dark':'mwid-snow.png','icon-night-dark':'mwid-snow.png','icon-light':'mwil-snow.png','icon-night-light':'mwil-snow.png'}
+CONDITIONS['ragged shower rain']={'text':_('Ragged shower rain'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
 CONDITIONS['ragged thunderstorm'] = {'text':_('Ragged thunderstorm'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['rain and snow']={'text':_('Rain and snow'),'image':'mwig-rain-and-snow.png','image-night':'mwig-rain-and-snow.png','icon-dark':'mwid-rain-and-snow.png','icon-night-dark':'mwid-rain-and-snow.png','icon-light':'mwil-rain-and-snow.png','icon-night-light':'mwil-rain-and-snow.png'}
 CONDITIONS['rain mist']={'text':_('Rain mist'),'image':'mwig-rain.png','image-night':'mwig-rain.png','icon-dark':'mwid-rain.png','icon-night-dark':'mwid-rain.png','icon-light':'mwil-rain.png','icon-night-light':'mwil-rain.png'}
@@ -166,6 +169,7 @@
 CONDITIONS['squalls']={'text':_('Squalls'),'image':'mwig-windy.png','image-night':'mwig-windy.png','icon-dark':'mwid-windy.png','icon-night-dark':'mwid-windy.png','icon-light':'mwil-windy.png','icon-night-light':'mwil-windy.png'}
 CONDITIONS['storm']={'text':_('Storm'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['sunny']={'text':_('Sunny'),'image':'mwig-clear.png','image-night':'mwig-clear-night.png','icon-dark':'mwid-clear.png','icon-night-dark':'mwid-clear-night.png','icon-light':'mwil-clear.png','icon-night-light':'mwil-clear-night.png'}
+CONDITIONS['thundershowers']={'text':_('Thundershowers'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['thunderstorm']={'text':_('Thunderstorm'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['thunderstorms']={'text':_('Thunderstorm'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
 CONDITIONS['thunderstorms and ice pellets']={'text':_('Thunderstorms and ice pellets'),'image':'mwig-storm.png','image-night':'mwig-storm.png','icon-dark':'mwid-storm.png','icon-night-dark':'mwid-storm.png','icon-light':'mwil-storm.png','icon-night-light':'mwil-storm.png'}
@@ -315,15 +319,17 @@
 def get_condition(condition,tipo):
 	text = ''
 	if condition != None and len(condition)>0:
-		if condition.startswith('heavy '):
-			condition = condition[6:]
-			text = _('Heavy')+' '
-		elif condition.startswith('light '):
-			condition = condition[6:]
-			text = _('Light')+' '
 		if condition in CONDITIONS.keys():
 			return CONDITIONS[condition][tipo]
 		else:
+			if condition.startswith('heavy '):
+				condition = condition[6:]
+				text = _('Heavy')+' '
+			elif condition.startswith('light '):
+				condition = condition[6:]
+				text = _('Light')+' '
+			if condition in CONDITIONS.keys():
+				return CONDITIONS[condition][tipo]
 			if tipo == 'text':
 				return 'Error: %s'%condition
 	return CONDITIONS['not available'][tipo]
 
=== modified file 'src/wopenweathermapapi.py'
--- src/wopenweathermapapi.py	2014-07-20 18:24:50 +0000
+++ src/wopenweathermapapi.py	2015-10-22 19:11:49 +0000
@@ -61,6 +61,8 @@
 CONDITION[310] = 'light intensity drizzle rain'
 CONDITION[311] = 'drizzle rain'
 CONDITION[312] = 'heavy intensity drizzle rain'
+CONDITION[313] = 'shower rain and drizzle'
+CONDITION[314] = 'heavy shower rain and drizzle'
 CONDITION[321] = 'shower drizzle'
 CONDITION[500] = 'light rain'
 CONDITION[501] = 'moderate rain'
@@ -71,16 +73,27 @@
 CONDITION[520] = 'light intensity shower rain'
 CONDITION[521] = 'shower rain'
 CONDITION[522] = 'heavy intensity shower rain'
+CONDITION[531] = 'ragged shower rain'
 CONDITION[600] = 'light snow'
 CONDITION[601] = 'snow'
 CONDITION[602] = 'heavy snow'
 CONDITION[611] = 'sleet'
+CONDITION[612] = 'shower sleet'
+CONDITION[615] = 'light rain and snow'
+CONDITION[616] = 'rain and snow'
+CONDITION[620] = 'light shower snow'
 CONDITION[621] = 'shower snow'
+CONDITION[622] = 'heavy shower snow'
 CONDITION[701] = 'mist'
 CONDITION[711] = 'smoke'
 CONDITION[721] = 'haze'
-CONDITION[731] = 'sand'
+CONDITION[731] = 'sand, dust whirls'
 CONDITION[741] = 'fog'
+CONDITION[751] = 'sand'
+CONDITION[761] = 'dust'
+CONDITION[762] = 'volcanic ash'
+CONDITION[771] = 'squalls'
+CONDITION[781] = 'tornado'
 CONDITION[800] = 'clear'#sky is clear
 CONDITION[801] = 'partly sunny'#few clouds
 CONDITION[802] = 'partly cloudy'#scattered clouds