Merge lp:~saiarcot895/my-weather-indicator/time-zone-fix into lp:my-weather-indicator

[Saikrishna Arcot]

Change the time zone provider to Geonames, which returns a time zone compatible with Olson's time zone database, and use python-tz to look up the UTC offset.

[Lorenzo Carbonell (lorenzo-carbonell)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-04-20 06:50:43 +0000
+++ debian/control	2013-07-06 14:30:35 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Lorenzo Carbonell Cerezo <[e-mail]>
-Build-Depends: debhelper (>= 8), python, python-distutils-extra, python-polib
+Build-Depends: debhelper (>= 8), python, python-distutils-extra, python-polib, python3-tz, python3-urllib3, 
 Standards-Version: 3.9.3
 Homepage: http://www.atareao.es
 

=== modified file 'src/geocodeapi.py'
--- src/geocodeapi.py	2013-05-19 21:57:34 +0000
+++ src/geocodeapi.py	2013-07-06 14:30:35 +0000
@@ -28,6 +28,8 @@
 from sun import Sun
 import locale
 import datetime
+import pytz
+import urllib
 locale.setlocale(locale.LC_MESSAGES, '')
 LANG = locale.getlocale(locale.LC_MESSAGES)[0]
 '''
@@ -99,19 +101,16 @@
 	if len(directions)>0:
 		return directions[0]
 	return None
-		
 
 def get_rawOffset(lat,lon):	
-	url = 'http://www.earthtools.org/timezone/%s/%s'%(lat,lon)
-	response = read_from_url(url).decode('ISO-8859-1')
-	inicio = response.find('<offset>')+8
-	fin = response.find('</offset>')
-	ro = s2f(response[inicio:fin])
-	inicio = response.find('<dst>')+5
-	fin = response.find('</dst>')
-	if response[inicio:fin]=='True':
-		ro = ro + 1.0
-	return ro
+	try:
+		response = read_from_url('http://api.geonames.org/timezoneJSON?lat=%s&lng=%s&username=saiarcot895'%(lat,lon)).decode('ISO-8859-1')
+		json_response = json.loads(response)
+		timezone = pytz.timezone(json_response['timezoneId']);
+		strOffset = timezone.localize(datetime.datetime.now()).strftime("%z");
+		return s2f(strOffset) / 100;
+	except urllib.error.URLError:
+		print('Geonames error')
 	
 def get_inv_direction(lat,lon):
 	directions = get_inv_directions(lat,lon)