From 9a4cb390c4b3fb7a188a656677870ec42b8a1134 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Wed, 14 Mar 2018 09:54:20 -0700
Subject: [PATCH] Reposition map after KML load

---
 src/FlightDisplay/FlightDisplayViewMap.qml  | 2 +-
 src/FlightMap/Widgets/MapFitFunctions.qml   | 4 ----
 src/MissionManager/QGCMapPolygonVisuals.qml | 1 +
 src/PlanView/PlanView.qml                   | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index df01d8b74..45d868054 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -155,7 +155,7 @@ FlightMap {
     }
 
     MapFitFunctions {
-        id:                         mapFitFunctions
+        id:                         mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        _flightMap
         usePlannedHomePosition:     false
         planMasterController:       _planMasterController
diff --git a/src/FlightMap/Widgets/MapFitFunctions.qml b/src/FlightMap/Widgets/MapFitFunctions.qml
index 728ca30f7..938570b1f 100644
--- a/src/FlightMap/Widgets/MapFitFunctions.qml
+++ b/src/FlightMap/Widgets/MapFitFunctions.qml
@@ -90,10 +90,6 @@ Item {
     }
 
     function addMissionItemCoordsForFit(coordList) {
-        var homePosition = fitHomePosition()
-        if (homePosition.isValid) {
-            coordList.push(homePosition)
-        }
         for (var i=1; i<_missionController.visualItems.count; i++) {
             var missionItem = _missionController.visualItems.get(i)
             if (missionItem.specifiesCoordinate && !missionItem.isStandaloneCoordinate) {
diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index d24ff4c64..fa658fc62 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -181,6 +181,7 @@ Item {
 
         onAcceptedForLoad: {
             mapPolygon.loadKMLFile(file)
+            mapFitFunctions.fitMapViewportToMissionItems()
             close()
         }
     }
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 3e6f94494..1b41997d7 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -84,7 +84,7 @@ QGCView {
     property bool _firstLoadComplete:           false
 
     MapFitFunctions {
-        id:                         mapFitFunctions
+        id:                         mapFitFunctions  // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        editorMap
         usePlannedHomePosition:     true
         planMasterController:       _planMasterController
-- 
2.22.0