From 50bdc46d648c70078349b3a093187ed866ccf994 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@laptop-3.local>
Date: Sat, 8 Jul 2017 21:49:28 -0700
Subject: [PATCH] New polygon center calc

---
 src/MissionManager/QGCMapPolygon.cc         | 12 +++++++++---
 src/MissionManager/QGCMapPolygonVisuals.qml |  7 ++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/MissionManager/QGCMapPolygon.cc b/src/MissionManager/QGCMapPolygon.cc
index d8471b0ea..a7c5ca9ae 100644
--- a/src/MissionManager/QGCMapPolygon.cc
+++ b/src/MissionManager/QGCMapPolygon.cc
@@ -253,6 +253,8 @@ void QGCMapPolygon::removeVertex(int vertexIndex)
 
     _polygonPath.removeAt(vertexIndex);
     emit pathChanged();
+
+    _updateCenter();
 }
 
 void QGCMapPolygon::_polygonModelCountChanged(int count)
@@ -265,9 +267,13 @@ void QGCMapPolygon::_updateCenter(void)
     if (!_ignoreCenterUpdates) {
         QGeoCoordinate center;
 
-        if (_polygonPath.count() > 2) {
-            QPointF centerPoint = _toPolygonF().boundingRect().center();
-            center = _coordFromPointF(centerPoint);
+        if (_polygonPath.count() > 2) {            
+            QPointF centroid(0, 0);
+            QPolygonF polygonF = _toPolygonF();
+            for (int i=0; i<polygonF.count(); i++) {
+                centroid += polygonF[i];
+            }
+            center = _coordFromPointF(QPointF(centroid.x() / polygonF.count(), centroid.y() / polygonF.count()));
         }
 
         _center = center;
diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index f311753a7..5d630a7a2 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -35,8 +35,9 @@ Item {
     property var _splitHandlesComponent
     property var _centerDragHandleComponent
 
-    property real _zorderDragHandle:    QGroundControl.zOrderMapItems + 2
-    property real _zorderSplitHandle:   QGroundControl.zOrderMapItems + 1
+    property real _zorderDragHandle:    QGroundControl.zOrderMapItems + 3   // Highest to prevent splitting when items overlap
+    property real _zorderSplitHandle:   QGroundControl.zOrderMapItems + 2
+    property real _zorderCenterHandle:  QGroundControl.zOrderMapItems + 1   // Lowest such that drag or split takes precedence
 
     function addVisuals() {
         _polygonComponent = polygonComponent.createObject(mapControl)
@@ -281,7 +282,7 @@ Item {
         id: centerDragAreaComponent
 
         MissionItemIndicatorDrag {
-            z:                          _zorderDragHandle
+            z:                          _zorderCenterHandle
             onItemCoordinateChanged:    mapPolygon.center = itemCoordinate
             onDragStart:                mapPolygon.centerDrag = true
             onDragStop:                 mapPolygon.centerDrag = false
-- 
2.22.0