diff --git a/skais/ais/ais_trajectory.py b/skais/ais/ais_trajectory.py index 359705c1cc71a2db79d7b5c952fe5bc02c64b727..f3199b35dd09a9f7f7c294ac769e158d4ad8edcf 100644 --- a/skais/ais/ais_trajectory.py +++ b/skais/ais/ais_trajectory.py @@ -154,7 +154,7 @@ def apply_time_sequence(dat, time, func): class AISTrajectory(AISPoints): def __init__(self, df, interpolation_time=None): - # df = df.drop_duplicates(subset=['ts_sec']) + df = df.drop_duplicates(subset=['ts_sec']) if interpolation_time and len(df.index) > 4: @@ -163,7 +163,7 @@ class AISTrajectory(AISPoints): new_df = pd.DataFrame() t_raw = df['ts_sec'].to_numpy() t_interp1d = np.arange(start=t_raw[0], stop=t_raw[-1] + 1, - step=interpolation_time * 60) + step=interpolation_time) new_df['ts_sec'] = t_interp1d @@ -243,7 +243,7 @@ class AISTrajectory(AISPoints): return {"type": "LineString", "coordinates": coordinates} - def split_trajectory(self, time_gap=600): + def split_trajectory(self, time_gap=600, interpolation=None): if 'ts_sec' not in self.df: raise NoTimeInformation() @@ -254,7 +254,7 @@ class AISTrajectory(AISPoints): index = 0 while index < n_sample: i = compute_trajectory(self.df['ts_sec'][index:].to_numpy(), time_gap) - trajectory = AISTrajectory(work_df[:i]) + trajectory = AISTrajectory(work_df[:i], interpolation) result.append(trajectory) work_df = work_df[i:] index += i