ffi-geos 2.0.0 → 2.1.0

data/test/geometry_collection_tests.rb

@@ -200,8 +200,8 @@ class GeometryCollectionTests < Minitest::Test
 
   def test_snap_to_grid_with_illegal_result
     assert_raises(Geos::InvalidGeometryError) do
-      read('GEOMETRYCOLLECTION (POINT (0 2), LINESTRING (0 1, 0 11), POLYGON ((0 1, 0 1, 0 6, 0 6, 0 1)))').
-        snap_to_grid(1)
+      read('GEOMETRYCOLLECTION (POINT (0 2), LINESTRING (0 1, 0 11), POLYGON ((0 1, 0 1, 0 6, 0 6, 0 1)))')
+        .snap_to_grid(1)
     end
   end
 
@@ -214,29 +214,25 @@ class GeometryCollectionTests < Minitest::Test
       'GEOMETRYCOLLECTION (POINT (29 11), LINESTRING (30 10, 20 20), POLYGON ((30 10, 30 15, 25 15, 25 10, 30 10)))',
       wkt,
       Math::PI / 2,
-      [ 10.0, 20.0 ]
-     )
+      [10.0, 20.0])
 
     affine_tester(:rotate,
       'GEOMETRYCOLLECTION (POINT (-2 0), LINESTRING (-3 1, 7 -9), POLYGON ((-3 1, -3 -4, 2 -4, 2 1, -3 1)))',
       wkt,
       -Math::PI / 2,
-      [ -1.0, 2.0 ]
-    )
+      [-1.0, 2.0])
 
     affine_tester(:rotate,
       'GEOMETRYCOLLECTION (POINT (19 1), LINESTRING (20 0, 10 10), POLYGON ((20 0, 20 5, 15 5, 15 0, 20 0)))',
       wkt,
       Math::PI / 2,
-      read('POINT(10 10)')
-    )
+      read('POINT(10 10)'))
 
     affine_tester(:rotate,
       'GEOMETRYCOLLECTION (POINT (-0.5 0.5), LINESTRING (0.5 -0.5, -9.5 9.5), POLYGON ((0.5 -0.5, 0.5 4.5, -4.5 4.5, -4.5 -0.5, 0.5 -0.5)))',
       wkt,
       Math::PI / 2,
-      read('LINESTRING(0 0, 1 0)')
-    )
+      read('LINESTRING(0 0, 1 0)'))
   end
 
   def test_rotate_x
@@ -248,26 +244,22 @@ class GeometryCollectionTests < Minitest::Test
     affine_tester(:rotate_x,
       'GEOMETRYCOLLECTION Z (POINT Z (1 -1 -1), LINESTRING Z (1 -1 -1, 10 -10 -10), POLYGON Z ((0 0 0, 5 0 0, 5 -5 0, 0 -5 0, 0 0 0)))',
       wkt,
-      Math::PI
-    )
+      Math::PI)
 
     affine_tester(:rotate_x,
       'GEOMETRYCOLLECTION Z (POINT Z (1 -1 1), LINESTRING Z (1 -1 1, 10 -10 10), POLYGON Z ((0 0 0, 5 0 0, 5 0 5, 0 0 5, 0 0 0)))',
       wkt,
-      Math::PI / 2
-    )
+      Math::PI / 2)
 
     affine_tester(:rotate_x,
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 -1), LINESTRING Z (1 1 -1, 10 10 -10), 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,
       wkt,
-      Math::PI * 2
-    )
+      Math::PI * 2)
   end
 
   def test_rotate_y
@@ -279,26 +271,22 @@ class GeometryCollectionTests < Minitest::Test
     affine_tester(:rotate_y,
       'GEOMETRYCOLLECTION Z (POINT Z (-1 1 -1), LINESTRING Z (-1 1 -1, -10 10 -10), POLYGON Z ((0 0 0, -5 0 0, -5 5 0, 0 5 0, 0 0 0)))',
       wkt,
-      Math::PI
-    )
+      Math::PI)
 
     affine_tester(:rotate_y,
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 -1), LINESTRING Z (1 1 -1, 10 10 -10), POLYGON Z ((0 0 0, 0 0 -5, 0 5 -5, 0 5 0, 0 0 0)))',
       wkt,
