Use length instead of dx to prevent rounding errors (#130)

evetion · May 29, 2023 · c651836 · c651836 · evetion · May 29, 2023
1 parent ac1cd80
commit c651836
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GeoArrays"
 uuid = "2fb1d81b-e6a0-5fc5-82e6-8e06903437ab"
 authors = ["Maarten Pronk <[email protected]>"]
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"

diff --git a/src/geoarray.jl b/src/geoarray.jl
@@ -235,9 +235,7 @@ function ranges(ga::GeoArray, strategy::AbstractStrategy=Center())
     extra = typeof(strategy) == Center ? 0 : 1
     lx, ly = coords(ga, (1, 1), strategy)
     hx, hy = coords(ga, size(ga)[1:2] .+ extra, strategy)
-    dx = ga.f.linear[1, 1]
-    dy = ga.f.linear[2, 2]
-    lx:dx:hx, ly:dy:hy
+    range(lx, hx, length=size(ga)[1] + extra), range(ly, hy, length=size(ga)[2] + extra)
 end
 
 """

diff --git a/test/test_geoarray.jl b/test/test_geoarray.jl
@@ -120,8 +120,16 @@ end
 end
 
 @testset "Ranges" begin
-    ga = GeoArray(rand(10, 10))
+    ga = GeoArray(rand(Bool, 21601, 10801))
+    ga.f = AffineMap([0.016666666666666666 0.0; 0.0 -0.016666666666666666], [-180.00833333333333, 90.00833333333334])
     X, Y = GeoArrays.ranges(ga)
-    @test X == 0.5:1.0:9.5
-    @test Y == 0.5:1.0:9.5
+    @test last(X) ≈ 180.00
+    @test last(Y) ≈ -90.00
+    @test length(X) == 21601
+    @test length(Y) == 10801
+    X, Y = GeoArrays.ranges(ga, GeoArrays.Vertex())
+    @test length(X) == 21602
+    @test length(Y) == 10802
+    @test last(X) ≈ 180.00833333333333
+    @test last(Y) ≈ -90.00833333333334
 end