Merge pull request #6216 from DonLakeFlyer/LoadKMLMapMove

Reposition map after KML load
7 years ago · 5f39c6ab49
4 changed files with 3 additions and 6 deletions
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@ -155,7 +155,7 @@ FlightMap {
				@@ -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
--- a/src/FlightMap/Widgets/MapFitFunctions.qml
+++ b/src/FlightMap/Widgets/MapFitFunctions.qml
@ -90,10 +90,6 @@ Item {
				@@ -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) {
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@ -181,6 +181,7 @@ Item {
				@@ -181,6 +181,7 @@ Item {

        onAcceptedForLoad: {
            mapPolygon.loadKMLFile(file)
+            mapFitFunctions.fitMapViewportToMissionItems()
            close()
        }
    }
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@ -84,7 +84,7 @@ QGCView {
				@@ -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