From 28e3413ff66552f392fecee25068d634cdfe59fc Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 20 Oct 2018 14:12:15 -0400 Subject: Add 'location_t' data structure Instead of having people treat latitude and longitude as separate things, just add a 'location_t' data structure that contains both. Almost all cases want to always act on them together. This is really just prep-work for adding a few more locations that we track: I want to add a entry/exit location to each dive (independent of the dive site) because of how the Garmin Descent gives us the information (and hopefully, some day, other dive computers too). Signed-off-by: Linus Torvalds --- mobile-widgets/qmlmanager.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'mobile-widgets/qmlmanager.cpp') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 22431de30..c5603d434 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -754,14 +754,11 @@ void QMLManager::refreshDiveList() static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, double lon, const char *locationtext) { + location_t location = create_location(lat, lon); if (ds) { - ds->latitude.udeg = lrint(lat * 1000000); - ds->longitude.udeg = lrint(lon * 1000000); + ds->location = location; } else { - degrees_t latData, lonData; - latData.udeg = lrint(lat * 1000000); - lonData.udeg = lrint(lon * 1000000); - d->dive_site_uuid = create_dive_site_with_gps(locationtext, latData, lonData, d->when); + d->dive_site_uuid = create_dive_site_with_gps(locationtext, &location, d->when); } } @@ -1481,7 +1478,7 @@ QString QMLManager::getGpsFromSiteName(const QString& siteName) uuid = get_dive_site_uuid_by_name(qPrintable(siteName), NULL); if (uuid) { ds = get_dive_site_by_uuid(uuid); - return QString(printGPSCoords(ds->latitude.udeg, ds->longitude.udeg)); + return QString(printGPSCoords(&ds->location)); } return ""; } -- cgit v1.2.3-70-g09d2