Waypoint OOP version 2.5

_locales/en/messages.json

@@ -3604,6 +3604,9 @@
     "MissionPlannerJump2SettingsCheck": {
         "message": "JUMP settings incorrect : Repeat should not exceed 10! Check it again! Being forced to number of repeat equal 0!"
     },
+    "MissionPlannerJump3SettingsCheck": {
+        "message": "JUMP settings incorrect : not able to Jump to a POI! Being forced to WP 1!"
+    },
     "MissionPlannerHeadSettingsCheck": {
         "message": "Heading value is incorrect : Check it again! Being forced by default to -1 thence!"
     },

js/waypoint.js

@@ -6,6 +6,7 @@ let Waypoint = function (number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endM
     var self = {};
     let layerNumber = "undefined";
     let attachedNumber = "undefined";
+    let poiNumber = "undefined";
 
     self.getNumber = function () {
         return number;
@@ -23,6 +24,14 @@ let Waypoint = function (number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endM
         layerNumber = data;
     };
     
+    self.getPoiNumber = function () {
+        return poiNumber;
+    };
+
+    self.setPoiNumber = function (data) {
+        poiNumber = data;
+    };
+    
     self.isUsed = function () {
         return isUsed;
     };

js/waypointCollection.js

@@ -322,5 +322,15 @@ let WaypointCollection = function () {
         return (lJumptTargetAttached.length != 0 && lJumptTargetAttached != 'undefined')
     }
     
+    self.getPoiList = function() {
+        let poiList = [];
+        data.forEach(function (element) {
+            if (element.getAction() == MWNP.WPTYPE.SET_POI) {
+                poiList.push(element.getNumber());
+            }
+        });
+        return poiList;
+    }
+
     return self;
 };

src/css/tabs/mission_planer.css

@@ -54,7 +54,7 @@
 }
 
 .tab-mission-control .ic_loadFromEprom {
-    background-image: url(../images/icons/cf_icon_MP_loadfromEprom_grey.svg);
+    background-image: url(../images/icons/cf_icon_MP_loadFromEprom_grey.svg);
 }
 
 .tab-mission-control .ic_removeAll {

tabs/mission_control.js

@@ -884,6 +884,14 @@ TABS.mission_control.initialize = function (callback) {
                       $(this).val(1);
                       alert(chrome.i18n.getMessage('MissionPlannerJumpSettingsCheck'));
                     }
+                    else if (mission.getPoiList().length != 0 && mission.getPoiList()) {
+                        console.log("mission.getPoiList() ",mission.getPoiList());
+                        console.log(mission.convertJumpNumberToWaypoint(Number($(this).val())-1));
+                        if (mission.getPoiList().includes(mission.convertJumpNumberToWaypoint(Number($(this).val())-1))) {
+                            $(this).val(1);
+                            alert(chrome.i18n.getMessage('MissionPlannerJump3SettingsCheck'));
+                        }
+                    }
                 }
                 element.setP1((MWNP.WPTYPE.REV[element.getAction()] == "JUMP" ? mission.convertJumpNumberToWaypoint(Number($(this).val())-1) : Number($(this).val())));
                 mission.updateWaypoint(element);