bugfix

Author: rafaqz

src/defaults.jl

@@ -30,27 +30,31 @@ getpoint(c::AbstractCurveTrait, geom, i) = getgeom(c, geom, i)
 startpoint(c::AbstractCurveTrait, geom) = getpoint(c, geom, 1)
 endpoint(c::AbstractCurveTrait, geom) = getpoint(c, geom, length(geom))
 
-## MultiLineString
-nlinestring(p::AbstractMultiLineStringTrait, geom) = ngeom(p, geom)
-getlinestring(p::AbstractMultiLineStringTrait, geom) = getgeom(p, geom)
-getlinestring(p::AbstractMultiLineStringTrait, geom, i) = getgeom(p, geom, i)
-getpoint(g::AbstractMultiLineStringTrait, geom) = (p for p in getpoint(p) for g in getlinestring(geom))
-
 ## Polygons
 nring(p::AbstractPolygonTrait, geom) = ngeom(p, geom)
 getring(p::AbstractPolygonTrait, geom) = getgeom(p, geom)
 getring(p::AbstractPolygonTrait, geom, i) = getgeom(p, geom, i)
 getexterior(p::AbstractPolygonTrait, geom) = getring(p, geom, 1)
-nhole(p::AbstractPolygonTrait, geom) = nring(p, geom) - 1ring
+nhole(p::AbstractPolygonTrait, geom) = nring(p, geom) - 1
 gethole(p::AbstractPolygonTrait, geom, i) = getring(p, geom, i + 1)
+npoint(p::AbstractPolygonTrait, geom) = sum(npoint(p) for p in getring(p))
+getpoint(g::AbstractPolygonTrait, geom) = (p for p in getpoint(r) for r in getring(geom))
+
+## MultiLineString
+nlinestring(p::AbstractMultiLineStringTrait, geom) = ngeom(p, geom)
+getlinestring(p::AbstractMultiLineStringTrait, geom) = getgeom(p, geom)
+getlinestring(p::AbstractMultiLineStringTrait, geom, i) = getgeom(p, geom, i)
+npoint(g::AbstractMultiLineStringTrait, geom) = sum(npoint(l) for ls in getlinestring(geom))
+getpoint(g::AbstractMultiLineStringTrait, geom) = (p for p in getpoint(ls) for l in getlinestring(geom))
 
 ## MultiPolygon
 npolygon(p::AbstractMultiPolygonTrait, geom) = ngeom(p, geom)
 getpolygon(p::AbstractMultiPolygonTrait, geom) = getgeom(p, geom)
 getpolygon(p::AbstractMultiPolygonTrait, geom, i) = getgeom(p, geom, i)
+nring(p::AbstractMultiPolygonTrait, geom) = sum(nring(p) for p in getpolygon(p))
 getring(g::AbstractMultiPolygonTrait, geom) = (r for r in getring(p) for p in getpolygon(geom))
+npoint(p::AbstractMultiPolygonTrait, geom) = sum(npoint(r) for r in getring(geom))
 getpoint(g::AbstractMultiPolygonTrait, geom) = (p for p in getpoint(r) for r in getring(geom))
-nring(p::AbstractMultiPolygonTrait, geom) = sum(nring(p) for p in getpolygon(p))
 
 ## Surface
 npatch(p::AbstractPolyHedralSurfaceTrait, geom)::Integer = ngeom(p, geom)

src/interface.jl

@@ -200,7 +200,7 @@ Note that this is only valid for [`AbstractPolygon`](@ref)s and
 nring(geom) = nring(geomtype(geom), geom)
 
 """
-    getring(geom, [i::Integer]) -> Int
+    getring(geom, i::Integer) -> Int
 
 Return the `i`th ring for a given `geom`.
 
@@ -212,7 +212,6 @@ getring(geom, i::Integer) = getring(geomtype(geom), geom, i)
     getring(geom) -> iterator
 
 Returns an iterator over all rings in `geom`.
-
 Note that this is only valid for [`AbstractPolygon`](@ref)s and
 [`AbstractMultiPolygon`](@ref)s in single-argument form.
 """
@@ -322,7 +321,7 @@ Note that this is only valid for [`AbstractMultiLineString`](@ref)s.
 getlinestring(geom, i::Integer) = getlinestring(geomtype(geom), geom, i)
 
 """
-    getlinestring(geom, i::Integer) -> iterator
+    getlinestring(geom) -> iterator
 
 Returns an iterator over all linestrings in a geometry.
 Note that this is only valid for [`AbstractMultiLineString`](@ref)s.
@@ -339,20 +338,20 @@ Note that this is only valid for [`AbstractMultiPolygon`](@ref)s.
 npolygon(geom) = npolygon(geomtype(geom), geom)
 
 """
-    getpolygon(geom) -> AbstractCurve
+    getpolygon(geom, i::Integer) -> AbstractCurve
 
 Returns the `i`th polygon for the given `geom`.
 Note that this is only valid for [`AbstractMultiPolygon`](@ref)s.
 """
-getpolygon(geom) = getpolygon(geomtype(geom), geom)
+getpolygon(geom, i::Integer) = getpolygon(geomtype(geom), geom, i)
 
 """
-    getpolygon(geom) -> AbstractCurve
+    getpolygon(geom) -> iterator
 
 Returns an iterator over all polygons in a geometry.
 Note that this is only valid for [`AbstractMultiPolygon`](@ref)s.
 """
-getpolygon(geom, i::Integer) = getpolygon(geomtype(geom), geom, i)
+getpolygon(geom) = getpolygon(geomtype(geom), geom)
 
 """
     getring(geom, i::Integer) -> AbstractCurve
@@ -500,7 +499,7 @@ union(a, b) = union(geomtype(a), geomtype(b), a, b)
 
 # Spatial analysis
 """
-3   distance(a, b) -> Number
+    distance(a, b) -> Number
 
 Returns the shortest distance between `a` with `b`.
 """