From f21881828c2d0f9e0810a4d08d87668e96510468 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 26 Sep 2024 17:42:32 +0200
Subject: [PATCH 1/2] second filter

---
 rowers/dataprep.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index b24de134..8d6ed877 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1214,6 +1214,11 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
     x = x * - 1    
     neg_peaks, _ = find_peaks(x, height=0) # hieght is the threshold value
 
+    row.df[' Power (watts)'][neg_peaks] = row.df[' Power (watts)'][neg_peaks-1]
+    x = row.df[' Power (watts)'].values
+    x = x * - 1    
+    neg_peaks, _ = find_peaks(x, height=0) # hieght is the threshold value
+
     row.df[' Power (watts)'][neg_peaks] = row.df[' Power (watts)'][neg_peaks-1]
     
     #row.df[' Power (watts)'].replace(to_replace=0,method='ffill', inplace=True)

From bb0d07df7278520092ed51b1f791a6a6ecc03aa6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 30 Sep 2024 09:00:30 +0200
Subject: [PATCH 2/2] 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=AD<rwABzYG&OrIG2dEBzoq8eaPx=l%I~~3}TI~;bus_qg-<UsNe_HRq
zKl<(}alE*CyYG)(dV8)eUT?e2^X}|y_q5W-_2%?>H+1Q|-Tv)LRNfzV^v%oR#l_W)
z*W{ba%d_=KH>96_{bF37`;(KU@4kJxK6`%sbAL(iV><N4!+E>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*MLaJJjn<dJf+ul>OEB>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_uheS8w<Iu}g2y)y3;=w|U;3o$a1h`ncYlKJSJuowwV+U5U#3<Bq<0IlQ>I
zy78KPb9s5TKIw+^)30BQ>vMl{vh>}zFV|<!uYc|@>3vLx-gr1~w>;_olP;Naodq{P
zf4bXxlQw&Kzu#`d^`rgh{728yO&|Z<pY`3gPaN{6w~y||eH}gSHm8riKmOsz%x3rJ
ze)~`9E&lQ4`EPx?Gk`Au_WvKPZhWzS^1H`${9uQAy-CmEyM(g8`aV64-_oUzAN&s;
KfT2CafB^u+)tJcu

diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index cb88ba4f..6eda67e8 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -827,7 +827,16 @@ def course_upload_view(request):
 
                 for course in cs:
                     cname = name+' - '+course['name']
-                    cnotes = notes+'\n\n'+course['description']
+                    try:
+                        cnotes = notes+'\n\n'+course['description']
+                    except TypeError:
+                        try:
+                            cnotes = notes
+                        except TypeError:
+                            try:
+                                cnotes = course['description']
+                            except TypeError:
+                                cnotes = ''
                     polygons = course['polygons']
 
                     course = courses.createcourse(