after merge before cleanup

src/FlightDisplay/FlightDisplayViewMap.qml

@@ -223,21 +223,21 @@ FlightMap {
         missionItems:   wimaController.missionItems
         path:           wimaController.waypointPath
         showItems:      _wimaEnabled && _showAllWimaItems
-        zOrderWP:       QGroundControl.zOrderWaypointIndicators-3
-        zOrderLines:    QGroundControl.zOrderWaypointLines-1
+        zOrderWP:       QGroundControl.zOrderWaypointIndicators-2
+        zOrderLines:    QGroundControl.zOrderWaypointLines-2
         color:          "gray"
     }
     // current Items
-    /*WimaPlanMapItems {
+    WimaPlanMapItems {
         map:            flightMap
         largeMapView:   _mainIsMap
         missionItems:   wimaController.currentMissionItems
         path:           wimaController.currentWaypointPath
         showItems:      _wimaEnabled && _showCurrentWimaItems
         zOrderWP:       QGroundControl.zOrderWaypointIndicators-1
-        zOrderLines:    QGroundControl.zOrderWaypointIndicators-2
-        color:          "green" // gray with alpha 0.7
-    }*/
+        zOrderLines:    QGroundControl.zOrderWaypointLines-1
+        color:          "green"
+    }
 
     // Add trajectory points to the map
     MapItemView {

src/FlightDisplay/FlightDisplayWimaMenu.qml

@@ -310,6 +310,14 @@ Item {
                             Layout.fillWidth: true
                         }
 
+                        QGCButton {
+                            id: buttonRemoveTrajectoryHistory
+                            text:               qsTr("Clear Trajectory")
+                            onClicked:          wimaController.removeVehicleTrajectoryHistory()
+                            Layout.columnSpan:  2
+                            Layout.fillWidth: true
+                        }
+
 
                         // progess bar
                         Rectangle {

src/Vehicle/Vehicle.h

@@ -1051,7 +1051,7 @@ public:
     QGCCameraManager*           dynamicCameras      () { return _cameras; }
     QString                     hobbsMeter          ();
 
-    /// @true: When flying a mission the vehicle is always facing towards the next waypoint
+    /// @true: When flying a mission the vehicle is always facing towards the next setCurrentMissionSequence
     bool vehicleYawsToNextWaypointInMission(void) const;
 
     /// The vehicle is responsible for making the initial request for the Plan.

src/Wima/WimaController.h

@@ -108,6 +108,7 @@ public:
     Q_INVOKABLE bool calcReturnPath(); // wrapper for _calcReturnPath(QString &errorSring)#
     Q_INVOKABLE bool executeSmartRTL(); // wrapper for _executeSmartRTL(QString &errorSring)
     Q_INVOKABLE bool initSmartRTL();
+    Q_INVOKABLE void removeVehicleTrajectoryHistory();
 
 
     Q_INVOKABLE void saveToCurrent  ();