summaryrefslogtreecommitdiffstats
path: root/divesite.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-13 00:04:14 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-13 12:42:44 -0800
commit8c3efd2a22959f684b7604a405d66abc0831a9e1 (patch)
tree821439c85cf4df82d40da84f09a5cf0c56dee387 /divesite.c
parentd4f2b7214863b2a40ebcf69e7add113412f795b8 (diff)
downloadsubsurface-8c3efd2a22959f684b7604a405d66abc0831a9e1.tar.gz
Improve parsing of older XML files in order to auto create dive sites
While the existing code worked with a couple of hand crafted examples it turns out it did a poor job with most of my files. Oops. Depending on whether we find name or coordinates first, we need to identify existing sites in either case and do the right thing. The challeng here are multiple dives at the same site with slightly different GPS coordinates. If the name is read first, these all get merged into one (and we warn about the different GPS data). But if GPS gets read first, we create separate dive sites with the same name. We need a sane UI to consolidate these - but we can't completely automate this... it's possible that these ARE the same site and the GPS data is just imprecise (for example, multiple dives at the same time with GPS locations from the Subsurface companion app). The user should be able to either pick one of the GPS locations, or keep multiple (for example, different buoyes for the same site and you want to keep the different markers). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divesite.c')
-rw-r--r--divesite.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/divesite.c b/divesite.c
index d9351e1af..bccbe37e2 100644
--- a/divesite.c
+++ b/divesite.c
@@ -58,16 +58,6 @@ uint32_t create_dive_site_with_gps(const char *name, degrees_t latitude, degrees
return ds->uuid;
}
-/* this either returns the uuid for a site with that name or creates an entry */
-uint32_t dive_site_uuid_by_name(const char *name)
-{
- uint32_t id = get_dive_site_uuid_by_name(name);
- if (id == 0)
- id = create_dive_site(name);
-
- return id;
-}
-
/* if the uuid is valid, just get the site, otherwise create it first;
* so you can call this with dive->dive_site_uuid and you'll either get the existing
* dive site or it will create a new one - so make sure you assign the uuid back to