diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index db44689f9..762ebdbd8 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -10050,6 +10050,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Extruded height (from surface) for polygons" }, + "availableFrom" : { + "type" : "string", + "description" : "Date and time at which the item should first appear on 3D map" + }, "availableUntil" : { "type" : "string", "description" : "Date and time until after which this item should no longer appear on 3D map" @@ -10210,6 +10214,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Extruded height (from surface) for polygons" }, + "availableFrom" : { + "type" : "string", + "description" : "Date and time at which the item should first appear on 3D map" + }, "availableUntil" : { "type" : "string", "description" : "Date and time until after which this item should no longer appear on 3D map" @@ -58865,7 +58873,7 @@ except ApiException as e:
- Generated 2024-03-13T16:45:40.518+01:00 + Generated 2024-03-18T15:19:34.728+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml index 3d4b74232..1352c59e4 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml @@ -156,6 +156,9 @@ MapItem: description: "Extruded height (from surface) for polygons" type: number format: float + availableFrom: + description: "Date and time at which the item should first appear on 3D map" + type: string availableUntil: description: "Date and time until after which this item should no longer appear on 3D map" type: string diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index db44689f9..762ebdbd8 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -10050,6 +10050,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Extruded height (from surface) for polygons" }, + "availableFrom" : { + "type" : "string", + "description" : "Date and time at which the item should first appear on 3D map" + }, "availableUntil" : { "type" : "string", "description" : "Date and time until after which this item should no longer appear on 3D map" @@ -10210,6 +10214,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Extruded height (from surface) for polygons" }, + "availableFrom" : { + "type" : "string", + "description" : "Date and time at which the item should first appear on 3D map" + }, "availableUntil" : { "type" : "string", "description" : "Date and time until after which this item should no longer appear on 3D map" @@ -58865,7 +58873,7 @@ except ApiException as e:
- Generated 2024-03-13T16:45:40.518+01:00 + Generated 2024-03-18T15:19:34.728+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp index 439be987c..b8f3aec32 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp @@ -88,6 +88,8 @@ SWGMapItem::SWGMapItem() { m_coordinates_isSet = false; extruded_height = 0.0f; m_extruded_height_isSet = false; + available_from = nullptr; + m_available_from_isSet = false; available_until = nullptr; m_available_until_isSet = false; color_valid = 0; @@ -162,6 +164,8 @@ SWGMapItem::init() { m_coordinates_isSet = false; extruded_height = 0.0f; m_extruded_height_isSet = false; + available_from = new QString(""); + m_available_from_isSet = false; available_until = new QString(""); m_available_until_isSet = false; color_valid = 0; @@ -240,6 +244,9 @@ SWGMapItem::cleanup() { delete coordinates; } + if(available_from != nullptr) { + delete available_from; + } if(available_until != nullptr) { delete available_until; } @@ -318,6 +325,8 @@ SWGMapItem::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&coordinates, pJson["coordinates"], "QList", "SWGMapCoordinate"); ::SWGSDRangel::setValue(&extruded_height, pJson["extrudedHeight"], "float", ""); + ::SWGSDRangel::setValue(&available_from, pJson["availableFrom"], "QString", "QString"); + ::SWGSDRangel::setValue(&available_until, pJson["availableUntil"], "QString", "QString"); ::SWGSDRangel::setValue(&color_valid, pJson["colorValid"], "qint32", ""); @@ -430,6 +439,9 @@ SWGMapItem::asJsonObject() { if(m_extruded_height_isSet){ obj->insert("extrudedHeight", QJsonValue(extruded_height)); } + if(available_from != nullptr && *available_from != QString("")){ + toJsonValue(QString("availableFrom"), available_from, obj, QString("QString")); + } if(available_until != nullptr && *available_until != QString("")){ toJsonValue(QString("availableUntil"), available_until, obj, QString("QString")); } @@ -743,6 +755,16 @@ SWGMapItem::setExtrudedHeight(float extruded_height) { this->m_extruded_height_isSet = true; } +QString* +SWGMapItem::getAvailableFrom() { + return available_from; +} +void +SWGMapItem::setAvailableFrom(QString* available_from) { + this->available_from = available_from; + this->m_available_from_isSet = true; +} + QString* SWGMapItem::getAvailableUntil() { return available_until; @@ -868,6 +890,9 @@ SWGMapItem::isSet(){ if(m_extruded_height_isSet){ isObjectUpdated = true; break; } + if(available_from && *available_from != QString("")){ + isObjectUpdated = true; break; + } if(available_until && *available_until != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.h b/swagger/sdrangel/code/qt5/client/SWGMapItem.h index 99e36836d..fa0aeab1f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.h @@ -135,6 +135,9 @@ public: float getExtrudedHeight(); void setExtrudedHeight(float extruded_height); + QString* getAvailableFrom(); + void setAvailableFrom(QString* available_from); + QString* getAvailableUntil(); void setAvailableUntil(QString* available_until); @@ -238,6 +241,9 @@ private: float extruded_height; bool m_extruded_height_isSet; + QString* available_from; + bool m_available_from_isSet; + QString* available_until; bool m_available_until_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp index 5dfa91130..cc7db1fc0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp @@ -88,6 +88,8 @@ SWGMapItem_2::SWGMapItem_2() { m_coordinates_isSet = false; extruded_height = 0.0f; m_extruded_height_isSet = false; + available_from = nullptr; + m_available_from_isSet = false; available_until = nullptr; m_available_until_isSet = false; color_valid = 0; @@ -162,6 +164,8 @@ SWGMapItem_2::init() { m_coordinates_isSet = false; extruded_height = 0.0f; m_extruded_height_isSet = false; + available_from = new QString(""); + m_available_from_isSet = false; available_until = new QString(""); m_available_until_isSet = false; color_valid = 0; @@ -240,6 +244,9 @@ SWGMapItem_2::cleanup() { delete coordinates; } + if(available_from != nullptr) { + delete available_from; + } if(available_until != nullptr) { delete available_until; } @@ -318,6 +325,8 @@ SWGMapItem_2::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&coordinates, pJson["coordinates"], "QList", "SWGMapCoordinate"); ::SWGSDRangel::setValue(&extruded_height, pJson["extrudedHeight"], "float", ""); + ::SWGSDRangel::setValue(&available_from, pJson["availableFrom"], "QString", "QString"); + ::SWGSDRangel::setValue(&available_until, pJson["availableUntil"], "QString", "QString"); ::SWGSDRangel::setValue(&color_valid, pJson["colorValid"], "qint32", ""); @@ -430,6 +439,9 @@ SWGMapItem_2::asJsonObject() { if(m_extruded_height_isSet){ obj->insert("extrudedHeight", QJsonValue(extruded_height)); } + if(available_from != nullptr && *available_from != QString("")){ + toJsonValue(QString("availableFrom"), available_from, obj, QString("QString")); + } if(available_until != nullptr && *available_until != QString("")){ toJsonValue(QString("availableUntil"), available_until, obj, QString("QString")); } @@ -743,6 +755,16 @@ SWGMapItem_2::setExtrudedHeight(float extruded_height) { this->m_extruded_height_isSet = true; } +QString* +SWGMapItem_2::getAvailableFrom() { + return available_from; +} +void +SWGMapItem_2::setAvailableFrom(QString* available_from) { + this->available_from = available_from; + this->m_available_from_isSet = true; +} + QString* SWGMapItem_2::getAvailableUntil() { return available_until; @@ -868,6 +890,9 @@ SWGMapItem_2::isSet(){ if(m_extruded_height_isSet){ isObjectUpdated = true; break; } + if(available_from && *available_from != QString("")){ + isObjectUpdated = true; break; + } if(available_until && *available_until != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h index e5c7a6722..68c8f6daa 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h @@ -135,6 +135,9 @@ public: float getExtrudedHeight(); void setExtrudedHeight(float extruded_height); + QString* getAvailableFrom(); + void setAvailableFrom(QString* available_from); + QString* getAvailableUntil(); void setAvailableUntil(QString* available_until); @@ -238,6 +241,9 @@ private: float extruded_height; bool m_extruded_height_isSet; + QString* available_from; + bool m_available_from_isSet; + QString* available_until; bool m_available_until_isSet;