ffi-geos 2.3.1 → 2.5.0

data/test/point_tests.rb

@@ -12,30 +12,36 @@ class PointTests < Minitest::Test
 
   def test_default_srid
     geom = read('POINT(0 0)')
+
     assert_equal(0, geom.srid)
   end
 
   def test_setting_srid_manually
     geom = read('POINT(0 0)')
     geom.srid = 4326
+
     assert_equal(4326, geom.srid)
   end
 
   def test_dimensions
     geom = read('POINT(1 2)')
+
     assert_equal(0, geom.dimensions)
 
     geom = read('POINT(1 2 3)')
+
     assert_equal(0, geom.dimensions)
   end
 
   def test_num_geometries
     geom = read('POINT(1 2)')
+
     assert_equal(1, geom.num_geometries)
   end
 
   def test_get_x
     geom = read('POINT (1 2)')
+
     assert_equal(1, geom.get_x)
     assert_equal(1, geom.x)
 
@@ -46,6 +52,7 @@ class PointTests < Minitest::Test
 
   def test_get_y
     geom = read('POINT (1 2)')
+
     assert_equal(2, geom.get_y)
     assert_equal(2, geom.y)
 
@@ -56,6 +63,7 @@ class PointTests < Minitest::Test
 
   def test_get_z
     geom = read('POINT Z (1 2 3)')
+
     assert_equal(3, geom.get_z)
     assert_equal(3, geom.z)
     assert_raises(NoMethodError) do
@@ -68,12 +76,15 @@ class PointTests < Minitest::Test
     geom.srid = 4326
 
     Geos.srid_copy_policy = :zero
+
     assert_equal(0, geom.simplify(0.1).srid)
 
     Geos.srid_copy_policy = :lenient
+
     assert_equal(4326, geom.simplify(0.1).srid)
 
     Geos.srid_copy_policy = :strict
+
     assert_equal(4326, geom.simplify(0.1).srid)
   ensure
     Geos.srid_copy_policy = :default
@@ -84,12 +95,15 @@ class PointTests < Minitest::Test
     geom.srid = 4326
 
     Geos.srid_copy_policy = :zero
+
     assert_equal(0, geom.extract_unique_points.srid)
 
     Geos.srid_copy_policy = :lenient
+
     assert_equal(4326, geom.extract_unique_points.srid)
 
     Geos.srid_copy_policy = :strict
+
     assert_equal(4326, geom.extract_unique_points.srid)
   ensure
     Geos.srid_copy_policy = :default
@@ -98,43 +112,51 @@ class PointTests < Minitest::Test
   def test_normalize
     geom = read('POINT(10 10)')
 
-    assert_equal(geom.object_id, geom.normalize.object_id)
-    assert_equal(geom.object_id, geom.normalize!.object_id)
+    assert_same(geom, geom.normalize)
+    assert_same(geom, geom.normalize!)
   end
 
   def test_x_max
     geom = read('POINT (-10 -15)')
+
     assert_equal(-10, geom.x_max)
   end
 
   def test_x_min
     geom = read('POINT (-10 -15)')
+
     assert_equal(-10, geom.x_min)
   end
 
   def test_y_max
     geom = read('POINT (-10 -15)')
+
     assert_equal(-15, geom.y_max)
   end
 
   def test_y_min
     geom = read('POINT (-10 -15)')
+
     assert_equal(-15, geom.y_min)
   end
 
   def test_z_max
     geom = read('POINT (-10 -15)')
+
     assert_equal(0, geom.z_max)
 
     geom = read('POINT Z (-10 -15 -20)')
+
     assert_equal(-20, geom.z_max)
   end
 
   def test_z_min
     geom = read('POINT (-10 -15)')
+
     assert_equal(0, geom.z_min)
 
     geom = read('POINT Z (-10 -15 -20)')
+
     assert_equal(-20, geom.z_min)
   end
 
@@ -146,7 +168,7 @@ class PointTests < Minitest::Test
   end
 
   def test_snap_to_grid_empty
-    assert(read('POINT EMPTY').snap_to_grid!.empty?, 'Expected an empty Point')
+    assert_empty(read('POINT EMPTY').snap_to_grid!, 'Expected an empty Point')
   end
 
   def test_snap_to_grid_with_srid

