From a763825b97c98c634027f6ea65250c56a2131491 Mon Sep 17 00:00:00 2001 From: Katz Yamada Date: Tue, 22 Aug 2017 10:56:00 -0700 Subject: [PATCH] Incorrect location info observed in Gnss bugreport Fixed missing conversion from radian to degree for latitude and longitude values when generated from PQWP2 debug NMEA info. Bug: 64808400 Change-Id: I30c65f309c2cd209090cc45d9da1764d05a85c7b CRs-Fixed: 2095295 --- gnss/GnssAdapter.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 7e638ad7..edbb0933 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -48,6 +48,8 @@ #include #include +#define RAD2DEG (180.0 / M_PI) + using namespace loc_core; GnssAdapter::GnssAdapter() : @@ -2897,16 +2899,12 @@ bool GnssAdapter::getDebugReport(GnssDebugReport& r) } else if(!reports.mBestPosition.empty() && reports.mBestPosition.back().mValid) { r.mLocation.mValid = true; - r.mLocation.mLocation.latitude = - (double)(reports.mBestPosition.back().mBestLat); + r.mLocation.mLocation.latitude = + (double)(reports.mBestPosition.back().mBestLat) * RAD2DEG; r.mLocation.mLocation.longitude = - (double)(reports.mBestPosition.back().mBestLon); - r.mLocation.mLocation.altitude = - reports.mBestPosition.back().mBestAlt; - - r.mLocation.mLocation.timestamp = - reports.mBestPosition.back().mUtcReported.tv_sec * 1000ULL + - reports.mBestPosition.back().mUtcReported.tv_nsec / 1000000ULL; + (double)(reports.mBestPosition.back().mBestLon) * RAD2DEG; + r.mLocation.mLocation.altitude = reports.mBestPosition.back().mBestAlt; + r.mLocation.mUtcReported = reports.mBestPosition.back().mUtcReported; } else { r.mLocation.mValid = false;