Merge pull request #978 from JuliaRobotics/bug/fixing_small_bugs

Fixing naming and small serialization issues.

Author: Affie

src/DataBlobs/DataBlobs.jl

@@ -1,7 +1,7 @@
 
 using SHA
 
-include("entities/AbstractBlobEntries.jl")
+include("entities/BlobEntry.jl")
 include("entities/BlobStores.jl")
 
 include("services/AbstractBlobEntries.jl")

src/DataBlobs/entities/AbstractBlobEntries.jl renamed to src/DataBlobs/entities/BlobEntry.jl

@@ -1,6 +1,6 @@
 
 ##==============================================================================
-## BlobStoreEntry
+## BlobEntry
 ##==============================================================================
 
 """
@@ -26,5 +26,10 @@ General Data Store Entry.
     _version::String = string(_getDFGVersion()) # TBD consider upgrading to ::VersionNumber
 end
 
+StructTypes.StructType(::Type{BlobEntry}) = StructTypes.UnorderedStruct()
+StructTypes.idproperty(::Type{BlobEntry}) = :id
+StructTypes.omitempties(::Type{BlobEntry}) = (:id,)
+
+
 
 _fixtimezone(cts::NamedTuple) = ZonedDateTime(cts.utc_datetime*"+00")

src/entities/DFGVariable.jl

@@ -186,7 +186,7 @@ Base.@kwdef struct PackedVariable
     timestamp::ZonedDateTime
     nstime::Int
     ppes::Vector{MeanMaxPPE}
-    dataEntries::Vector{BlobEntry}
+    blobEntries::Vector{BlobEntry}
     variableType::String
     _version::String
     metadata::String

src/services/Serialization.jl

@@ -158,7 +158,7 @@ function packVariable(v::AbstractDFGVariable; includePPEs::Bool=true, includeSol
         metadata = base64encode(JSON3.write(v.smallData)),
         solvable = v.solvable,
         variableType = DFG.typeModuleName(DFG.getVariableType(v)),
-        dataEntries = collect(values(v.dataDict)),
+        blobEntries = collect(values(v.dataDict)),
         _version = string(DFG._getDFGVersion()))
 end
 
@@ -174,7 +174,7 @@ function unpackVariable(variable::PackedVariable; skipVersionCheck::Bool=false)
     solverDict = Dict{Symbol, VariableNodeData{variableType, pointType}}(
         map(sd -> sd.solveKey, variable.solverData) .=> 
         map(sd -> DFG.unpackVariableNodeData(sd), variable.solverData))
-    dataDict = Dict{Symbol, BlobEntry}(map(de -> de.label, variable.dataEntries) .=> variable.dataEntries)
+    dataDict = Dict{Symbol, BlobEntry}(map(de -> de.label, variable.blobEntries) .=> variable.blobEntries)
     metadata = JSON3.read(base64decode(variable.metadata), Dict{Symbol, DFG.SmallDataTypes})
 
     return DFGVariable(
@@ -215,11 +215,11 @@ function _packSolverData(
     end
 end
 
-# returns ::Dict{String, <:Any}
+# returns PackedFactor
 function packFactor(dfg::AbstractDFG, f::DFGFactor)
     fnctype = getSolverData(f).fnc.usrfnc!
     return PackedFactor(;    
-        id = f.id !== nothing ? string(f.id) : nothing,
+        id = f.id,
         label = f.label,
         tags = collect(f.tags),
         _variableOrderSymbols = f._variableOrderSymbols,