data/test/polygon_tests.rb

@@ -12,61 +12,74 @@ class PolygonTests < Minitest::Test
 
   def test_default_srid
     geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
+
     assert_equal(0, geom.srid)
   end
 
   def test_setting_srid_manually
     geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
     geom.srid = 4326
+
     assert_equal(4326, geom.srid)
   end
 
   def test_dimensions
     geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
+
     assert_equal(2, geom.dimensions)
 
     geom = read('POLYGON ((0 0 0, 5 0 0, 5 5 0, 0 5 0, 0 0 0))')
+
     assert_equal(2, geom.dimensions)
   end
 
   def test_num_geometries
     geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
+
     assert_equal(1, geom.num_geometries)
   end
 
   def test_x_max
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(8, geom.x_max)
   end
 
   def test_x_min
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(-10, geom.x_min)
   end
 
   def test_y_max
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(9, geom.y_max)
   end
 
   def test_y_min
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(0, geom.y_min)
   end
 
   def test_z_max
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(0, geom.z_min)
 
     geom = read('POLYGON Z ((0 0 0, 5 0 3, 8 9 4, -10 5 3, 0 0 0))')
+
     assert_equal(4, geom.z_max)
   end
 
   def test_z_min
     geom = read('POLYGON ((0 0, 5 0, 8 9, -10 5, 0 0))')
+
     assert_equal(0, geom.z_min)
 
     geom = read('POLYGON Z ((0 0 0, 5 0 3, 8 9 4, -10 5 3, 0 0 0))')
+
     assert_equal(0, geom.z_min)
   end
 
@@ -84,7 +97,7 @@ class PolygonTests < Minitest::Test
   end
 
   def test_snap_to_grid_empty
-    assert(read('POLYGON EMPTY').snap_to_grid!.empty?, 'Expected an empty Polygon')
+    assert_empty(read('POLYGON EMPTY').snap_to_grid!, 'Expected an empty Polygon')
   end
 
   def test_snap_to_grid_collapse_holes

data/test/prepared_geometry_tests.rb

@@ -30,6 +30,7 @@ class PreparedGeometryTests < Minitest::Test
       geom_b = read(geom_b)
 
       value = geom_a.send(method, geom_b)
+
       assert_equal(expected[i], value)
     end
   end
