Merge pull request #170 from jw3126/lineMerge

fix lineMerge

Author: jw3126

Project.toml

@@ -1,7 +1,7 @@
 name = "LibGEOS"
 uuid = "a90b1aa1-3769-5649-ba7e-abc5a9d163eb"
 license = "MIT"
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"

src/geos_functions.jl

@@ -663,20 +663,36 @@ end
 # GEOSPolygonizer_getCutEdges
 # GEOSPolygonize_full
 
-function lineMerge(obj::Geometry, context::GEOSContext = get_context(obj))::MultiLineString
+function lineMerge(obj::Geometry, context::GEOSContext = get_context(obj))
     result = GEOSLineMerge_r(context, obj)
     if result == C_NULL
         error("LibGEOS: Error in GEOSLineMerge")
     end
-    MultiLineString(result, context)
+    geomFromGEOS(result, context)
+end
+
+function maximumInscribedCircle(obj::Geometry, tolerance, context::GEOSContext = get_context(obj))
+    result = GEOSMaximumInscribedCircle_r(context, obj, tolerance)
+    if result == C_NULL
+        error("LibGEOS: Error in GEOSMaximumInscribedCircle")
+    end
+    geomFromGEOS(result, context)
+end
+
+function isValidReason(obj::Geometry, context::GEOSContext = get_context(obj))
+    result = GEOSisValidReason_r(context, obj)
+    if result == C_NULL
+        error("LibGEOS: Error in GEOSisValidReason")
+    end
+    result
 end
 
 function simplify(obj::Geometry, tol::Real, context::GEOSContext = get_context(obj))
     result = GEOSSimplify_r(context, obj, tol)
     if result == C_NULL
         error("LibGEOS: Error in GEOSSimplify")
     end
-    geomFromGEOS(result)
+    geomFromGEOS(result, context)
 end
 
 function topologyPreserveSimplify(obj::Geometry, tol::Real, context::GEOSContext = get_context(obj))

src/geos_types.jl

@@ -10,6 +10,14 @@ function Base.show(io::IO, geo::AbstractGeometry)
     end
 end
 
+function open_issue_if_conversion_makes_sense(T::Type, id)
+    msg = """LibGEOS: Can't convert a pointer to an element with a GeomType ID id = $id (GEOSGeomType = $(GEOSGeomTypes(id)))
+    to a geometry of type $T (yet).
+    Please open an issue if you think this conversion makes sense.")
+    """
+    error(msg)
+end
+
 mutable struct Point <: AbstractGeometry
     ptr::GEOSGeom
     context::GEOSContext
