Skip to content

fix meta(x), which was shielded by getproperty #7

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
SimonDanisch merged 1 commit into from
Aug 13, 2019
Merged

fix meta(x), which was shielded by getproperty #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/metadata.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ macro meta_type(name, mainfield, supertype, params...)

GeometryBasics.MetaFree(::Type{<: $MetaName{Typ}}) where Typ = Typ
GeometryBasics.MetaFree(::Type{<: $MetaName}) = $name
GeometryBasics.metafree(x::$MetaName) = x.main
GeometryBasics.metafree(x::$MetaName) = getfield(x, :main)
GeometryBasics.metafree(x::AbstractVector{<: $MetaName}) = getcolumns(x, $field)[1]
GeometryBasics.meta(x::$MetaName) = x.meta
GeometryBasics.meta(x::$MetaName) = getfield(x, :meta)
GeometryBasics.meta(x::AbstractVector{<: $MetaName}) = getcolumns(x, :meta)[1]
function (MT::Type{<: $MetaName})(args...; meta...)
nt = values(meta)
Expand Down
19 changes: 18 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using GeometryBasics: TupleView, TriangleFace, SimplexFace, LineString, Mesh, me
using Test, Random, Query, StructArrays, Tables
using StaticArrays


@testset "GeometryBasics" begin
@testset "embedding metadata" begin
@testset "Meshes" begin

Expand Down Expand Up @@ -83,6 +83,14 @@ using StaticArrays
@test length(filtered) == 7
end
end

@testset "point with metadata" begin
p = Point(1.1, 2.2)
@test p isa AbstractVector{Float64}
pm = GeometryBasics.PointMeta(1.1, 2.2; a=1, b=2)
@test meta(pm) === (a=1, b=2)
@test metafree(pm) === p
end
end

@testset "view" begin
Expand Down Expand Up @@ -146,6 +154,14 @@ end
@test triangles == [Tetrahedron(points...)]
end

@testset "reinterpret" begin
numbers = collect(reshape(1:6, 2, 3))
points = reinterpret(Point{2, Int}, numbers)
@test points[1] === Point(1, 2)
@test points[2] === Point(3, 4)
numbers[4] = 0
@test points[2] === Point(3, 0)
end
end


Expand Down Expand Up @@ -220,3 +236,4 @@ end
end

end
end