1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-09 12:25:31 -04:00

Add altitudeDateTime to MapItem

This commit is contained in:
srcejon 2025-03-06 13:55:38 +00:00
parent 5ae5641f99
commit cb5d921e68
8 changed files with 86 additions and 2 deletions
sdrbase/resources/webapi/doc
html2
swagger/include
swagger/sdrangel

@ -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:
</div>
<div id="generator">
<div class="content">
Generated 2025-02-04T16:59:42.434+01:00
Generated 2025-03-06T14:54:56.926+01:00
</div>
</div>
</div>

@ -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

@ -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

@ -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:
</div>
<div id="generator">
<div class="content">
Generated 2025-02-04T16:59:42.434+01:00
Generated 2025-03-06T14:54:56.926+01:00
</div>
</div>
</div>

@ -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<SWGMapCoordinate*>();
m_track_isSet = false;
predicted_track = new QList<SWGMapCoordinate*>();
@ -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<void*>*)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<SWGMapCoordinate*>*
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;
}

@ -73,6 +73,9 @@ public:
QString* getPositionDateTime();
void setPositionDateTime(QString* position_date_time);
QString* getAltitudeDateTime();
void setAltitudeDateTime(QString* altitude_date_time);
QList<SWGMapCoordinate*>* getTrack();
void setTrack(QList<SWGMapCoordinate*>* 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<SWGMapCoordinate*>* track;
bool m_track_isSet;

@ -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<SWGMapCoordinate*>();
m_track_isSet = false;
predicted_track = new QList<SWGMapCoordinate*>();
@ -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<void*>*)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<SWGMapCoordinate*>*
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;
}

@ -73,6 +73,9 @@ public:
QString* getPositionDateTime();
void setPositionDateTime(QString* position_date_time);
QString* getAltitudeDateTime();
void setAltitudeDateTime(QString* altitude_date_time);
QList<SWGMapCoordinate*>* getTrack();
void setTrack(QList<SWGMapCoordinate*>* 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<SWGMapCoordinate*>* track;
bool m_track_isSet;