nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

RideFile: Don't use 0.0 as min or max for gps lat/lon

Browse Source
This commit is contained in:
grauser
2015-06-02 23:04:32 +02:00
parent b02a869674
commit 55fb4d68c6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/RideFile.cpp
View File

@@ -714,9 +714,9 @@ void RideFile::updateMin(RideFilePoint* point)
minPoint->watts = point->watts;
if (point->alt<minPoint->alt)
minPoint->alt = point->alt;
if (minPoint->lon == 0 || point->lon<minPoint->lon)
if (minPoint->lon == 0.0 || (point->lon != 0.0 && point->lon<minPoint->lon))
minPoint->lon = point->lon;
if (minPoint->lat == 0 || point->lat<minPoint->lat)
if (minPoint->lat == 0.0 || (point->lat != 0.0 && point->lat<minPoint->lat))
minPoint->lat = point->lat;
if (point->headwind<minPoint->headwind)
minPoint->headwind = point->headwind;
@@ -791,9 +791,9 @@ void RideFile::updateMax(RideFilePoint* point)
maxPoint->watts = point->watts;
if (point->alt>maxPoint->alt)
maxPoint->alt = point->alt;
if (point->lon>maxPoint->lon)
if (maxPoint->lon == 0.0 || (point->lon != 0.0 && point->lon>maxPoint->lon))
maxPoint->lon = point->lon;
if (point->lat>maxPoint->lat)
if (maxPoint->lat == 0.0 || (point->lat != 0.0 && point->lat>maxPoint->lat))
maxPoint->lat = point->lat;
if (point->headwind>maxPoint->headwind)
maxPoint->headwind = point->headwind;

6
src/Route.cpp
View File

@@ -373,6 +373,12 @@ Routes::search(RideItem *item, RideFile*ride, QList<IntervalItem*>&here)
for (int routecount=0;routecount<routes.count();routecount++) {
RouteSegment *segment = &routes[routecount];
qDebug() << ride->getMinPoint(RideFile::lat);
qDebug() << ride->getMaxPoint(RideFile::lat);
qDebug() << ride->getMinPoint(RideFile::lon);
qDebug() << ride->getMaxPoint(RideFile::lon);
// The third decimal place is worth up to 110 m
if (ride->getMinPoint(RideFile::lat).toDouble()<segment->getMinLat()+0.001 &&
ride->getMaxPoint(RideFile::lat).toDouble()>segment->getMaxLat()-0.001 &&