mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add helper function to determine the distance between two points

Browse source 
And use this to find a dive site within a certain radius of a GPS fix.
This will be used to figure out if dive sites might be the same.

This uses a new Qt5 component (Positioning) which was added in Qt5.2.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-10 11:45:34 -07:00
parent 1ee447b5a9
commit d541c2b601
5 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -128,8 +128,8 @@ if(NOT (insource OR insourcedir))
endif()
# configure Qt.
find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network WebKitWidgets PrintSupport Svg Test LinguistTools)
set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Svg)
find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network WebKitWidgets PrintSupport Svg Test LinguistTools Positioning)
set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Svg Qt5::Positioning)
set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test)
# Generate the ssrf-config.h every 'make'

22
divesite.c
View file

@ -34,6 +34,28 @@ uint32_t get_dive_site_uuid_by_gps(degrees_t latitude, degrees_t longitude, stru
return 0;
}
/* this is in globe.cpp, so including the .h file is a pain */
extern double getDistance(int lat1, int lon1, int lat2, int lon2);
/* find the closest one, no more than distance meters away - if more than one at same distance, pick the first */
uint32_t get_dive_site_uuid_by_gps_proximity(degrees_t latitude, degrees_t longitude, int distance, struct dive_site **dsp)
{
int i;
int uuid = 0;
struct dive_site *ds;
double cur_distance, min_distance = distance + 0.001;
for_each_dive_site (i, ds) {
if (dive_site_has_gps_location(ds) &&
(cur_distance = getDistance(ds->latitude.udeg, ds->longitude.udeg, latitude.udeg, longitude.udeg)) < min_distance) {
min_distance = cur_distance;
uuid = ds->uuid;
if (dsp)
*dsp = ds;
}
}
return uuid;
}
/* try to create a uniqe ID - fingers crossed */
static uint32_t dive_site_getUniqId()
{

1
divesite.h
View file

@ -53,6 +53,7 @@ uint32_t create_dive_site(const char *name);
uint32_t create_dive_site_with_gps(const char *name, degrees_t latitude, degrees_t longitude);
uint32_t get_dive_site_uuid_by_name(const char *name, struct dive_site **dsp);
uint32_t get_dive_site_uuid_by_gps(degrees_t latitude, degrees_t longitude, struct dive_site **dsp);
uint32_t get_dive_site_uuid_by_gps_proximity(degrees_t latitude, degrees_t longitude, int distance, struct dive_site **dsp);
bool dive_site_is_empty(struct dive_site *ds);
#ifdef __cplusplus

8
qt-ui/globe.cpp
View file

@ -1,4 +1,5 @@
#include "globe.h"
#include <QGeoCoordinate>
#ifndef NO_MARBLE
#include "mainwindow.h"
#include "helpers.h"
@ -392,3 +393,10 @@ void GlobeGPS::reload()
{
}
#endif
extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2)
{
QGeoCoordinate c1(lat1 / 1000000.0, lon1 / 1000000.0);
QGeoCoordinate c2(lat2 / 1000000.0, lon2 / 1000000.0);
return c1.distanceTo(c2);
}

3
qt-ui/globe.h
View file

@ -74,4 +74,7 @@ slots:
};
#endif // NO_MARBLE
extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2);
#endif // GLOBE_H