Moving Add New Set as a sibling of Map rather than a child.

src/FlightMap/Widgets/CenterMapDropButton.qml

@@ -200,7 +200,7 @@ DropButton {
             QGCButton {
                 text:               qsTr("Current Location")
                 Layout.fillWidth:   true
-                enabled:            mainWindow.gcsPosition.isValid && !followVehicleCheckBox.checked
+                enabled:            mainWindow.gcsPosition && mainWindow.gcsPosition.isValid && !followVehicleCheckBox.checked
 
                 onClicked: {
                     dropButton.hideDropDown()

src/PlanView/PlanToolBar.qml

@@ -178,7 +178,7 @@ Rectangle {
         anchors.rightMargin:    _margins
         anchors.right:          parent.right
         anchors.verticalCenter: parent.verticalCenter
-        text:                   missionController.dirty ? qsTr("Upload Required") : qsTr("Upload")
+        text:                   missionController ? (missionController.dirty ? qsTr("Upload Required") : qsTr("Upload")) : ""
         enabled:                _activeVehicle
         visible:                _manualUpload
         onClicked:              missionController.upload()

src/QtLocationPlugin/QMLControl/OfflineMap.qml

@@ -49,9 +49,9 @@ QGCView {
     property bool   _tooManyTiles:      QGroundControl.mapEngineManager.tileCount > _maxTilesForDownload
     property var    _settings:          QGroundControl.settingsManager.flightMapSettings
 
-    readonly property real minZoomLevel:    3
+    readonly property real minZoomLevel:    1
     readonly property real maxZoomLevel:    20
-    readonly property real sliderTouchArea: ScreenTools.isMobile ? ScreenTools.defaultFontPixelWidth * 5 : ScreenTools.defaultFontPixelWidth * 3
+    readonly property real sliderTouchArea: ScreenTools.defaultFontPixelWidth * (ScreenTools.isTinyScreen ? 5 : (ScreenTools.isMobile ? 6 : 3))
 
     readonly property int _maxTilesForDownload: 100000
 
@@ -601,17 +601,27 @@ QGCView {
                         }
                     } // Map
                 }
+            } // Item - Add new set view
+        } // Map
 
         //-- Add new set dialog
         Rectangle {
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             anchors.verticalCenter: parent.verticalCenter
             anchors.right:      parent.right
+            visible:            _map.visible
             width:              ScreenTools.defaultFontPixelWidth * (ScreenTools.isTinyScreen ? 24 : 28)
             height:             Math.min(parent.height - (anchors.margins * 2), addNewSetFlickable.y + addNewSetColumn.height + addNewSetLabel.anchors.margins)
             color:              Qt.rgba(qgcPal.window.r, qgcPal.window.g, qgcPal.window.b, 0.85)
             radius:             ScreenTools.defaultFontPixelWidth * 0.5
 
+            MouseArea {
+                anchors.fill:   parent
+                onWheel:        { wheel.accepted = true; }
+                onPressed:      { mouse.accepted = true; }
+                onReleased:     { mouse.accepted = true; }
+            }
+
             QGCLabel {
                 id:                 addNewSetLabel
                 anchors.margins:    ScreenTools.defaultFontPixelHeight / 2
@@ -853,8 +863,6 @@ QGCView {
                 } // Column
             } // QGCFlickable
         } // Rectangle - Add new set dialog
-            } // Item - Add new set view
-        } // Map
 
         QGCFlickable {
             id:                 _tileSetList