Fix tests

Author: meggart

src/YAXArrayBase.jl

@@ -31,9 +31,10 @@ function __init__()
 
   @require AxisIndices="f52c9ee2-1b1c-4fd8-8546-6350938c7f11" include("axisarrays/axisindices.jl")
 
-  @require ArchGDAL="c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" include("axisarrays/archgdal.jl")
-      
-  @require ArchGDAL="c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" include("datasets/archgdal.jl")
+  @require ArchGDAL="c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" begin 
+    include("axisarrays/archgdal.jl")
+    include("datasets/archgdal.jl")
+  end
 
 
   @require Zarr="0a941bbe-ad1d-11e8-39d9-ab76183a1d99" include("datasets/zarr.jl")

src/datasets/archgdal.jl

@@ -48,7 +48,10 @@ function GDALDataset(filename)
         allbands = map(1:nb) do iband
             b = AG.getband(r, iband)
             gb = GDALBand(b, filename, iband)
-            name = AG.getname(AG.getcolorinterp(b))
+            name = AG.GDAL.gdalgetdescription(b.ptr)
+            if isempty(name)
+                name = AG.getname(AG.getcolorinterp(b))
+            end
             name => gb
         end
         proj = AG.getproj(r)
@@ -76,7 +79,17 @@ end
 
 get_varnames(ds::GDALDataset) = collect(keys(ds.bands))
 
-get_var_dims(ds::GDALDataset, _) = ("X", "Y")
+function get_var_dims(ds::GDALDataset, d) 
+    if d === "X"
+        return ("X",)
+    elseif d==="Y"
+        return ("Y",)
+    else
+        return ("X", "Y")
+    end
+end
+
+get_global_attrs(ds::GDALDataset) = Dict("projection"=>ds.projection)
 
 function get_var_attrs(ds::GDALDataset, name)
     if name in ("Y", "X")
@@ -96,7 +109,7 @@ isy(s) = uppercase(s) == "Y"
 function totransform(x, y)
     xstep = diff(x)
     ystep = diff(y)
-    if !all(isapprox(first(xstep)), xstep) && !all(isapprox(first(ystep)), ystep)
+    if !all(isapprox(first(xstep)), xstep) || !all(isapprox(first(ystep)), ystep)
         throw(ArgumentError("Grid must have regular spacing"))
     end
     Float64[first(x), first(xstep), 0.0, first(y), 0.0, first(ystep)]
@@ -173,6 +186,7 @@ function create_dataset(
             else
                 AG.setcolorinterp!(b, AG.GDAL.GDALColorInterp(icol - 1))
             end
+            AG.GDAL.gdalsetdescription(b.ptr, varnames[i])
             atts = varattrs[i]
             haskey(atts, "missing_value") && AG.setnodatavalue!(b, atts["missing_value"])
             if haskey(atts, "labels")

test/arrays.jl

@@ -74,7 +74,7 @@ end
   @test YAXArrayBase.iscontdim(r,1) == true
   @test YAXArrayBase.iscontdim(r,2) == true
   @test YAXArrayBase.iscontdim(r,3) == true
-  @test YAXArrayBase.getattributes(r)["projection"] == "+proj=cea +lat_ts=33.75 +lon_0=-117.333333333333 +x_0=0 +y_0=0 +datum=NAD27 +units=m +no_defs"
+  @test YAXArrayBase.getattributes(r)["projection_PROJ4"] == "+proj=cea +lat_ts=33.75 +lon_0=-117.333333333333 +x_0=0 +y_0=0 +datum=NAD27 +units=m +no_defs"
   b = AG.getband(r,1)
   @test YAXArrayBase.dimnames(b) == (:Y, :X)
   @test YAXArrayBase.dimname(b,1) == :Y
@@ -85,5 +85,5 @@ end
   @test_throws Exception YAXArrayBase.dimvals(b,3)
   @test YAXArrayBase.iscontdim(b,1) == true
   @test YAXArrayBase.iscontdim(b,2) == true
-  @test YAXArrayBase.getattributes(b)["projection"] == "+proj=cea +lat_ts=33.75 +lon_0=-117.333333333333 +x_0=0 +y_0=0 +datum=NAD27 +units=m +no_defs"
+  @test YAXArrayBase.getattributes(b)["projection_PROJ4"] == "+proj=cea +lat_ts=33.75 +lon_0=-117.333333333333 +x_0=0 +y_0=0 +datum=NAD27 +units=m +no_defs"
 end