python/bicycle-statistics
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor accumulated distance creation.

Browse Source
This commit is contained in:
Thomas Klaehn 2019-08-14 11:37:57 +02:00
parent 0cf59eb7f1
commit ddbb5f159f
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gpx2html/__init__.py
View File

@ -86,6 +86,25 @@ def generate_date_list(start_date, end_date):
r = (end_date + datetime.timedelta(days=1) - start_date).days r = (end_date + datetime.timedelta(days=1) - start_date).days
return[start_date + datetime.timedelta(days=i) for i in range(r)] return[start_date + datetime.timedelta(days=i) for i in range(r)]
def get_distance_by_date(tracks, date):
'''Return accumulated distances [km] by date.
Args:
tracks (list(Track)): List of tracks to be evaluated.
date (datetine.datetime): Date to be evaluated.
Return (float): Accumulated distance [km] for date.
'''
distance = 0
for track in tracks:
if track.start_time.year == date.year and \
track.start_time.month == date.month and \
track.start_time.day == date.day:
distance += track.distance
if distance > 0:
distance /= 1000
return distance
class Gpx2Html(object): class Gpx2Html(object):
def __init__(self, infolder, outfolder, logger): def __init__(self, infolder, outfolder, logger):
@ -132,20 +151,13 @@ class Gpx2Html(object):
end_date = now end_date = now
tracks = self.tracks.tracks(start_date, end_date) tracks = self.tracks.tracks(start_date, end_date)
for date in generate_date_list(start_date, end_date): for date in generate_date_list(start_date, end_date):
for track in tracks: date_distance = get_distance_by_date(tracks, date)
if track.start_time.month == date.month and track.start_time.day == date.day: try:
if len(acc_year_dist) < date.timetuple().tm_yday: acc_year_dist.append(date_distance + acc_year_dist[-1])
acc_year_dist.append(track.distance / 1000) except IndexError:
else: acc_year_dist.append(date_distance)
acc_year_dist.append(track.distance / 1000 + acc_year_dist[-1])
elif len(acc_year_dist) < date.timetuple().tm_yday:
if len(acc_year_dist) > 0:
acc_year_dist.append(acc_year_dist[-1])
else:
acc_year_dist.append(0)
if len(acc_year_dist) == 365:
acc_year_dist.append(acc_year_dist[-1])
accumulated_distance[year] = acc_year_dist accumulated_distance[year] = acc_year_dist
plot_line_chart(accumulated_distance, MONTH_LABELS, plot_line_chart(accumulated_distance, MONTH_LABELS,
"Accumulated Distance", 'Month', 'km', "Accumulated Distance", 'Month', 'km',
os.path.join(self.outfolder, 'acc_dist.png')) os.path.join(self.outfolder, 'acc_dist.png'))