From 440913db7d133c603c4c98372b42c326b256ad86 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Thu, 12 Jul 2018 19:11:55 -0700
Subject: [PATCH] Fix orbit radius

---
 src/FlightDisplay/FlightDisplayViewMap.qml    | 9 ++++++---
 src/FlightDisplay/GuidedActionsController.qml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 5137432e4..d09e2ecf1 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -303,12 +303,11 @@ FlightMap {
         visible:    false
 
         property alias center:  _mapCircle.center
-        property real radius:   defaultRadius
 
         readonly property real defaultRadius: 30
 
         function show(coord) {
-            orbitMapCircle.radius = defaultRadius
+            _mapCircle.radius.rawValue = defaultRadius
             orbitMapCircle.center = coord
             orbitMapCircle.visible = true
         }
@@ -317,12 +316,16 @@ FlightMap {
             orbitMapCircle.visible = false
         }
 
+        function radius() {
+            return _mapCircle.radius.rawValue
+        }
+
         Component.onCompleted: guidedActionsController.orbitMapCircle = orbitMapCircle
 
         QGCMapCircle {
             id:                 _mapCircle
             interactive:        true
-            radius.rawValue:    orbitMapCircle.radius
+            radius.rawValue:    30
         }
     }
 
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index 769b14abe..7f89377e2 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/src/FlightDisplay/GuidedActionsController.qml
@@ -389,7 +389,7 @@ Item {
             _activeVehicle.setCurrentMissionSequence(actionData)
             break
         case actionOrbit:
-            _activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius, _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange)
+            _activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius(), _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange)
             orbitMapCircle.hide()
             break
         case actionLandAbort:
-- 
2.22.0