Skip to content

Wrap concavehull #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asinghvi17 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Wrap concavehull #218

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b370c5f
Wrap `concavehull`
asinghvi17 Mar 11, 2025
1cb652b
Add concavehull to tests
asinghvi17 Mar 11, 2025
4e288b8
Add context to each test, so we know which functions failed!
asinghvi17 Mar 11, 2025
ddf358c
refactor to have one required arg and then kwarg that changes method …
asinghvi17 Mar 11, 2025
f0f577a
Merge branch 'master' into as/concavehull
asinghvi17 Nov 10, 2025
77d5797
Fix tests since concavehull signature is different
asinghvi17 Nov 10, 2025
5e0ce3c
Fix test for setZ on 2D coordseq
asinghvi17 Nov 11, 2025
1741599
Update maximum inscribed circle test to test semantic properties rath…
asinghvi17 Nov 11, 2025
27a3087
Bump patch version and GEOS compat
asinghvi17 Nov 11, 2025
2102ecb
Regenerate code for GEOS v3.14.1
asinghvi17 Nov 11, 2025
be568ef
Fix namespace error in test_geo_interface.jl
asinghvi17 Nov 11, 2025
26c8981
Use TaskLocalValues for compatibility with Julia's new threading model
asinghvi17 Nov 11, 2025
94e3521
Merge branch 'as/wrapeverything' into as/concavehull
asinghvi17 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/geo_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ for f in (
:envelope,
:minimumRotatedRectangle,
:convexhull,
:concavehull,
:concavehull_of_polygons,
:boundary,
:unaryUnion,
:pointOnSurface,
Expand Down
47 changes: 47 additions & 0 deletions src/geos_functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,53 @@ function convexhull(obj::Geometry, context::GEOSContext = get_context(obj))
geomFromGEOS(result, context)
end

"""
concavehull(geom, ratio; bylength = false, allow_holes = true)

Compute the concave hull of a geometry, according to the chi-shape generated from
`geom` with the given `ratio`.

If `bylength` is true, the chi-shape is generated from the length of the geometry,
calling `GEOSConcaveHullByLength`; otherwise it is generated from the area, calling
`GEOSConcaveHull`.

If `allow_holes` is true, the concave hull may have holes. If false, then holes are disallowed.

See also [`convexhull`](@ref), [`concavehull_of_polygons`](@ref).
"""
function concavehull(obj::Geometry; ratio::Union{Real, Nothing} = nothing, length_ratio::Union{Real, Nothing} = nothing, allow_holes::Bool = true, context::GEOSContext = get_context(obj))
result = if isnothing(ratio) && isnothing(length_ratio)
throw(ArgumentError("Either `ratio` or `length_ratio` must be provided to `LibGEOS.concavehull`, none were provided."))
elseif !isnothing(ratio) && !isnothing(length_ratio)
throw(ArgumentError("Only one of `ratio` or `length_ratio` may be provided to `LibGEOS.concavehull`; got both."))
elseif !isnothing(ratio) && isnothing(length_ratio)
GEOSConcaveHull_r(context, obj, ratio, allow_holes)
elseif isnothing(ratio) && !isnothing(length_ratio)
GEOSConcaveHullByLength_r(context, obj, ratio, allow_holes)
end
if result == C_NULL
error("LibGEOS: Error in GEOSConcaveHull")
end
geomFromGEOS(result, context)
end

"""
concavehull_of_polygons(obj::Geometry, ratio; tight = false, allow_holes = true)

Compute the concave hull of a geometry, according to the chi-shape generated from
`obj` with the given `ratio`.

If `tight` is true, the chi-shape is generated from the tightest fit of the geometry,
otherwise it is generated from the area.
"""
function concavehull_of_polygons(obj::Geometry, ratio::Real; tight::Bool = false, allow_holes::Bool = true, context::GEOSContext = get_context(obj))
result = GEOSConcaveHullOfPolygons_r(context, obj, ratio, tight, allow_holes)
if result == C_NULL
error("LibGEOS: Error in GEOSConcaveHullOfPolygons")
end
geomFromGEOS(result, context)
end

function difference(
obj1::Geometry,
obj2::Geometry,
Expand Down
53 changes: 37 additions & 16 deletions test/test_geo_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ const LG = LibGEOS
LG.delaunayTriangulationEdges,
LG.delaunayTriangulation,
LG.constrainedDelaunayTriangulation,
Base.Fix2(LG.concavehull, 0.3),
# these have different signatures
# LG.simplify, LG.topologyPreserveSimplify,
)
Expand Down Expand Up @@ -358,39 +359,51 @@ const LG = LibGEOS
@test geom isa MultiPoint
@test GeoInterface.coordinates(geom) == coords
for f in one_arg_functions
@test f(LibGEOS.MultiPoint(coords)) == f(GeoInterface.MultiPoint(coords))
@testset let current_function = f
@test f(LibGEOS.MultiPoint(coords)) == f(GeoInterface.MultiPoint(coords))
end
end
coords2 = [[0.0, 10], [0.5, 10], [20.0, 20], [10.0, 10], [0.0, 10]]
for f in two_arg_functions
@test f(LibGEOS.LineString(coords), LibGEOS.LineString(coords)) ==
f(GeoInterface.LineString(coords), GeoInterface.LineString(coords))
@testset let current_function = f
@test f(LibGEOS.LineString(coords), LibGEOS.LineString(coords)) ==
f(GeoInterface.LineString(coords), GeoInterface.LineString(coords))
end
end

coords = [[0.0, 0], [0.0, 10], [10.0, 10], [10.0, 0], [0.0, 0]]
geom = GeoInterface.convert(LineString, GeoInterface.LineString(coords))
@test geom isa LineString
@test GeoInterface.coordinates(geom) == coords
for f in one_arg_functions
@test f(LibGEOS.LineString(coords)) == f(GeoInterface.LineString(coords))
@testset let current_function = f
@test f(LibGEOS.LineString(coords)) == f(GeoInterface.LineString(coords))
end
end
coords2 = [[0.0, 10], [0.5, 10], [20.0, 20], [10.0, 10], [0.0, 10]]
for f in two_arg_functions
@test f(LibGEOS.LineString(coords), LibGEOS.LineString(coords)) ==
f(GeoInterface.LineString(coords), GeoInterface.LineString(coords))
@testset let current_function = f
@test f(LibGEOS.LineString(coords), LibGEOS.LineString(coords)) ==
f(GeoInterface.LineString(coords), GeoInterface.LineString(coords))
end
end

coords = [[[0.0, 0], [0.0, 10], [10.0, 10], [10.0, 0], [0.0, 0]]]
geom = GeoInterface.convert(MultiLineString, GeoInterface.MultiLineString(coords))
@test geom isa MultiLineString
@test GeoInterface.coordinates(geom) == coords
for f in one_arg_functions
@test f(LibGEOS.MultiLineString(coords)) ==
f(GeoInterface.MultiLineString(coords))
@testset let current_function = f
@test f(LibGEOS.MultiLineString(coords)) ==
f(GeoInterface.MultiLineString(coords))
end
end
coords2 = [[[0.0, 10], [0.5, 10], [20.0, 20], [10.0, 10], [0.0, 10]]]
for f in two_arg_functions
@test f(LibGEOS.MultiLineString(coords), LibGEOS.MultiLineString(coords2)) ==
f(GeoInterface.MultiLineString(coords), LibGEOS.MultiLineString(coords2))
@testset let current_function = f
@test f(LibGEOS.MultiLineString(coords), LibGEOS.MultiLineString(coords2)) ==
f(GeoInterface.MultiLineString(coords), LibGEOS.MultiLineString(coords2))
end
end

coords = [[[0.0, 0], [0.0, 10], [10.0, 10], [10.0, 0], [0.0, 0]]]
Expand All @@ -401,12 +414,16 @@ const LG = LibGEOS
@test GeoInterface.nhole(geom) == 0
@test GeoInterface.coordinates(geom) == coords
for f in one_arg_functions
@test f(LibGEOS.Polygon(coords)) == f(GeoInterface.Polygon(coords))
@testset let current_function = f
@test f(LibGEOS.Polygon(coords)) == f(GeoInterface.Polygon(coords))
end
end
coords2 = [[[0.0, 10], [0.5, 10], [20.0, 20], [10.0, 10], [0.0, 10]]]
for f in two_arg_functions
@test f(LibGEOS.Polygon(coords), LibGEOS.Polygon(coords2)) ==
f(GeoInterface.Polygon(coords), LibGEOS.Polygon(coords2))
@testset let current_function = f
@test f(LibGEOS.Polygon(coords), LibGEOS.Polygon(coords2)) ==
f(GeoInterface.Polygon(coords), LibGEOS.Polygon(coords2))
end
end

pgeom = LibGEOS.prepareGeom(geom)
Expand All @@ -418,12 +435,16 @@ const LG = LibGEOS
@test geom isa MultiPolygon
@test GeoInterface.coordinates(geom) == coords
for f in one_arg_functions
@test f(LibGEOS.MultiPolygon(coords)) == f(GeoInterface.MultiPolygon(coords))
@testset let current_function = f
@test f(LibGEOS.MultiPolygon(coords)) == f(GeoInterface.MultiPolygon(coords))
end
end
coords2 = [[[[0.0, 10], [0.5, 10], [20.0, 20], [10.0, 10], [0.0, 10]]]]
for f in two_arg_functions
@test f(LibGEOS.MultiPolygon(coords), LibGEOS.MultiPolygon(coords2)) ==
f(GeoInterface.MultiPolygon(coords), LibGEOS.MultiPolygon(coords2))
@testset let current_function = f
@test f(LibGEOS.MultiPolygon(coords), LibGEOS.MultiPolygon(coords2)) ==
f(GeoInterface.MultiPolygon(coords), LibGEOS.MultiPolygon(coords2))
end
end
end

Expand Down
Loading