@@ -70,6 +71,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 +118,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_in_delta(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_in_delta(5.0, coord_seq.x[0])
+    assert_in_delta(5.0, coord_seq.y[0])
+    assert_in_delta(8.0, coord_seq.x[1])
+    assert_in_delta(8.0, coord_seq.y[1])
+  end
 end

data/test/strtree_tests.rb

@@ -40,8 +40,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([@item_1],
       @tree.query(read('LINESTRING(5 5, 6 6)')))
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(20 0, 30 10)')))
+    assert_empty(@tree.query(read('LINESTRING(20 0, 30 10)')))
 
     assert_equal([@item_2, @item_3],
       @tree.query(read('LINESTRING(25 25, 26 26)')))
@@ -58,8 +57,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([@item_1],
       @tree.query(read('LINESTRING(5 5, 6 6)'), :item))
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(20 0, 30 10)'), :item))
+    assert_empty(@tree.query(read('LINESTRING(20 0, 30 10)'), :item))
 
     assert_equal([@item_2, @item_3],
       @tree.query(read('LINESTRING(25 25, 26 26)'), :item))
@@ -70,8 +68,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([@geom_1],
       @tree.query(read('LINESTRING(5 5, 6 6)'), :geometry))
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(20 0, 30 10)'), :geometry))
+    assert_empty(@tree.query(read('LINESTRING(20 0, 30 10)'), :geometry))
 
     assert_equal([@geom_2, @geom_3],
       @tree.query(read('LINESTRING(25 25, 26 26)'), :geometry))
@@ -86,8 +83,7 @@ class STRtreeTests < Minitest::Test
       @tree.query(read('LINESTRING(5 5, 6 6)'), :all)
     )
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(20 0, 30 10)'), :all))
+    assert_empty(@tree.query(read('LINESTRING(20 0, 30 10)'), :all))
 
     assert_equal(
       [
@@ -115,8 +111,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([@item_1],
       @tree.query_all(read('LINESTRING(5 5, 6 6)')).collect { |v| v[:item] })
 
-    assert_equal([],
-      @tree.query_all(read('LINESTRING(20 0, 30 10)')))
+    assert_empty(@tree.query_all(read('LINESTRING(20 0, 30 10)')))
 
     assert_equal([@item_2, @item_3],
       @tree.query_all(read('LINESTRING(25 25, 26 26)')).collect { |v| v[:item] })
@@ -133,8 +128,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([@geom_1],
       @tree.query_geometries(read('LINESTRING(5 5, 6 6)')))
 
-    assert_equal([],
-      @tree.query_geometries(read('LINESTRING(20 0, 30 10)')))
+    assert_empty(@tree.query_geometries(read('LINESTRING(20 0, 30 10)')))
 
     assert_equal([@geom_2, @geom_3],
       @tree.query_geometries(read('LINESTRING(25 25, 26 26)')))
@@ -150,11 +144,9 @@ class STRtreeTests < Minitest::Test
 
     @tree.remove(read('POINT(5 5)'), @item_1)
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(5 5, 6 6)')))
+    assert_empty(@tree.query(read('LINESTRING(5 5, 6 6)')))
 
-    assert_equal([],
-      @tree.query(read('LINESTRING(20 0, 30 10)')))
+    assert_empty(@tree.query(read('LINESTRING(20 0, 30 10)')))
 
     assert_equal([@item_2, @item_3],
       @tree.query(read('LINESTRING(25 25, 26 26)')))
@@ -191,8 +183,7 @@ class STRtreeTests < Minitest::Test
     assert_equal([item_1],
       tree.query(read('LINESTRING(5 5, 6 6)')))
 
-    assert_equal([],
-      tree.query(read('LINESTRING(20 0, 30 10)')))
+    assert_empty(tree.query(read('LINESTRING(20 0, 30 10)')))
 
     assert_equal([item_2, item_3],
       tree.query(read('LINESTRING(25 25, 26 26)')))
@@ -246,6 +237,7 @@ class STRtreeTests < Minitest::Test
     tree.insert(geom_3)
 
     nearest_geom = tree.nearest(geom_4)
+
     assert_equal(write(geom_2), write(nearest_geom))
   end
 
@@ -356,6 +348,7 @@ class STRtreeTests < Minitest::Test
     tree.insert(geom_3, item_3)
 
     nearest_item = tree.nearest_item(geom_4)
+
     assert_equal(item_2, nearest_item)
   end
 end

data/test/test_helper.rb

@@ -90,6 +90,7 @@ module TestHelper
     Geos.srid_copy_policy = srid_policy
 
     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))
@@ -124,6 +125,7 @@ module TestHelper
     geom = geom_from_geom_or_wkt(geom)
 
     result = geom.__safe_send__(method, *args, **options)
+
     assert_equal(expected, write(result.snap_to_grid(1)))
   end
 

data/test/tools_tests.rb

@@ -31,12 +31,15 @@ class ToolsTests < Minitest::Test
 
   def test_pick_srid_from_geoms
     Geos.srid_copy_policy = :default
+
     assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269))
 
     Geos.srid_copy_policy = :zero
+
     assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269))
 
     Geos.srid_copy_policy = :lenient
+
     assert_equal(4326, Geos::Tools.pick_srid_from_geoms(4326, 4269))
 
     Geos.srid_copy_policy = :strict
@@ -63,15 +66,19 @@ class ToolsTests < Minitest::Test
 
   def test_pick_srid_according_to_policy
     Geos.srid_copy_policy = :default
+
     assert_equal(0, Geos::Tools.pick_srid_according_to_policy(4326))
 
     Geos.srid_copy_policy = :zero
+
     assert_equal(0, Geos::Tools.pick_srid_according_to_policy(4326))
 
     Geos.srid_copy_policy = :lenient
+
     assert_equal(4326, Geos::Tools.pick_srid_according_to_policy(4326))
 
     Geos.srid_copy_policy = :strict
+
     assert_equal(4326, Geos::Tools.pick_srid_according_to_policy(4326))
   ensure
     Geos.srid_copy_policy = :default