@@ -19,8 +27,7 @@ mutable struct Point <: AbstractGeometry
         point = if id == GEOS_POINT
             point = new(cloneGeom(obj, context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a point (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(Point, id)
         end
         finalizer(destroyGeom, point)
         point
@@ -50,8 +57,7 @@ mutable struct MultiPoint <: AbstractGeometry
                 context
                )
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a multipoint (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(MultiPoint, id)
         end
         finalizer(destroyGeom, multipoint)
         multipoint
@@ -83,8 +89,7 @@ mutable struct LineString <: AbstractGeometry
         line = if id == GEOS_LINESTRING
             new(cloneGeom(obj, context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a linestring (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(LineString, id)
         end
         finalizer(destroyGeom, line)
         line
@@ -115,8 +120,7 @@ mutable struct MultiLineString <: AbstractGeometry
                                  [cloneGeom(obj, context)],
                                  context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a multi-linestring (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(MultiLineString, id)
         end
         finalizer(destroyGeom, multiline)
         multiline
@@ -147,8 +151,7 @@ mutable struct LinearRing <: AbstractGeometry
         ring = if id == GEOS_LINEARRING
             new(cloneGeom(obj, context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a linear ring (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(LinearRing, id)
         end
         finalizer(destroyGeom, ring)
         ring
@@ -174,8 +177,7 @@ mutable struct Polygon <: AbstractGeometry
         elseif id == GEOS_LINEARRING
             new(cloneGeom(createPolygon(obj, context), context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a polygon (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(Polygon, id)
         end
         finalizer(destroyGeom, polygon)
         polygon
@@ -214,8 +216,7 @@ mutable struct MultiPolygon <: AbstractGeometry
                 context
                )
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a multi-polygon (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(MultiPolygon, id)
         end
         finalizer(destroyGeom, multipolygon)
         multipolygon
@@ -254,8 +255,7 @@ mutable struct GeometryCollection <: AbstractGeometry
         geometrycollection = if id == GEOS_GEOMETRYCOLLECTION
             new(cloneGeom(obj, context), context)
         else
-            error("LibGEOS: Can't convert a pointer to an element with a GeomType ID of $id to a geometry collection (yet).
-                   Please open an issue if you think this conversion makes sense.")
+            open_issue_if_conversion_makes_sense(GeometryCollection, id)
         end
         finalizer(destroyGeom, geometrycollection)
         geometrycollection

test/test_geos_functions.jl

@@ -1,5 +1,7 @@
 using Test
 using LibGEOS
+import GeoInterface
+using Extents
 
 @testset "WKTWriter" begin
     # default writing options
@@ -905,13 +907,20 @@ end
     @test p isa Polygon
 
     lss = readgeom("MULTILINESTRING((0 0, 0 1), (0 1, 0 2))")
-    @test lineMerge(lss) == readgeom("MULTILINESTRING ((0 0, 0 1, 0 2))")
+    @test lineMerge(lss) == readgeom("LINESTRING (0 0, 0 1, 0 2)")
 
-    geo_invalid = readgeom("POLYGON((0 0, 0 1, 1 1, 1 0, -1 1, 0 0))")
-    @test !LibGEOS.isValid(geo_invalid)
-    geo_valid = LibGEOS.makeValid(geo_invalid)
-    @test geo_valid isa LibGEOS.MultiPolygon
-    @test LibGEOS.isValid(geo_valid)
+    lss = readgeom("MULTILINESTRING((0 0, 0 1), (0 2, 0 3), (0 3, 0 4))")
+    @test lineMerge(lss) == readgeom("MULTILINESTRING ((0 0, 0 1), (0 2, 0 3, 0 4))")
+
+    lss = readgeom("MULTILINESTRING EMPTY")
+    @test lineMerge(lss) == readgeom("GEOMETRYCOLLECTION EMPTY")
+
+    lss = readgeom("LINESTRING EMPTY")
+    @test lineMerge(lss) == readgeom("GEOMETRYCOLLECTION EMPTY")
 
     @test LibGEOS.reverse(readgeom("LINESTRING(0 0, 1 1)")) == readgeom("LINESTRING(1 1, 0 0)")
+
+    geo = readgeom("POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))")
+    mic = LibGEOS.maximumInscribedCircle(geo, 1e-4)
+    @test mic == readgeom("LINESTRING (0.5 0.5, 0 0.5)")
 end

test/test_geos_types.jl

@@ -1,4 +1,14 @@
 
+@testset "open_issue_if_conversion_makes_sense" begin
+    polygon = readgeom("POLYGON EMPTY")
+    GC.@preserve polygon begin
+        res = @test_throws Exception Point(polygon.ptr, polygon.context)
+        msg = res.value.msg
+        @test occursin("GEOS_POLYGON", msg)
+        @test occursin("Point", msg)
+    end
+end
+
 # Function to test if a geomerty is valid and if its type matches the geometry ID and has the correct dimensions
 function testValidTypeDims(geom::LibGEOS.Geometry, typeid::LibGEOS.GEOSGeomTypes, dims::Integer)
     @test LibGEOS.isValid(geom)

test/test_invalid_geometry.jl

@@ -1,3 +1,6 @@
+using Test
+using LibGEOS
+
 @testset "LibGEOS invalid geometry" begin
     # LibGEOS shouldn't crash but error out on invalid geometry
 
@@ -11,4 +14,10 @@
     @test !LibGEOS.isValid(polygon)
     @test LibGEOS.GEOSisValidReason_r(LibGEOS.get_global_context(), polygon) ==
           "Hole lies outside shell[15 15]"
+    @test LibGEOS.isValidReason(polygon) == "Hole lies outside shell[15 15]"
+
+    geo_valid = LibGEOS.makeValid(polygon)
+    @test geo_valid isa LibGEOS.MultiPolygon
+    @test LibGEOS.isValid(geo_valid)
+    @test LibGEOS.isValidReason(geo_valid) == "Valid Geometry"
 end