-      Math::PI / 2
-    )
+      Math::PI / 2)
 
     affine_tester(:rotate_y,
       'GEOMETRYCOLLECTION Z (POINT Z (-1 1 1), LINESTRING Z (-1 1 1, -10 10 10), 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,
       wkt,
-      Math::PI * 2
-    )
+      Math::PI * 2)
   end
 
   def test_rotate_z
@@ -309,26 +297,22 @@ class GeometryCollectionTests < Minitest::Test
     affine_tester(:rotate_z,
       'GEOMETRYCOLLECTION (POINT (-1 -1), LINESTRING (0 0, -10 -10), POLYGON ((0 0, -5 0, -5 -5, 0 -5, 0 0)))',
       wkt,
-      Math::PI
-    )
+      Math::PI)
 
     affine_tester(:rotate_z,
       'GEOMETRYCOLLECTION (POINT (-1 1), LINESTRING (0 0, -10 10), POLYGON ((0 0, 0 5, -5 5, -5 0, 0 0)))',
       wkt,
-      Math::PI / 2
-    )
+      Math::PI / 2)
 
     affine_tester(:rotate_z,
       'GEOMETRYCOLLECTION (POINT (1 -1), LINESTRING (0 0, 10 -10), POLYGON ((0 0, 0 -5, 5 -5, 5 0, 0 0)))',
       wkt,
-      Math::PI + Math::PI / 2
-    )
+      Math::PI + Math::PI / 2)
 
     affine_tester(:rotate_z,
       wkt,
       wkt,
-      Math::PI * 2
-    )
+      Math::PI * 2)
   end
 
   def test_scale
@@ -336,15 +320,13 @@ class GeometryCollectionTests < Minitest::Test
       'GEOMETRYCOLLECTION (POINT (5 5), LINESTRING (0 0, 50 50), POLYGON ((0 0, 25 0, 25 25, 0 25, 0 0)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
       5,
-      5
-    )
+      5)
 
     affine_tester(:scale,
       'GEOMETRYCOLLECTION (POINT (3 2), LINESTRING (0 0, 30 20), POLYGON ((0 0, 15 0, 15 10, 0 10, 0 0)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
       3,
-      2
-    )
+      2)
 
     writer.output_dimensions = 3
     affine_tester(:scale,
@@ -352,33 +334,29 @@ class GeometryCollectionTests < Minitest::Test
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
       4,
       2,
-      -8
-    )
+      -8)
   end
 
   def test_scale_hash
     affine_tester(:scale,
       'GEOMETRYCOLLECTION (POINT (5 5), LINESTRING (0 0, 50 50), POLYGON ((0 0, 25 0, 25 25, 0 25, 0 0)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
-      :x => 5,
-      :y => 5
-    )
+      x: 5,
+      y: 5)
 
     affine_tester(:scale,
       'GEOMETRYCOLLECTION (POINT (3 2), LINESTRING (0 0, 30 20), POLYGON ((0 0, 15 0, 15 10, 0 10, 0 0)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
-      :x => 3,
-      :y => 2
-    )
+      x: 3,
+      y: 2)
 
     writer.output_dimensions = 3
     affine_tester(:scale,
       'GEOMETRYCOLLECTION Z (POINT Z (4 2 -8), LINESTRING Z (4 2 -8, 40 20 -80), POLYGON Z ((0 0 0, 20 0 0, 20 10 0, 0 10 0, 0 0 0)))',
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
-      :x => 4,
-      :y => 2,
-      :z => -8
-    )
+      x: 4,
+      y: 2,
+      z: -8)
   end
 
   def test_trans_scale
