ffi-geos 2.2.0 → 2.4.0

data/test/geometry_tests.rb

@@ -13,7 +13,7 @@ class GeometryTests < Minitest::Test
   def test_intersection
     comparison_tester(
       :intersection,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((10 10, 10 5, 5 5, 5 10, 10 10))'
       else
         'POLYGON ((5 10, 10 10, 10 5, 5 5, 5 10))'
@@ -36,7 +36,11 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :intersection,
-      'GEOMETRYCOLLECTION (LINESTRING (2 0, 4 0), POINT (0 0), POINT (10 0))',
+      if Geos::GEOS_NICE_VERSION >= '031000'
+        'GEOMETRYCOLLECTION (LINESTRING (2 0, 4 0), POINT (10 0), POINT (0 0))'
+      else
+        'GEOMETRYCOLLECTION (LINESTRING (2 0, 4 0), POINT (0 0), POINT (10 0))'
+      end,
       'LINESTRING(0 0, 10 0)',
       'LINESTRING(9 0, 12 0, 12 20, 4 0, 2 0, 2 10, 0 10, 0 -10)',
       precision: 2
@@ -119,7 +123,11 @@ class GeometryTests < Minitest::Test
 
     snapped_tester(
       :buffer,
-      'POLYGON ((90 10, 90 100, 93 107, 100 110, 107 107, 110 100, 109 -5, 105 -9, 0 -10, -7 -7, -10 0, -7 7, 0 10, 90 10))',
+      if Geos::GEOS_NICE_VERSION >= '031100'
+        'POLYGON ((90 10, 90 100, 93 107, 100 110, 107 107, 110 100, 110 -4, 104 -10, 0 -10, -7 -7, -10 0, -7 7, 0 10, 90 10))'
+      else
+        'POLYGON ((90 10, 90 100, 93 107, 100 110, 107 107, 110 100, 109 -5, 105 -9, 0 -10, -7 -7, -10 0, -7 7, 0 10, 90 10))'
+      end,
       'LINESTRING(0 0, 100 0, 100 100)',
       10,
       quad_segs: 2, join: :mitre, mitre_limit: 1.0
@@ -206,7 +214,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10))'
       else
         'POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0))'
@@ -217,7 +225,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10))'
       else
         'POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))'
@@ -228,7 +236,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10))'
       else
         'POLYGON ((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0))'
@@ -303,7 +311,7 @@ class GeometryTests < Minitest::Test
 
       comparison_tester(
         method,
-        if Geos::GEOS_VERSION > '3.9.0'
+        if Geos::GEOS_NICE_VERSION > '030900'
           'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'
         else
           'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)))'
@@ -314,7 +322,7 @@ class GeometryTests < Minitest::Test
 
       comparison_tester(
         method,
-        if Geos::GEOS_VERSION > '3.9.0'
+        if Geos::GEOS_NICE_VERSION > '030900'
           'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'
         else
           'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)))'
@@ -325,7 +333,7 @@ class GeometryTests < Minitest::Test
 
       comparison_tester(
         method,
-        if Geos::GEOS_VERSION > '3.9.0'
+        if Geos::GEOS_NICE_VERSION > '030900'
           'MULTIPOLYGON (((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10)), ((10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0, 10 0)))'
         else
           'MULTIPOLYGON (((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))'
@@ -420,7 +428,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :union,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'
       else
         'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)))'
@@ -431,7 +439,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :union,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'
       else
         'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)))'
@@ -442,7 +450,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :union,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0, 0 10))'
       else
         'POLYGON ((0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0))'
@@ -468,7 +476,7 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :union_cascaded,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
       else
         'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
@@ -487,7 +495,7 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :union_cascaded,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 1, 1 1, 2 1, 2 0, 1 0, 0 0, 0 1))'
       else
         'POLYGON ((0 0, 0 1, 1 1, 2 1, 2 0, 1 0, 0 0))'
@@ -504,7 +512,7 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :unary_union,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
       else
         'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
@@ -547,7 +555,7 @@ class GeometryTests < Minitest::Test
   def test_union_without_arguments
     simple_tester(
       :union,
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
       else
         'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
@@ -955,7 +963,13 @@ class GeometryTests < Minitest::Test
     }
 
     assert_nil(read('POINT(0 0)').valid_detail)
