root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Fixed POI selection when the POI radius is not >> trackpoint distance

Browse Source 
Fixes #153
This commit is contained in:
Martin Tůma 2018-09-12 19:55:32 +02:00
parent 3291ea86ef
commit 09a5f57109
1 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/data/poi.cpp
View File

@ -94,6 +94,28 @@ static bool cb(size_t data, void* context)
return true; return true;
} }
static Coordinates intermediate(const Coordinates &c1, const Coordinates &c2,
double f)
{
double lat1 = deg2rad(c1.lat());
double lon1 = deg2rad(c1.lon());
double lat2 = deg2rad(c2.lat());
double lon2 = deg2rad(c2.lon());
double cosLat1 = cos(lat1);
double cosLat2 = cos(lat2);
double d = 2 * asin(sqrt(pow((sin((lat1 - lat2) / 2)), 2) + cosLat1
* cosLat2 * pow(sin((lon1 - lon2) / 2), 2)));
double sinD = sin(d);
double A = sin((1.0-f)*d) / sinD;
double B = sin(f*d) / sinD;
double x = A * cosLat1 * cos(lon1) + B * cosLat2 * cos(lon2);
double y = A * cosLat1 * sin(lon1) + B * cosLat2 * sin(lon2);
double z = A * sin(lat1) + B * sin(lat2);
return Coordinates(rad2deg(atan2(y, x)), rad2deg(atan2(z, sqrt(x*x + y*y))));
}
QList<Waypoint> POI::points(const Path &path) const QList<Waypoint> POI::points(const Path &path) const
{ {
QList<Waypoint> ret; QList<Waypoint> ret;
@ -101,8 +123,15 @@ QList<Waypoint> POI::points(const Path &path) const
qreal min[2], max[2]; qreal min[2], max[2];
QSet<int>::const_iterator it; QSet<int>::const_iterator it;
for (int i = 0; i < path.count(); i++) {
RectC br(path.at(i).coordinates(), _radius); for (int i = 1; i < path.count(); i++) {
double ds = path.at(i).distance() - path.at(i-1).distance();
unsigned n = (unsigned)ceil(ds / _radius);
for (unsigned j = 0; j < n; j++) {
RectC br(n > 1 ? intermediate(path.at(i-1).coordinates(),
path.at(i).coordinates(), (double)j/(double)n)
: path.at(i-1).coordinates(), _radius);
min[0] = br.topLeft().lon(); min[0] = br.topLeft().lon();
min[1] = br.bottomRight().lat(); min[1] = br.bottomRight().lat();
max[0] = br.bottomRight().lon(); max[0] = br.bottomRight().lon();
@ -110,6 +139,16 @@ QList<Waypoint> POI::points(const Path &path) const
_tree.Search(min, max, cb, &set); _tree.Search(min, max, cb, &set);
} }
}
RectC br(path.last().coordinates(), _radius);
min[0] = br.topLeft().lon();
min[1] = br.bottomRight().lat();
max[0] = br.bottomRight().lon();
max[1] = br.topLeft().lat();
_tree.Search(min, max, cb, &set);
for (it = set.constBegin(); it != set.constEnd(); ++it) for (it = set.constBegin(); it != set.constEnd(); ++it)
ret.append(_data.at(*it)); ret.append(_data.at(*it));