Minor refactoring

Author: Sov-trotter

src/GeometryBasics.jl

@@ -36,6 +36,7 @@ module GeometryBasics
     export AbstractMesh, Mesh, TriangleMesh
     export GLNormalMesh2D, PlainTriangleMesh
     export Feature, collect_feature
+    
     # all the different predefined mesh types
     # Note: meshes can contain arbitrary meta information,
     export AbstractMesh, TriangleMesh, PlainMesh, GLPlainMesh, GLPlainMesh2D, GLPlainMesh3D

src/metadata.jl

@@ -192,12 +192,15 @@ Base.getindex(x::MeshMeta, idx::Int) = getindex(metafree(x), idx)
 Base.size(x::MeshMeta) = size(metafree(x))
 
 
-#=
+"""
 `Feature` type acts same as Meta method 
 The difference lies in the fact that it is designed to handle
 heterogeneous types.
-=#
-struct Feature{T, Names, Types} #<:AbstractVector{T} 
+
+eg: A Point MetaGeometry is a `PointMeta`
+But a feature is represented as `Feature{Point}`
+"""
+struct Feature{T, Names, Types} 
     data::T
     rest::NamedTuple{Names, Types}
 end
@@ -253,3 +256,4 @@ end
 
 Base.getindex(f::Feature, idx::Int) = getindex(metafree(f), idx)
 Base.size(f::Feature) = size(metafree(f))
+

test/runtests.jl

@@ -604,20 +604,21 @@ end
     @test <(x, x1)
 end
 
-@testset "New Meta Methods" begin
+@testset "Feature and heterogeneous data" begin
     ls = [LineString([Point(i, (i+1)^2/6), Point(i*0.86,i+5), Point(i/3, i/7)]) for i in 1:10]
     mls = MultiLineString([LineString([Point(i+1, (i)^2/6), Point(i*0.75,i+8), Point(i/2.5, i/6.79)]) for i in 5:10]) 
     poly = Polygon(Point{2, Int}[(40, 40), (20, 45), (45, 30), (40, 40)])
     geom = [ls..., mls, poly]
-    prop = [(country_states = "India$(i)", rainfall = i*10) for i in 1:12]
-    
-    feat = [Feature(i, j) for (i,j)  = zip(geom, prop)]
+    prop = Any[(country_states = "India$(i)", rainfall = (i*9)/2) for i in 1:11]
+    push!(prop, (country_states = 12, rainfall = 1000))   # a pinch of heterogeneity
+
+    feat = [Feature(i, j) for (i,j) = zip(geom, prop)]
     sa = collect_feature(feat)
 
     @test nameof(eltype(feat)) == :Feature
-    @test eltype(sa) === Feature{Any,(:country_states, :rainfall),Tuple{String,Int64}}
+    @test eltype(sa) === Feature{Any,(:country_states, :rainfall),Tuple{Any,Float64}}
     @test propertynames(sa) === (:data, :country_states, :rainfall)
-    @test getproperty(sa, :country_states) isa Array{String}
+    @test getproperty(sa, :country_states) isa Array{Any}
     @test getproperty(sa, :data) == geom
 end