From 5b1b127ad0e51a5dd5f56bf8f69e2b20a5ff33ca Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Wed, 27 Dec 2017 16:45:43 +0100
Subject: [PATCH] LP-572 Move MagicWayPoint in map and keep inside safe area

---
 .../gcs/src/plugins/opmap/opmapgadgetwidget.cpp  | 16 ++++++++++------
 ground/gcs/src/plugins/opmap/opmapgadgetwidget.h |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
index 01071b9e8..2d6cfd14a 100644
--- a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -209,7 +209,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
     m_widget->progressBarMap->setMaximum(1);
 
     connect(m_map, SIGNAL(zoomChanged(double, double, double)), this, SLOT(zoomChanged(double, double, double))); // map zoom change signals
-    connect(m_map, SIGNAL(OnCurrentPositionChanged(internals::PointLatLng)), this, SLOT(OnCurrentPositionChanged(internals::PointLatLng))); // map poisition change signals
+    connect(m_map, SIGNAL(OnCurrentPositionChanged(internals::PointLatLng)), this, SLOT(OnCurrentPositionChanged(internals::PointLatLng))); // map position change signals
     connect(m_map, SIGNAL(OnTileLoadComplete()), this, SLOT(OnTileLoadComplete())); // tile loading stop signals
     connect(m_map, SIGNAL(OnTileLoadStart()), this, SLOT(OnTileLoadStart())); // tile loading start signals
     connect(m_map, SIGNAL(OnTilesStillToLoad(int)), this, SLOT(OnTilesStillToLoad(int))); // tile loading signals
@@ -1031,7 +1031,7 @@ void OPMapGadgetWidget::setHome(internals::PointLatLng pos_lat_lon, double altit
     m_map->Home->RefreshPos();
 
     // move the magic waypoint to keep it within the safe area boundry
-    keepMagicWaypointWithInSafeArea();
+    keepMagicWaypointWithinSafeArea();
 }
 
 
@@ -2065,7 +2065,7 @@ void OPMapGadgetWidget::onSafeAreaActGroup_triggered(QAction *action)
     m_map->Home->RefreshPos();
 
     // move the magic waypoint if need be to keep it within the safe area around the home position
-    keepMagicWaypointWithInSafeArea();
+    keepMagicWaypointWithinSafeArea();
 }
 
 /**
@@ -2096,6 +2096,9 @@ void OPMapGadgetWidget::moveToMagicWaypointPosition()
     if (m_map_mode != MagicWaypoint_MapMode) {
         return;
     }
+
+    magicWayPoint->SetCoord(magicWayPoint->Coord());
+    keepMagicWaypointWithinSafeArea();
 }
 
 // *************************************************************************************
@@ -2123,8 +2126,9 @@ void OPMapGadgetWidget::showMagicWaypointControls()
 // *************************************************************************************
 // move the magic waypoint to keep it within the safe area boundry
 
-void OPMapGadgetWidget::keepMagicWaypointWithInSafeArea()
+void OPMapGadgetWidget::keepMagicWaypointWithinSafeArea()
 {
+    bool moveMagicWP = false;
     // calcute the bearing and distance from the home position to the magic waypoint
     double dist = distance(m_home_position.coord, magicWayPoint->Coord());
     double bear = bearing(m_home_position.coord, magicWayPoint->Coord());
@@ -2134,11 +2138,11 @@ void OPMapGadgetWidget::keepMagicWaypointWithInSafeArea()
 
     if (dist > boundry_dist) {
         dist = boundry_dist;
+        moveMagicWP = true;
     }
 
     // move the magic waypoint;
-
-    if (m_map_mode == MagicWaypoint_MapMode) { // move the on-screen waypoint
+    if ((m_map_mode == MagicWaypoint_MapMode) && moveMagicWP) { // if needed, move the on-screen waypoint to the safe area
         if (magicWayPoint) {
             magicWayPoint->SetCoord(destPoint(m_home_position.coord, bear, dist));
         }
diff --git a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.h b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.h
index 02aa9d6f1..696a10fbc 100644
--- a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.h
+++ b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.h
@@ -304,7 +304,7 @@ private:
     void moveToMagicWaypointPosition();
     void hideMagicWaypointControls();
     void showMagicWaypointControls();
-    void keepMagicWaypointWithInSafeArea();
+    void keepMagicWaypointWithinSafeArea();
 
     double distance(internals::PointLatLng from, internals::PointLatLng to);
     double bearing(internals::PointLatLng from, internals::PointLatLng to);