Merge remote-tracking branch 'upstream/master' into abo_home_safehome_lon_lat_swap

_locales/en/messages.json

@@ -3998,6 +3998,9 @@
     "MissionPlannerJumpTargetRemoval": {
         "message": "You can't remove a Waypoint which is defined as a JUMP target! \nYou first need to remove the target on the waypoint triggering the JUMP."
     },
+    "MissionPlannerAltitudeChangeReset": {
+        "message": "Altitude below ground level. Change ignored"
+    },
     "SafehomeSelected": {
         "message": ""
     },

js/waypoint.js

@@ -139,12 +139,14 @@ let Waypoint = function (number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endM
     self.getElevation = async function (globalSettings) {
         let elevation;
         if (globalSettings.mapProviderType == 'bing') {
-            const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/List?points='+self.getLatMap()+','+self.getLonMap()+'&heights=ellipsoid&key='+globalSettings.mapApiKey);
+            let elevationEarthModel = $('#elevationEarthModel').prop("checked") ? "sealevel" : "ellipsoid";
+
+            const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/List?points='+self.getLatMap()+','+self.getLonMap()+'&heights='+elevationEarthModel+'&key='+globalSettings.mapApiKey);
             const myJson = await response.json();
             elevation = myJson.resourceSets[0].resources[0].elevations[0];
         }
         else {
-            elevation = "NA";
+            elevation = "N/A";
         }
         return elevation;
     }

js/waypointCollection.js

@@ -424,19 +424,21 @@ let WaypointCollection = function () {
             samples = 1024;
         }
         if (globalSettings.mapProviderType == 'bing') {
+            let elevationEarthModel = $('#elevationEarthModel').prop("checked") ? "sealevel" : "ellipsoid";
+
             if (point2measure.length >1) {
-                const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/Polyline?points='+point2measure+'&heights=ellipsoid&samples='+String(samples+1)+'&key='+globalSettings.mapApiKey);
+                const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/Polyline?points='+point2measure+'&heights='+elevationEarthModel+'&samples='+String(samples+1)+'&key='+globalSettings.mapApiKey);
                 const myJson = await response.json();
                 elevation = myJson.resourceSets[0].resources[0].elevations;
             }
             else {
-                const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/List?points='+point2measure+'&heights=ellipsoid&key='+globalSettings.mapApiKey);
+                const response = await fetch('http://dev.virtualearth.net/REST/v1/Elevation/List?points='+point2measure+'&heights='+elevationEarthModel+'&key='+globalSettings.mapApiKey);
                 const myJson = await response.json();
                 elevation = myJson.resourceSets[0].resources[0].elevations;
             }
         }
         else {
-            elevation = "NA";
+            elevation = "N/A";
         }
         //console.log("elevation ", elevation);
         return [lengthMission, totalMissionDistance, samples, elevation, altPoint2measure, namePoint2measure, refPoint2measure];

src/css/tabs/auxiliary.css

@@ -22,6 +22,14 @@
     background: #37a8db;
 }
 
+.tab-auxiliary .mode.inRange .info {
+    background: #104156;
+    color: white;
+}
+.tab-auxiliary .mode.inRange:nth-child(odd) .info {
+    background: #104156;
+}
+
 .tab-auxiliary .mode.off .info {
     background: #828885;
     color: white;
@@ -198,6 +206,33 @@
     padding: 10px 5px;
 }
 