-    tester['Invalid Coordinate', 'POINT (0 nan)', 'POINT(0 NaN)', 0]
+
+    if Geos::GEOS_NICE_VERSION >= '031000'
+      tester['Invalid Coordinate', 'POINT (0 NaN)', 'POINT(0 NaN)', 0]
+    else
+      tester['Invalid Coordinate', 'POINT (0 nan)', 'POINT(0 NaN)', 0]
+    end
+
     tester['Self-intersection', 'POINT (2.5 5)', 'POLYGON((0 0, 0 5, 5 5, 5 10, 0 0))', 0]
 
     tester['Ring Self-intersection', 'POINT (0 0)', 'POLYGON((0 0, -10 10, 10 10, 0 0, 4 5, -4 5, 0 0)))', 0]
@@ -1371,7 +1385,7 @@ class GeometryTests < Minitest::Test
     ]
 
     tester[
-      if Geos::GEOS_VERSION > '3.8'
+      if Geos::GEOS_NICE_VERSION >= '030800'
         '5.0 5.0, 8.0 8.0'
       else
         '5.0 5.0 NaN, 8.0 8.0 NaN'
@@ -1471,7 +1485,11 @@ class GeometryTests < Minitest::Test
   def test_polygonize_full
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:polygonize_full)
 
-    writer.rounding_precision = 3
+    writer.rounding_precision = if Geos::GEOS_NICE_VERSION >= '031000'
+      0
+    else
+      3
+    end
 
     geom_a = read(
       'GEOMETRYCOLLECTION(
@@ -1556,7 +1574,7 @@ class GeometryTests < Minitest::Test
     geom = read('POLYGON((0 0, 1 1, 0 1, 1 0, 0 0))')
 
     assert_equal(
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'MULTIPOLYGON (((1 0, 0 0, 0.5 0.5, 1 0)), ((1 1, 0.5 0.5, 0 1, 1 1)))'
       else
         'MULTIPOLYGON (((0 0, 0.5 0.5, 1 0, 0 0)), ((0.5 0.5, 0 1, 1 1, 0.5 0.5)))'
@@ -1807,8 +1825,8 @@ class GeometryTests < Minitest::Test
     # polygon with a hole
     tester[
       'GEOMETRYCOLLECTION (POLYGON ((8 2, 10 10, 8.5 1, 8 2)), POLYGON ((7 8, 10 10, 8 2, 7 8)), POLYGON ((3 8, 10 10, 7 8, 3 8)), ' \
-        'POLYGON ((2 2, 8 2, 8.5 1, 2 2)), POLYGON ((2 2, 7 8, 8 2, 2 2)), POLYGON ((2 2, 3 8, 7 8, 2 2)), POLYGON ((0.5 9, 10 10, 3 8, 0.5 9)), ' \
-        'POLYGON ((0.5 9, 3 8, 2 2, 0.5 9)), POLYGON ((0 0, 2 2, 8.5 1, 0 0)), POLYGON ((0 0, 0.5 9, 2 2, 0 0)))',
+      'POLYGON ((2 2, 8 2, 8.5 1, 2 2)), POLYGON ((2 2, 7 8, 8 2, 2 2)), POLYGON ((2 2, 3 8, 7 8, 2 2)), POLYGON ((0.5 9, 10 10, 3 8, 0.5 9)), ' \
+      'POLYGON ((0.5 9, 3 8, 2 2, 0.5 9)), POLYGON ((0 0, 2 2, 8.5 1, 0 0)), POLYGON ((0 0, 0.5 9, 2 2, 0 0)))',
       'POLYGON((0 0, 8.5 1, 10 10, 0.5 9, 0 0),(2 2, 3 8, 7 8, 8 2, 2 2)))',
       0
     ]
@@ -1827,6 +1845,24 @@ class GeometryTests < Minitest::Test
     tester['MULTILINESTRING ((10 0, 10 10), (0 0, 10 10), (0 0, 10 0))', 'MULTIPOINT(0 0, 10 0, 10 10, 11 10)', tolerance: 2.0, only_edges: true]
   end
 
+  def test_constrained_delaunay_triangulation
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:constrained_delaunay_triangulation)
+
+    tester = lambda { |expected, geom|
+      geom = read(geom)
+      geom_tri = geom.constrained_delaunay_triangulation
+      geom_tri.normalize!
+
+      assert_equal(write(read(expected).normalize), write(geom_tri))
+    }
+
+    writer.trim = true
+
+    tester['GEOMETRYCOLLECTION EMPTY', 'POLYGON EMPTY']
+    tester['GEOMETRYCOLLECTION EMPTY', 'POINT(0 0)']
+    tester['GEOMETRYCOLLECTION (POLYGON ((10 10, 20 40, 90 10, 10 10)), POLYGON ((90 90, 20 40, 90 10, 90 90)))', 'POLYGON ((10 10, 20 40, 90 90, 90 10, 10 10))']
+  end
+
   def test_voronoi_diagram
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:voronoi_diagram)
 
