Browse Source

AirmapManager: make sure to pass the SITA reg data to the right objects

QGC4.4
Beat Küng 8 years ago
parent
commit
a6becbdd16
  1. 10
      src/MissionManager/AirMapManager.cc
  2. 10
      src/MissionManager/AirMapManager.h

10
src/MissionManager/AirMapManager.cc

@ -569,8 +569,12 @@ void AirMapFlightManager::_uploadFlight() @@ -569,8 +569,12 @@ void AirMapFlightManager::_uploadFlight()
root.insert("buffer", 2);
QJsonObject flightFeatures;
flightFeatures.insert("sita_uav_registration_id", ""); // TODO
flightFeatures.insert("sita_pilot_registration_id", ""); // TODO
if (_sitaUavRegistrationId != "") {
flightFeatures.insert("sita_uav_registration_id", _sitaUavRegistrationId);
}
if (_sitaPilotRegistrationId != "") {
flightFeatures.insert("sita_pilot_registration_id", _sitaPilotRegistrationId);
}
root.insert("flight_features", flightFeatures);
root.insert("takeoff_latitude", _flight.takeoffCoord.latitude());
@ -1196,6 +1200,8 @@ void AirMapManager::setToolbox(QGCToolbox* toolbox) @@ -1196,6 +1200,8 @@ void AirMapManager::setToolbox(QGCToolbox* toolbox)
AirMapSettings* ap = toolbox->settingsManager()->airMapSettings();
_networkingData.airmapAPIKey = ap->apiKey()->rawValueString();
_networkingData.login.setCredentials(ap->clientID()->rawValueString(), ap->userName()->rawValueString(), ap->password()->rawValueString());
_flightManager.setSitaPilotRegistrationId(ap->sitaUserReg()->rawValueString());
_flightManager.setSitaUavRegistrationId(ap->sitaUavReg()->rawValueString());
}
void AirMapManager::setROI(QGeoCoordinate& center, double radiusMeters)

10
src/MissionManager/AirMapManager.h

@ -245,6 +245,13 @@ public: @@ -245,6 +245,13 @@ public:
const QString& flightID() const { return _currentFlightId; }
void setSitaUavRegistrationId(const QString& sitaUavRegistrationId) {
_sitaUavRegistrationId = sitaUavRegistrationId;
}
void setSitaPilotRegistrationId(const QString& sitaPilotRegistrationId) {
_sitaPilotRegistrationId = sitaPilotRegistrationId;
}
public slots:
void endFlight();
@ -300,6 +307,9 @@ private: @@ -300,6 +307,9 @@ private:
QString _pilotID; ///< Pilot ID in the form "auth0|abc123"
bool _noFlightCreatedYet = true;
QTimer _pollTimer; ///< timer to poll for approval check
QString _sitaUavRegistrationId;
QString _sitaPilotRegistrationId;
};
/// class to send telemetry data to AirMap

Loading…
Cancel
Save