diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 5c9d0c33..7496d8dc 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -323,7 +323,14 @@ def resample(id, r, parent, overwrite='copy'): data['datetime'] = data['time'].apply( lambda x: startdatetime+datetime.timedelta(seconds=x/1000.)) - data = data.resample('S', on='datetime').mean() + try: + data = data.resample('S', on='datetime').mean() + except TypeError: + data1 = data._get_numeric_data() + data1['datetime'] = data['datetime'] + data = data1.resample('S', on='datetime').mean() + + data.interpolate(method='linear', inplace=True) data.reset_index(drop=True, inplace=True) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 7f20535e..27485f46 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