From 3c6e8ff646a6fb4c64721a3652459cd0612ebe4d Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 18 Feb 2025 18:25:44 +0100 Subject: [PATCH 1/3] Update latlon --- locales/en/messages.json | 10 +++++++--- src/js/fc.js | 4 ++-- src/js/msp/MSPHelper.js | 4 ++-- src/js/tabs/gps.js | 17 ++++++++++------- src/js/tabs/setup.js | 13 ++++++++----- src/tabs/gps.html | 8 ++++++-- src/tabs/setup.html | 7 +++++-- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 163a47e8f2..8022ab80b7 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2957,9 +2957,13 @@ "gpsAltitude": { "message": "Altitude:" }, - "gpsLatLon": { - "message": "Current Latitude / Longitude:", - "description": "Show GPS position - Latitude / Longitude" + "gpsLatitude": { + "message": "Latitude:", + "description": "Show GPS position - Latitude" + }, + "gpsLongitude": { + "message": "Longitude:", + "description": "Show GPS position - Longitude" }, "gpsHeading": { "message": "Heading IMU / GPS:", diff --git a/src/js/fc.js b/src/js/fc.js index b3fe462391..bf7a71a619 100644 --- a/src/js/fc.js +++ b/src/js/fc.js @@ -342,8 +342,8 @@ const FC = { this.GPS_DATA = { fix: 0, numSat: 0, - lat: 0, - lon: 0, + latitude: 0, + longitude: 0, alt: 0, speed: 0, ground_course: 0, diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index f34cb74496..38a01ae63d 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -309,8 +309,8 @@ MspHelper.prototype.process_data = function (dataHandler) { case MSPCodes.MSP_RAW_GPS: FC.GPS_DATA.fix = data.readU8(); FC.GPS_DATA.numSat = data.readU8(); - FC.GPS_DATA.lat = data.read32(); - FC.GPS_DATA.lon = data.read32(); + FC.GPS_DATA.latitude = data.read32(); + FC.GPS_DATA.longitude = data.read32(); FC.GPS_DATA.alt = data.readU16(); FC.GPS_DATA.speed = data.readU16(); FC.GPS_DATA.ground_course = data.readU16(); diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 9d1024cda8..5336ced992 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -334,9 +334,9 @@ gps.initialize = async function (callback) { } function update_ui() { - const lat = FC.GPS_DATA.lat / 10000000; - const lon = FC.GPS_DATA.lon / 10000000; - const url = `https://maps.google.com/?q=${lat},${lon}`; + const latitude = FC.GPS_DATA.latitude / 10000000; + const longitude = FC.GPS_DATA.longitude / 10000000; + const url = `https://maps.google.com/?q=${latitude},${longitude}`; const imuHeadingDegrees = FC.SENSOR_DATA.kinematics[2]; // Convert to radians and add 180 degrees to make icon point in the right direction const imuHeadingRadians = ((imuHeadingDegrees + 180) * Math.PI) / 180; @@ -353,9 +353,12 @@ gps.initialize = async function (callback) { const gpsUnitText = i18n.getMessage("gpsPositionUnit"); $(".GPS_info td.alt").text(`${alt} m`); - $(".GPS_info td.latLon a") + $(".GPS_info td.latitude a") .prop("href", url) - .text(`${lat.toFixed(6)} / ${lon.toFixed(6)} ${gpsUnitText}`); + .text(`${latitude.toFixed(6)} ${gpsUnitText}`); + $(".GPS_info td.longitude a") + .prop("href", url) + .text(`${longitude.toFixed(6)} ${gpsUnitText}`); $(".GPS_info td.heading").text(`${imuHeadingDegrees.toFixed(0)} / ${gpsHeading.toFixed(0)} ${gpsUnitText}`); $(".GPS_info td.speed").text(`${FC.GPS_DATA.speed} cm/s`); $(".GPS_info td.sats").text(FC.GPS_DATA.numSat); @@ -384,12 +387,12 @@ gps.initialize = async function (callback) { if (ispConnected()) { $("#connect").hide(); - gpsFoundPosition = !!(lon && lat); + gpsFoundPosition = !!(longitude && latitude); if (gpsFoundPosition) { (hasMag ? iconStyleMag : iconStyleGPS).getImage().setRotation(imuHeadingRadians); iconFeature.setStyle(hasMag ? iconStyleMag : iconStyleGPS); - const center = fromLonLat([lon, lat]); + const center = fromLonLat([longitude, latitude]); mapView.setCenter(center); iconGeometry.setCoordinates(center); } else { diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index af80fb2702..fa15264d1d 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -524,13 +524,16 @@ setup.initialize = function (callback) { gpsFix_e.toggleClass("ready", FC.GPS_DATA.fix != 0); gpsSats_e.text(FC.GPS_DATA.numSat); - const lat = FC.GPS_DATA.lat / 10000000; - const lon = FC.GPS_DATA.lon / 10000000; - const url = `https://maps.google.com/?q=${lat},${lon}`; + const latitude = FC.GPS_DATA.latitude / 10000000; + const longitude = FC.GPS_DATA.longitude / 10000000; + const url = `https://maps.google.com/?q=${latitude},${longitude}`; const gpsUnitText = i18n.getMessage("gpsPositionUnit"); - $(".GPS_info td.latLon a") + $(".GPS_info td.latitude a") .prop("href", url) - .text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gpsUnitText}`); + .text(`${latitude.toFixed(4)} ${gpsUnitText}`); + $(".GPS_info td.longitude a") + .prop("href", url) + .text(`${longitude.toFixed(4)} ${gpsUnitText}`); } function get_fast_data() { diff --git a/src/tabs/gps.html b/src/tabs/gps.html index 6a49c81e61..a75b0b06df 100755 --- a/src/tabs/gps.html +++ b/src/tabs/gps.html @@ -114,8 +114,12 @@ - - 0.0000 deg + + 0.0000 deg + + + + 0.0000 deg diff --git a/src/tabs/setup.html b/src/tabs/setup.html index 234a76e09d..c021d7c44d 100644 --- a/src/tabs/setup.html +++ b/src/tabs/setup.html @@ -112,9 +112,12 @@ - - 0.0000 deg + + 0.0000 deg + + + 0.0000 deg From 4bffcd28efdc4c241f15dc1731c7f04deed3869f Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 18 Feb 2025 18:44:19 +0100 Subject: [PATCH 2/3] Update virtual --- src/js/VirtualFC.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/VirtualFC.js b/src/js/VirtualFC.js index 10e983eeb7..26e1a3a534 100644 --- a/src/js/VirtualFC.js +++ b/src/js/VirtualFC.js @@ -321,8 +321,8 @@ const VirtualFC = { const sampleGpsData = { fix: 2, numSat: 10, - lat: 474919409, - lon: 190539766, + latitude: 474919409, + longitude: 190539766, alt: 0, speed: 0, ground_course: 1337, From a2b294b7799931e94cb18a725cdfc1ac30f34ccc Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Thu, 20 Feb 2025 13:08:39 +0100 Subject: [PATCH 3/3] Fix missing table row --- src/tabs/setup.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tabs/setup.html b/src/tabs/setup.html index c021d7c44d..c6675b29de 100644 --- a/src/tabs/setup.html +++ b/src/tabs/setup.html @@ -118,6 +118,7 @@ 0.0000 deg +