+.tab-auxiliary .acroEnabled {
+    margin-top: 0;
+    margin-bottom: 0;
+    background-color: #828885;
+    color: white;
+    font-family: 'open_sansbold', Arial, serif;
+    font-size: 12px;
+    display: block;
+    cursor: pointer;
+    transition: all ease 0.2s;
+    line-height: 28px;
+    position: fixed;
+    bottom:10px;
+    left:20px;
+    width:10%;
+    text-align: center;
+    z-index: 25000;
+}
+
+.tab-auxiliary .acroEnabled.on {
+    background-color: #37a8db;
+}
+
+.tab-auxiliary .acroEnabled.off {
+    background-color: #828885;
+}
+
 @media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
     .tab-auxiliary .fixed_band {
         width: calc(100% - -30px);

tabs/auxiliary.html

@@ -22,6 +22,9 @@
             <a class="save" href="#" i18n="auxiliaryButtonSave"></a>
         </div>
     </div>
+    <div class="acroEnabled">
+        ACRO
+    </div>
 </div>
 <div id="tab-auxiliary-templates">
     <table class="modes">

tabs/auxiliary.js

@@ -111,6 +111,7 @@ TABS.auxiliary.initialize = function (callback) {
         $(newMode).data('index', modeIndex);
         $(newMode).data('id', modeId);
         $(newMode).data('origId', ORIG_AUX_CONFIG_IDS[modeIndex]);
+        $(newMode).data('modeName', AUX_CONFIG[modeIndex]);
 
         $(newMode).find('.name').data('modeElement', newMode);
         $(newMode).find('a.addRange').data('modeElement', newMode);
@@ -344,8 +345,19 @@ TABS.auxiliary.initialize = function (callback) {
 
         function update_ui() {
             let hasUsedMode = false;
+            let acroEnabled = true;
+            let acroFail = ["ANGLE", "HORIZON", "MANUAL", "NAV RTH", "NAV POSHOLD", "NAV CRUISE", "NAV COURSE HOLD", "NAV WP", "GCS NAV"];
+
+            var auxChannelCount = RC.active_channels - 4;
+
+            for (var i = 0; i < (auxChannelCount); i++) {
+                update_marker(i, RC.channels[i + 4]);
+            }
+
             for (var i = 0; i < AUX_CONFIG.length; i++) {
                 var modeElement = $('#mode-' + i);
+                let inRange = false;
+                
                 if (modeElement.find(' .range').length == 0) {
                     // if the mode is unused, skip it
                     modeElement.removeClass('off').removeClass('on');
@@ -353,13 +365,49 @@ TABS.auxiliary.initialize = function (callback) {
                 }
 
                 if (FC.isModeBitSet(modeElement.data('origId'))) {
-                    $('.mode .name').eq(modeElement.data('index')).data('modeElement').addClass('on').removeClass('off');
+                    // The flight controller can activate the mode
+                    $('.mode .name').eq(modeElement.data('index')).data('modeElement').addClass('on').removeClass('inRange').removeClass('off');
+
+                    if (jQuery.inArray(modeElement.data('modeName'), acroFail) !== -1) {
+                        acroEnabled = false;
+                    }
                 } else {
-                    $('.mode .name').eq(modeElement.data('index')).data('modeElement').removeClass('on').addClass('off');
+                    // Check to see if the mode is in range
+                    var modeRanges = modeElement.find(' .range');
+                    for (r = 0; r < modeRanges.length; r++) {
+                        var rangeLow = $(modeRanges[r]).find('.lowerLimitValue').html();
+                        var rangeHigh = $(modeRanges[r]).find('.upperLimitValue').html();
+                        var markerPosition = $(modeRanges[r]).find('.marker')[0].style.left;
+                        markerPosition = markerPosition.substring(0, markerPosition.length-1);
+
+                        rangeLow = (rangeLow - 900) / (2100-900) * 100;
+                        rangeHigh = (rangeHigh - 900) / (2100-900) * 100;
+
+                        if ((markerPosition >= rangeLow) && (markerPosition <= rangeHigh)) {
+                            inRange = true;
+                        }
+                    }
+                    
+                    if (inRange) {
+                        $('.mode .name').eq(modeElement.data('index')).data('modeElement').removeClass('on').addClass('inRange').removeClass('off');
+
+                        if (jQuery.inArray(modeElement.data('modeName'), acroFail) !== -1) {
+                            acroEnabled = false;
+                        }
+                    } else {
+                        // If not, it is shown as disabled.
+                        $('.mode .name').eq(modeElement.data('index')).data('modeElement').removeClass('on').removeClass('inRange').addClass('off');
+                    }
                 }
                 hasUsedMode = true;
             }
 
+            if (acroEnabled) {
+                $('.acroEnabled').addClass('on').removeClass('off');
+            } else {
+                $('.acroEnabled').removeClass('on').addClass('off');
+            }
+        
             let hideUnused = hideUnusedModes && hasUsedMode;
             for (let i = 0; i < AUX_CONFIG.length; i++) {
                 let modeElement = $('#mode-' + i);
@@ -367,11 +415,6 @@ TABS.auxiliary.initialize = function (callback) {
                     modeElement.toggle(!hideUnused);
                 }
             }    
-            var auxChannelCount = RC.active_channels - 4;
-
-            for (var i = 0; i < (auxChannelCount); i++) {
-                update_marker(i, RC.channels[i + 4]);
-            }
         }
 
         let hideUnusedModes = false;
@@ -391,6 +434,8 @@ TABS.auxiliary.initialize = function (callback) {
         // enable data pulling
         helper.mspBalancedInterval.add('aux_data_pull', 50, 1, get_rc_data);
 
+        $(".tab-auxiliary .acroEnabled").width($("#mode-0 .info").width());
+
         GUI.content_ready(callback);
     }
 };
@@ -398,3 +443,7 @@ TABS.auxiliary.initialize = function (callback) {
 TABS.auxiliary.cleanup = function (callback) {
     if (callback) callback();
 };
+
+$(window).on('resize', function(){
+    $(".tab-auxiliary .acroEnabled").width($("#mode-0 .info").width());
+});

tabs/mission_control.html

@@ -114,14 +114,18 @@
                                             <a class="ic_center" data-role="home-center" href="#"  title="move to center view"></a>
                                         </div>
                                     </td>
-                                    <td><input type="number" class="home-lat" /></td>
                                     <td><input type="number" class="home-lon" /></td>
-                                    <td><span id="elevationValueAtHome">NA</span></td>
+                                    <td><input type="number" class="home-lat" /></td>
+                                    <td><span id="elevationValueAtHome">N/A</span></td>
                                     </tr>
                                 </tbody>
                             </table>
                         </div>
                     </div>
+                    <div class="point" id="elevationEarthModelclass" style="display: none">
+                        <label class="spacer_box_title i18n-replaced" for="elevationEarthModel">Use Sea Level Earth DEM Model: </label>
+                        <input id="elevationEarthModel" type="checkbox" value="0" class="togglemedium" required>
+                    </div>
                 </div>
 
                 <div id="missionPlanerSafehome" class="gui_box grey" style="display: none">
@@ -215,7 +219,11 @@
                         </div>
                         <div class="point" id="elevationAtWP" style="display: none">
                             <label class="point-label">Elevation (m): </label>
-                            <span id="elevationValueAtWP">NA</span>
+                            <span id="elevationValueAtWP">N/A</span>
+                        </div>
+                        <div class="point" id="groundClearanceAtWP" style="display: none">
+                            <label class="point-label">Grd Dist (m): </label>
+                            <span id="groundClearanceValueAtWP">N/A</span>
                         </div>
                         <div class="point" id="pointP1class" style="display: none">
                             <label class="point-label" for="pointP1">Parameter 1: </label>

tabs/mission_control.js

@@ -663,6 +663,11 @@ TABS.mission_control.initialize = function (callback) {
             HOME.setAlt(elevationAtHome);
         })()
 
+        if (globalSettings.mapProviderType == 'bing') {
+            $('#elevationEarthModelclass').fadeIn(300);
+        } else {
+            $('#elevationEarthModelclass').fadeOut(300);
+        }
     }
 
 
@@ -1301,8 +1306,10 @@ TABS.mission_control.initialize = function (callback) {
                 let tempWp = mission.getWaypoint(tempMarker.number);
                 tempWp.setLon(Math.round(coord[0] * 10000000));
                 tempWp.setLat(Math.round(coord[1] * 10000000));
+                if (selectedMarker != null && tempMarker.number == selectedMarker.getLayerNumber()) {
                     $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
                     $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
+                }
                 mission.updateWaypoint(tempWp);
                 repaintLine4Waypoints(mission);
             }
@@ -1352,14 +1359,16 @@ TABS.mission_control.initialize = function (callback) {
          */
         app.Drag.prototype.handleUpEvent = function (evt) {
             if ( tempMarker.kind == "waypoint" ) {
+                if (selectedMarker != null && tempMarker.number == selectedMarker.getLayerNumber()) {
                     (async () => {
-                        if (mission.getWaypoint(tempMarker.number).getP3() == 1.0) {
                         const elevationAtWP = await mission.getWaypoint(tempMarker.number).getElevation(globalSettings);
                         $('#elevationValueAtWP').text(elevationAtWP);
-                        }
+                        const returnAltitude = checkAltElevSanity(false, mission.getWaypoint(tempMarker.number).getAlt(), elevationAtWP, mission.getWaypoint(tempMarker.number).getP3());
+                        mission.getWaypoint(tempMarker.number).setAlt(returnAltitude);
                         plotElevation();
                     })()
                 }
+            }
             else if (tempMarker.kind == "home" ) {
                 (async () => {
                     const elevationAtHome = await HOME.getElevation(globalSettings);
@@ -1459,7 +1468,9 @@ TABS.mission_control.initialize = function (callback) {
         // Map on-click behavior definition
         //////////////////////////////////////////////////////////////////////////
         map.on('click', function (evt) {
+            var tempSelectedMarkerIndex = null;
             if (selectedMarker != null && selectedFeature != null) {
+                tempSelectedMarkerIndex = selectedMarker.getLayerNumber();
                 try {
                     selectedFeature.setStyle(getWaypointIcon(selectedMarker, false));
                     selectedMarker = null;
@@ -1488,6 +1499,23 @@ TABS.mission_control.initialize = function (callback) {
 
                 var altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.getAlt());
 
+                if (globalSettings.mapProviderType == 'bing') {
+                    $('#elevationAtWP').fadeIn();
+                    $('#groundClearanceAtWP').fadeIn();
+                    if (tempSelectedMarkerIndex == null || tempSelectedMarkerIndex != selectedMarker.getLayerNumber()) {
+                        (async () => {
+                            const elevationAtWP = await selectedMarker.getElevation(globalSettings);
+                            $('#elevationValueAtWP').text(elevationAtWP);
+                            const returnAltitude = checkAltElevSanity(false, selectedMarker.getAlt(), elevationAtWP, selectedMarker.getP3());
+                            selectedMarker.setAlt(returnAltitude);
+                            plotElevation();
+                        })()
+                    }
+                } else {
+                    $('#elevationAtWP').fadeOut();
+                    $('#groundClearanceAtWP').fadeOut();
+                }
+
                 $('#altitudeInMeters').text(` ${altitudeMeters}m`);
                 $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
                 $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
@@ -1515,10 +1543,24 @@ TABS.mission_control.initialize = function (callback) {
             else if (selectedFeature && tempMarker.kind == "line" && tempMarker.selection) {
                 let tempWpCoord = ol.proj.toLonLat(evt.coordinate);
                 let tempWp = new Waypoint(tempMarker.number, MWNP.WPTYPE.WAYPOINT, Math.round(tempWpCoord[1] * 10000000), Math.round(tempWpCoord[0] * 10000000), alt=Number(settings.alt), p1=Number(settings.speed));
+                if (homeMarkers.length && HOME.getAlt() != "N/A") {
+                    (async () => {
+                        const elevationAtWP = await tempWp.getElevation(globalSettings);
+                        tempWp.setAlt(checkAltElevSanity(false, settings.alt, elevationAtWP, 0));
+
                         mission.insertWaypoint(tempWp, tempMarker.number);
                         mission.update();
                         cleanLayers();
                         redrawLayers();
+                        plotElevation();
+                    })()
+                } else {
+                    mission.insertWaypoint(tempWp, tempMarker.number);
+                    mission.update();
+                    cleanLayers();
+                    redrawLayers();
+                    plotElevation();
+                }
             }
             else if (selectedFeature && tempMarker.kind == "safehome" && tempMarker.selection) {
                 selectedMarker = SAFEHOMES.getSafehome(tempMarker.number);
@@ -1538,11 +1580,24 @@ TABS.mission_control.initialize = function (callback) {
             else {
                 let tempWpCoord = ol.proj.toLonLat(evt.coordinate);
                 let tempWp = new Waypoint(mission.get().length, MWNP.WPTYPE.WAYPOINT, Math.round(tempWpCoord[1] * 10000000), Math.round(tempWpCoord[0] * 10000000), alt=Number(settings.alt), p1=Number(settings.speed));
+                if (homeMarkers.length && HOME.getAlt() != "N/A") {
+                    (async () => {
+                        const elevationAtWP = await tempWp.getElevation(globalSettings);
+                        tempWp.setAlt(checkAltElevSanity(false, settings.alt, elevationAtWP, 0));
+
                         mission.put(tempWp);
                         mission.update();
                         cleanLayers();
                         redrawLayers();
                         plotElevation();
+                    })()
+                } else {
+                    mission.put(tempWp);
+                    mission.update();
+                    cleanLayers();
+                    redrawLayers();
+                    plotElevation();
+                }
             }
             //mission.missionDisplayDebug();
         });
@@ -1656,7 +1711,6 @@ TABS.mission_control.initialize = function (callback) {
                 if ([MWNP.WPTYPE.SET_POI,MWNP.WPTYPE.POSHOLD_TIME,MWNP.WPTYPE.LAND].includes(selectedMarker.getAction())) {
                     selectedMarker.setP1(0.0);
                     selectedMarker.setP2(0.0);
-                    selectedMarker.setP3(0.0);
                 }
                 for (var j in dictOfLabelParameterPoint[selectedMarker.getAction()]) {
                     if (dictOfLabelParameterPoint[selectedMarker.getAction()][j] != '') {
@@ -1699,7 +1753,9 @@ TABS.mission_control.initialize = function (callback) {
 
         $('#pointAlt').on('change', function (event) {
             if (selectedMarker) {
-                selectedMarker.setAlt(Number($('#pointAlt').val()));
+                const elevationAtWP = Number($('#elevationValueAtWP').text());
+                const returnAltitude = checkAltElevSanity(true, Number($('#pointAlt').val()), elevationAtWP, selectedMarker.getP3());
+                selectedMarker.setAlt(returnAltitude);
                 mission.updateWaypoint(selectedMarker);
                 mission.update();
                 redrawLayer();
@@ -1727,22 +1783,35 @@ TABS.mission_control.initialize = function (callback) {
 
         $('#pointP3').on('change', function (event) {
             if (selectedMarker) {
+                const P3Value = selectedMarker.getP3();
                 selectedMarker.setP3( $('#pointP3').prop("checked") ? 1.0 : 0.0);
-                if ($('#pointP3').prop("checked")) {
+                if (globalSettings.mapProviderType == 'bing') {
                     (async () => {
                         const elevationAtWP = await selectedMarker.getElevation(globalSettings);
                         $('#elevationValueAtWP').text(elevationAtWP);
-                        $('#elevationAtWP').fadeIn(300);
+                        var altitude = Number($('#pointAlt').val());
-                    })()
+                        if (P3Value != selectedMarker.getP3()) {
+                            if ($('#pointP3').prop("checked")) {
+                                if (altitude < 0) {
+                                    altitude = settings.alt;
+                                }
+                                selectedMarker.setAlt(altitude + elevationAtWP * 100);
+                            } else {
+                                selectedMarker.setAlt(altitude - Number(elevationAtWP) * 100);
+                            }
+                        }
+                        const returnAltitude = checkAltElevSanity(false, selectedMarker.getAlt(), elevationAtWP, selectedMarker.getP3());
+                        selectedMarker.setAlt(returnAltitude);
+                        $('#pointAlt').val(selectedMarker.getAlt());
+                        altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.getAlt());
+                        $('#altitudeInMeters').text(` ${altitudeMeters}m`);
 
-                }
-                else {
-                    $('#elevationAtWP').fadeOut(300);
-                }
                         mission.updateWaypoint(selectedMarker);
                         mission.update();
                         redrawLayer();
                         plotElevation();
+                    })()
+                }
             }
         });
 
@@ -1834,6 +1903,28 @@ TABS.mission_control.initialize = function (callback) {
             closeHomePanel();
         });
 
+        $('#elevationEarthModel').on('change', function (event) {
+            if (globalSettings.mapProviderType == 'bing') {
+                (async () => {
+                    const elevationAtHome = await HOME.getElevation(globalSettings);
+                    $('#elevationValueAtHome').text(elevationAtHome+' m');
+                    HOME.setAlt(elevationAtHome);
+
+                    if (selectedMarker) {
+                        const elevationAtWP = await selectedMarker.getElevation(globalSettings);
+                        $('#elevationValueAtWP').text(elevationAtWP);
+                        const returnAltitude = checkAltElevSanity(false, selectedMarker.getAlt(), elevationAtWP, selectedMarker.getP3());
+                        selectedMarker.setAlt(returnAltitude);
+                        mission.updateWaypoint(selectedMarker);
+                    }
+
+                    mission.update();
+                    redrawLayer();
+                    plotElevation();
+                })()
+            }
+        });
+
         /////////////////////////////////////////////
         // Callback for Remove buttons
         /////////////////////////////////////////////
@@ -2189,6 +2280,46 @@ TABS.mission_control.initialize = function (callback) {
       }
     }
 
+    /* resetAltitude = true : For selected WPs only. Changes WP Altitude value back to previous value if setting below ground level.
+     ^ resetAltitude = false : changes WP Altitude to value required to give ground clearance = default Altitude setting */
+    function checkAltElevSanity(resetAltitude, checkAltitude, elevation, P3Datum) {
+        if (globalSettings.mapProviderType != 'bing') {
+            return checkAltitude;
+        }
+
+        let groundClearance = "NO HOME";
+        let altitude = checkAltitude;
+        if (P3Datum) {
+            if (checkAltitude < 100 * elevation) {
+                if (resetAltitude) {
+                    alert(chrome.i18n.getMessage('MissionPlannerAltitudeChangeReset'));
+                    altitude = selectedMarker.getAlt();
+                } else {
+                    altitude = settings.alt + 100 * elevation;
+                }
+            }
+            groundClearance = altitude / 100 - elevation;
+        } else if (homeMarkers.length && HOME.getAlt() != "N/A") {
+            let elevationAtHome = HOME.getAlt();
+            if ((checkAltitude / 100 + elevationAtHome) < elevation) {
+                if (resetAltitude) {
+                    alert(chrome.i18n.getMessage('MissionPlannerAltitudeChangeReset'));
+                    altitude = selectedMarker.getAlt();
+                } else {
+                    altitude = settings.alt + 100 * (elevation - elevationAtHome);
+                }
+            }
+            groundClearance = altitude / 100 + (elevationAtHome - elevation);
+        }
+        $('#pointAlt').val(altitude);
+        let altitudeMeters = parseInt(altitude) / 100;
+        $('#altitudeInMeters').text(` ${altitudeMeters}m`);
+        document.getElementById('groundClearanceAtWP').style.color = groundClearance < (settings.alt / 100) ? "#FF0000" : "#303030";
+        $('#groundClearanceValueAtWP').text(` ${groundClearance}`);
+
+        return altitude;
+    }
+
     function plotElevation() {
         if ($('#missionPlanerElevation').is(":visible")) {
             if (mission.get().length == 0) {