Fixed bugs in nested iterator. Expanded tests and enabled code coverage.

Author: evetion

.github/workflows/CI.yml

@@ -34,6 +34,10 @@ jobs:
       - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v2
+        with:
+          files: lcov.info
   docs:
     name: Documentation
     runs-on: ubuntu-latest

src/GeoInterface.jl

@@ -1,5 +1,7 @@
 module GeoInterface
 
+using Base.Iterators
+
 include("types.jl")
 include("interface.jl")
 include("defaults.jl")

src/defaults.jl

@@ -19,7 +19,7 @@ ismeasured(::AbstractPointTrait, geom) = :M in coordnames(geom)
 isempty(T, geom) = false
 
 ## Points
-ngeom(::AbstractPointTrait, geom)::Integer = 0
+ngeom(::AbstractPointTrait, geom) = 0
 getgeom(::AbstractPointTrait, geom) = nothing
 getgeom(::AbstractPointTrait, geom, i) = nothing
 
@@ -37,24 +37,24 @@ getring(t::AbstractPolygonTrait, geom, i) = getgeom(t, geom, i)
 getexterior(t::AbstractPolygonTrait, geom) = getring(t, geom, 1)
 nhole(t::AbstractPolygonTrait, geom) = nring(t, geom) - 1
 gethole(t::AbstractPolygonTrait, geom, i) = getring(t, geom, i + 1)
-npoint(p::AbstractPolygonTrait, geom) = sum(npoint(p) for p in getring(t, geom))
-getpoint(t::AbstractPolygonTrait, geom) = (p for p in getpoint(r) for r in getring(t, geom))
+npoint(t::AbstractPolygonTrait, geom) = sum(npoint(p) for p in getring(t, geom))
+getpoint(t::AbstractPolygonTrait, geom) = flatten((p for p in getpoint(r)) for r in getring(t, geom))
 
 ## MultiLineString
 nlinestring(t::AbstractMultiLineStringTrait, geom) = ngeom(t, geom)
 getlinestring(t::AbstractMultiLineStringTrait, geom) = getgeom(t, geom)
 getlinestring(t::AbstractMultiLineStringTrait, geom, i) = getgeom(t, geom, i)
 npoint(t::AbstractMultiLineStringTrait, geom) = sum(npoint(ls) for ls in getgeom(t, geom))
-getpoint(t::AbstractMultiLineStringTrait, geom) = (p for p in getpoint(ls) for ls in getgeom(t, geom))
+getpoint(t::AbstractMultiLineStringTrait, geom) = flatten((p for p in getpoint(ls)) for ls in getgeom(t, geom))
 
 ## MultiPolygon
 npolygon(t::AbstractMultiPolygonTrait, geom) = ngeom(t, geom)
 getpolygon(t::AbstractMultiPolygonTrait, geom) = getgeom(t, geom)
 getpolygon(t::AbstractMultiPolygonTrait, geom, i) = getgeom(t, geom, i)
 nring(t::AbstractMultiPolygonTrait, geom) = sum(nring(p) for p in getpolygon(t, geom))
-getring(t::AbstractMultiPolygonTrait, geom) = (r for r in getring(p) for p in getpolygon(t, geom))
+getring(t::AbstractMultiPolygonTrait, geom) = flatten((r for r in getring(p)) for p in getpolygon(t, geom))
 npoint(t::AbstractMultiPolygonTrait, geom) = sum(npoint(r) for r in getring(t, geom))
-getpoint(t::AbstractMultiPolygonTrait, geom) = (p for p in getpoint(r) for r in getring(t, geom))
+getpoint(t::AbstractMultiPolygonTrait, geom) = flatten((p for p in getpoint(r)) for r in getring(t, geom))
 
 ## Surface
 npatch(t::AbstractPolyHedralSurfaceTrait, geom)::Integer = ngeom(t, geom)
