Import: merge dives trip-wise

The old way of merging log-files was not well defined: Trips
were recognized as the same if and only if the first dives
started at the same instant. Later dives did not matter.

Change this to merge dives if they are overlapping.
Moreover, on parsing and download generate trips in a separate
trip-table.

This will be fundamental for undo of dive-import: Firstly, we
don't want to mix trips of imported and not-yet imported dives.
Secondly, by merging trip-wise, we can autogroup the dives
in the import-data to trips and merge these at once. This will
simplify the code to decide to which trip dives should be
autogrouped.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 3 insertions, 2 deletions

diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index ecc664364..3e366db58 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -769,8 +769,9 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton *button)
 		}
 		/* parse file and import dives */
 		struct dive_table table = { 0 };
-		parse_file(QFile::encodeName(zipFile.fileName()), &table, &trip_table);
-		process_imported_dives(&table, false, false);
+		struct trip_table trips = { 0 };
+		parse_file(QFile::encodeName(zipFile.fileName()), &table, &trips);
+		process_imported_dives(&table, &trips, false, false);
 		MainWindow::instance()->refreshDisplay();
 
 		/* store last entered user/pass in config */