ffi-geos 2.1.0 → 2.3.1

data/test/geometry_tests.rb

@@ -13,12 +13,40 @@ class GeometryTests < Minitest::Test
   def test_intersection
     comparison_tester(
       :intersection,
-      'POLYGON ((5 10, 10 10, 10 5, 5 5, 5 10))',
+      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))'
+      end,
       'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON ((5 5, 15 5, 15 15, 5 15, 5 5))'
     )
   end
 
+  def test_intersection_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSIntersectionPrec_r)
+
+    comparison_tester(
+      :intersection,
+      'GEOMETRYCOLLECTION (POLYGON ((1 2, 1 1, 0.5 1, 1 2)), POLYGON ((9.5 1, 2 1, 2 2, 9 2, 9.5 1)), LINESTRING (1 1, 2 1), LINESTRING (2 2, 1 2))',
+      'MULTIPOLYGON(((0 0,5 10,10 0,0 0),(1 1,1 2,2 2,2 1,1 1),(100 100,100 102,102 102,102 100,100 100)))',
+      'POLYGON((0 1,0 2,10 2,10 1,0 1))',
+      precision: 0
+    )
+
+    comparison_tester(
+      :intersection,
+      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
+    )
+  end
+
   def test_buffer
     simple_tester(
       :buffer,
@@ -95,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
@@ -182,26 +214,50 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      'POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 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))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(5 -10, 5 10)'
     )
 
     comparison_tester(
       :difference,
-      'POLYGON ((10 0, 0 0, 0 10, 10 10, 10 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))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(10 0, 20 0)'
     )
 
     comparison_tester(
       :difference,
-      'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 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))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
     )
   end
 
+  def test_difference_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSDifferencePrec_r)
+
+    comparison_tester(
+      :difference,
+      'MULTILINESTRING ((2 8, 4 8), (6 8, 10 8))',
+      'LINESTRING (2 8, 10 8)',
+      'LINESTRING (3.9 8.1, 6.1 7.9)',
+      precision: 2
+    )
+  end
+
   def test_sym_difference
     %w{ sym_difference symmetric_difference }.each do |method|
       comparison_tester(
@@ -255,27 +311,51 @@ class GeometryTests < Minitest::Test
 
       comparison_tester(
         method,
-        'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 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)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'LINESTRING(5 -10, 5 10)'
       )
 
       comparison_tester(
         method,
-        'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 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)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'LINESTRING(10 0, 20 0)'
       )
 
       comparison_tester(
         method,
-        'MULTIPOLYGON (((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 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)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
       )
     end
   end
 
+  def test_sym_difference_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSSymDifferencePrec_r)
+
+    comparison_tester(
+      :sym_difference,
+      'GEOMETRYCOLLECTION (POLYGON ((0 10, 6 10, 10 10, 10 0, 6 0, 0 0, 0 10)), LINESTRING (6 -10, 6 0))',
+      'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
+      'LINESTRING(5 -10, 5 10)',
+      precision: 2
+    )
+  end
+
   def test_boundary
     simple_tester(
       :boundary,
@@ -348,32 +428,59 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :union,
-      'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 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)))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(5 -10, 5 10)'
     )
 
     comparison_tester(
       :union,
-      'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 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)))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(10 0, 20 0)'
     )
 
     comparison_tester(
       :union,
-      'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 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))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
     )
   end
 
+  def test_union_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSUnionPrec_r)
+
+    geom_a = read('POINT (1.9 8.2)')
+    geom_b = read('POINT (4.1 9.8)')
+
+    result = geom_a.union(geom_b, precision: 2)
+
+    assert_equal('MULTIPOINT (2 8, 4 10)', write(result))
+  end
+
   def test_union_cascaded
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:union_cascaded)
 
     simple_tester(
       :union_cascaded,
-      '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))',
+      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))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -388,7 +495,11 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :union_cascaded,
-      'POLYGON ((0 0, 0 1, 1 1, 2 1, 2 0, 1 0, 0 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))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 0 1, 1 1, 1 0, 0 0)),
         ((1 0, 1 1, 2 1, 2 0, 1 0))
@@ -401,7 +512,11 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :unary_union,
-      '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))',
+      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))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -411,6 +526,22 @@ class GeometryTests < Minitest::Test
     )
   end
 
+  def test_unary_union_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSUnaryUnionPrec_r)
+
+    simple_tester(
+      :unary_union,
+      'POLYGON ((0 0, 0 12, 9 12, 9 15, 15 15, 15 9, 12 9, 12 0, 0 0))',
+      'MULTIPOLYGON(
+        ((0 0, 1 0, 1 1, 0 1, 0 0)),
+        ((10 10, 10 14, 14 14, 14 10, 10 10),
+        (11 11, 11 12, 12 12, 12 11, 11 11)),
+        ((0 0, 11 0, 11 11, 0 11, 0 0))
+      ))',
+      3
+    )
+  end
+
   def test_node
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:node)
 
@@ -424,7 +555,11 @@ class GeometryTests < Minitest::Test
   def test_union_without_arguments
     simple_tester(
       :union,
-      '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))',
+      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))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -828,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]
@@ -1230,7 +1371,11 @@ class GeometryTests < Minitest::Test
       cs = geom_1.nearest_points(geom_2)
       result = cs.to_s if cs
 