@@ -1842,7 +1878,7 @@ class GeometryTests < Minitest::Test
     geom = 'MULTIPOINT(0 0, 100 0, 100 100, 0 100)'
 
     tester[
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'GEOMETRYCOLLECTION (POLYGON ((200 200, 200 50, 50 50, 50 200, 200 200)), POLYGON ((-100 200, 50 200, 50 50, -100 50, -100 200)), POLYGON ((-100 -100, -100 50, 50 50, 50 -100, -100 -100)), POLYGON ((200 -100, 50 -100, 50 50, 200 50, 200 -100)))'
       else
         'GEOMETRYCOLLECTION (POLYGON ((50 200, 200 200, 200 50, 50 50, 50 200)), POLYGON ((-100 50, -100 200, 50 200, 50 50, -100 50)), POLYGON ((50 -100, -100 -100, -100 50, 50 50, 50 -100)), POLYGON ((200 50, 200 -100, 50 -100, 50 50, 200 50)))'
@@ -1858,9 +1894,16 @@ class GeometryTests < Minitest::Test
     ]
 
     # Allows a tolerance for the first argument
-    @writer.rounding_precision = 3
+    writer.rounding_precision = if Geos::GEOS_NICE_VERSION >= '031000'
+      0
+    else
+      3
+    end
+
+    writer.trim = true
+
     tester[
-      if Geos::GEOS_VERSION > '3.9.0'
+      if Geos::GEOS_NICE_VERSION > '030900'
         'GEOMETRYCOLLECTION (POLYGON ((290 140, 185 140, 185 215, 188 235, 290 252, 290 140)), POLYGON ((80 340, 101 340, 188 235, 185 215, 80 215, 80 340)), POLYGON ((80 140, 80 215, 185 215, 185 140, 80 140)), POLYGON ((290 340, 290 252, 188 235, 101 340, 290 340)))'
       else
         'GEOMETRYCOLLECTION (POLYGON ((290 252, 290 140, 185 140, 185 215, 188 235, 290 252)), POLYGON ((80 215, 80 340, 101 340, 188 235, 185 215, 80 215)), POLYGON ((185 140, 80 140, 80 215, 185 215, 185 140)), POLYGON ((101 340, 290 340, 290 252, 188 235, 101 340)))'
@@ -1941,12 +1984,12 @@ class GeometryTests < Minitest::Test
     tester[
       'LINESTRING (-112.712119 33.575919, -112.712127 33.575885)',
       '0106000000010000000103000000010000001a00000035d42824992d5cc01b834e081dca404073b9c150872d5cc03465a71fd4c940400ec00644882d5cc03b8a' \
-        '73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc06989' \
-        '95d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d' \
-        '21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a0' \
-        '8499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf' \
-        '9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb8' \
-        '7361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
+      '73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc06989' \
+      '95d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d' \
+      '21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a0' \
+      '8499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf' \
+      '9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb8' \
+      '7361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
     ]
     tester['LINESTRING EMPTY', 'POLYGON EMPTY']
   end
@@ -2038,7 +2081,7 @@ class GeometryTests < Minitest::Test
     simple_tester(:reverse, 'MULTIPOINT (100 100, 10 100, 30 100)', 'MULTIPOINT (100 100, 10 100, 30 100)')
     simple_tester(:reverse, 'LINESTRING (200 200, 200 100)', 'LINESTRING (200 100, 200 200)')
 
-    if Geos::GEOS_VERSION >= '3.8.1'
+    if Geos::GEOS_NICE_VERSION >= '030801'
       simple_tester(:reverse, 'MULTILINESTRING ((3 3, 4 4), (1 1, 2 2))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 1))')
     else
       simple_tester(:reverse, 'MULTILINESTRING ((1 1, 2 2), (3 3, 4 4))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 1))')

data/test/line_string_tests.rb

@@ -80,7 +80,11 @@ class LineStringTests < Minitest::Test
     # straight right
     simple_tester(
       :offset_curve,
-      'LINESTRING (10 -2, 0 -2)',
+      if Geos::GEOS_NICE_VERSION >= '031100'
+        'LINESTRING (0 -2, 10 -2)'
+      else
+        'LINESTRING (10 -2, 0 -2)'
+      end,
       'LINESTRING (0 0, 10 0)',
       -2,
       quad_segs: 0,
@@ -91,7 +95,11 @@ class LineStringTests < Minitest::Test
     # outside curve
     simple_tester(
       :offset_curve,
-      'LINESTRING (12 10, 12 0, 10 -2, 0 -2)',
+      if Geos::GEOS_NICE_VERSION >= '031100'
+        'LINESTRING (0 -2, 10 -2, 12 0, 12 10)'
+      else
+        'LINESTRING (12 10, 12 0, 10 -2, 0 -2)'
+      end,
       'LINESTRING (0 0, 10 0, 10 10)',
       -2,
       quad_segs: 1,
@@ -264,7 +272,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_x, 'LINESTRING Z (1 -1 -1, 10 -10 -10)', wkt, Math::PI)
     affine_tester(:rotate_x, 'LINESTRING Z (1 -1 1, 10 -10 10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_x, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_x, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_x, wkt, wkt, Math::PI * 2)
   end
 
@@ -276,7 +284,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_y, 'LINESTRING Z (-1 1 -1, -10 10 -10)', wkt, Math::PI)
     affine_tester(:rotate_y, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_y, 'LINESTRING Z (-1 1 1, -10 10 10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_y, 'LINESTRING Z (-1 1 1, -10 10 10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_y, wkt, wkt, Math::PI * 2)
   end
 
@@ -287,7 +295,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_z, 'LINESTRING (-1 -1, -10 -10)', wkt, Math::PI)
     affine_tester(:rotate_z, 'LINESTRING (-1 1, -10 10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_z, 'LINESTRING (1 -1, 10 -10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_z, 'LINESTRING (1 -1, 10 -10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_z, wkt, wkt, Math::PI * 2)
   end
 

data/test/point_tests.rb

@@ -177,7 +177,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_x, 'POINT Z (1 -1 -1)', wkt, Math::PI)
     affine_tester(:rotate_x, 'POINT Z (1 -1 1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_x, 'POINT Z (1 1 -1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_x, 'POINT Z (1 1 -1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_x, wkt, wkt, Math::PI * 2)
   end
 
@@ -189,7 +189,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_y, 'POINT Z (-1 1 -1)', wkt, Math::PI)
     affine_tester(:rotate_y, 'POINT Z (1 1 -1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_y, 'POINT Z (-1 1 1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_y, 'POINT Z (-1 1 1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_y, wkt, wkt, Math::PI * 2)
   end
 
@@ -200,7 +200,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_z, 'POINT (-1 -1)', wkt, Math::PI)
     affine_tester(:rotate_z, 'POINT (-1 1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_z, 'POINT (1 -1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_z, 'POINT (1 -1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_z, wkt, wkt, Math::PI * 2)
   end
 

data/test/polygon_tests.rb

@@ -147,7 +147,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_x,
       'POLYGON Z ((0 0 0, 5 0 0, 5 0 -5, 0 0 -5, 0 0 0))',
       wkt,
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_x,
       wkt,
@@ -173,7 +173,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_y,
       'POLYGON Z ((0 0 0, 0 0 5, 0 5 5, 0 5 0, 0 0 0))',
       wkt,
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_y,
       wkt,
@@ -195,7 +195,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_z,
       'POLYGON ((0 0, 0 -5, 5 -5, 5 0, 0 0))',
       'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))',
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_z,
       'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))',

data/test/prepared_geometry_tests.rb

@@ -70,6 +70,12 @@ class PreparedGeometryTests < Minitest::Test
     relationship_tester(:contains?, true, false, false, false, false, true, false, false)
   end
 
+  def test_contains_properly
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::PreparedGeometry)
+
+    relationship_tester(:contains_properly?, true, false, false, false, false, false, false, false)
+  end
+
   def test_overlaps
     skip unless ENV['FORCE_TESTS'] || defined?(Geos::PreparedGeometry)
 
@@ -111,4 +117,28 @@ class PreparedGeometryTests < Minitest::Test
       Geos::PreparedGeometry.new('hello world')
     end
   end
+
+  def test_distance
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedDistance_r))
+
+    assert_equal(5.0, read(POINT_A).to_prepared.distance(read(POINT_B)))
+  end
+
+  def test_distance_within
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedDistanceWithin_r))
+
+    assert(read(POINT_A).to_prepared.distance_within?(read(POINT_B), 30.0))
+    refute(read(POINT_A).to_prepared.distance_within?(read(POINT_B), 3.0))
+  end
+
+  def test_nearest_points
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedNearestPoints_r))
+
+    coord_seq = read('POLYGON((1 1, 1 5, 5 5, 5 1, 1 1))').to_prepared.nearest_points(read('POLYGON((8 8, 9 9, 9 10, 8 8))'))
+
+    assert_equal(5.0, coord_seq.x[0])
+    assert_equal(5.0, coord_seq.y[0])
+    assert_equal(8.0, coord_seq.x[1])
+    assert_equal(8.0, coord_seq.y[1])
+  end
 end

