diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-06-28 07:33:51 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-06-28 20:13:49 +0900 |
| commit | 9e1d83ca562bcd33ae887a42df4fc5edf323f007 (patch) | |
| tree | 2332e01e46d5a358bb1a25616e2378e7533c05d2 /core/trip.h | |
| parent | 230f3846fa77d1b58195e71489fba145bcd1e0b7 (diff) | |
| download | subsurface-9e1d83ca562bcd33ae887a42df4fc5edf323f007.tar.gz | |
Import: use TRIP_THRESHOLD when checking for trip-overlap
When checking for trip-overlap on import, only really overlapping trips
have been considered, i.e. when dives had overlapping times.
Instead use the TRIP_THRESHOLD so that on download dives are added to
the same trip if in a two-days time frame.
Reported-by: Miika Turkia <miika.turkia@gmail.com>
Reported-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/trip.h')
| -rw-r--r-- | core/trip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/trip.h b/core/trip.h index 3b7fec44d..2ca2791cd 100644 --- a/core/trip.h +++ b/core/trip.h @@ -42,6 +42,7 @@ extern dive_trip_t *create_trip_from_dive(struct dive *dive); extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_table *trip_table_arg); extern dive_trip_t *get_dives_to_autogroup(struct dive_table *table, int start, int *from, int *to, bool *allocated); extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated); +extern bool trips_overlap(const struct dive_trip *t1, const struct dive_trip *t2); extern void select_dives_in_trip(struct dive_trip *trip); extern void deselect_dives_in_trip(struct dive_trip *trip); |