diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 95fe1fc1..a824f571 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -374,6 +374,18 @@ def workout_summary_to_df( def resample(id, r, parent, overwrite=False): data, row = getrowdata_db(id=id) + rowdata = rrdata(csvfile=parent.csvfilename).df + # drop all columns except ' latitude' and ' longitude' and 'TimeStamp (sec)' from rowdata + allowedcolumns = [' latitude', ' longitude', 'TimeStamp (sec)'] + rowdata = rowdata.filter(allowedcolumns) + rowdata.rename(columns={'TimeStamp (sec)': 'time'}, inplace=True) + rowdata['time'] = (rowdata['time']-rowdata.loc[0,'time'])*1000. + rowdata.set_index('time', inplace=True) + data.set_index('time', inplace=True) + rowdata_interpolated = rowdata.reindex(data.index.union(rowdata.index)).interpolate('index') + data = data.merge(rowdata_interpolated, left_index=True, right_index=True, how='left') + data = data.reset_index() + messages = [] # resample diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 45ab3cec..eca15abb 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 40bd1f56..b5e57156 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4700,6 +4700,7 @@ def workout_map_view(request, id=0): u = w.user.user r = getrower(u) rowdata = rdata(csvfile=f1) + hascoordinates = 1 if rowdata != 0: try: