diff options
author | Paweł Spychalski <pspychalski@gmail.com> | 2020-11-27 14:15:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 14:15:35 +0300 |
commit | 98359d74754442a461bb49bf97a4c6fab79b2418 (patch) | |
tree | debb635d1d2d07e99b0b53e2f3a5638ba9c6d74c /tabs | |
parent | b7622385fd70381067805a4a5f73427ea4171c07 (diff) | |
parent | d53adc22b22e847e25dbc32754aea815a13a3563 (diff) |
Merge pull request #1016 from miralem/mission-planner-show-altitude-in-meters
Added label that converts cm into m and shows the value
Diffstat (limited to 'tabs')
-rw-r--r-- | tabs/mission_control.html | 2 | ||||
-rw-r--r-- | tabs/mission_control.js | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/tabs/mission_control.html b/tabs/mission_control.html index 92ef77c3..0a9b6f3a 100644 --- a/tabs/mission_control.html +++ b/tabs/mission_control.html @@ -95,7 +95,7 @@ </div> <div class="point"> <label class="point-label" for="pointAlt">Alt (cm): </label> - <input id="pointAlt" type="text" value="0" required> + <input id="pointAlt" type="text" value="0" required><span id="altitudeInMeters"></span> </div> <div class="point"> <label class="point-label" for="pointSpeed">Speed (cm/s): </label> diff --git a/tabs/mission_control.js b/tabs/mission_control.js index f935c672..05d76c07 100644 --- a/tabs/mission_control.js +++ b/tabs/mission_control.js @@ -99,11 +99,11 @@ TABS.mission_control.initialize = function (callback) { MSP.send_message(MSPCodes.MSP_ALTITUDE, false, false, get_attitude_data); } + function get_attitude_data() { MSP.send_message(MSPCodes.MSP_ATTITUDE, false, false, update_gpsTrack); } - - + function update_gpsTrack() { let lat = GPS_DATA.lat / 10000000; @@ -480,6 +480,10 @@ TABS.mission_control.initialize = function (callback) { }; ol.inherits(app.Drag, ol.interaction.Pointer); + app.ConvertCentimetersToMeters = function (val) { + return parseInt(val) / 100; + }; + /** * @constructor * @extends {ol.control.Control} @@ -684,6 +688,9 @@ TABS.mission_control.initialize = function (callback) { selectedFeature.setStyle(getPointIcon(true)); + var altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.alt); + + $('#altitudeInMeters').text(` ${altitudeMeters}m`); $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000); $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000); $('#pointAlt').val(selectedMarker.alt); @@ -718,6 +725,11 @@ TABS.mission_control.initialize = function (callback) { map.width_ = width; map.height_ = height; }, 200); + $('#pointAlt').keyup(function(){ + let altitudeMeters = app.ConvertCentimetersToMeters($(this).val()); + $('#altitudeInMeters').text(` ${altitudeMeters}m`); + }); + $('#removeAllPoints').on('click', function () { if (markers.length && confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) { removeAllPoints(); |