From 263ea5d3648baadfddf886b2e0ad2debac695657 Mon Sep 17 00:00:00 2001 From: mikeller Date: Fri, 29 Jun 2018 00:58:29 +1200 Subject: [PATCH 1/2] Fixed display of GPS altitude. --- src/js/tabs/gps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 7fa3d97a..6566c95c 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -48,7 +48,7 @@ TABS.gps.initialize = function (callback) { var url = 'https://maps.google.com/?q=' + lat + ',' + lon; $('.GPS_info td.fix').html((GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - $('.GPS_info td.alt').text((GPS_DATA.alt / 10) + ' m'); + $('.GPS_info td.alt').text(GPS_DATA.alt + ' m'); $('.GPS_info td.lat a').prop('href', url).text(lat.toFixed(4) + ' deg'); $('.GPS_info td.lon a').prop('href', url).text(lon.toFixed(4) + ' deg'); $('.GPS_info td.speed').text(GPS_DATA.speed + ' cm/s'); From ec75c22669428f539a60c95a72ddc719f34fd857 Mon Sep 17 00:00:00 2001 From: mikeller Date: Fri, 29 Jun 2018 01:18:27 +1200 Subject: [PATCH 2/2] Fix from review. --- src/js/tabs/gps.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 6566c95c..1dc095e7 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -46,9 +46,13 @@ TABS.gps.initialize = function (callback) { var lat = GPS_DATA.lat / 10000000; var lon = GPS_DATA.lon / 10000000; var url = 'https://maps.google.com/?q=' + lat + ',' + lon; + var alt = GPS_DATA.alt; + if (semver.lt(CONFIG.apiVersion, "1.39.0")) { + alt = alt / 10; + } $('.GPS_info td.fix').html((GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - $('.GPS_info td.alt').text(GPS_DATA.alt + ' m'); + $('.GPS_info td.alt').text(alt + ' m'); $('.GPS_info td.lat a').prop('href', url).text(lat.toFixed(4) + ' deg'); $('.GPS_info td.lon a').prop('href', url).text(lon.toFixed(4) + ' deg'); $('.GPS_info td.speed').text(GPS_DATA.speed + ' cm/s');