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 --- desktop-widgets/tab-widgets/maintab.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index bb8f0d904..6f3691d3d 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -696,9 +696,8 @@ uint32_t MainTab::updateDiveSite(uint32_t pickedUuid, dive *d) newDs->name = copy_qstring(ui.location->text()); newDs->uuid = pickedUuid; qDebug() << "Creating and copying dive site"; - } else if (newDs->latitude.udeg == 0 && newDs->longitude.udeg == 0) { - newDs->latitude.udeg = origDs->latitude.udeg; - newDs->longitude.udeg = origDs->longitude.udeg; + } else if (!has_location(&newDs->location)) { + newDs->location = origDs->location; qDebug() << "Copying GPS information"; } } -- cgit v1.2.3-70-g09d2