-      assert_equal(expected, result)
+      if expected.nil?
+        assert_nil(result)
+      else
+        assert_equal(expected, result)
+      end
     }
 
     tester[
@@ -1240,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'
@@ -1340,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(
@@ -1424,7 +1573,14 @@ class GeometryTests < Minitest::Test
 
     geom = read('POLYGON((0 0, 1 1, 0 1, 1 0, 0 0))')
 
-    assert_equal('MULTIPOLYGON (((0 0, 0.5 0.5, 1 0, 0 0)), ((0.5 0.5, 0 1, 1 1, 0.5 0.5)))', write(geom.make_valid))
+    assert_equal(
+      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)))'
+      end,
+      write(geom.make_valid)
+    )
   end
 
   def test_shared_paths
@@ -1482,7 +1638,7 @@ class GeometryTests < Minitest::Test
     geom = read('LINESTRING(0 0, 10 10))')
     assert_kind_of(Enumerable, geom.each)
     assert_kind_of(Enumerable, geom.to_enum)
-    assert_equal(geom, geom.each {})
+    assert_equal(geom, geom.each(&EMPTY_BLOCK))
   end
 
   def test_normalize
@@ -1668,7 +1824,9 @@ 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)))',
+      '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((0 0, 8.5 1, 10 10, 0.5 9, 0 0),(2 2, 3 8, 7 8, 8 2, 2 2)))',
       0
     ]
@@ -1701,7 +1859,14 @@ class GeometryTests < Minitest::Test
 
     geom = 'MULTIPOINT(0 0, 100 0, 100 100, 0 100)'
 
-    tester['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)))', geom]
+    tester[
+      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)))'
+      end,
+      geom
+    ]
 
     tester['MULTILINESTRING ((50 50, 50 200), (200 50, 50 50), (50 50, -100 50), (50 50, 50 -100))', geom, tolerance: 0, only_edges: true]
 
@@ -1711,8 +1876,23 @@ class GeometryTests < Minitest::Test
     ]
 
     # Allows a tolerance for the first argument
-    @writer.rounding_precision = 3
-    tester['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)))', 'MULTIPOINT ((150 210), (210 270), (150 220), (220 210), (215 269))', 10]
+    writer.rounding_precision = if Geos::GEOS_NICE_VERSION >= '031000'
+      0
+    else
+      3
+    end
+
+    writer.trim = true
+
+    tester[
+      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)))'
+      end,
+      'MULTIPOINT ((150 210), (210 270), (150 220), (220 210), (215 269))',
+      10
+    ]
   end
 
   def test_precision
@@ -1785,11 +1965,37 @@ class GeometryTests < Minitest::Test
     tester['LINESTRING (200 200, 200 100)', 'POLYGON ((100 100, 300 100, 200 200, 100 100))']
     tester[
       'LINESTRING (-112.712119 33.575919, -112.712127 33.575885)',
-      '0106000000010000000103000000010000001a00000035d42824992d5cc01b834e081dca404073b9c150872d5cc03465a71fd4c940400ec00644882d5cc03b8a73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc0698995d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a08499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb87361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
+      '0106000000010000000103000000010000001a00000035d42824992d5cc01b834e081dca404073b9c150872d5cc03465a71fd4c940400ec00644882d5cc03b8a' \
+      '73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc06989' \
+      '95d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d' \
+      '21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a0' \
+      '8499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf' \
+      '9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb8' \
+      '7361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
     ]
     tester['LINESTRING EMPTY', 'POLYGON EMPTY']
   end
 
+  def test_maximum_inscribed_circle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:maximum_inscribed_circle)
+
+    geom = read('POLYGON ((100 200, 200 200, 200 100, 100 100, 100 200))')
+    output = geom.maximum_inscribed_circle(0.001)
+    assert_equal('LINESTRING (150 150, 150 200)', write(output))
+  end
+
+  def test_largest_empty_circle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:largest_empty_circle)
+
+    geom = read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))')
+    output = geom.largest_empty_circle(0.001)
+    assert_equal('LINESTRING (150 150, 100 100)', write(output))
+
+    geom = read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))')
+    output = geom.largest_empty_circle(0.001, boundary: read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))'))
+    assert_equal('LINESTRING (100 100, 100 100)', write(output))
+  end
+
   def test_minimum_width
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_width)
 
@@ -1856,7 +2062,13 @@ class GeometryTests < Minitest::Test
     simple_tester(:reverse, 'POINT (3 5)', 'POINT (3 5)')
     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)')
-    simple_tester(:reverse, 'MULTILINESTRING ((1 1, 2 2), (3 3, 4 4))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 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))')
+    end
+
     simple_tester(:reverse, 'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1))', 'POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 1 2, 2 2, 2 1, 1 1))')
     simple_tester(:reverse, 'MULTIPOLYGON (((0 0, 10 0, 10 10, 0 10, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), ((100 100, 100 200, 200 200, 100 100)))', 'MULTIPOLYGON (((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 1 2, 2 2, 2 1, 1 1)), ((100 100, 200 200, 100 200, 100 100)))')
     simple_tester(:reverse, 'GEOMETRYCOLLECTION (LINESTRING (1 1, 2 2), GEOMETRYCOLLECTION (LINESTRING (3 5, 2 9)))', 'GEOMETRYCOLLECTION (LINESTRING (2 2, 1 1), GEOMETRYCOLLECTION(LINESTRING (2 9, 3 5)))')

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/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,7 +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 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)')
@@ -326,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
 
@@ -338,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)')