Fix up ordering

src/FlightDisplay/FlightDisplayViewMap.qml

@@ -46,7 +46,6 @@ FlightMap {
     property bool   _disableVehicleTracking:    false
     property bool   _keepVehicleCentered:       _mainIsMap ? false : true
 
-
     // Track last known map position and zoom from Fly view in settings
     onZoomLevelChanged: QGroundControl.flightMapZoom = zoomLevel
     onCenterChanged:    QGroundControl.flightMapPosition = center
@@ -209,11 +208,11 @@ FlightMap {
     // Add trajectory points to the map
     MapItemView {
         model: _mainIsMap ? _activeVehicle ? _activeVehicle.trajectoryPoints : 0 : 0
-        delegate:
+
-            MapPolyline {
+        delegate: MapPolyline {
             line.width: 3
             line.color: "red"
-            z:          QGroundControl.zOrderMapItems - 2
+            z:          QGroundControl.zOrderTrajectoryLines
             path: [
                 object.coordinate1,
                 object.coordinate2,
@@ -224,13 +223,13 @@ FlightMap {
     // Add the vehicles to the map
     MapItemView {
         model: QGroundControl.multiVehicleManager.vehicles
-        delegate:
+
-            VehicleMapItem {
+        delegate: VehicleMapItem {
             vehicle:        object
             coordinate:     object.coordinate
             isSatellite:    flightMap.isSatelliteMap
             size:           _mainIsMap ? ScreenTools.defaultFontPixelHeight * 3 : ScreenTools.defaultFontPixelHeight
-            z:              QGroundControl.zOrderMapItems - 1
+            z:              QGroundControl.zOrderVehicles
         }
     }
 
@@ -246,7 +245,7 @@ FlightMap {
 
     // Add lines between waypoints
     MissionLineView {
-        model: _mainIsMap ? missionController.waypointLines : 0
+        model:  _mainIsMap ? missionController.waypointLines : 0
     }
 
     GeoFenceMapVisuals {

src/FlightMap/MapItems/MissionLineView.qml

@@ -24,7 +24,7 @@ MapItemView {
     delegate: MapPolyline {
         line.width: 3
         line.color: "#be781c"                           // Hack, can't get palette to work in here
-        z:          QGroundControl.zOrderMapItems - 1   // Under item indicators
+        z:          QGroundControl.zOrderWaypointLines
 
         path: [
             object.coordinate1,

src/QmlControls/QGroundControlQmlGlobal.h

@@ -51,9 +51,13 @@ public:
 
     Q_PROPERTY(int      supportedFirmwareCount          READ supportedFirmwareCount CONSTANT)
 
-    Q_PROPERTY(qreal                zOrderTopMost       READ zOrderTopMost          CONSTANT) ///< z order for top most items, toolbar, main window sub view
+    Q_PROPERTY(qreal zOrderTopMost              READ zOrderTopMost              CONSTANT) ///< z order for top most items, toolbar, main window sub view
-    Q_PROPERTY(qreal                zOrderWidgets       READ zOrderWidgets          CONSTANT) ///< z order value to widgets, for example: zoom controls, hud widgetss
+    Q_PROPERTY(qreal zOrderWidgets              READ zOrderWidgets              CONSTANT) ///< z order value to widgets, for example: zoom controls, hud widgetss
-    Q_PROPERTY(qreal                zOrderMapItems      READ zOrderMapItems         CONSTANT) ///< z order value for map items, for example: mission item indicators
+    Q_PROPERTY(qreal zOrderMapItems             READ zOrderMapItems             CONSTANT)
+    Q_PROPERTY(qreal zOrderVehicles             READ zOrderVehicles             CONSTANT)
+    Q_PROPERTY(qreal zOrderWaypointIndicators   READ zOrderWaypointIndicators   CONSTANT)
+    Q_PROPERTY(qreal zOrderTrajectoryLines      READ zOrderTrajectoryLines      CONSTANT)
+    Q_PROPERTY(qreal zOrderWaypointLines        READ zOrderWaypointLines        CONSTANT)
 
     //-------------------------------------------------------------------------
     // MavLink Protocol
@@ -135,9 +139,13 @@ public:
     static QGeoCoordinate   flightMapPosition   ();
     static double           flightMapZoom       ();
 
-    qreal                   zOrderTopMost       ()  { return 1000; }
+    qreal zOrderTopMost             () { return 1000; }
-    qreal                   zOrderWidgets       ()  { return 100; }
+    qreal zOrderWidgets             () { return 100; }
-    qreal                   zOrderMapItems      ()  { return 50; }
+    qreal zOrderMapItems            () { return 50; }
+    qreal zOrderWaypointIndicators  () { return 50; }
+    qreal zOrderVehicles            () { return 49; }
+    qreal zOrderTrajectoryLines     () { return 48; }
+    qreal zOrderWaypointLines       () { return 47; }
 
     bool    isVersionCheckEnabled   () { return _toolbox->mavlinkProtocol()->versionCheckEnabled(); }
     int     mavlinkSystemID         () { return _toolbox->mavlinkProtocol()->getSystemId(); }