Commit 0edf06fa authored by Jerome Royan's avatar Jerome Royan
Browse files

update patches

parent 8bf07172
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@
patch -u ../api/DefaultApi.h -i fixHeaderModelIssue.patch
patch -u ../api/DefaultApi.cpp -i fixCppModelIssue.patch
patch -u ../api/RelocalizationInformationApi.cpp -i fixCppRelocalizationInformation.patch
#patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
#patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
#patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
#patch -u ../model/WorldLink.cpp -i fixCppWorldLinksModel.patch
patch -u ../api/TrackablesApi.cpp -i fixCppTrackables.patch
patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
patch -u ../model/Capability.cpp -i fixCppCapabilityModel.patch
patch -u ../model/Trackable.cpp -i fixCppTrackableModel.patch
patch -u ../model/UuidAndMode.cpp -i fixCppUuidAndModeModel.patch
patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
patch -u ../model/WorldLink.cpp -i fixCppWorldLinkModel.patch
+12 −10
Original line number Diff line number Diff line
diff --git a/EtsiServerGen/model/Capability.cpp b/../../world-storage-cpp-server/EtsiServerGen/model/Capability.cpp
index 8df709d..442bc9d 100644
--- a/EtsiServerGen/model/Capability.cpp
+++ b/../../world-storage-cpp-server/EtsiServerGen/model/Capability.cpp
@@ -63,6 +63,7 @@ ptree Capability::toPropertyTree() const
--- Capability.cpp	2024-09-19 23:18:16.290090280 +0200
+++ Capability-corrected.cpp	2024-09-20 13:40:09.082949533 +0200
@@ -63,7 +63,8 @@
 {
 	ptree pt;
 	ptree tmp_node;
-	pt.add_child("encodingInformation", m_EncodingInformation.toPropertyTree());
+	pt.put("trackableType", m_TrackableType.getEnumValue());
 	pt.add_child("encodingInformation", m_EncodingInformation.toPropertyTree());
+    pt.add_child("encodingInformation", m_EncodingInformation.toPropertyTree());
 	pt.put("framerate", m_Framerate);
 	pt.put("latency", m_Latency);
@@ -73,6 +74,7 @@ ptree Capability::toPropertyTree() const
 	pt.put("accuracy", m_Accuracy);
@@ -73,7 +74,8 @@
 void Capability::fromPropertyTree(ptree const &pt)
 {
 	ptree tmp_node;
-	if (pt.get_child_optional("encodingInformation")) {
+	m_TrackableType.setEnumValue(pt.get("trackableType",""));
 	if (pt.get_child_optional("encodingInformation")) {
+    if (pt.get_child_optional("encodingInformation")) {
         m_EncodingInformation = fromPt<EncodingInformationStructure>(pt.get_child("encodingInformation"));
 	}
 	m_Framerate = pt.get("framerate", 0.0);
+0 −14
Original line number Diff line number Diff line
diff --git a/EtsiServerGen/model/GetRelocalizationInformation_200_response.cpp b/../../world-storage-cpp-server/EtsiServerGen/model/GetRelocalizationInformation_200_response.cpp
index d6f90df..ce6079e 100644
--- a/EtsiServerGen/model/GetRelocalizationInformation_200_response.cpp
+++ b/../../world-storage-cpp-server/EtsiServerGen/model/GetRelocalizationInformation_200_response.cpp
@@ -47,6 +47,9 @@ std::string GetRelocalizationInformation_200_response::toJsonString(bool prettyJ
     // workaround inspired by: https://stackoverflow.com/a/56395440
     std::regex reg("\\\"([0-9]+\\.{0,1}[0-9]*)\\\"");
     std::string result = std::regex_replace(ss.str(), reg, "$1");
+
+    result.erase(std::remove(result.begin(), result.end(), '|'), result.end());
+
     return result;
 }
 
+16 −10
Original line number Diff line number Diff line
--- RelocalizationInformationApi.cpp	2024-09-17 15:53:04.949160050 +0200
+++ RelocalizationInformationApi_corrected.cpp	2024-09-17 15:44:29.639017895 +0200
@@ -161,12 +161,12 @@
--- RelocalizationInformationApi.cpp	2024-09-19 22:57:54.664539447 +0200
+++ RelocalizationInformationApi_corrected.cpp	2024-09-19 22:57:22.213975949 +0200
@@ -157,16 +157,12 @@
 {
     const auto request = session->get_request();
     // Getting the query params
-    std::string uuids_raw = request->get_query_parameter("uuids");
+    std::multimap<std::string, std::string> uuids_raw = request->get_query_parameters("uuids");
     std::vector<UuidAndMode> uuids;
     std::vector<std::string> uuids_temp;
     boost::split(uuids_temp, uuids_raw, boost::is_any_of(","));
-    std::vector<std::string> uuids_temp;
-    boost::split(uuids_temp, uuids_raw, boost::is_any_of(","));
-    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromString(i); return ret;});
+    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromJsonString(i); return ret;});
     std::string capabilities_raw = request->get_query_parameter("capabilities");
-    std::string capabilities_raw = request->get_query_parameter("capabilities");
+    std::transform(uuids_raw.begin(), uuids_raw.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromJsonString(i.second); return ret;});
+    std::multimap<std::string, std::string> capabilities_raw = request->get_query_parameters("capabilities");
     std::vector<Capability> capabilities;
     std::vector<std::string> capabilities_temp;
     boost::split(capabilities_temp, capabilities_raw, boost::is_any_of(","));
-    std::vector<std::string> capabilities_temp;
-    boost::split(capabilities_temp, capabilities_raw, boost::is_any_of(","));
-    std::transform(capabilities_temp.begin(), capabilities_temp.end(), std::back_inserter(capabilities), [](const auto& i){ Capability ret; ret.fromString(i); return ret;});
+    std::transform(capabilities_temp.begin(), capabilities_temp.end(), std::back_inserter(capabilities), [](const auto& i){ Capability ret; ret.fromJsonString(i); return ret;});
+    std::transform(capabilities_raw.begin(), capabilities_raw.end(), std::back_inserter(capabilities), [](const auto& i){ Capability ret; ret.fromJsonString(i.second); return ret;});
     // Getting the headers
     std::string token = request->get_header("token", "");
     
+0 −21
Original line number Diff line number Diff line
diff --git a/EtsiServerGen/model/RelocalizationInformation.cpp b/../../world-storage-cpp-server/EtsiServerGen/model/RelocalizationInformation.cpp
index 46fd7ec..8a020e9 100644
--- a/EtsiServerGen/model/RelocalizationInformation.cpp
+++ b/../../world-storage-cpp-server/EtsiServerGen/model/RelocalizationInformation.cpp
@@ -64,6 +64,7 @@ ptree RelocalizationInformation::toPropertyTree() const
 	ptree pt;
 	ptree tmp_node;
 	pt.put("requestUUID", m_RequestUUID);
+    pt.put("requestType", m_RequestType.getEnumValue());
 	// generate tree for RelocObjects
     tmp_node.clear();
 	if (!m_RelocObjects.empty()) {
@@ -78,6 +79,8 @@ void RelocalizationInformation::fromPropertyTree(ptree const &pt)
 {
 	ptree tmp_node;
 	m_RequestUUID = pt.get("requestUUID", "");
+    m_RequestType.setEnumValue(pt.get("requestType",""));
+
 	// push all items of RelocObjects into member
 	if (pt.get_child_optional("relocObjects")) {
         m_RelocObjects = fromPt<std::vector<RelocalizationInformation_relocObjects_inner>>(pt.get_child("relocObjects"));
Loading