Merge pull request #6224 from DonLakeFlyer/StableMerge

Stable merge

src/MissionManager/QGCMapPolygonVisuals.qml

@@ -32,6 +32,7 @@ Item {
     property int    borderWidth:        0
     property color  borderColor:        "black"
 
+    property var    _gqcView:                   ggcView
     property var    _polygonComponent
     property var    _dragHandlesComponent
     property var    _splitHandlesComponent
@@ -172,12 +173,13 @@ Item {
 
     QGCFileDialog {
         id:             kmlLoadDialog
-        qgcView:        _root.qgcView
+        qgcView:        _qgcView
         folder:         QGroundControl.settingsManager.appSettings.missionSavePath
         title:          qsTr("Select KML File")
         selectExisting: true
         nameFilters:    [ qsTr("KML files (*.kml)") ]
-        fileExtension:  "kml"
+        fileExtension:  QGroundControl.settingsManager.appSettings.kmlFileExtension
+
         onAcceptedForLoad: {
             mapPolygon.loadKMLFile(file)
             mapFitFunctions.fitMapViewportToMissionItems()

src/PlanView/PlanView.qml

@@ -174,6 +174,8 @@ QGCView {
             fileDialog.title =          qsTr("Select Plan File")
             fileDialog.selectExisting = true
             fileDialog.nameFilters =    masterController.loadNameFilters
+            fileDialog.fileExtension =  QGroundControl.settingsManager.appSettings.planFileExtension
+            fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension
             fileDialog.openForLoad()
         }
 
@@ -182,6 +184,8 @@ QGCView {
             fileDialog.plan =           true
             fileDialog.selectExisting = false
             fileDialog.nameFilters =    masterController.saveNameFilters
+            fileDialog.fileExtension =  QGroundControl.settingsManager.appSettings.planFileExtension
+            fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension
             fileDialog.openForSave()
         }
 
@@ -194,6 +198,8 @@ QGCView {
             fileDialog.plan =           false
             fileDialog.selectExisting = false
             fileDialog.nameFilters =    masterController.saveKmlFilters
+            fileDialog.fileExtension =  QGroundControl.settingsManager.appSettings.kmlFileExtension
+            fileDialog.fileExtension2 = ""
             fileDialog.openForSave()
         }
     }
@@ -240,8 +246,6 @@ QGCView {
         qgcView:        _qgcView
         property bool plan: true
         folder:         QGroundControl.settingsManager.appSettings.missionSavePath
-        fileExtension:  QGroundControl.settingsManager.appSettings.planFileExtension
-        fileExtension2: QGroundControl.settingsManager.appSettings.missionFileExtension
 
         onAcceptedForSave: {
             plan ? masterController.saveToFile(file) : masterController.saveToKml(file)

src/Terrain.cc

@@ -77,7 +77,7 @@ void TerrainBatchManager::_sendNextBatch(void)
 
     QUrlQuery query;
     query.addQueryItem(QStringLiteral("points"), points);
-    QUrl url(QStringLiteral("https://api.airmap.com/elevation/stage/srtm1/ele"));
+    QUrl url(QStringLiteral("https://api.airmap.com/elevation/v1/ele"));
     url.setQuery(query);
 
     QNetworkRequest request(url);