Fix nstime serialised as a string

Author: Affie

docs/src/variable_factor_serialization.md

@@ -26,7 +26,7 @@ prior = addFactor!(dfg, [:x0], PriorPose2( MvNormal([10; 10; 1.0/8.0], Matrix(Di
 
 # Now serialize them:
 pVariable = packVariable(dfg, x0)
-pFactor = packFactor(dfg, prior)
+pFactor = packFactor(prior)
 
 # And we can deserialize them
 upVariable = unpackVariable(dfg, pVariable)
@@ -60,7 +60,7 @@ for v in getVariables(dfg)
 end
 # Factors
 for f in getFactors(dfg)
-    fPacked = packFactor(dfg, f)
+    fPacked = packFactor(f)
     io = open("$folder/factors/$(f.label).json", "w")
     JSON3.write(io, fPacked)
     close(io)

src/Deprecated.jl

@@ -2,7 +2,7 @@
 ## ================================================================================
 ## Remove in v0.21
 ##=================================================================================
-
+@deprecate packFactor(dfg::AbstractDFG, f::DFGFactor) packFactor(f::DFGFactor)
 
 # #TODO check this one
 # function addData!(

src/entities/DFGFactor.jl

@@ -89,7 +89,7 @@ Base.@kwdef struct PackedFactor <: AbstractDFGFactor
     tags::Vector{Symbol}
     _variableOrderSymbols::Vector{Symbol}
     timestamp::ZonedDateTime
-    nstime::Int
+    nstime::String
     fnctype::String
     solvable::Int
     data::String

src/entities/DFGVariable.jl

@@ -183,7 +183,7 @@ Base.@kwdef struct PackedVariable  <: AbstractDFGVariable
     label::Symbol
     tags::Vector{Symbol} = Symbol[]
     timestamp::ZonedDateTime = now(tz"UTC")
-    nstime::Int = 0
+    nstime::String = "0"
     ppes::Vector{MeanMaxPPE} = MeanMaxPPE[]
     blobEntries::Vector{BlobEntry} = BlobEntry[]
     variableType::String

src/services/Serialization.jl

@@ -151,7 +151,7 @@ function packVariable(v::AbstractDFGVariable; includePPEs::Bool=true, includeSol
         id=v.id,
         label = v.label,
         timestamp = v.timestamp,
-        nstime = v.nstime.value,
+        nstime = string(v.nstime.value),
         tags = collect(v.tags), # Symbol.()
         ppes = collect(values(v.ppeDict)),
         solverData = packVariableNodeData.(collect(values(v.solverDataDict))),
@@ -216,15 +216,15 @@ function _packSolverData(
 end
 
 # returns PackedFactor
-function packFactor(dfg::AbstractDFG, f::DFGFactor)
+function packFactor(f::DFGFactor)
     fnctype = getSolverData(f).fnc.usrfnc!
     return PackedFactor(;    
         id = f.id,
         label = f.label,
         tags = collect(f.tags),
         _variableOrderSymbols = f._variableOrderSymbols,
         timestamp = f.timestamp,
-        nstime = f.nstime.value,
+        nstime = string(f.nstime.value),
         fnctype = String(_getname(fnctype)),
         solvable = getSolvable(f),
         metadata = base64encode(JSON3.write(f.smallData)),