data/test/utils_tests.rb

@@ -32,7 +32,7 @@ class UtilsTests < Minitest::Test
     assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF2'), "'0FFFFFFF2' and '0FFFFFFF2' patterns match")
     assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF*'), "'0FFFFFFF2' and '0FFFFFFF*' patterns match")
     assert(Geos::Utils.relate_match('0FFFFFFF2', 'TFFFFFFF2'), "'0FFFFFFF2' and 'TFFFFFFF2' patterns match")
-    assert(!Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFFF'), "'0FFFFFFF2' and '0FFFFFFFF' patterns match")
+    refute(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFFF'), "'0FFFFFFF2' and '0FFFFFFFF' patterns match")
   end
 
   def create_method_tester(expected, method, cs, type_id, klass)
@@ -188,6 +188,7 @@ class UtilsTests < Minitest::Test
     exterior_ring = Geos.create_linear_ring(cs)
 
     geom = Geos.create_polygon(exterior_ring)
+
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -212,6 +213,7 @@ class UtilsTests < Minitest::Test
     )
 
     geom = Geos.create_polygon(outer, inner)
+
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -244,6 +246,7 @@ class UtilsTests < Minitest::Test
     )
 
     geom = Geos.create_polygon(exterior_ring, [hole_1, hole_2])
+
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -261,13 +264,20 @@ class UtilsTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_point)
 
     assert_equal('MULTIPOINT EMPTY', write(Geos.create_multi_point))
-    assert_equal('MULTIPOINT (0 0, 10 10)',
+
+    assert_equal(
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        'MULTIPOINT ((0 0), (10 10))'
+      else
+        'MULTIPOINT (0 0, 10 10)'
+      end,
       write(
         Geos.create_multi_point(
           read('POINT(0 0)'),
           read('POINT(10 10)')
         )
-      ))
+      )
+    )
   end
 
   def test_create_bad_multi_point
@@ -451,6 +461,7 @@ class UtilsTests < Minitest::Test
       ])
 
       Geos.create_linear_ring(cs)
+
       GC.start
     end
   end

data/test/wkb_reader_tests.rb

@@ -17,6 +17,7 @@ class WkbReaderTests < Minitest::Test
     else
       @wkb_reader.read(g)
     end
+
     refute_nil(geom)
     assert_equal(type_id, geom.type_id)
     assert_equal(geom_type, geom.geom_type)

data/test/wkb_writer_tests.rb