@@ -445,28 +423,26 @@ class GeometryCollectionTests < Minitest::Test
     affine_tester(:trans_scale,
       'GEOMETRYCOLLECTION (POINT (2 2), LINESTRING (1 1, 11 11), POLYGON ((1 1, 6 1, 6 6, 1 6, 1 1)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
-      :delta_x => 1, :delta_y => 1, :x_factor => 1, :y_factor => 1)
+      delta_x: 1, delta_y: 1, x_factor: 1, y_factor: 1)
 
     writer.output_dimensions = 3
     affine_tester(:trans_scale,
       'GEOMETRYCOLLECTION Z (POINT Z (15 28 1), LINESTRING Z (15 28 1, 60 91 10), POLYGON Z ((10 21 0, 35 21 0, 35 56 0, 10 56 0, 10 21 0)))',
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
-      :delta_x => 2, :delta_y => 3, :x_factor => 5, :y_factor => 7)
+      delta_x: 2, delta_y: 3, x_factor: 5, y_factor: 7)
 
     affine_tester(:trans_scale,
       'GEOMETRYCOLLECTION Z (POINT Z (3 1 1), LINESTRING Z (3 1 1, 12 10 10), POLYGON Z ((2 0 0, 7 0 0, 7 5 0, 2 5 0, 2 0 0)))',
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
-      :delta_x => 2, :z_factor => 2)
+      delta_x: 2, z_factor: 2)
   end
 
-
   def test_translate
     affine_tester(:translate,
       'GEOMETRYCOLLECTION (POINT (6 13), LINESTRING (5 12, 15 22), POLYGON ((5 12, 10 12, 10 17, 5 17, 5 12)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
       5,
-      12
-    )
+      12)
 
     writer.output_dimensions = 3
     affine_tester(:translate,
@@ -474,25 +450,22 @@ class GeometryCollectionTests < Minitest::Test
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
       -3,
       -7,
-      3
-    )
+      3)
   end
 
   def test_translate_hash
     affine_tester(:translate,
       'GEOMETRYCOLLECTION (POINT (6 13), LINESTRING (5 12, 15 22), POLYGON ((5 12, 10 12, 10 17, 5 17, 5 12)))',
       'GEOMETRYCOLLECTION (POINT (1 1), LINESTRING (0 0, 10 10), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))',
-      :x => 5,
-      :y => 12
-    )
+      x: 5,
+      y: 12)
 
     writer.output_dimensions = 3
     affine_tester(:translate,
       'GEOMETRYCOLLECTION Z (POINT Z (-2 -6 4), LINESTRING Z (-2 -6 4, 7 3 13), POLYGON Z ((-3 -7 3, 2 -7 3, 2 -2 3, -3 -2 3, -3 -7 3)))',
       'GEOMETRYCOLLECTION Z (POINT Z (1 1 1), LINESTRING Z (1 1 1, 10 10 10), POLYGON Z ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0)))',
-      :x => -3,
-      :y => -7,
-      :z => 3
-    )
+      x: -3,
+      y: -7,
+      z: 3)
   end
 end

data/test/geometry_tests.rb

@@ -133,7 +133,7 @@ class GeometryTests < Minitest::Test
   def test_difference
     comparison_tester(
       :difference,
-      'GEOMETRYCOLLECTION EMPTY',
+      EMPTY_GEOMETRY,
       'POINT(0 0)',
       'POINT(0 0)'
     )
@@ -154,7 +154,7 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      'GEOMETRYCOLLECTION EMPTY',
+      EMPTY_GEOMETRY,
       'POINT(5 0)',
       'LINESTRING(0 0, 10 0)'
     )
@@ -206,7 +206,7 @@ class GeometryTests < Minitest::Test
     %w{ sym_difference symmetric_difference }.each do |method|
       comparison_tester(
         method,
-        'GEOMETRYCOLLECTION EMPTY',
+        EMPTY_GEOMETRY,
         'POINT(0 0)',
         'POINT(0 0)'
       )