data/test/strtree_tests.rb

@@ -233,7 +233,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     geom_1 = read('POINT (3 3)')
     geom_2 = read('POINT (2 7)')
@@ -250,7 +250,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_depth
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     number_of_geoms = 100
     geoms = []
@@ -284,7 +284,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_empty_tree
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     tree = Geos::STRtree.new(10)
     geom_1 = read('POINT (3 3)')
@@ -294,7 +294,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_some_empty_geometries
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     geom_1 = read('LINESTRING EMPTY')
     geom_2 = read('POINT (2 7)')
@@ -312,8 +312,8 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_only_empty_geometries
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
-    skip if Geos::GEOS_VERSION > '3.9.0'
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
+    skip if Geos::GEOS_NICE_VERSION > '030900'
 
     geom_1 = read('LINESTRING EMPTY')
     geom_2 = read('POINT (2 7)')
@@ -327,7 +327,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_disallowed_inserts_on_nearest
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     setup_tree
 
@@ -339,7 +339,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_item
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest_item)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest_item))
 
     geom_1 = read('POINT (3 3)')
     geom_2 = read('POINT (2 7)')

data/test/test_helper.rb

@@ -9,6 +9,12 @@ SimpleCov.start do
   add_filter '/.bundle/'
 end
 
+if ENV['CI']
+  require 'simplecov_json_formatter'
+
+  SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
+end
+
 require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/reporters'
