Skip to content

Commit b9c3494

Browse files
committed
Merge pull request #5 from JuliaGeo/up
Test dependencies, squash 0.4 warnings, new install instructions
2 parents 9ff2690 + e9a9761 commit b9c3494

File tree

8 files changed

+222
-225
lines changed

8 files changed

+222
-225
lines changed

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ to your start-up file (e.g. ``.bash_profile``).
3737

3838
2. At the Julia prompt, run
3939
```julia
40-
julia> Pkg.clone("https://github.com/yeesian/LibGEOS.jl.git")
41-
```
42-
3. `LibGEOS` has dependencies on [GeoInterface](https://github.com/yeesian/GeoInterface.jl), so you will need to install it by running
43-
```julia
44-
julia> Pkg.clone(https://github.com/yeesian/GeoInterface.jl.git)
40+
julia> Pkg.add("LibGEOS")
4541
```
4642

47-
4. Test that `LibGEOS` works by runnning
43+
3. Test that `LibGEOS` works by runnning
4844
```julia
4945
julia> Pkg.test("LibGEOS")
5046
```

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
julia 0.3
22
GeoInterface
3-
Compat
3+
Compat

src/geo_interface.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function GeoInterface.coordinates(polygon::Polygon)
1212
if length(interiors) == 0
1313
return Vector{Vector{Float64}}[exterior]
1414
else
15-
return [Vector{Vector{Float64}}[exterior], interiors]
15+
return [Vector{Vector{Float64}}[exterior]; interiors]
1616
end
1717
end
1818

@@ -24,14 +24,14 @@ function GeoInterface.coordinates(multipolygon::MultiPolygon)
2424
for (i,geom) in enumerate(getGeometries(multipolygon.ptr))
2525
exterior = getCoordinates(getCoordSeq(exteriorRing(geom)))
2626
interiors = [getCoordinates(getCoordSeq(ring)) for ring in interiorRings(geom)]
27-
coords[i] = [Vector{Vector{Float64}}[exterior], interiors]
27+
coords[i] = [Vector{Vector{Float64}}[exterior]; interiors]
2828
end
2929
coords
3030
end
3131

3232
function GeoInterface.geometries(obj::GeometryCollection)
3333
collection = GeoInterface.AbstractGeometry[]
34-
sizehint(collection, numGeometries(obj.ptr))
34+
sizehint!(collection, numGeometries(obj.ptr))
3535
for geom in getGeometries(obj.ptr)
3636
if geomTypeId(geom) == GEOS_POINT
3737
push!(collection, Point(cloneGeom(geom)))

src/geos_c.jl

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)