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

Add expected year distance chart.

Browse Source
This commit is contained in:
Thomas Klaehn
2019-08-15 13:00:44 +02:00
parent 2cd36b5e52
commit e1c68a55b3
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bicycle_statistics/__main__.py
View File

@@ -13,8 +13,8 @@ LOG_FORMAT = "%(asctime)s %(levelname)s %(message)s"
UPDATE_INTERVAL = 60 UPDATE_INTERVAL = 60
logging.basicConfig(format=LOG_FORMAT, level=log_level, filename=LOG_FILE) # logging.basicConfig(format=LOG_FORMAT, level=log_level, filename=LOG_FILE)
# logging.basicConfig(format=LOG_FORMAT, level=log_level) logging.basicConfig(format=LOG_FORMAT, level=log_level)
log = logging.getLogger('bicycle-statistics') log = logging.getLogger('bicycle-statistics')
def parse_args(): def parse_args():

22
gpx2html/__init__.py
View File

@@ -140,12 +140,12 @@ class Gpx2Html(object):
'Average Speed', 'Month', 'km/h', 'Average Speed', 'Month', 'km/h',
os.path.join(self.outfolder, 'avg_spd.png')) os.path.join(self.outfolder, 'avg_spd.png'))
now = datetime.datetime.now()
# Accumulated distance: # Accumulated distance:
accumulated_distance = dict() accumulated_distance = dict()
for year in self.tracks.years(): for year in self.tracks.years():
acc_year_dist = list() acc_year_dist = list()
start_date = datetime.datetime(year, 1, 1) start_date = datetime.datetime(year, 1, 1)
now = datetime.datetime.now()
end_date = datetime.datetime(year, 12, 31) end_date = datetime.datetime(year, 12, 31)
if year == now.year: if year == now.year:
end_date = now end_date = now
@@ -162,6 +162,25 @@ class Gpx2Html(object):
"Accumulated Distance", 'Month', 'km', "Accumulated Distance", 'Month', 'km',
os.path.join(self.outfolder, 'acc_dist.png')) os.path.join(self.outfolder, 'acc_dist.png'))
# Expected year distance:
start_date =datetime.datetime(now.year, 1, 1)
end_date = now
tracks = self.tracks.tracks(start_date, end_date)
acc_year_dist = list()
exp_year_dist = list()
for date in generate_date_list(start_date, end_date):
date_distance = get_distance_by_date(tracks, date)
try:
acc_year_dist.append(date_distance + acc_year_dist[-1])
except IndexError:
acc_year_dist.append(date_distance)
expexted_distance = acc_year_dist[-1] / date.timetuple().tm_yday * 365
exp_year_dist.append(expexted_distance)
xyz = dict()
xyz['driven'] = acc_year_dist
xyz['expected'] = exp_year_dist
plot_line_chart(xyz, MONTH_LABELS[:now.month], "Distance", 'Month',
'km', os.path.join(self.outfolder, 'exp_dist.png'))
end_date = datetime.datetime.today() end_date = datetime.datetime.today()
@@ -268,6 +287,7 @@ class Gpx2Html(object):
handle.write('<p>\n') handle.write('<p>\n')
handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('distance.png')) handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('distance.png'))
handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('acc_dist.png')) handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('acc_dist.png'))
handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('exp_dist.png'))
handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('avg_spd.png')) handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('avg_spd.png'))
handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('last_14_days.png')) handle.write('<IMG SRC="{}" ALT="Distance">\n'.format('last_14_days.png'))
handle.write('</p>\n') handle.write('</p>\n')