Skip to content

getattributes(::DimArray): always a Dict with String keys #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjarthur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

getattributes(::DimArray): always a Dict with String keys #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ext/DimensionalDataExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module DimensionalDataExt
using DimensionalData: DimArray, DimensionalData, data, Dim, metadata
using DimensionalData: DimArray, DimensionalData, data, Dim, metadata, NoMetadata, Metadata, val
import YAXArrayBase: dimname, dimnames, dimvals, iscontdim, getattributes, getdata, yaxcreate
_dname(::DimensionalData.Dim{N}) where N = N
_dname(d::DimensionalData.Dimension) = DimensionalData.name(d)
Expand All @@ -10,7 +10,13 @@ dimvals(x::DimArray,i) = DimensionalData.dims(x)[i].val

getdata(x::DimArray) = data(x)

getattributes(x::DimArray) = metadata(x)
# the interface promises a Dict with String keys; DimensionalData's default metadata is
# `NoMetadata()` and its `Metadata` wraps a Dict whose keys may be Symbols
getattributes(x::DimArray) = _attributes(metadata(x))
_attributes(::NoMetadata) = Dict{String,Any}()
_attributes(m::Metadata) = _attributes(val(m))
_attributes(d::AbstractDict) = Dict{String,Any}(string(k) => v for (k, v) in d)
_attributes(m) = m

function yaxcreate(::Type{<:DimArray},data,dnames,dvals,atts)
d = ntuple(ndims(data)) do i
Expand Down
8 changes: 8 additions & 0 deletions test/arrays.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ end
@test dimvals(d,1) == 0.5:1.0:2.5
@test dimvals(d,2) == 1.5:0.5:3.0
@test getattributes(d) == Dict{String,Any}("a1"=>5, "a2"=>"att")
# metadata is normalised to a Dict with String keys, whatever DimensionalData holds
dd = DimArray(rand(2, 3), (X(1:2), Y(1:3)))
@test getattributes(dd) == Dict{String,Any}() && getattributes(dd) isa Dict{String,Any}
dd = DimArray(rand(2, 3), (X(1:2), Y(1:3)); metadata=Dict(:units => "K"))
@test getattributes(dd) == Dict{String,Any}("units" => "K") && getattributes(dd) isa Dict{String,Any}
dd = DimArray(rand(2, 3), (X(1:2), Y(1:3)); metadata=DimensionalData.Metadata(Dict("a" => 1)))
@test getattributes(dd) == Dict{String,Any}("a" => 1)
@test yaxconvert(DimArray, M()) isa DimArray
end

@testitem "ArchGDAL" begin
Expand Down
Loading