Delete flights using flightID instead of flightPlanID (still doesn't work)

src/Airmap/AirMapFlightPlanManager.h

@@ -91,9 +91,9 @@ public:
     void                setFlightStartTime  (QDateTime start) override;
     void                setFlightEndTime    (QDateTime end) override;
     void                loadFlightList      (QDateTime startTime, QDateTime endTime) override;
-    void                deleteFlightPlan    (QString flightPlanID) override;
+    void                deleteFlight        (QString flightID) override;
 
-    void                deleteSelectedFlightPlans() override;
+    void                deleteSelectedFlights() override;
 
 signals:
     void            error                   (const QString& what, const QString& airmapdMessage, const QString& airmapdDetails);
@@ -101,7 +101,7 @@ signals:
 private slots:
     void _pollBriefing                      ();
     void _missionChanged                    ();
-    void _deleteFlightPlan                  ();
+    void _deleteFlight                      ();
     void _uploadFlightPlan                  ();
     void _updateFlightPlan                  ();
     void _loadFlightList                    ();
@@ -116,7 +116,6 @@ private:
         GetPilotID,
         FlightUpload,
         FlightUpdate,
-        FlightPlanPolling,
         FlightDelete,
         FlightSubmit,
         FlightPolling,

src/Airmap/AirMapTelemetry.cc

@@ -98,6 +98,10 @@ AirMapTelemetry::startTelemetryStream(const QString& flightID)
         qCWarning(AirMapManagerLog) << "Not starting telemetry: not in idle state:" << (int)_state;
         return;
     }
+    if(flightID.isEmpty()) {
+        qCWarning(AirMapManagerLog) << "Not starting telemetry: No flight ID.";
+        return;
+    }
     qCInfo(AirMapManagerLog) << "Starting Telemetry stream with flightID" << flightID;
     _state      = State::StartCommunication;
     _flightID   = flightID;

src/Airmap/AirmapSettings.qml

@@ -524,7 +524,7 @@ QGCView {
                             anchors.horizontalCenter: parent.horizontalCenter
                             onClicked: {
                                 flightListRoot.updateSelection();
-                                QGroundControl.airspaceManager.flightPlan.deleteSelectedFlightPlans()
+                                QGroundControl.airspaceManager.flightPlan.deleteSelectedFlights()
                             }
                         }
                         QGCButton {

src/AirspaceManagement/AirspaceFlightPlanProvider.h

@@ -175,8 +175,8 @@ public:
     Q_INVOKABLE virtual void    submitFlightPlan            () = 0;
     Q_INVOKABLE virtual void    updateFlightPlan            () = 0;
     Q_INVOKABLE virtual void    loadFlightList              (QDateTime startTime, QDateTime endTime) = 0;
-    Q_INVOKABLE virtual void    deleteFlightPlan            (QString flighPlanID) = 0;
-    Q_INVOKABLE virtual void    deleteSelectedFlightPlans   () = 0;
+    Q_INVOKABLE virtual void    deleteFlight            (QString flighPlanID) = 0;
+    Q_INVOKABLE virtual void    deleteSelectedFlights       () = 0;
 
     virtual PermitStatus        flightPermitStatus  () const { return PermitNone; }
     virtual QDateTime           flightStartTime     () const = 0;