Merge pull request #40 from JuliaGeometry/improvements

improve tests and interfaces

Author: SimonDanisch

src/GeometryBasics.jl

@@ -29,6 +29,7 @@ module GeometryBasics
     export OffsetInteger, ZeroIndex, OneIndex, GLIndex
     export FaceView, SimpleFaceView
     export AbstractPoint, PointMeta, PointWithUV
+    export PolygonMeta, MultiPointMeta
     export decompose, coordinates, faces, normals, decompose_uv, decompose_normals, texturecoordinates
     export Tesselation, pointmeta, Normal, UV, UVW
     export GLTriangleFace, GLNormalMesh3D, GLPlainTriangleMesh, GLUVMesh3D, GLUVNormalMesh3D

src/basic_types.jl

@@ -165,6 +165,8 @@ end
 Base.show(io::IO, x::LineP) = print(io, "Line(", x[1], " => ", x[2], ")")
 
 """
+    LineString(points::AbstractVector{<:AbstractPoint})
+
 A LineString is a geometry of connected line segments
 """
 struct LineString{
@@ -177,6 +179,7 @@ end
 
 coordinates(x::LineString) = x.points
 
+Base.copy(x::LineString) = LineString(copy(x.points))
 Base.size(x::LineString) = size(coordinates(x))
 Base.getindex(x::LineString, i) = getindex(coordinates(x), i)
 
@@ -231,6 +234,12 @@ function LineString(points::AbstractVector{<: AbstractPoint}, indices::AbstractV
     return LineString(points, faces)
 end
 
+
+"""
+    Polygon(exterior::AbstractVector{<:Point})
+    Polygon(exterior::AbstractVector{<:Point}, interiors::Vector{<:AbstractVector{<:AbstractPoint}})
+
+"""
 struct Polygon{
         Dim, T <: Real,
         P <: AbstractPoint{Dim, T},
@@ -241,6 +250,8 @@ struct Polygon{
     interiors::V
 end
 
+Base.copy(x::Polygon) = Polygon(copy(x.exterior), copy(x.interiors))
+
 Base.:(==)(a::Polygon, b::Polygon) = (a.exterior == b.exterior) && (a.interiors == b.interiors)
 
 function Polygon(exterior::E, interiors::AbstractVector{E}) where E <: AbstractVector{LineP{Dim, T, P}} where {Dim, T, P}
@@ -261,7 +272,9 @@ function Polygon(exterior::AbstractVector{P}, faces::AbstractVector{<: LineFace}
     return Polygon(LineString(exterior, faces))
 end
 
-
+"""
+    MultiPolygon(polygons::AbstractPolygon)
+"""
 struct MultiPolygon{
         Dim, T <: Real,
         Element <: AbstractPolygon{Dim, T},
@@ -294,11 +307,17 @@ end
 Base.getindex(ms::MultiLineString, i) = ms.linestrings[i]
 Base.size(ms::MultiLineString) = size(ms.linestrings)
 
+
+"""
+    MultiPoint(points::AbstractVector{AbstractPoint})
+
+A collection of points
+"""
 struct MultiPoint{
         Dim, T <: Real,
-        Element <: AbstractPoint{Dim, T},
-        A <: AbstractVector{Element}
-    } <: AbstractVector{Element}
+        P <: AbstractPoint{Dim, T},
+        A <: AbstractVector{P}
+    } <: AbstractVector{P}
 
     points::A
 end

src/geometry_primitives.jl

@@ -14,8 +14,8 @@ end
 
 Triangulate an N-Face into a tuple of triangular faces.
 """
-@generated function convert_simplex(::Type{TriangleFace{T}}, f::NgonFace{N}) where {T, N}
-    3 <= N || error("decompose not implented for N <= 3 yet. N: $N")# other wise degenerate
+@generated function convert_simplex(::Type{TriangleFace{T}}, f::Union{SimplexFace{N}, NgonFace{N}}) where {T, N}
+    3 <= N || error("decompose not implemented for N <= 3 yet. N: $N")# other wise degenerate
     v = Expr(:tuple)
     for i = 3:N
         push!(v.args, :(TriangleFace{T}(f[1], f[$(i-1)], f[$i])))
@@ -28,7 +28,7 @@ end
 
 Extract all line segments in a Face.
 """
-@generated function convert_simplex(::Type{LineFace{T}}, f::NgonFace{N}) where {T, N}
+@generated function convert_simplex(::Type{LineFace{T}}, f::Union{SimplexFace{N}, NgonFace{N}}) where {T, N}
     2 <= N || error("decompose not implented for N <= 2 yet. N: $N")# other wise degenerate
 
     v = Expr(:tuple)

src/metadata.jl

@@ -113,6 +113,10 @@ macro meta_type(name, mainfield, supertype, params...)
             return MT(obj, nt)
         end
 
+        function Base.propertynames(::$MetaName{$(params...), Typ, Names, Types}) where {$(params...), Typ, Names, Types}
+            return ($field, Names...)
+        end
+
         function StructArrays.staticschema(::Type{$MetaName{$(params...), Typ, Names, Types}}) where {$(params...), Typ, Names, Types}
             NamedTuple{($field, Names...), Base.tuple_type_cons(Typ, Types)}
         end
@@ -137,3 +141,7 @@ Base.getindex(x::NgonFaceMeta, idx::Int) = getindex(metafree(x), idx)
 Base.getindex(x::SimplexFaceMeta, idx::Int) = getindex(metafree(x), idx)
 
 @meta_type(Polygon, polygon, AbstractPolygon, N, T)
+
+@meta_type(MultiPoint, points, AbstractVector, P)
+Base.getindex(x::MultiPointMeta, idx::Int) = getindex(metafree(x), idx)
+Base.size(x::MultiPointMeta) = size(metafree(x))

test/runtests.jl

@@ -83,6 +83,7 @@ using LinearAlgebra
         pm = GeometryBasics.PointMeta(1.1, 2.2; a=1, b=2)
         @test meta(pm) === (a=1, b=2)
         @test metafree(pm) === p
+        @test propertynames(pm) == (:position, :a, :b)
     end
 end