From bb0d07df7278520092ed51b1f791a6a6ecc03aa6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 30 Sep 2024 09:00:30 +0200 Subject: [PATCH] fix --- rowers/courseutils.py | 4 ++-- rowers/tasks.py | 3 +++ rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 3999 bytes rowers/views/racesviews.py | 11 ++++++++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/rowers/courseutils.py b/rowers/courseutils.py index 90a1a03e..c60f0034 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -18,7 +18,7 @@ class InvalidTrajectoryError(Exception): def time_in_path(df, p, maxmin='max', getall=False, name='unknown', logfile=None): if df.empty: # pragma: no cover - return 0 + return 0, 0 def f(x): return coordinate_in_path(x['latitude'], x['longitude'], p) @@ -55,7 +55,7 @@ def time_in_path(df, p, maxmin='max', getall=False, name='unknown', logfile=None raise InvalidTrajectoryError( "Trajectory doesn't go through path") # pragma: no cover - return 0 # pragma: no cover + return 0, 0 # pragma: no cover def coursetime_first(data, paths, polygons=[], logfile=None): diff --git a/rowers/tasks.py b/rowers/tasks.py index 4dc9fc90..287b5997 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1107,6 +1107,7 @@ def handle_check_race_course(self, row.calc_dist_from_gps() rowdata = row.df rowdata['cum_dist'] = rowdata['gps_dist_calculated'] + row.df.to_csv("~/Downloads/lagoon.csv") try: _ = rowdata[' latitude'] @@ -1174,6 +1175,7 @@ def handle_check_race_course(self, startseconds = [] endseconds = [] + for startt in entrytimes: logmessage = 'Path starting at {t}'.format(t=startt) dologging(logfile, logmessage) @@ -1210,6 +1212,7 @@ def handle_check_race_course(self, 'endsecond': endseconds, }) + records = records.loc[records['coursecompleted'], : ] if len(records): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 346692ec5b9d274de7c1e55739968f7566b1108f..0c6337922dbf624ef760fcd6309ccbbe5ba30949 100644 GIT binary patch delta 258 zcmV+d0sa1=ADH+1Q|-Tv)LRNfzV^v%oR#l_W) z*W{ba%d_=KH>96_{bF37`;(KU@4kJxK6`%sbAL(iV>qN%x<0$?Pm~xcT|h z-PW75*~|O=b{noA?MLT7dX{eb_~-tt@3wv7kUzbBbT{tn=yA6>ef0hD4?ku$yFd5a ze@buhk1x-E>(iY9d;zfk|7dmNi~W<|J*MLaJJjnOEB>1q6yE`9vqe|aA6 IN5p^u03p?y7XSbN delta 260 zcmV+f0sH=+AE6%yABzYGNnG@?2dEBzJq`Q)Z@&LM!e^($mq)Ap0T1?PdiNXi=j%`F z{r5-TT_uheS8wI zy78KPb9s5TKIw+^)30BQ>vMl{vh>}zFV|3vLx-gr1~w>;_olP;Naodq{P zf4bXxlQw&Kzu#`d^`rgh{728yO&|Z