@@ -23,25 +29,26 @@ puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUB
 puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
 
 if Geos.respond_to?(:version)
-  puts "GEOS version #{Geos.version}"
+  puts "GEOS version #{Geos.version} (#{Geos::GEOS_NICE_VERSION})"
 else
-  puts "GEOS version #{Geos::GEOS_VERSION}"
+  puts "GEOS version #{Geos::GEOS_VERSION} (#{Geos::GEOS_NICE_VERSION})"
 end
 
 puts "ffi-geos version #{Geos::VERSION}" if defined?(Geos::VERSION)
 puts "Using #{Geos::FFIGeos.geos_library_path}" if defined?(Geos::FFIGeos)
+puts "Process #{$PID}"
 
 module TestHelper
   TOLERANCE = 0.0000000000001
 
-  EMPTY_GEOMETRY = if Geos::GEOS_VERSION > '3.8'
+  EMPTY_GEOMETRY = if Geos::GEOS_NICE_VERSION >= '030800'
     'POINT EMPTY'
   else
     'GEOMETRYCOLLECTION EMPTY'
   end
 
   EMPTY_BLOCK = proc do
-    nil
+    # no-op
   end
 
   def self.included(base)
@@ -81,7 +88,8 @@ module TestHelper
     geom = read(wkt)
     geom.srid = 4326
     Geos.srid_copy_policy = srid_policy
