Merge "Incorrect location info observed in Gnss bugreport"

This commit is contained in:
Linux Build Service Account 2017-08-24 14:16:55 -07:00 committed by Gerrit - the friendly Code Review server
commit 04eb6ff7ee

View file

@ -48,6 +48,8 @@
#include <vector> #include <vector>
#include <string> #include <string>
#define RAD2DEG (180.0 / M_PI)
using namespace loc_core; using namespace loc_core;
GnssAdapter::GnssAdapter() : GnssAdapter::GnssAdapter() :
@ -2897,16 +2899,12 @@ bool GnssAdapter::getDebugReport(GnssDebugReport& r)
} }
else if(!reports.mBestPosition.empty() && reports.mBestPosition.back().mValid) { else if(!reports.mBestPosition.empty() && reports.mBestPosition.back().mValid) {
r.mLocation.mValid = true; r.mLocation.mValid = true;
r.mLocation.mLocation.latitude = r.mLocation.mLocation.latitude =
(double)(reports.mBestPosition.back().mBestLat); (double)(reports.mBestPosition.back().mBestLat) * RAD2DEG;
r.mLocation.mLocation.longitude = r.mLocation.mLocation.longitude =
(double)(reports.mBestPosition.back().mBestLon); (double)(reports.mBestPosition.back().mBestLon) * RAD2DEG;
r.mLocation.mLocation.altitude = r.mLocation.mLocation.altitude = reports.mBestPosition.back().mBestAlt;
reports.mBestPosition.back().mBestAlt; r.mLocation.mUtcReported = reports.mBestPosition.back().mUtcReported;
r.mLocation.mLocation.timestamp =
reports.mBestPosition.back().mUtcReported.tv_sec * 1000ULL +
reports.mBestPosition.back().mUtcReported.tv_nsec / 1000000ULL;
} }
else { else {
r.mLocation.mValid = false; r.mLocation.mValid = false;