diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 9b8d5e716..8825326d4 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -10184,6 +10184,10 @@ margin-bottom: 20px; "type" : "string", "description" : "Date and time at this position (ISO 8601 extended format)" }, + "altitudeDateTime" : { + "type" : "string", + "description" : "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + }, "track" : { "type" : "array", "description" : "Track/path the item has taken", @@ -10355,6 +10359,10 @@ margin-bottom: 20px; "type" : "string", "description" : "Date and time at this position (ISO 8601 extended format)" }, + "altitudeDateTime" : { + "type" : "string", + "description" : "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + }, "track" : { "type" : "array", "description" : "Track/path the item has taken", @@ -59593,7 +59601,7 @@ except ApiException as e:
- Generated 2025-02-04T16:59:42.434+01:00 + Generated 2025-03-06T14:54:56.926+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml index 47882e5f0..b4d8a4022 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml @@ -78,6 +78,9 @@ MapItem: positionDateTime: description: "Date and time at this position (ISO 8601 extended format)" type: string + altitudeDateTime: + description: "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + type: string track: description: "Track/path the item has taken" type: array diff --git a/swagger/sdrangel/api/swagger/include/Map.yaml b/swagger/sdrangel/api/swagger/include/Map.yaml index 8f756c210..cd1361583 100644 --- a/swagger/sdrangel/api/swagger/include/Map.yaml +++ b/swagger/sdrangel/api/swagger/include/Map.yaml @@ -78,6 +78,9 @@ MapItem: positionDateTime: description: "Date and time at this position (ISO 8601 extended format)" type: string + altitudeDateTime: + description: "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + type: string track: description: "Track/path the item has taken" type: array diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 9b8d5e716..8825326d4 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -10184,6 +10184,10 @@ margin-bottom: 20px; "type" : "string", "description" : "Date and time at this position (ISO 8601 extended format)" }, + "altitudeDateTime" : { + "type" : "string", + "description" : "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + }, "track" : { "type" : "array", "description" : "Track/path the item has taken", @@ -10355,6 +10359,10 @@ margin-bottom: 20px; "type" : "string", "description" : "Date and time at this position (ISO 8601 extended format)" }, + "altitudeDateTime" : { + "type" : "string", + "description" : "Date and time at this altitude, if different from positionDateTime (ISO 8601 extended format)" + }, "track" : { "type" : "array", "description" : "Track/path the item has taken", @@ -59593,7 +59601,7 @@ except ApiException as e:
- Generated 2025-02-04T16:59:42.434+01:00 + Generated 2025-03-06T14:54:56.926+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp index 1ad899e03..0eee73732 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp @@ -46,6 +46,8 @@ SWGMapItem::SWGMapItem() { m_fixed_position_isSet = false; position_date_time = nullptr; m_position_date_time_isSet = false; + altitude_date_time = nullptr; + m_altitude_date_time_isSet = false; track = nullptr; m_track_isSet = false; predicted_track = nullptr; @@ -126,6 +128,8 @@ SWGMapItem::init() { m_fixed_position_isSet = false; position_date_time = new QString(""); m_position_date_time_isSet = false; + altitude_date_time = new QString(""); + m_altitude_date_time_isSet = false; track = new QList(); m_track_isSet = false; predicted_track = new QList(); @@ -201,6 +205,9 @@ SWGMapItem::cleanup() { if(position_date_time != nullptr) { delete position_date_time; } + if(altitude_date_time != nullptr) { + delete altitude_date_time; + } if(track != nullptr) { auto arr = track; for(auto o: *arr) { @@ -297,6 +304,8 @@ SWGMapItem::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&position_date_time, pJson["positionDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&altitude_date_time, pJson["altitudeDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&track, pJson["track"], "QList", "SWGMapCoordinate"); @@ -394,6 +403,9 @@ SWGMapItem::asJsonObject() { if(position_date_time != nullptr && *position_date_time != QString("")){ toJsonValue(QString("positionDateTime"), position_date_time, obj, QString("QString")); } + if(altitude_date_time != nullptr && *altitude_date_time != QString("")){ + toJsonValue(QString("altitudeDateTime"), altitude_date_time, obj, QString("QString")); + } if(track && track->size() > 0){ toJsonArray((QList*)track, obj, "track", "SWGMapCoordinate"); } @@ -569,6 +581,16 @@ SWGMapItem::setPositionDateTime(QString* position_date_time) { this->m_position_date_time_isSet = true; } +QString* +SWGMapItem::getAltitudeDateTime() { + return altitude_date_time; +} +void +SWGMapItem::setAltitudeDateTime(QString* altitude_date_time) { + this->altitude_date_time = altitude_date_time; + this->m_altitude_date_time_isSet = true; +} + QList* SWGMapItem::getTrack() { return track; @@ -871,6 +893,9 @@ SWGMapItem::isSet(){ if(position_date_time && *position_date_time != QString("")){ isObjectUpdated = true; break; } + if(altitude_date_time && *altitude_date_time != QString("")){ + isObjectUpdated = true; break; + } if(track && (track->size() > 0)){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.h b/swagger/sdrangel/code/qt5/client/SWGMapItem.h index ae4402424..9262c0081 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.h @@ -73,6 +73,9 @@ public: QString* getPositionDateTime(); void setPositionDateTime(QString* position_date_time); + QString* getAltitudeDateTime(); + void setAltitudeDateTime(QString* altitude_date_time); + QList* getTrack(); void setTrack(QList* track); @@ -185,6 +188,9 @@ private: QString* position_date_time; bool m_position_date_time_isSet; + QString* altitude_date_time; + bool m_altitude_date_time_isSet; + QList* track; bool m_track_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp index be758a8dc..aa7ed4684 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp @@ -46,6 +46,8 @@ SWGMapItem_2::SWGMapItem_2() { m_fixed_position_isSet = false; position_date_time = nullptr; m_position_date_time_isSet = false; + altitude_date_time = nullptr; + m_altitude_date_time_isSet = false; track = nullptr; m_track_isSet = false; predicted_track = nullptr; @@ -126,6 +128,8 @@ SWGMapItem_2::init() { m_fixed_position_isSet = false; position_date_time = new QString(""); m_position_date_time_isSet = false; + altitude_date_time = new QString(""); + m_altitude_date_time_isSet = false; track = new QList(); m_track_isSet = false; predicted_track = new QList(); @@ -201,6 +205,9 @@ SWGMapItem_2::cleanup() { if(position_date_time != nullptr) { delete position_date_time; } + if(altitude_date_time != nullptr) { + delete altitude_date_time; + } if(track != nullptr) { auto arr = track; for(auto o: *arr) { @@ -297,6 +304,8 @@ SWGMapItem_2::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&position_date_time, pJson["positionDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&altitude_date_time, pJson["altitudeDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&track, pJson["track"], "QList", "SWGMapCoordinate"); @@ -394,6 +403,9 @@ SWGMapItem_2::asJsonObject() { if(position_date_time != nullptr && *position_date_time != QString("")){ toJsonValue(QString("positionDateTime"), position_date_time, obj, QString("QString")); } + if(altitude_date_time != nullptr && *altitude_date_time != QString("")){ + toJsonValue(QString("altitudeDateTime"), altitude_date_time, obj, QString("QString")); + } if(track && track->size() > 0){ toJsonArray((QList*)track, obj, "track", "SWGMapCoordinate"); } @@ -569,6 +581,16 @@ SWGMapItem_2::setPositionDateTime(QString* position_date_time) { this->m_position_date_time_isSet = true; } +QString* +SWGMapItem_2::getAltitudeDateTime() { + return altitude_date_time; +} +void +SWGMapItem_2::setAltitudeDateTime(QString* altitude_date_time) { + this->altitude_date_time = altitude_date_time; + this->m_altitude_date_time_isSet = true; +} + QList* SWGMapItem_2::getTrack() { return track; @@ -871,6 +893,9 @@ SWGMapItem_2::isSet(){ if(position_date_time && *position_date_time != QString("")){ isObjectUpdated = true; break; } + if(altitude_date_time && *altitude_date_time != QString("")){ + isObjectUpdated = true; break; + } if(track && (track->size() > 0)){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h index ee7406e95..ed0d5f783 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h @@ -73,6 +73,9 @@ public: QString* getPositionDateTime(); void setPositionDateTime(QString* position_date_time); + QString* getAltitudeDateTime(); + void setAltitudeDateTime(QString* altitude_date_time); + QList* getTrack(); void setTrack(QList* track); @@ -185,6 +188,9 @@ private: QString* position_date_time; bool m_position_date_time_isSet; + QString* altitude_date_time; + bool m_altitude_date_time_isSet; + QList* track; bool m_track_isSet;