From c521aec88452460cc139d9d74d1f23ef58eac1a6 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 23 Jan 2013 11:53:42 -0800 Subject: Import and merge GPS data from the webservice Dive locations marked (and named) via the companion app are downloaded from the webservice, parsed and merged with the existing dives. Signed-off-by: Dirk Hohndel --- dive.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dive.c') diff --git a/dive.c b/dive.c index fe9ce3a20..db8ebda9d 100644 --- a/dive.c +++ b/dive.c @@ -1209,12 +1209,17 @@ static int max_time(duration_t a, duration_t b) */ static int likely_same_dive(struct dive *a, struct dive *b) { - int fuzz, match; + int match, fuzz = 20 * 60; /* Don't try to merge dives in different trips */ if (a->divetrip && b->divetrip && a->divetrip != b->divetrip) return 0; + /* if one of the dives has no depth and duration this could be + * a location marker from the webservice */ + if ((!a->maxdepth.mm && !a->duration.seconds) || + (!b->maxdepth.mm && !b->duration.seconds)) + return ((a->when <= b->when + fuzz) && (a->when >= b->when - fuzz)); /* * Do some basic sanity testing of the values we * have filled in during 'fixup_dive()' -- cgit v1.2.3-70-g09d2