Skip to content

Commit 5cc3f07

Browse files
committed
Merge pull request #13 from JuliaGeo/bug-in-createCollection
Bug in create collection
2 parents f882a4b + 40b0f82 commit 5cc3f07

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/LibGEOS.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ module LibGEOS
88

99
using Compat, GeoInterface
1010

11-
export Point, LineString, MultiLineString, LinearRing, Polygon, MultiPolygon, GeometryCollection,
11+
export Point, MultiPoint, LineString, MultiLineString, LinearRing, Polygon, MultiPolygon, GeometryCollection,
1212
parseWKT, geomFromWKT, geomToWKT,
13-
project, projectNormalized, interpolate, interpolateNormalized,
13+
project, projectNormalized, interpolate, interpolateNormalized,
1414
buffer, envelope, intersection, convexhull, difference, symmetricDifference,
1515
boundary, union, unaryUnion, pointOnSurface, centroid, node,
1616
polygonize, lineMerge, simplify, topologyPreserveSimplify, uniquePoints, sharedPaths,
1717
snap, delaunayTriangulation, delaunayTriangulationEdges,
18-
disjoint, touches, intersects, crosses, within, contains, overlaps, equals, equalsexact, covers, coveredby,
18+
disjoint, touches, intersects, crosses, within, contains, overlaps, equals, equalsexact, covers, coveredby,
1919
prepareGeom, prepcontains, prepcontainsproperly, prepcoveredby, prepcovers, prepcrosses,
2020
prepdisjoint, prepintersects, prepoverlaps, preptouches, prepwithin,
2121
isEmpty, isSimple, isRing, hasZ, isClosed, isValid, normalize!, interiorRings, exteriorRing,
2222
numPoints, startPoint, endPoint, area, geomLength, distance, hausdorffdistance, nearestPoints
2323

2424
include("geos_c.jl")
25-
25+
2626
# --- GEOSconnection ---
2727
type GEOSconnection
2828
status::Symbol
@@ -44,4 +44,4 @@ module LibGEOS
4444
include("geos_types.jl")
4545
include("geos_operations.jl")
4646
include("geo_interface.jl")
47-
end
47+
end

src/geos_functions.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ end
352352

353353

354354
function createCollection(geomtype::Int, geoms::Vector{GEOSGeom})
355-
result = GEOSGeom_createCollection(@compat(Int32(geomtype)), pointer(geoms), length(geoms))
355+
result = GEOSGeom_createCollection(@compat(Int32(geomtype)), pointer(geoms), @compat(UInt32(length(geoms))))
356356
if result == C_NULL
357357
error("LibGEOS: Error in GEOSGeom_createCollection")
358358
end
@@ -1093,4 +1093,3 @@ end
10931093
# Return 0 on exception, the closest points of the two geometries otherwise.
10941094
# The first point comes from g1 geometry and the second point comes from g2.
10951095
nearestPoints(g1::GEOSGeom, g2::GEOSGeom) = GEOSNearestPoints(g1, g2)
1096-

0 commit comments

Comments
 (0)