adds method

Author: lazarusA

ext/ArchGDALExt/ArchGDALExt.jl

@@ -40,6 +40,7 @@ module ArchGDALExt
             error("RasterDataset only has 3 dimensions")
         end
     end
+    
     iscontdim(a::RasterDataset, i) = i < 3 ? true : nraster(a)<8
     function getattributes(a::RasterDataset)
         globatts = Dict{String,Any}(
@@ -50,7 +51,7 @@ module ArchGDALExt
         allbands = mergewith(bands...) do a1,a2
             isequal(a1,a2) ? a1 : missing
         end
-        merge(globatts, allbands)
+        return merge(globatts, allbands)
     end
 
 
@@ -75,9 +76,9 @@ module ArchGDALExt
     end
     iscontdim(a::AbstractRasterBand, i) = true
     function getattributes(a::AbstractRasterBand)
-    atts = getattributes(AG.RasterDataset(AG.getdataset(a)))
-    bandatts = getbandattributes(a)
-    merge(atts, bandatts)
+        atts = getattributes(AG.RasterDataset(AG.getdataset(a)))
+        bandatts = getbandattributes(a)
+        return merge(atts, bandatts)
     end
 
     function insertattifnot!(attrs, val, name, condition)
@@ -86,13 +87,13 @@ module ArchGDALExt
         end
     end
     function getbandattributes(a::AbstractRasterBand)
-    atts = Dict{String,Any}()
-    catdict = Dict((i-1)=>v for (i,v) in enumerate(AG.getcategorynames(a)))
-    insertattifnot!(atts, AG.getnodatavalue(a), "missing_value", isnothing)
-    insertattifnot!(atts, catdict, "labels", isempty)
-    insertattifnot!(atts, AG.getunittype(a), "units", isempty)
-    insertattifnot!(atts, AG.getoffset(a), "add_offset", iszero)
-    insertattifnot!(atts, AG.getscale(a), "scale_factor", x->isequal(x, one(x)))
-    atts
+        atts = Dict{String,Any}()
+        catdict = Dict((i-1)=>v for (i,v) in enumerate(AG.getcategorynames(a)))
+        insertattifnot!(atts, AG.getnodatavalue(a), "missing_value", isnothing)
+        insertattifnot!(atts, catdict, "labels", isempty)
+        insertattifnot!(atts, AG.getunittype(a), "units", isempty)
+        insertattifnot!(atts, AG.getoffset(a), "add_offset", iszero)
+        insertattifnot!(atts, AG.getscale(a), "scale_factor", x->isequal(x, one(x)))
+        return atts
     end
 end

ext/ArchGDALExt/archgdaldataset.jl

@@ -14,45 +14,15 @@ Base.size(b::GDALBand) = b.size
 DiskArrays.eachchunk(b::GDALBand) = b.cs
 DiskArrays.haschunks(::GDALBand) = DiskArrays.Chunked()
 
-# function DiskArrays.readblock!(b::GDALBand, aout::Matrix, r::AbstractUnitRange...)
-#         AG.read(b.filename) do ds
-#             AG.getband(ds, b.band) do bh
-#                 DiskArrays.readblock!(bh, aout, r...)
-#         end
-#     end
-#  end
 function DiskArrays.readblock!(b::GDALBand, aout::Matrix, r::AbstractUnitRange...)
-    AG.read(b.filename) do ds
-        AG.getband(ds, b.band) do bh
-            xsize, ysize = AG.width(bh), AG.height(bh)
-            for chunk in eachchunk(b)
-                # Compute overlap between the requested range and the current chunk range
-                overlap = tuple(intersect(r[i], chunk[i]) for i in eachindex(r))                
-                overlap_clipped = (
-                    clip_overlap(overlap[1], xsize),  # Clip x-range to raster width
-                    clip_overlap(overlap[2], ysize)   # Clip y-range to raster height
-                )
-                if all(x -> !isempty(x), overlap_clipped)
-                    chunk_data = AG.read(bh, overlap_clipped...)                    
-                    aout_indices = tuple((overlap_clipped[i] .- first(r[i]) .+ 1 for i in eachindex(r))...)                    
-                    view(aout, aout_indices...) .= chunk_data
-                end
-            end
+        AG.read(b.filename) do ds
+            AG.getband(ds, b.band) do bh
+                DiskArrays.readblock!(bh, aout, r...) # ? what to do if size(aout) < r ranges ?, i.e. chunk reads!
         end
     end
-end
-function clip_overlap(range, max_size)
-    start = max(1, range.start)
-    stop = min(max_size, range.stop)
-    return start <= stop ? start : stop
-end
+ end
 
-function DiskArrays.readblock!(b::GDALBand, aout, r::AbstractUnitRange...)
-    aout2 = similar(aout)
-    DiskArrays.readblock!(b, aout2, r)
-    aout .= aout2
-end
-function DiskArrays.readblock!(b::GDALBand, aout, r::Tuple{AbstractUnitRange, AbstractUnitRange})
+function DiskArrays.readblock!(b::GDALBand, aout::Matrix, r::Tuple{AbstractUnitRange, AbstractUnitRange})
     DiskArrays.readblock!(b, aout, r...)
 end
 
@@ -63,14 +33,12 @@ function DiskArrays.writeblock!(b::GDALBand, ain, r::AbstractUnitRange...)
         end
     end
 end
-
-function DiskArrays.writeblock!(b::GDALBand, ain, r::Tuple{AbstractUnitRange, AbstractUnitRange})
-    AG.read(b.filename, flags=AG.OF_Update) do ds
-        AG.getband(ds, b.band) do bh
-            DiskArrays.writeblock!(bh, ain, r...)
-        end
-    end
+function DiskArrays.readblock!(b::GDALBand, aout, r::AbstractUnitRange...)
+    aout2 = similar(aout)
+    DiskArrays.readblock!(b, aout2, r)
+    aout .= aout2
 end
+
 struct GDALDataset
     filename::String
     bandsize::Tuple{Int,Int}