@@ -433,12 +433,20 @@ class WkbWriterTests < Minitest::Test
     }
 
     tester[
-      [1, 1, 0, 0, 32, 230, 16, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*'),
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        [1, 1, 0, 0, 160, 230, 16, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 8, 64].pack('C*')
+      else
+        [1, 1, 0, 0, 32, 230, 16, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*')
+      end,
       include_srid: true
     ]
 
     tester[
-      [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*')
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        [1, 1, 0, 0, 128, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 8, 64].pack('C*')
+      else
+        [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*')
+      end
     ]
   end
 
@@ -448,13 +456,26 @@ class WkbWriterTests < Minitest::Test
     geom = read('POINT(1 2 3)')
     geom.srid = 4326
 
-    assert_equal('0101000020E6100000000000000000F03F0000000000000040',
+    assert_equal(
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        '01010000A0E6100000000000000000F03F00000000000000400000000000000840'
+      else
+        '0101000020E6100000000000000000F03F0000000000000040'
+      end,
       @wkb_writer.write_hex(
         geom,
         include_srid: true
-      ))
+      )
+    )
 
-    assert_equal('0101000000000000000000F03F0000000000000040', @wkb_writer.write_hex(geom))
+    assert_equal(
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        '0101000080000000000000F03F00000000000000400000000000000840'
+      else
+        '0101000000000000000000F03F0000000000000040'
+      end,
+      @wkb_writer.write_hex(geom)
+    )
   end
 
   def test_illegal_output_dimensions
@@ -466,4 +487,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

data/test/wkt_reader_tests.rb

@@ -8,6 +8,7 @@ class WktReaderTests < Minitest::Test
   def wkt_tester(type_id, geom_type, klass, *geoms)
     geoms.each do |g|
       geom = read(g)
+
       refute_nil(geom)
       assert_equal(type_id, geom.type_id)
       assert_equal(geom_type, geom.geom_type)
@@ -106,6 +107,7 @@ class WktReaderTests < Minitest::Test
 
   def test_read_linearring
     geom = read('LINEARRING(0 0, 1 1, 2 2, 3 3, 0 0)')
+
     assert_equal(Geos::GEOS_LINEARRING, geom.type_id)
     assert_equal('LinearRing', geom.geom_type)
     assert_kind_of(Geos::LinearRing, geom)

data/test/wkt_writer_tests.rb

@@ -21,9 +21,11 @@ class WktWriterTests < Minitest::Test
     geom = read('POINT(6 7)')
 
     writer.trim = true
+
     assert_equal('POINT (6 7)', write(geom))
 
     writer.trim = false
+
     assert_equal('POINT (6.0000000000000000 7.0000000000000000)', write(geom))
   end
 
@@ -35,7 +37,11 @@ class WktWriterTests < Minitest::Test
     [
       'POINT (0 0)',
       'POINT EMPTY',
-      'MULTIPOINT (0 1, 2 3)',
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        'MULTIPOINT ((0 1), (2 3))'
+      else
+        'MULTIPOINT (0 1, 2 3)'
+      end,
       'MULTIPOINT EMPTY',
       'LINESTRING (0 0, 2 3)',
       'LINESTRING EMPTY',
@@ -45,7 +51,11 @@ class WktWriterTests < Minitest::Test
       'POLYGON EMPTY',
       '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)))',
       'MULTIPOLYGON EMPTY',
-      'GEOMETRYCOLLECTION (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))), POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)), MULTILINESTRING ((0 0, 2 3), (10 10, 3 4)), LINESTRING (0 0, 2 3), MULTIPOINT (0 0, 2 3), POINT (9 0))',
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        'GEOMETRYCOLLECTION (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))), POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)), MULTILINESTRING ((0 0, 2 3), (10 10, 3 4)), LINESTRING (0 0, 2 3), MULTIPOINT ((0 0), (2 3)), POINT (9 0))'
+      else
+        'GEOMETRYCOLLECTION (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))), POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)), MULTILINESTRING ((0 0, 2 3), (10 10, 3 4)), LINESTRING (0 0, 2 3), MULTIPOINT (0 0, 2 3), POINT (9 0))'
+      end,
       'GEOMETRYCOLLECTION EMPTY'
     ].each do |g|
       assert_equal(g, write(read(g)))
@@ -59,6 +69,7 @@ class WktWriterTests < Minitest::Test
 
     tester = lambda { |expected, precision|
       writer.rounding_precision = precision if precision
+
       assert_equal(expected, write(geom))
     }
 
@@ -94,6 +105,7 @@ class WktWriterTests < Minitest::Test
 
     # 3d if requested _and_ available
     writer.output_dimensions = 3
+
     assert_equal('POINT Z (1 2 3)', write(geom_3d))
     assert_equal('POINT (3 2)', write(geom_2d))
 
@@ -114,6 +126,7 @@ class WktWriterTests < Minitest::Test
     @writer.rounding_precision = 2
 
     geom = read('POINT(1 2 3)')
+
     assert_equal('POINT (1 2)', write(geom, trim: true))
 
     assert_equal('POINT (1.0000 2.0000)', write(geom, rounding_precision: 4))
@@ -133,20 +146,25 @@ class WktWriterTests < Minitest::Test
 
     # New 3d WKT by default
     writer.output_dimensions = 3
+
     assert_equal('POINT Z (1 2 3)', write(geom_3d))
 
     # Switch to old
     writer.old_3d = true
+
     assert_equal('POINT (1 2 3)', write(geom_3d))
 
     # Old3d flag is not reset when changing dimensions
     writer.output_dimensions = 2
+
     assert_equal('POINT (1 2)', write(geom_3d))
     writer.output_dimensions = 3
+
     assert_equal('POINT (1 2 3)', write(geom_3d))
 
     # Likewise, dimensions spec is not reset when changing old3d flag
     writer.old_3d = false
+
     assert_equal('POINT Z (1 2 3)', write(geom_3d))
   end
 end