use GEOS_jll GEOS 3.8.0 artifacts

This will require at least julia 1.3. Testing to see if it works.
Some tests with pointOnSurface had to be updated. This is expected since it can return any point on the surface. Other than that some GeometryCollections are now ordered differently, and the unary union of an empty point remains an empty point.

Author: visr

.travis.yml

@@ -3,8 +3,7 @@ os:
     - osx
     - linux
 julia:
-    - 1.0
-    - 1
+    - 1.3
     - nightly
 matrix:
   allow_failures:

Project.toml

@@ -3,14 +3,13 @@ uuid = "a90b1aa1-3769-5649-ba7e-abc5a9d163eb"
 version = "0.5.1"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
+GEOS_jll = "d604d12d-fa86-5845-992e-78dc15976526"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-BinaryProvider = "0.5.3"
 CEnum = "0.2.0"
 GeoInterface = "0.4.0"
 julia = "1.0.0"

appveyor.yml

@@ -1,7 +1,6 @@
 environment:
   matrix:
-  - julia_version: 1.0
-  - julia_version: 1
+  - julia_version: 1.3
   - julia_version: nightly
 
 platform:

deps/build.jl

@@ -1,12 +1,6 @@
 module LibGEOS
 
-    # Load in `deps.jl`, complaining if it does not exist
-    const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
-    if !isfile(depsjl_path)
-        error("LibGEOS not installed properly, run Pkg.build(\"LibGEOS\"), restart Julia and try again")
-    end
-    include(depsjl_path)
-
+    using GEOS_jll
     using GeoInterface
     using Libdl
     using CEnum
@@ -111,9 +105,6 @@ module LibGEOS
     end
 
     function __init__()
-        # Always check your dependencies from `deps.jl`
-        check_deps()
-
         global _context = GEOSContext()
     end
 

src/LibGEOS.jl

@@ -16,7 +16,7 @@
     hole1 = LibGEOS.createLinearRing(Vector{Float64}[[1,8],[2,8],[2,9],[1,9],[1,8]])
     hole2 = LibGEOS.createLinearRing(Vector{Float64}[[8,1],[9,1],[9,2],[8,2],[8,1]])
     polygon = LibGEOS.createPolygon(shell,LibGEOS.GEOSGeom[hole1,hole2])
-    @test LibGEOS.getDimensions(polygon) == 2
+    @test LibGEOS.getGeomDimensions(polygon) == 2
     @test LibGEOS.geomTypeId(polygon) == LibGEOS.GEOS_POLYGON
     @test LibGEOS.geomArea(polygon) ≈ 98.0 atol=1e-5
     exterior = LibGEOS.exteriorRing(polygon)
@@ -397,7 +397,7 @@
     56.528833333300 25.2103333333,
     56.528666666700 25.2101666667))""")
     geom2_ = LibGEOS.pointOnSurface(geom1_)
-    @test LibGEOS.getCoordinates(LibGEOS.getCoordSeq(geom2_))[1] ≈ [56.528917,25.210417] atol=1e-5
+    @test LibGEOS.getCoordinates(LibGEOS.getCoordSeq(geom2_))[1] ≈ [56.5286666667, 25.2101666667] atol=1e-5
     LibGEOS.destroyGeom(geom1_)
     LibGEOS.destroyGeom(geom2_)
 
@@ -596,7 +596,7 @@
     # GEOSUnaryUnionTest
     geom1_ = LibGEOS._readgeom("POINT EMPTY")
     geom2_ = LibGEOS.unaryUnion(geom1_)
-    @test LibGEOS._writegeom(geom2_) == "GEOMETRYCOLLECTION EMPTY"
+    @test LibGEOS._writegeom(geom2_) == "POINT EMPTY"
     LibGEOS.destroyGeom(geom1_)
     LibGEOS.destroyGeom(geom2_)
 
@@ -626,7 +626,7 @@
 
     geom1_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT(4 5), MULTIPOINT(6 7, 6 5, 6 7), LINESTRING(0 5, 10 5), LINESTRING(4 -10, 4 10))")
     geom2_ = LibGEOS.unaryUnion(geom1_)
-    geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5))")
+    geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10))")
     @test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
     LibGEOS.destroyGeom(geom1_)
     LibGEOS.destroyGeom(geom2_)

test/test_geos_functions.jl

@@ -147,7 +147,7 @@ end
     56.529000000000 25.2105000000,
     56.528833333300 25.2103333333,
     56.528666666700 25.2101666667))""")
-    @test GeoInterface.coordinates(pointOnSurface(g1)) ≈ [56.528917,25.210417] atol=1e-5
+    @test GeoInterface.coordinates(pointOnSurface(g1)) ≈ [56.5286666667, 25.2101666667] atol=1e-5
 
     # GEOSSharedPathsTest
     factcheck(sharedPaths,
@@ -196,12 +196,12 @@ end
 
     # GEOSUnaryUnionTest
     test_unaryunion(geom::String, expected::String) = factcheck(unaryUnion, geom, expected)
-    test_unaryunion("POINT EMPTY", "GEOMETRYCOLLECTION EMPTY")
+    test_unaryunion("POINT EMPTY", "POINT EMPTY")
     test_unaryunion("POINT (6 3)", "POINT (6 3)")
     test_unaryunion("POINT (4 5 6)", "POINT Z (4 5 6)")
     test_unaryunion("MULTIPOINT (4 5, 6 7, 4 5, 6 5, 6 7)", "MULTIPOINT (4 5, 6 5, 6 7)")
     test_unaryunion("GEOMETRYCOLLECTION (POINT(4 5), MULTIPOINT(6 7, 6 5, 6 7), LINESTRING(0 5, 10 5), LINESTRING(4 -10, 4 10))",
-                    "GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5))")
+                    "GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10))")
     test_unaryunion("GEOMETRYCOLLECTION (POINT(4 5), MULTIPOINT(6 7, 6 5, 6 7), POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 6, 7 6, 7 8, 5 8, 5 6)))",
                     "GEOMETRYCOLLECTION (POINT (6 7), POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0), (5 6, 7 6, 7 8, 5 8, 5 6)))")
     test_unaryunion("GEOMETRYCOLLECTION (MULTILINESTRING((5 7, 12 7), (4 5, 6 5), (5.5 7.5, 6.5 7.5)), POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 6, 7 6, 7 8, 5 8, 5 6)))",