sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

startdate time improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-16 19:36:50 +02:00
parent 8462050228
commit 721ad43e24
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/dataprep.py
View File

@@ -1848,7 +1848,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
partofday = getpartofday(row,r) partofday = getpartofday(row,r)
if startdatetime.tzinfo is None: if startdatetime.tzinfo is None or str(startdatetime.tzinfo) in ['tzutc()','Ect/GMT']:
timezone_str = 'UTC' timezone_str = 'UTC'
try: try:
startdatetime = timezone.make_aware(startdatetime) startdatetime = timezone.make_aware(startdatetime)
@@ -1860,6 +1860,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
lonavg = row.df[' longitude'].mean() lonavg = row.df[' longitude'].mean()
tf = TimezoneFinder() tf = TimezoneFinder()
if row.df[' latitude'].std() != 0:
try: try:
timezone_str = tf.timezone_at(lng=lonavg, lat=latavg) timezone_str = tf.timezone_at(lng=lonavg, lat=latavg)
except (ValueError,OverflowError): # pragma: no cover except (ValueError,OverflowError): # pragma: no cover
@@ -1869,6 +1870,8 @@ def get_startdate_time_zone(r,row,startdatetime=None):
lat=latavg) lat=latavg)
if timezone_str is None: # pragma: no cover if timezone_str is None: # pragma: no cover
timezone_str = r.defaulttimezone timezone_str = r.defaulttimezone
else:
timezone_str = r.defaulttimezone
try: try:
startdatetime = pytz.timezone(timezone_str).localize( startdatetime = pytz.timezone(timezone_str).localize(
row.rowdatetime row.rowdatetime
@@ -1878,6 +1881,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
pytz.timezone(timezone_str) pytz.timezone(timezone_str)
) )
except KeyError: # pragma: no cover except KeyError: # pragma: no cover
print('mies')
timezone_str = r.defaulttimezone timezone_str = r.defaulttimezone
else: else:
timezone_str = str(startdatetime.tzinfo) timezone_str = str(startdatetime.tzinfo)
@@ -1886,7 +1890,6 @@ def get_startdate_time_zone(r,row,startdatetime=None):
starttime = startdatetime.strftime('%H:%M:%S') starttime = startdatetime.strftime('%H:%M:%S')
return startdatetime,startdate,starttime,timezone_str,partofday return startdatetime,startdate,starttime,timezone_str,partofday