@@ -383,6 +383,19 @@ class GeometryTests < Minitest::Test
     )
   end
 
+  def test_coverage_union
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:coverage_union)
+
+    simple_tester(
+      :union_cascaded,
+      'POLYGON ((0 0, 0 1, 1 1, 2 1, 2 0, 1 0, 0 0))',
+      'MULTIPOLYGON(
+        ((0 0, 0 1, 1 1, 1 0, 0 0)),
+        ((1 0, 1 1, 2 1, 2 0, 1 0))
+      ))'
+    )
+  end
+
   def test_unary_union
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:unary_union)
 
@@ -515,6 +528,17 @@ class GeometryTests < Minitest::Test
     end
   end
 
+  def test_minimum_bounding_circle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_bounding_circle)
+
+    geom = read('LINESTRING(0 10, 0 20)')
+
+    assert_equal(
+      'POLYGON ((5 15, 5 14, 5 13, 4 12, 4 11, 3 11, 2 10, 1 10, 0 10, -1 10, -2 10, -3 11, -4 11, -4 12, -5 13, -5 14, -5 15, -5 16, -5 17, -4 18, -4 19, -3 19, -2 20, -1 20, 0 20, 1 20, 2 20, 3 19, 4 19, 4 18, 5 17, 5 16, 5 15))',
+      write(geom.minimum_bounding_circle.snap_to_grid(1))
+    )
+  end
+
   def test_envelope
     simple_tester(
       :envelope,
@@ -649,7 +673,7 @@ class GeometryTests < Minitest::Test
       tests.each do |test|
         expected, method, args = test
         if ENV['FORCE_TESTS'] || geom_a.respond_to?(method)
-          value = geom_a.send(method, *([ geom_b ] + Array(args)))
+          value = geom_a.send(method, *([geom_b] + Array(args)))
           assert_equal(expected, value)
         end
       end
@@ -951,7 +975,7 @@ class GeometryTests < Minitest::Test
   def test_interior_rings
     array_tester(
       :interior_rings,
-      [ 'LINEARRING (11 11, 11 12, 12 12, 12 11, 11 11)' ],
+      ['LINEARRING (11 11, 11 12, 12 12, 12 11, 11 11)'],
       'POLYGON(
         (10 10, 10 14, 14 14, 14 10, 10 10),
         (11 11, 11 12, 12 12, 12 11, 11 11)
@@ -1154,12 +1178,22 @@ class GeometryTests < Minitest::Test
     simple_tester(:distance, 2.0, geom, read('LINESTRING (3 0 , 10 0)'))
   end
 
+  def test_distance_indexed
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:distance_indexed)
+
+    geom_a = read('POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))')
+    geom_b = read('POLYGON ((20 30, 10 10, 13 14, 7 8, 20 30))')
+
+    assert_in_delta(9.219544457292887, geom_a.distance_indexed(geom_b), TOLERANCE)
+    assert_in_delta(9.219544457292887, geom_b.distance_indexed(geom_a), TOLERANCE)
+  end
+
   def test_hausdorff_distance
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:hausdorff_distance)
 
-    tester = lambda { |expected, g1, g2|
-      geom_1 = read(g1)
-      geom_2 = read(g2)
+    tester = lambda { |expected, g_1, g_2|
+      geom_1 = read(g_1)
+      geom_2 = read(g_2)
       assert_in_delta(expected, geom_1.hausdorff_distance(geom_2), TOLERANCE)
     }
 
@@ -1173,9 +1207,9 @@ class GeometryTests < Minitest::Test
   def test_hausdorff_distance_with_densify_fract
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:hausdorff_distance)
 
