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

fixed alerts, manual testing completed

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-04 11:31:25 +02:00
parent 2544ea16a9
commit dfdaa566a0
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/dataroutines.py
View File

@@ -231,7 +231,6 @@ def get_video_data(w, groups=['basic'], mode='water'):
df2 = df2.round(decimals=2)
boatspeed = (100*df2['velo']).astype(int)/100.
try:
coordinates = get_latlon_time(w.id)
@@ -245,10 +244,13 @@ def get_video_data(w, groups=['basic'], mode='water'):
coordinates.set_index(pd.to_timedelta(
coordinates['time'], unit='s'), inplace=True)
coordinates = coordinates.resample('1s').mean().interpolate()
coordinates['time'] = coordinates['time']-coordinates['time'].min()
latitude = coordinates['latitude']
longitude = coordinates['longitude']
coordinates = coordinates.resample('1s').first().interpolate().fillna(method='ffill')
#coordinates['time'] = coordinates['time']-coordinates['time'].min()
df2 = pd.concat([df2, coordinates], axis=1)
latitude = df2['latitude']
longitude = df2['longitude']
boatspeed = (100*df2['velo']).astype(int)/100.
# bundle data
data = {
'boatspeed': boatspeed.values.tolist(),
@@ -281,9 +283,6 @@ def get_video_data(w, groups=['basic'], mode='water'):
except KeyError: # pragma: no cover
pass
for key, value in data.items():
print(key, len(value))
metrics['boatspeed'] = metrics.pop('velo')
# metrics['workperstroke'] = metrics.pop('driveenergy')
metrics = collections.OrderedDict(sorted(metrics.items()))