From d404aa767feb24b19da50ba833723b3dd0cfb271 Mon Sep 17 00:00:00 2001 From: Michael Werle Date: Thu, 3 Sep 2020 12:04:05 +0900 Subject: [Bug #2934] Geo Lookup - support for remote dive sites Some remote dive sites have no populated places (towns, cities) nearby. For such sites, we now fall back to looking up unpopulated place names, such as the reef or island name. Also some code refactorisation: the actual network access is now encapsulated in its own function removing some duplicated code handling in the reverseGeoLookup function and making it more readable. Furthermore, reverseGeoLookup() was completely refactored as most of its functionality was due to legacy requirements; the current code-base only calls this function from a single location and only with an empty taxonomy_data object. This makes the function more focussed and much simpler and more readable. Finally, a resource leak in reverseGeocde introduced in 4f3b26f9b6296273e37ec317bc68f32f94f546dc was fixed. Signed-off-by: Michael Werle --- desktop-widgets/locationinformation.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 01a1a4390..780390198 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -317,10 +317,12 @@ void LocationInformationWidget::reverseGeocode() location_t location = parseGpsText(ui.diveSiteCoordinates->text()); if (!ds || !has_location(&location)) return; - taxonomy_data taxonomy = { 0, 0 }; - reverseGeoLookup(location.lat, location.lon, &taxonomy); - if (ds != diveSite) + taxonomy_data taxonomy = reverseGeoLookup(location.lat, location.lon); + if (ds != diveSite) { + free_taxonomy(&taxonomy); return; + } + // This call transfers ownership of the taxonomy memory into an EditDiveSiteTaxonomy object Command::editDiveSiteTaxonomy(ds, taxonomy); } -- cgit v1.2.3-70-g09d2