diff --git a/tabs/mission_control.js b/tabs/mission_control.js
index ed7df824..0b86d593 100644
--- a/tabs/mission_control.js
+++ b/tabs/mission_control.js
@@ -347,7 +347,7 @@ TABS.mission_control.initialize = function (callback) {
//////////////////////////////////////////////////////////////////////////////////////////////
var markers = []; // Layer for Waypoints
var lines = []; // Layer for lines between waypoints
- var safehomeMarkers =[]; // layer for Safehome points
+ var safehomeMarkers = []; // layer for Safehome points
var map;
@@ -357,6 +357,7 @@ TABS.mission_control.initialize = function (callback) {
var selectedMarker = null;
var selectedFeature = null;
var tempMarker = null;
+ var disableMarkerEdit = false;
//////////////////////////////////////////////////////////////////////////////////////////////
// define & init parameters for default Settings
@@ -379,11 +380,19 @@ TABS.mission_control.initialize = function (callback) {
vMaxDistSH = 0;
settings = { speed: 0, alt: 5000, safeRadiusSH : 50, maxDistSH : vMaxDistSH};
}
+
//////////////////////////////////////////////////////////////////////////////////////////////
// define & init Waypoints parameters
//////////////////////////////////////////////////////////////////////////////////////////////
var mission = new WaypointCollection();
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // define & init Multi Mission parameters
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ var multimission = new WaypointCollection();
+ var multimissionCount = 0;
+ var maxMultimissionCount = 9;
+
//////////////////////////////////////////////////////////////////////////////////////////////
// define & init home parameters
//////////////////////////////////////////////////////////////////////////////////////////////
@@ -481,7 +490,6 @@ TABS.mission_control.initialize = function (callback) {
const $row = $safehomesTableBody.find('tr:last');
-
$row.find(".safehome-number").text(safehome.getNumber()+1);
$row.find(".safehome-enabled-value").prop('checked',safehome.isUsed()).change(function () {
@@ -734,6 +742,240 @@ TABS.mission_control.initialize = function (callback) {
renderHomeOnMap();
plotElevation();
}
+
+ /////////////////////////////////////////////
+ //
+ // Manage Multi Mission
+ //
+ /////////////////////////////////////////////
+ /* Multi Mission working method:
+ * 'multimission' waypoint collection is a repository for all multi missions.
+ * 'mission' WP collection remains as the WP source for the map display.
+ * All missions can be displayed on the map or only a single mission. With all missions displayed 'mission' and
+ * 'multimission' are copies containing all missions. When a single mission is displayed 'multimission' contains all
+ * missions except the currently displayed mission.
+ * On update to display all missions the current dislayed mission is merged back into 'multimission' and 'mission'
+ * updated as a copy of 'multimission'.
+ * When all missions are displayed WP data can be viewed but mission edit is disabled.
+ * Mission WPs can be edited only when a single mission is loaded on the map. */
+
+ var startWPCount = 0;
+
+ function renderMultimissionTable() {
+ $('#multimissionOptionList').prop('options').length = 1;
+ for (var i = 1; i <= multimissionCount; i++) {
+ $('#multimissionOptionList').append($('