Skip to content

Commit 532a672

Browse files
authored
Concat longitude and latitude and add location url on Setup tab (#3491)
1 parent 25447ae commit 532a672

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

locales/en/messages.json

-6
Original file line numberDiff line numberDiff line change
@@ -2726,12 +2726,6 @@
27262726
"gpsAltitude": {
27272727
"message": "Altitude:"
27282728
},
2729-
"gpsLat": {
2730-
"message": "Latitude:"
2731-
},
2732-
"gpsLon": {
2733-
"message": "Longitude:"
2734-
},
27352729
"gpsHeading": {
27362730
"message": "Heading:"
27372731
},

src/js/tabs/setup.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ setup.initialize = function (callback) {
194194
arming_disable_flags_e = $('.arming-disable-flags'),
195195
gpsFix_e = $('.GPS_info span.colorToggle'),
196196
gpsSats_e = $('.gpsSats'),
197-
gpsLat_e = $('.gpsLat'),
198-
gpsLon_e = $('.gpsLon'),
199197
roll_e = $('dd.roll'),
200198
pitch_e = $('dd.pitch'),
201199
heading_e = $('dd.heading'),
@@ -428,14 +426,15 @@ setup.initialize = function (callback) {
428426
}
429427

430428
// GPS info is acquired in the background using update_live_status() in serial_backend.js
431-
432429
gpsFix_e.text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse'));
433430
gpsFix_e.toggleClass('ready', FC.GPS_DATA.fix != 0);
434-
435-
const gspUnitText = i18n.getMessage('gpsPositionUnit');
436431
gpsSats_e.text(FC.GPS_DATA.numSat);
437-
gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} ${gspUnitText}`);
438-
gpsLon_e.text(`${(FC.GPS_DATA.lon / 10000000).toFixed(4)} ${gspUnitText}`);
432+
433+
const lat = FC.GPS_DATA.lat / 10000000;
434+
const lon = FC.GPS_DATA.lon / 10000000;
435+
const url = `https://maps.google.com/?q=${lat},${lon}`;
436+
const gpsUnitText = i18n.getMessage('gpsPositionUnit');
437+
$('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} ${gpsUnitText} / ${lon.toFixed(4)} ${gpsUnitText}`);
439438
}
440439

441440
function get_fast_data() {

src/tabs/setup.html

+2-6
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,8 @@
128128
<td class="gpsSats"></td>
129129
</tr>
130130
<tr>
131-
<td i18n="gpsLat"></td>
132-
<td class="gpsLat"></td>
133-
</tr>
134-
<tr class="noboarder">
135-
<td i18n="gpsLon"></td>
136-
<td class="gpsLon"></td>
131+
<td i18n="gpsLatLon"></td>
132+
<td class="latLon"><a href="#" target="_blank">0.0000 deg</a></td>
137133
</tr>
138134
</tbody>
139135
</table>

0 commit comments

Comments
 (0)