-    geom_b = geom.send(method, *args, **options)
+
+    geom_b = geom.__safe_send__(method, *args, **options)
     assert_equal(4326, geom.srid)
     assert_equal(expected_srid, geom_b.srid)
     assert_equal(expected, write(geom_b))
@@ -115,13 +123,14 @@ module TestHelper
   def snapped_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
 
-    result = geom.send(method, *args, **options)
+    result = geom.__safe_send__(method, *args, **options)
     assert_equal(expected, write(result.snap_to_grid(1)))
   end
 
   def simple_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args, **options)
+
+    result = geom.__safe_send__(method, *args, **options)
     result = write(result) if result.is_a?(Geos::Geometry)
 
     if expected.nil?
@@ -133,13 +142,13 @@ module TestHelper
 
   def simple_bang_tester(method, expected, wkt, *args, **options)
     geom = read(wkt)
-    result = geom.send(method, *args, **options)
+    result = geom.__safe_send__(method, *args, **options)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(result))
 
     geom = read(wkt)
-    geom.send("#{method}!", *args, **options)
+    geom.__safe_send__("#{method}!", *args, **options)
 
     assert_equal(expected, write(geom))
   end
@@ -153,7 +162,7 @@ module TestHelper
 
   def array_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args, **options)
+    result = geom.__safe_send__(method, *args, **options)
 
     case result
       when Geos::Geometry
@@ -171,16 +180,38 @@ module TestHelper
     writer.trim = true
 
     geom = read(wkt)
-    geom.send("#{method}!", *args, **options).snap_to_grid!(0.1)
+    geom.__safe_send__("#{method}!", *args, **options).snap_to_grid!(0.1)
 
     assert_equal(expected, write(geom))
 
     geom = read(wkt)
-    geom_2 = geom.send(method, *args, **options).snap_to_grid(0.1)
+    geom_2 = geom.__safe_send__(method, *args, **options).snap_to_grid(0.1)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(geom_2, trim: true))
   end
 end
 
+class Object
+  if RUBY_VERSION >= '2.7'
+    def __safe_send__(method_name, *args, **kwargs)
+      send(method_name, *args, **kwargs)
+    end
+  else
+    def __safe_send__(method_name, *args, **kwargs)
+      raise NoMethodError unless respond_to?(method_name)
+
+      arity = method(method_name).arity
+
+      if arity.zero?
+        send(method_name)
+      elsif arity.negative? && !kwargs.empty?
+        send(method_name, *args, **kwargs)
+      else
+        send(method_name, *args)
+      end
+    end
+  end
+end
+
 Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)

data/test/wkb_writer_tests.rb

@@ -466,4 +466,24 @@ class WkbWriterTests < Minitest::Test
       @wkb_writer.output_dimensions = 0
     end
   end
+
+  def test_wkb_flavor_extended
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSWKBWriter_setFlavor_r)
+
+    @wkb_writer.output_dimensions = 3
+    @wkb_writer.flavor = :extended
+
+    assert_equal('010200008003000000000000000000F03F000000000000004000000000000008400000000000001040000000000000144000000000000018400000000000001C4000000000000020400000000000002240',
+      @wkb_writer.write_hex(read('LINESTRING Z (1 2 3, 4 5 6, 7 8 9)')))
+  end
+
+  def test_wkb_flavor_iso
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSWKBWriter_setFlavor_r)
+
+    @wkb_writer.output_dimensions = 3
+    @wkb_writer.flavor = :iso
+
+    assert_equal('01EA03000003000000000000000000F03F000000000000004000000000000008400000000000001040000000000000144000000000000018400000000000001C4000000000000020400000000000002240',
+      @wkb_writer.write_hex(read('LINESTRING Z (1 2 3, 4 5 6, 7 8 9)')))
+  end
 end