-    tester = lambda { |expected, g1, g2|
-      geom_1 = read(g1)
-      geom_2 = read(g2)
+    tester = lambda { |expected, g_1, g_2|
+      geom_1 = read(g_1)
+      geom_2 = read(g_2)
       assert_in_delta(expected, geom_1.hausdorff_distance(geom_2, 0.001), TOLERANCE)
     }
 
@@ -1189,9 +1223,9 @@ class GeometryTests < Minitest::Test
   def test_nearest_points
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:nearest_points)
 
-    tester = lambda { |expected, g1, g2|
-      geom_1 = read(g1)
-      geom_2 = read(g2)
+    tester = lambda { |expected, g_1, g_2|
+      geom_1 = read(g_1)
+      geom_2 = read(g_2)
 
       cs = geom_1.nearest_points(geom_2)
       result = cs.to_s if cs
@@ -1206,7 +1240,11 @@ class GeometryTests < Minitest::Test
     ]
 
     tester[
-      '5.0 5.0 NaN, 8.0 8.0 NaN',
+      if Geos::GEOS_VERSION > '3.8'
+        '5.0 5.0, 8.0 8.0'
+      else
+        '5.0 5.0 NaN, 8.0 8.0 NaN'
+      end,
       'POLYGON((1 1, 1 5, 5 5, 5 1, 1 1))',
       'POLYGON((8 8, 9 9, 9 10, 8 8))'
     ]
@@ -1246,6 +1284,41 @@ class GeometryTests < Minitest::Test
     )
   end
 
+  def test_polygonize_with_geometry_arguments
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:polygonize)
+
+    geom_a = read('LINESTRING (100 100, 100 300, 300 300, 300 100, 100 100)')
+    geom_b = read('LINESTRING (150 150, 150 250, 250 250, 250 150, 150 150)')
+
+    polygonized = geom_a.polygonize(geom_b)
+    assert_equal(2, polygonized.length)
+    assert_equal(
+      'POLYGON ((100 100, 100 300, 300 300, 300 100, 100 100), (150 150, 250 150, 250 250, 150 250, 150 150))',
+      write(polygonized[0].snap_to_grid(0.1))
+    )
+    assert_equal(
+      'POLYGON ((150 150, 150 250, 250 250, 250 150, 150 150))',
+      write(polygonized[1].snap_to_grid(0.1))
+    )
+  end
+
+  def test_polygonize_valid
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:polygonize_valid)
+
+    geom_a = read(
+      'GEOMETRYCOLLECTION(
+        LINESTRING (100 100, 100 300, 300 300, 300 100, 100 100),
+        LINESTRING (150 150, 150 250, 250 250, 250 150, 150 150)
+      )'
+    )
+
+    polygonized = geom_a.polygonize_valid
+    assert_equal(
+      'POLYGON ((100 100, 100 300, 300 300, 300 100, 100 100), (150 150, 250 150, 250 250, 150 250, 150 150))',
+      write(polygonized.snap_to_grid(0.1))
+    )
+  end
+
   def test_polygonize_cut_edges
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:polygonize_cut_edges)
 
@@ -1338,6 +1411,22 @@ class GeometryTests < Minitest::Test
     end
   end
 
+  def test_build_area
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:build_area)
+
+    geom = read('GEOMETRYCOLLECTION (LINESTRING(0 0, 0 1, 1 1), LINESTRING (1 1, 1 0, 0 0))')
+
+    assert_equal('POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))', write(geom.build_area))
+  end
+
+  def test_make_valid
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:make_valid)
+
+    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))
+  end
+
   def test_shared_paths
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:shared_paths)
 
@@ -1507,7 +1596,7 @@ class GeometryTests < Minitest::Test
     assert_raises(Geos::MixedSRIDsError) do
       Geos.srid_copy_policy = :strict
       geom_c = geom.intersection(geom_b)
-      assert_equal(231231, geom_c.srid)
+      assert_equal(231_231, geom_c.srid)
     end
   ensure
     Geos.srid_copy_policy = :default
@@ -1623,7 +1712,7 @@ 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]
+    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]
   end
 
   def test_precision