Fix Rotate and Scale of RegularGrid (#1071)

JuliaGeometry · Sep 18, 2024 · a9b2511 · a9b2511
1 parent e5d3d51
commit a9b2511
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/transforms/rotate.jl b/src/transforms/rotate.jl
@@ -60,7 +60,7 @@ applycoord(t::Rotate, b::Box) = TransformedGeometry(b, t)
 
 applycoord(t::Rotate, e::Ellipsoid) = Ellipsoid(radii(e), applycoord(t, center(e)), t.rot * rotation(e))
 
-applycoord(t::Rotate, g::CartesianGrid) = TransformedGrid(g, t)
+applycoord(t::Rotate, g::RegularGrid) = TransformedGrid(g, t)
 
 applycoord(t::Rotate, g::RectilinearGrid) = TransformedGrid(g, t)
 

diff --git a/src/transforms/scale.jl b/src/transforms/scale.jl
@@ -76,6 +76,8 @@ function applycoord(t::Scale, g::CartesianGrid)
   CartesianGrid(dims, orig, spac, offs)
 end
 
+applycoord(t::Scale, g::RegularGrid) = TransformedGrid(g, t)
+
 applycoord(t::Scale, g::RectilinearGrid) =
   RectilinearGrid{manifold(g),crs(g)}(ntuple(i -> t.factors[i] * xyz(g)[i], paramdim(g)))
 

diff --git a/test/transforms.jl b/test/transforms.jl
@@ -182,6 +182,16 @@
   @test r ≈ SimpleMesh(f.(vertices(d)), topology(d))
   @test TB.revert(f, r, c) ≈ d
 
+  # ------------
+  # REGULARGRID
+  # ------------
+
+  f = Rotate(Angle2d(T(π / 2)))
+  d = RegularGrid(merc(0, 0), merc(1, 1), dims=(10, 10))
+  r, c = TB.apply(f, d)
+  @test r ≈ SimpleMesh(f.(vertices(d)), topology(d))
+  @test TB.revert(f, r, c) ≈ d
+
   # ----------------
   # RECTILINEARGRID
   # ----------------
@@ -851,6 +861,16 @@ end
   @test r ≈ CartesianGrid(cart(1, 2), cart(11, 22), dims=(10, 10))
   @test TB.revert(f, r, c) ≈ d
 
+  # ------------
+  # REGULARGRID
+  # ------------
+
+  f = Scale(T(1), T(2))
+  d = RegularGrid(merc(1, 1), merc(11, 11), dims=(10, 10))
+  r, c = TB.apply(f, d)
+  @test r ≈ RegularGrid(merc(1, 2), merc(11, 22), dims=(10, 10))
+  @test TB.revert(f, r, c) ≈ d
+
   # ----------------
   # RECTILINEARGRID
   # ----------------