Merge branch 'master' of https://github.com/JuliaRobotics/DistributedFactorGraphs.jl into 2Q20/cg_structure_updates

Author: GearsAD

.travis.yml

@@ -17,6 +17,12 @@ julia:
 env:
     - IIF_TEST=false
 
+branches:
+  only:
+  - master
+  - develop
+  - /^release-.*$/
+  
 jobs:
   include:
     - julia: 1.4

src/BigData/services/AbstractBigDataEntries.jl

@@ -44,6 +44,7 @@ Should be extended if DFG variable is not returned by reference.
 """
 function addDataEntry!(dfg::AbstractDFG,
                        lbl::Symbol,
+                       datastore::Union{FileDataStore, InMemoryDataStore},
                        descr::Symbol,
                        mimeType::AbstractString,
                        data::Vector{UInt8} )
@@ -52,7 +53,7 @@ function addDataEntry!(dfg::AbstractDFG,
   # Make a big data entry in the graph - use JSON2 to just write this
   element = GeneralBigDataEntry(dfg, node, descr, mimeType=mimeType)
   # Set it in the store
-  addBigData!(fec.datastore, element, data)
+  addBigData!(datastore, element, data)
   # Add the entry to the graph
   addBigDataEntry!(node, element)
 end

src/FileDFG/services/FileDFG.jl

@@ -162,7 +162,7 @@ function loadDFG(dst::String,
     if unzip
       @info "DFG.loadDFG is deleting a temp folder created during unzip, $loaddir"
       # need this because the number of files created in /tmp/caesar/random is becoming redonkulous.
-      Base.rm(loaddir, recursive=true)
+      Base.rm(loaddir, recursive=true, force=true)
     end
 
     return dfgLoadInto