Merge branch 'andrea/cleanup_of_json_properties_after_assigning' into 'development'

HOTFIX: Cleaning up properties after assigning.

See merge request VP/opentrackio-cpp!17

Author: AndreaSpiteri-mosys

include/opentrackio-cpp/OpenTrackIOHelper.h

@@ -174,8 +174,8 @@ namespace opentrackio
     };
 
     template<>
-    inline void OpenTrackIOHelpers::assignField<std::vector<double>>(nlohmann::json &json, std::string_view fieldStr,
-                                                 std::optional<std::vector<double>> &field,
+    inline void OpenTrackIOHelpers::assignField<std::vector<std::string>>(nlohmann::json &json, std::string_view fieldStr,
+                                                 std::optional<std::vector<std::string>> &field,
                                                  std::string_view typeStr, std::vector<std::string> &errors)
     {
         if (!json.contains(fieldStr) || !json[fieldStr].is_array())
@@ -184,10 +184,10 @@ namespace opentrackio
             return;
         }
 
-        std::vector<double> vec{};
+        std::vector<std::string> vec{};
         if (!iterateJsonArrayAndPopulateVector(json[fieldStr], vec))
         {
-            errors.emplace_back("field: {} had elements not of type: double");
+            errors.emplace_back("field: {} had elements not of type: string");
             field = std::nullopt;
             return;
         }

include/opentrackio-cpp/OpenTrackIOTypes.h

@@ -157,8 +157,9 @@ namespace opentrackio::opentrackiotypes
                 return std::nullopt;
             }
 
-            std::optional<int> subFrame;
-            OpenTrackIOHelpers::assignField(tcJson["format"], "subFrame", subFrame, "uint32", errors);
+            std::optional<uint32_t> subFrame;
+            OpenTrackIOHelpers::assignField(tcJson, "subFrame", subFrame, "uint32_t", errors);
+
             return Timecode{hours.value(), minutes.value(), seconds.value(), frames.value(), frameRate.value(), subFrame};
         }
     };

src/OpenTrackIOProperties.cpp

@@ -177,6 +177,7 @@ namespace opentrackio::opentrackioproperties
             OpenTrackIOHelpers::assignField(lensJson, "serialNumber", lens.serialNumber, "string", errors);
             OpenTrackIOHelpers::assignField(lensJson, "distortionOverscanMax", lens.distortionOverscanMax, "double", errors);
             OpenTrackIOHelpers::assignField(lensJson, "undistortionOverscanMax", lens.undistortionOverscanMax, "double", errors);
+            OpenTrackIOHelpers::assignField(lensJson, "calibrationHistory", lens.calibrationHistory, "string", errors);
 
             OpenTrackIOHelpers::clearFieldIfEmpty(json["static"], "lens");
         }
@@ -666,6 +667,7 @@ namespace opentrackio::opentrackioproperties
                 errors.emplace_back("field: timing/synchronization/ptp/leaderPriorities is required, however it is missing a subfield(s).");
                 return std::nullopt;
             }
+            OpenTrackIOHelpers::clearFieldIfEmpty(ptpJson, leaderPrioritiesStr);
 
             outSync.ptp->leaderPriorities = Synchronization::Ptp::LeaderPriorities{
                 priority1.value(),
@@ -710,7 +712,7 @@ namespace opentrackio::opentrackioproperties
                 }
             }
 
-            json.erase("ptp");
+            OpenTrackIOHelpers::clearFieldIfEmpty(syncJson, "ptp");
         }
 
         return outSync;