add a few test on Rect and Line

Author: visr

Project.toml

@@ -11,11 +11,11 @@ StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
+IterTools = "1.3.0"
 StaticArrays = "0.12"
 StructArrays = "0.3,0.4"
 Tables = "0.2, 1"
 julia = "1.1"
-IterTools = "1.3.0"
 
 [extras]
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

src/rectangles.jl

@@ -479,23 +479,23 @@ end
 # Containment
 
 """
-    contains(b1::Rect, b2::Rect)
+    in(b1::Rect, b2::Rect)
 
-Check if Rects are contained in each other. This does not use
+Check if Rect `b1` is contained in `b2`. This does not use
 strict inequality, so Rects may share faces and this will still
 return true.
 """
-function Base.in(b2::Rect{N}, b1::Rect{N}) where N
+function Base.in(b1::Rect{N}, b2::Rect{N}) where N
     for i = 1:N
-        maximum(b2)[i] <= maximum(b1)[i] &&
-            minimum(b2)[i] >= minimum(b1)[i] ||
+        maximum(b1)[i] <= maximum(b2)[i] &&
+            minimum(b1)[i] >= minimum(b2)[i] ||
             return false
     end
     return true
 end
 
 """
-    contains(b1::Rect{N, T}, pt::VecTypes)
+    in(pt::VecTypes, b1::Rect{N, T})
 
 Check if a point is contained in a Rect. This will return true if
 the point is on a face of the Rect.

test/geometrytypes.jl

@@ -226,4 +226,16 @@ end
     rect = FRect3D(base, wxyz)
     @test (rect * 4) == FRect3D(base .* 4, wxyz .* 4)
     @test (rect * Vec(2, -2, 3)) == FRect3D(base .* Vec(2, -2, 3), wxyz .* Vec(2, -2, 3))
+
+    rect1 = Rect(Vec(0.0, 0.0), Vec(1.0, 2.0))
+    rect2 = Rect(0.0, 0.0, 1.0, 2.0)
+    @test rect1 isa GeometryBasics.HyperRectangle{2, Float64}
+    @test rect1 == rect2
+
+    split1, split2 = GeometryBasics.split(rect1, 2, 1)
+    @test widths(split1) == widths(split2)
+    @test origin(split1) == Vec(0, 0)
+    @test origin(split2) == Vec(0, 1)
+    @test in(split1, rect1)
+    @test !in(rect1, split1)
 end

test/runtests.jl

@@ -208,6 +208,7 @@ using LinearAlgebra
             faces = [LineFace(1, 2), LineFace(3, 4)]
             polygon = Polygon(points, faces)
             @test polygon == Polygon(LineString(points, faces))
+            @test ndims(polygon) === 2
         end
 
         @testset "Mesh" begin
@@ -276,6 +277,7 @@ end
 
 @testset "decompose/triangulation" begin
     primitive = Sphere(Point3f0(0), 1)
+    @test ndims(primitive) === 3
     mesh = triangle_mesh(primitive)
     @test decompose(Point, mesh) isa Vector{Point3f0}
     @test decompose(Point, primitive) isa Vector{Point3f0}
@@ -375,3 +377,19 @@ end
     @test coordinates(m) isa Vector{Point3f0}
     @test GeometryBasics.faces(m) isa Vector{GLTriangleFace}
 end
+
+@testset "lines intersects" begin
+    a = Line(Point(0.0, 0.0), Point(4.0, 1.0))
+    b = Line(Point(0.0, 0.25), Point(3.0, 0.25))
+    c = Line(Point(0.0, 0.25), Point(0.5, 0.25))
+    d = Line(Point(0.0, 0.0), Point(0.0, 4.0))
+    e = Line(Point(1.0, 0.0), Point(0.0, 4.0))
+    f = Line(Point(5.0, 0.0), Point(6.0, 0.0))
+
+    @test intersects(a, b) === (true, Point(1.0, 0.25))
+    @test intersects(a, c) === (false, Point(0.0, 0.0))
+    @test intersects(d, d) === (false, Point(0.0, 0.0))
+    found, point = intersects(d, e)
+    @test found && point ≈ Point(0.0, 4.0)
+    @test intersects(a, f) === (false, Point(0.0, 0.0))
+end