Skip to content

Fix boundary of Box #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Fix boundary of Box #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d46c600
Fix boundary of 'Box'
eliascarv Aug 30, 2024
b767a1d
Fix tests
eliascarv Aug 30, 2024
1a6412a
Apply suggestions
eliascarv Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions src/boundary.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,42 @@ end

boundary(::Plane) = nothing

boundary(b::Box) = _boundary(b, Val(embeddim(b)))
boundary(b::Box{𝔼{1}}) = Multi([minimum(b), maximum(b)])

_boundary(b::Box, ::Val{1}) = Multi([minimum(b), maximum(b)])

function _boundary(b::Box, ::Val{2})
A = to(minimum(b))
B = to(maximum(b))
v = Point.([(A[1], A[2]), (B[1], A[2]), (B[1], B[2]), (A[1], B[2])])
function boundary(b::Box{𝔼{2}})
A = convert(Cartesian, coords(minimum(b)))
B = convert(Cartesian, coords(maximum(b)))
point(x, y) = Point{𝔼{2}}(convert(crs(b), Cartesian{datum(crs(b))}(x, y)))
v = [point(A.x, A.y), point(B.x, A.y), point(B.x, B.y), point(A.x, B.y)]
Ring(v)
end

function _boundary(b::Box, ::Val{3})
A = to(minimum(b))
B = to(maximum(b))
v =
Point.([
(A[1], A[2], A[3]),
(B[1], A[2], A[3]),
(B[1], B[2], A[3]),
(A[1], B[2], A[3]),
(A[1], A[2], B[3]),
(B[1], A[2], B[3]),
(B[1], B[2], B[3]),
(A[1], B[2], B[3])
])
function boundary(b::Box{𝔼{3}})
A = convert(Cartesian, coords(minimum(b)))
B = convert(Cartesian, coords(maximum(b)))
point(x, y, z) = Point{𝔼{3}}(convert(crs(b), Cartesian{datum(crs(b))}(x, y, z)))
v = [
point(A.x, A.y, A.z),
point(B.x, A.y, A.z),
point(B.x, B.y, A.z),
point(A.x, B.y, A.z),
point(A.x, A.y, B.z),
point(B.x, A.y, B.z),
point(B.x, B.y, B.z),
point(A.x, B.y, B.z)
]
c = [(4, 3, 2, 1), (6, 5, 1, 2), (3, 7, 6, 2), (4, 8, 7, 3), (1, 5, 8, 4), (6, 7, 8, 5)]
SimpleMesh(v, connect.(c))
end

function boundary(b::Box{🌐})
A = convert(LatLon, coords(minimum(b)))
B = convert(LatLon, coords(maximum(b)))
point(lat, lon) = Point{🌐}(convert(crs(b), LatLon{datum(crs(b))}(lat, lon)))
v = [point(A.lat, A.lon), point(A.lat, B.lon), point(B.lat, B.lon), point(B.lat, A.lon)]
Ring(v)
end

boundary(b::Ball) = Sphere(center(b), radius(b))

boundary(::Sphere) = nothing
Expand Down
7 changes: 5 additions & 2 deletions test/primitives.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
# different datums
p1 = Point(Cartesian{WGS84{1762}}(T(1), T(1), T(1)))
p2 = Point(Cartesian{ITRF{2008}}(T(1), T(1), T(1)))
@test p1 == p2
@test p1 ≈ p2
@test_broken p1 == p2
@test_broken p1 ≈ p2

# latlon special cases
@test latlon(45, 180) == latlon(45, -180)
Expand Down Expand Up @@ -460,6 +460,9 @@ end
b = Box(cart(0, 0), cart(1, 1))
@test boundary(b) == Ring(cart.([(0, 0), (1, 0), (1, 1), (0, 1)]))

b = Box(latlon(0, 0), latlon(1, 1))
@test boundary(b) == Ring(latlon.([(0, 0), (0, 1), (1, 1), (1, 0)]))

b = Box(cart(0, 0, 0), cart(1, 1, 1))
m = boundary(b)
@test m isa Mesh
Expand Down