reduce ambiguities (issue #20)

Author: Alexander-Barth

src/cfconventions.jl

@@ -102,7 +102,7 @@ good_data = NCDatasets.filter(ds["data"],:,:, accepted_status_flags = ["good_dat
 filter(ncv::AbstractVariable, indices::TIndices...; kwargs...) =
     _filter(ncv, indices...; kwargs...)
 
-filter(ncv::AbstractVariable, indices::Vector{<:Integer}; kwargs...) =
+filter(ncv::AbstractVariable, indices::Union{Vector{<:Integer}, Array{<:CartesianIndex}}...; kwargs...) =
     _filter(ncv, indices...; kwargs...)
 
 filter(ncv::AbstractVariable, indices::BitVector; kwargs...) =

src/cfvariable.jl

@@ -441,7 +441,6 @@ end
 #@inline CFtransformdata(data::Char,fv,scale_factor,add_offset,time_origin,time_factor,DTcast) = CFtransform_missing(data,fv)
 #@inline CFinvtransformdata(data::Char,fv,scale_factor,add_offset,time_origin,time_factor,DT) = CFtransform_replace_missing(data,fv)
 
-
 function Base.getindex(v::CFVariable, indexes::TIndices...)
     data = v.var[indexes...]
     return CFtransformdata(data,fill_and_missing_values(v),scale_factor(v),add_offset(v),

src/memory_dataset.jl

@@ -2,7 +2,7 @@ import CommonDataModel as CDM
 
 Base.size(RA::ResizableArray) = size(RA.A)
 Base.getindex(RA::ResizableArray,inds...) = getindex(RA.A,inds...)
-Base.checkbounds(::Type{Bool},RA::ResizableArray,inds...) = all(minimum.(inds) .> 0)
+Base.checkbounds(::Type{Bool},RA::ResizableArray,inds::Union{Integer,AbstractVector{<:Integer}}...) = all(minimum.(inds) .> 0)
 
 function grow!(RA::ResizableArray{T,N},new_size) where {T,N}
     # grow
@@ -53,7 +53,7 @@ function grow_unlimited_dimension(ds,dname,len)
     end
 end
 
-Base.getindex(v::MemoryVariable,ij...) = v.data[ij...]
+Base.getindex(v::MemoryVariable,ij::TIndices...) = v.data[ij...]
 CDM.load!(v::MemoryVariable,buffer,ij...) = buffer .= view(v.data,ij...)
 
 function Base.setindex!(v::MemoryVariable,data,ij...)

src/multifile.jl

@@ -126,11 +126,6 @@ function MFDataset(TDS,fnames::AbstractArray{<:AbstractString,N},mode = "r"; agg
 end
 
 
-Base.getindex(v::Union{MFVariable,DeferVariable},ci::CartesianIndices) = v[ci.indices...]
-Base.setindex!(v::Union{MFVariable,DeferVariable},data,ci::CartesianIndices) = setindex!(v,data,ci.indices...)
-
-
-
 function close(mfds::MFDataset)
     close.(mfds.ds)
     return nothing
@@ -249,8 +244,8 @@ end
 dataset(v::Union{MFVariable,MFCFVariable}) = v.ds
 
 
-Base.getindex(v::MFCFVariable,ind...) = v.cfvar[ind...]
-Base.setindex!(v::MFCFVariable,data,ind...) = v.cfvar[ind...] = data
+Base.getindex(v::MFCFVariable,ind::TIndices...) = v.cfvar[ind...]
+Base.setindex!(v::MFCFVariable,data,ind::TIndices...) = v.cfvar[ind...] = data
 
 
 function Base.cat(vs::AbstractVariable...; dims::Integer)

src/types.jl

@@ -1,7 +1,7 @@
 
 const SymbolOrString = Union{Symbol, AbstractString}
 
-const TIndices = Union{<:Integer,AbstractVector{<:Integer},AbstractArray{<:CartesianIndex}, CartesianIndex ,Colon}
+const TIndices = Union{<:Integer,AbstractVector{<:Integer},Colon}
 
 """