@@ -68,10 +68,15 @@ getcoord(t::AbstractPointTrait, geom) = (getcoord(t, geom, i) for i in 1:ncoord(
 ## Npoints
 npoint(::LineTrait, _) = 2
 npoint(::TriangleTrait, _) = 3
+nring(::TriangleTrait, _) = 1
 npoint(::RectangleTrait, _) = 4
+nring(::RectangleTrait, _) = 1
 npoint(::QuadTrait, _) = 4
+nring(::QuadTrait, _) = 1
 npoint(::PentagonTrait, _) = 5
+nring(::PentagonTrait, _) = 1
 npoint(::HexagonTrait, _) = 6
+nring(::HexagonTrait, _) = 1
 
 issimple(::AbstractCurveTrait, geom) =
     allunique([getpoint(t, geom, i) for i in 1:npoint(geom)-1]) && allunique([getpoint(t, geom, i) for i in 2:npoint(t, geom)])

src/utils.jl

@@ -30,7 +30,7 @@ end
 """Test whether the required interface for your `feature` has been implemented correctly."""
 function testfeature(feature)
     try
-        @assert isfeature(geom)
+        @assert isfeature(feature)
         geom = geometry(feature)
         @assert isgeometry(geom)
         props = properties(feature)

test/test_primitives.jl

@@ -2,32 +2,84 @@
 
 @testset "Developer" begin
     # Implement interface
-    struct MyCurve end
     struct MyPoint end
+    struct MyCurve end
+    struct MyPolygon end
+    struct MyMultiPoint end
+    struct MyMultiCurve end
+    struct MyMultiPolygon end
+    struct MyCollection end
+
     GeoInterface.isgeometry(::MyPoint) = true
-    GeoInterface.isgeometry(::MyCurve) = true
     GeoInterface.geomtype(::MyPoint) = GeoInterface.PointTrait()
-    GeoInterface.geomtype(::MyCurve) = GeoInterface.LineStringTrait()
     GeoInterface.ncoord(::GeoInterface.PointTrait, geom::MyPoint) = 2
     GeoInterface.getcoord(::GeoInterface.PointTrait, geom::MyPoint, i) = [1, 2][i]
+
+    GeoInterface.isgeometry(::MyCurve) = true
+    GeoInterface.geomtype(::MyCurve) = GeoInterface.LineStringTrait()
     GeoInterface.ngeom(::GeoInterface.LineStringTrait, geom::MyCurve) = 2
     GeoInterface.getgeom(::GeoInterface.LineStringTrait, geom::MyCurve, i) = MyPoint()
     GeoInterface.convert(::Type{MyCurve}, ::GeoInterface.LineStringTrait, geom) = geom
 
-    # Test validity
-    geom = MyCurve()
-    @test testgeometry(geom)
-    @test !isnothing(GeoInterface.convert(MyCurve, geom))
+    GeoInterface.isgeometry(::MyPolygon) = true
+    GeoInterface.geomtype(::MyPolygon) = GeoInterface.PolygonTrait()
+    GeoInterface.ngeom(::GeoInterface.PolygonTrait, geom::MyPolygon) = 2
+    GeoInterface.getgeom(::GeoInterface.PolygonTrait, geom::MyPolygon, i) = MyCurve()
+
+
+    @testset "Point" begin
+        geom = MyPoint()
+        @test GeoInterface.testgeometry(geom)
+        @test GeoInterface.x(geom) === 1
+        @test GeoInterface.y(geom) === 2
+        @test GeoInterface.ncoord(geom) === 2
+    end
 
-    # Check functions
-    @test GeoInterface.npoint(geom) == 2  # defaults to ngeom
-    @test GeoInterface.coordinates(geom) == [[1, 2], [1, 2]]
-    @test_throws MethodError GeoInterface.area(geom)
-    point = GeoInterface.getgeom(geom, 1)
-    @test GeoInterface.y(point) == 2
+    @testset "LineString" begin
+        geom = MyCurve()
+        @test GeoInterface.testgeometry(geom)
+        @test !isnothing(GeoInterface.convert(MyCurve, geom))
+
+        @test GeoInterface.npoint(geom) == 2  # defaults to ngeom
+        @test GeoInterface.coordinates(geom) == [[1, 2], [1, 2]]
+        @test_throws MethodError GeoInterface.area(geom)
+        point = GeoInterface.getpoint(geom, 1)
+        @test GeoInterface.y(point) == 2
+    end
+
+    @testset "Polygon" begin
+        geom = MyPolygon()
+        @test GeoInterface.testgeometry(geom)
+
+        @test GeoInterface.nring(geom) == 2
+        @test GeoInterface.nhole(geom) == 1
+        @test GeoInterface.coordinates(geom) == [[[1, 2], [1, 2]], [[1, 2], [1, 2]]]
+        lines = GeoInterface.getring(geom)
+        line = GeoInterface.gethole(geom, 1)
+        line = GeoInterface.getexterior(geom)
+        @test GeoInterface.npoint(geom) == 4
+        @test collect(GeoInterface.getpoint(geom)) == [MyPoint(), MyPoint(), MyPoint(), MyPoint()]
+    end
 
 end
 
 @testset "Defaults" begin
     @test GeoInterface.subtrait(GeoInterface.TINTrait()) == GeoInterface.TriangleTrait
 end
+
+@testset "Feature" begin
+    struct Row end
+    struct Point end
+
+    GeoInterface.isgeometry(::Point) = true
+    GeoInterface.geomtype(::Point) = GeoInterface.PointTrait()
+    GeoInterface.ncoord(::GeoInterface.PointTrait, geom::Point) = 2
+    GeoInterface.getcoord(::GeoInterface.PointTrait, geom::Point, i) = [1, 2][i]
+
+    GeoInterface.isfeature(::Row) = true
+    GeoInterface.geometry(r::Row) = Point()
+    GeoInterface.properties(r::Row) = (; test=1)
+
+    @test GeoInterface.testfeature(Row())
+
+end