From 3d92951396e6f01c2037246270682d7993bddea9 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 26 Jun 2018 09:29:16 -0700
Subject: [PATCH] Fix Orbit

---
 src/FlightDisplay/FlightDisplayViewMap.qml |  2 +-
 src/Vehicle/Vehicle.cc                     | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 372d7f4d5..b0a10636c 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -369,7 +369,7 @@ FlightMap {
                 clickMenu.coord = clickCoord
                 clickMenu.popup()
             } else if (guidedActionsController.showGotoLocation) {
-                _guidedLocationCoordinate = clickCoord
+                gotoLocationItem.show(clickCoord)
                 guidedActionsController.confirmAction(guidedActionsController.actionGoto, clickCoord)
             } else if (guidedActionsController.showOrbit) {
                 orbitMapCircle.show(clickCoord)
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index cd12a2355..a23251c35 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -2777,15 +2777,6 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
         return;
     }
 
-    double lat, lon, alt;
-    if (centerCoord.isValid()) {
-        lat = lon = alt = qQNaN();
-    } else {
-        lat = centerCoord.latitude();
-        lon = centerCoord.longitude();
-        alt = amslAltitude;
-    }
-
     if (capabilityBits() && MAV_PROTOCOL_CAPABILITY_COMMAND_INT) {
         sendMavCommandInt(defaultComponentId(),
                           MAV_CMD_DO_ORBIT,
@@ -2795,7 +2786,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
                           qQNaN(),         // Use default velocity
                           0,               // Vehicle points to center
                           qQNaN(),         // reserved
-                          lat, lon, alt);
+                          centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
     } else {
         sendMavCommand(defaultComponentId(),
                        MAV_CMD_DO_ORBIT,
@@ -2804,7 +2795,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
                        qQNaN(),         // Use default velocity
                        0,               // Vehicle points to center
                        qQNaN(),         // reserved
-                       lat, lon, alt);
+                       centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
     }
 }
 
-- 
2.22.0