Done for the night

src/Airmap/AirMapFlightPlanManager.cc

@@ -677,7 +677,7 @@ AirMapFlightPlanManager::_loadFlightList()
                 for (const auto& flight : response.flights) {
                     AirMapFlightInfo* pFlight = new AirMapFlightInfo(flight, this);
                     _flightList.append(pFlight);
-                    qCDebug(AirMapManagerLog) << "Found:" << pFlight->flightID();
+                    qCDebug(AirMapManagerLog) << "Found:" << pFlight->flightID() << pFlight->flightPlanID();
                 }
                 emit flightListChanged();
             } else {

src/Airmap/AirMapFlightPlanManager.h

@@ -27,13 +27,14 @@ class AirMapFlightInfo : public AirspaceFlightInfo
 {
     Q_OBJECT
 public:
-    AirMapFlightInfo                            (const airmap::Flight& flight, QObject *parent = nullptr);
-    virtual QString                 flightID    () override { return QString::fromStdString(_flight.id); }
-    virtual QString                 createdTime () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
-    virtual QString                 startTime   () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
-    virtual QString                 endTime     () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
-    virtual QGeoCoordinate          takeOff     () override { return QGeoCoordinate(_flight.latitude, _flight.longitude);}
-    virtual QmlObjectListModel*     boundingBox () override { return &_boundingBox; }
+    AirMapFlightInfo                        (const airmap::Flight& flight, QObject *parent = nullptr);
+    QString             flightID            () override { return QString::fromStdString(_flight.id); }
+    QString             flightPlanID        () override { return QString::fromStdString(_flight.flight_plan_id.get()); }
+    QString             createdTime         () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
+    QString             startTime           () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
+    QString             endTime             () override { return QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate); } //-- TODO: Need to get rid of boost first
+    QGeoCoordinate      takeOff             () override { return QGeoCoordinate(_flight.latitude, _flight.longitude);}
+    QmlObjectListModel* boundingBox         () override { return &_boundingBox; }
 private:
     airmap::Flight      _flight;
     QmlObjectListModel  _boundingBox;

src/Airmap/AirmapSettings.qml

@@ -434,6 +434,7 @@ QGCView {
                         text:           qsTr("Flight Area")
                         anchors.bottom: map.top
                         anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 0.25
+                        anchors.horizontalCenter: parent.horizontalCenter
                     }
                     Map {
                         id:             map
@@ -448,9 +449,9 @@ QGCView {
                         function updateActiveMapType() {
                             var settings =  QGroundControl.settingsManager.flightMapSettings
                             var fullMapName = settings.mapProvider.enumStringValue + " " + settings.mapType.enumStringValue
-                            for (var i = 0; i < _map.supportedMapTypes.length; i++) {
-                                if (fullMapName === _map.supportedMapTypes[i].name) {
-                                    _map.activeMapType = _map.supportedMapTypes[i]
+                            for (var i = 0; i < map.supportedMapTypes.length; i++) {
+                                if (fullMapName === map.supportedMapTypes[i].name) {
+                                    map.activeMapType = map.supportedMapTypes[i]
                                     return
                                 }
                             }

src/AirspaceManagement/AirspaceFlightPlanProvider.h

@@ -31,26 +31,28 @@ class AirspaceFlightInfo : public QObject
 public:
     AirspaceFlightInfo                          (QObject *parent = nullptr);
 
-    Q_PROPERTY(QString              flightID    READ flightID       CONSTANT)
-    Q_PROPERTY(QString              createdTime READ createdTime    CONSTANT)
-    Q_PROPERTY(QString              startTime   READ startTime      CONSTANT)
-    Q_PROPERTY(QString              endTime     READ endTime        CONSTANT)
-    Q_PROPERTY(QGeoCoordinate       takeOff     READ takeOff        CONSTANT)
-    Q_PROPERTY(QmlObjectListModel*  boundingBox READ boundingBox    CONSTANT)
-    Q_PROPERTY(bool                 selected    READ selected       WRITE setSelected   NOTIFY selectedChanged)
-
-    virtual QString                 flightID    () = 0;
-    virtual QString                 createdTime () = 0;
-    virtual QString                 startTime   () = 0;
-    virtual QString                 endTime     () = 0;
-    virtual QGeoCoordinate          takeOff     () = 0;
-    virtual QmlObjectListModel*     boundingBox () = 0;
-
-    virtual bool                    selected    () { return _selected; }
-    virtual void                    setSelected (bool sel) { _selected = sel; emit selectedChanged(); }
+    Q_PROPERTY(QString              flightID        READ flightID       CONSTANT)
+    Q_PROPERTY(QString              flightPlanID    READ flightPlanID   CONSTANT)
+    Q_PROPERTY(QString              createdTime     READ createdTime    CONSTANT)
+    Q_PROPERTY(QString              startTime       READ startTime      CONSTANT)
+    Q_PROPERTY(QString              endTime         READ endTime        CONSTANT)
+    Q_PROPERTY(QGeoCoordinate       takeOff         READ takeOff        CONSTANT)
+    Q_PROPERTY(QmlObjectListModel*  boundingBox     READ boundingBox    CONSTANT)
+    Q_PROPERTY(bool                 selected        READ selected       WRITE setSelected   NOTIFY selectedChanged)
+
+    virtual QString                 flightID        () = 0;
+    virtual QString                 flightPlanID    () = 0;
+    virtual QString                 createdTime     () = 0;
+    virtual QString                 startTime       () = 0;
+    virtual QString                 endTime         () = 0;
+    virtual QGeoCoordinate          takeOff         () = 0;
+    virtual QmlObjectListModel*     boundingBox     () = 0;
+
+    virtual bool                    selected        () { return _selected; }
+    virtual void                    setSelected     (bool sel) { _selected = sel; emit selectedChanged(); }
 
 signals:
-    void    selectedChanged         ();
+    void    selectedChanged                         ();
 
 protected:
     bool    _selected;