Skip to content

Commit e49d1c4

Browse files
authored
Merge pull request #1689 from JuliaRobotics/23Q1/maint/dropDFGJSON2
Upgrades to drop JSON3 dependancy in DFG
2 parents 9ba6669 + a90defc commit e49d1c4

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
2020
FunctionalStateMachine = "3e9e306e-7e3c-11e9-12d2-8f8f67a2f951"
2121
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
2222
JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
23+
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
2324
KernelDensityEstimate = "2472808a-b354-52ea-a80e-1658a3c6056d"
2425
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2526
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -58,6 +59,7 @@ FileIO = "1"
5859
FunctionalStateMachine = "0.2.9"
5960
JSON = "0.21"
6061
JSON2 = "0.3"
62+
JSON3 = "1"
6163
KernelDensityEstimate = "0.5.6"
6264
Manifolds = "0.8.15"
6365
ManifoldsBase = "0.13.12, 0.14"

src/IncrementalInference.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ using Dates,
4141
ProgressMeter,
4242
DocStringExtensions,
4343
FunctionalStateMachine,
44-
JSON2,
44+
JSON2,
45+
JSON3,
4546
Combinatorics,
4647
UUIDs,
4748
TensorCast

src/Serialization/services/SerializingDistributions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ function convert(::Type{<:PackedSamplableBelief}, obj::StringThemSamplableBelief
160160
end
161161
convert(::Type{<:SamplableBelief}, obj::PackedSamplableBelief) = unpackDistribution(obj)
162162

163-
function convert(::Type{<:PackedSamplableBelief}, nt::NamedTuple)
163+
function convert(::Type{<:PackedSamplableBelief}, nt::Union{NamedTuple, JSON3.Object})
164164
distrType = DFG.getTypeFromSerializationModule(nt._type)
165165
return distrType(; nt...)
166166
end

0 commit comments

Comments
 (0)