ffi-geos 2.2.0 → 2.4.0

data/lib/ffi-geos/wkb_reader.rb

@@ -34,7 +34,7 @@ module Geos
       raise ParseError, e
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKBReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end

data/lib/ffi-geos/wkb_writer.rb

@@ -20,7 +20,7 @@ module Geos
       set_options(options)
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKBWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
@@ -83,9 +83,21 @@ module Geos
       FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle_pointer, ptr, val)
     end
 
+    if FFIGeos.respond_to?(:GEOSWKBWriter_getFlavor_r)
+      def flavor
+        FFIGeos.GEOSWKBWriter_getFlavor_r(Geos.current_handle_pointer, ptr)
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSWKBWriter_setFlavor_r)
+      def flavor=(val)
+        FFIGeos.GEOSWKBWriter_setFlavor_r(Geos.current_handle_pointer, ptr, val)
+      end
+    end
+
     private
 
-      def set_options(options) #:nodoc:
+      def set_options(options) # :nodoc:
         self.include_srid = options[:include_srid] if options.key?(:include_srid)
       end
   end

data/lib/ffi-geos/wkt_reader.rb

@@ -28,7 +28,7 @@ module Geos
       raise ParseError, e
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKTReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end

data/lib/ffi-geos/wkt_writer.rb

@@ -21,11 +21,11 @@ module Geos
       set_options(options)
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKTWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
-    def set_options(options) #:nodoc:
+    def set_options(options) # :nodoc:
       [:trim, :old_3d, :rounding_precision, :output_dimensions].each do |k|
         send("#{k}=", options[k]) if respond_to?("#{k}=") && options.key?(k)
       end

data/lib/ffi-geos.rb

@@ -15,6 +15,10 @@ module Geos
     File.join(GEOS_BASE, 'wkb_reader')
   autoload :WkbWriter,
     File.join(GEOS_BASE, 'wkb_writer')
+  autoload :GeoJSONReader,
+    File.join(GEOS_BASE, 'geojson_reader')
+  autoload :GeoJSONWriter,
+    File.join(GEOS_BASE, 'geojson_writer')
   autoload :CoordinateSequence,
     File.join(GEOS_BASE, 'coordinate_sequence')
   autoload :Geometry,
@@ -56,7 +60,13 @@ module Geos
         elsif FFI::Platform::IS_WINDOWS
           ENV['PATH'].split(File::PATH_SEPARATOR)
         else
-          ['/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386}-linux-gnu']
+          [
+            '/usr/local/{lib64,lib}',
+            '/opt/local/{lib64,lib}',
+            '/usr/{lib64,lib}',
+            '/opt/homebrew/lib',
+            '/usr/lib/{x86_64,i386,aarch64}-linux-gnu'
+          ]
         end
     end
 
@@ -98,6 +108,11 @@ module Geos
       :ndr, 1 # Little Endian
     ])
 
+    Geos::Flavors = enum(:flavor, [
+      :extended, 1,
+      :iso, 2
+    ])
+
     Geos::BufferCapStyles = enum(:buffer_cap_style, [
       :round, 1,
       :flat, 2,
@@ -581,6 +596,11 @@ module Geos
         :pointer, :pointer, :pointer, :double, :int
       ],
 
+      GEOSConstrainedDelaunayTriangulation_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSVoronoiDiagram_r: [
         # *geom, *handle, *geom, *envelope, tolerance, only_edges
         :pointer, :pointer, :pointer, :pointer, :double, :int
@@ -721,6 +741,11 @@ module Geos
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDistanceWithin_r: [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, double distance
+        :char, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSHausdorffDistance_r: [
         # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
         :int, :pointer, :pointer, :pointer, :pointer
@@ -949,6 +974,21 @@ module Geos
         # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
+
+      GEOSPreparedDistance_r: [
+        # (1 on success, 0 on failure), *handle, *prepared, *geom, *distance
+        :int, :pointer, :pointer, :pointer, :pointer
+      ],
+
+      GEOSPreparedDistanceWithin_r: [
+        # (1 on true, 0 on false), *handle, *prepared, *geom, max_distance
+        :char, :pointer, :pointer, :pointer, :double
+      ],
+
+      GEOSPreparedNearestPoints_r: [
+        # *coord_seq, *handle, *prepared, *geom
+        :pointer, :pointer, :pointer, :pointer
+      ],
       #### /PreparedGeometry functions ####
 
       #### WktReader functions ####
@@ -1082,8 +1122,52 @@ module Geos
         # void, *handle, *geom, bool
         :void, :pointer, :pointer, :char
       ],
+
+      GEOSWKBWriter_getFlavor_r: [
+        # flavor, *handle, *geom
+        :flavor, :pointer, :pointer
+      ],
+
+      GEOSWKBWriter_setFlavor_r: [
+        # void, *handle, *geom, flavor
+        :void, :pointer, :pointer, :flavor
+      ],
       #### /WkbWriter functions ####
 
+      #### GeoJSONReader functions ####
+      GEOSGeoJSONReader_create_r: [
+        # *geojson_reader, *handle
+        :pointer, :pointer
+      ],
+
+      GEOSGeoJSONReader_readGeometry_r: [
+        # *geom, *handle, *geojson_reader, string
+        :pointer, :pointer, :pointer, :string
+      ],
+
+      GEOSGeoJSONReader_destroy_r: [
+        # void, *handle, *geojson_reader
+        :void, :pointer, :pointer
+      ],
+      #### /GeoJSONReader functions ###
+
+      #### GeoJSONWriter functions ####
+      GEOSGeoJSONWriter_create_r: [
+        # *geojson_writer, *handle
+        :pointer, :pointer
+      ],
+
+      GEOSGeoJSONWriter_destroy_r: [
+        # void, *handle, *geojson_writer
+        :void, :pointer, :pointer
+      ],
+
+      GEOSGeoJSONWriter_writeGeometry_r: [
+        # string, *handle, *geojson_writer, :geom, :indent
+        :string, :pointer, :pointer, :pointer, :int
+      ],
+      #### /GeoJSONWriter functions ####
+
       #### Linearref functions ####
       GEOSProject_r: [
         # distance, *handle, *geom_a, *geom_b
@@ -1363,12 +1447,14 @@ module Geos
       GEOS_CAPI_VERSION,
       GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH,
       GEOS_SVN_REVISION =
-      if !(versions = Geos.version.scan(/^
+      if (versions = Geos.version.scan(/^
         ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
         -CAPI-
         ((\d+)\.(\d+)\.(\d+))
         (?:\s+r?(\h+))?
       $/x)).empty?
+        ['0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0]
+      else
         versions = versions[0]
         [
           versions[0],
@@ -1382,11 +1468,13 @@ module Geos
           versions[8].to_i,
           versions[9]&.to_i
         ]
-      else
-        ['0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0]
       end
     GEOS_CAPI_FIRST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i
     GEOS_CAPI_LAST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i + GEOS_CAPI_VERSION_MINOR.to_i
+
+    GEOS_NICE_VERSION = [GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERSION_PATCH].collect { |version|
+      version.to_s.rjust(2, '0')
+    }.join
   end
 
   module Constants

data/sonar-project.properties

@@ -2,15 +2,15 @@ sonar.projectKey=dark-panda_ffi-geos
 sonar.organization=dark-panda
 
 # This is the name and version displayed in the SonarCloud UI.
-#sonar.projectName=ffi-geos
-#sonar.projectVersion=1.0
+sonar.projectName=ffi-geos
+sonar.projectVersion=1.0
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=lib, test
 
 # Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8
 
 # Additional reports
 sonar.ruby.rubocop.reportPaths=rubocop-report.json
-sonar.ruby.coverage.reportPaths=coverage/.resultset.json
+sonar.ruby.coverage.reportPaths=coverage/coverage.json

data/test/coordinate_sequence_tests.rb

@@ -515,16 +515,16 @@ class CoordinateSequenceTests < Minitest::Test
   end
 
   undef :affine_tester
-  def affine_tester(method, expected, coords, *args)
+  def affine_tester(method, expected, coords, *args, **options)
     cs = Geos::CoordinateSequence.new(coords)
-    cs.send("#{method}!", *args)
+    cs.__safe_send__("#{method}!", *args, **options)
 
     expected.length.times do |i|
       assert_in_delta(expected[i], cs.get_ordinate(0, i), TOLERANCE)
     end
 
     cs = Geos::CoordinateSequence.new(coords)
-    cs_2 = cs.send(method, *args)
+    cs_2 = cs.__safe_send__(method, *args, **options)
 
     expected.length.times do |i|
       assert_in_delta(coords[i], cs.get_ordinate(0, i), TOLERANCE)
@@ -542,21 +542,21 @@ class CoordinateSequenceTests < Minitest::Test
   def test_rotate_x
     affine_tester(:rotate_x, [1, -1, -1], [1, 1, 1], Math::PI)
     affine_tester(:rotate_x, [1, -1, 1], [1, 1, 1], Math::PI / 2)
-    affine_tester(:rotate_x, [1, 1, -1], [1, 1, 1], Math::PI + Math::PI / 2)
+    affine_tester(:rotate_x, [1, 1, -1], [1, 1, 1], Math::PI + (Math::PI / 2))
     affine_tester(:rotate_x, [1, 1, 1], [1, 1, 1], Math::PI * 2)
   end
 
   def test_rotate_y
     affine_tester(:rotate_y, [-1, 1, -1], [1, 1, 1], Math::PI)
     affine_tester(:rotate_y, [1, 1, -1], [1, 1, 1], Math::PI / 2)
-    affine_tester(:rotate_y, [-1, 1, 1], [1, 1, 1], Math::PI + Math::PI / 2)
+    affine_tester(:rotate_y, [-1, 1, 1], [1, 1, 1], Math::PI + (Math::PI / 2))
     affine_tester(:rotate_y, [1, 1, 1], [1, 1, 1], Math::PI * 2)
   end
 
   def test_rotate_z
     affine_tester(:rotate_z, [-1, -1], [1, 1], Math::PI)
     affine_tester(:rotate_z, [-1, 1], [1, 1], Math::PI / 2)
-    affine_tester(:rotate_z, [1, -1], [1, 1], Math::PI + Math::PI / 2)
+    affine_tester(:rotate_z, [1, -1], [1, 1], Math::PI + (Math::PI / 2))
     affine_tester(:rotate_z, [1, 1], [1, 1], Math::PI * 2)
   end
 

data/test/geojson_reader_tests.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeoJSONReaderTests < Minitest::Test
+  include TestHelper
+
+  attr_reader :json_reader
+
+  def setup
+    super
+
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSGeoJSONReader_create_r)
+
+    @json_reader = Geos::GeoJSONReader.new
+
+    @writer.rounding_precision = 3
+  end
+
+  def json_read(*args, **options)
+    json_reader.read(*args, **options)
+  end
+
+  def geojson_tester(expected, json, **options)
+    assert_equal(expected, write(json_read(json, **options)))
+  end
+
+  def test_point
+    geojson_tester(
+      'POINT (-117.000 33.000)',
+      '{"type":"Point","coordinates":[-117.0,33.0]}'
+    )
+  end
+
+  def test_line_string
+    geojson_tester(
+      'LINESTRING (102.000 0.000, 103.000 1.000, 104.000 0.000, 105.000 1.000)',
+      '{"type":"LineString","coordinates":[[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]]}'
+    )
+  end
+
+  def test_polygon
+    geojson_tester(
+      'POLYGON ((30.000 10.000, 40.000 40.000, 20.000 40.000, 10.000 20.000, 30.000 10.000))',
+      '{"type":"Polygon","coordinates":[[[30,10],[40,40],[20,40],[10,20],[30,10]]]}'
+    )
+  end
+
+  def test_polygon_with_inner_ring
+    geojson_tester(
+      'POLYGON ((35.000 10.000, 45.000 45.000, 15.000 40.000, 10.000 20.000, 35.000 10.000), (20.000 30.000, 35.000 35.000, 30.000 20.000, 20.000 30.000))',
+      '{"type":"Polygon","coordinates":[[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}'
+    )
+  end
+
+  def test_multi_point
+    geojson_tester(
+      'MULTIPOINT (10.000 40.000, 40.000 30.000, 20.000 20.000, 30.000 10.000)',
+      '{"type":"MultiPoint","coordinates":[[10, 40], [40, 30], [20, 20], [30, 10]]}'
+    )
+  end
+
+  def test_multi_line_string
+    geojson_tester(
+      'MULTILINESTRING ((10.000 10.000, 20.000 20.000, 10.000 40.000), (40.000 40.000, 30.000 30.000, 40.000 20.000, 30.000 10.000))',
+      '{"type":"MultiLineString","coordinates":[[[10, 10], [20, 20], [10, 40]],[[40, 40], [30, 30], [40, 20], [30, 10]]]}'
+    )
+  end
+
+  def test_multi_polygon
+    geojson_tester(
+      'MULTIPOLYGON (((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)), ((20.000 35.000, 10.000 30.000, 10.000 10.000, 30.000 5.000, 45.000 20.000, 20.000 35.000), (30.000 20.000, 20.000 15.000, 20.000 25.000, 30.000 20.000)))',
+      '{"type": "MultiPolygon", "coordinates": [[[[40, 40], [20, 45], [45, 30], [40, 40]]], [[[20, 35], [10, 30], [10, 10], [30, 5], [45, 20], [20, 35]], [[30, 20], [20, 15], [20, 25], [30, 20]]]]}'
+    )
+  end
+
+  def test_geometry_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION (POINT (40.000 10.000), LINESTRING (10.000 10.000, 20.000 20.000, 10.000 40.000), POLYGON ((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)))',
+      '{"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [40, 10]},{"type": "LineString","coordinates": [[10, 10], [20, 20], [10, 40]]},{"type": "Polygon","coordinates": [[[40, 40], [20, 45], [45, 30], [40, 40]]]}]}'
+    )
+  end
+
+  def test_feature_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION (POINT (-117.000 33.000), POINT (-122.000 45.000))',
+      '{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[-117.0,33.0]}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-122.0,45.0]}}]}'
+    )
+  end
+
+  def test_empty_point
+    geojson_tester(
+      'POINT EMPTY',
+      '{"type":"Point","coordinates":[]}'
+    )
+  end
+
+  def test_empty_line_string
+    geojson_tester(
+      'LINESTRING EMPTY',
+      '{"type":"LineString","coordinates":[]}'
+    )
+  end
+
+  def test_empty_polygon
+    geojson_tester(
+      'POLYGON EMPTY',
+      '{"type":"Polygon","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_point
+    geojson_tester(
+      'MULTIPOINT EMPTY',
+      '{"type":"MultiPoint","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_line_string
+    geojson_tester(
+      'MULTILINESTRING EMPTY',
+      '{"type":"MultiLineString","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_polygon
+    geojson_tester(
+      'MULTIPOLYGON EMPTY',
+      '{"type": "MultiPolygon", "coordinates": []}'
+    )
+  end
+
+  def test_empty_geometry_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION EMPTY',
+      '{"type": "GeometryCollection","geometries": []}'
+    )
+  end
+
+  def test_incomplete_geojson
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"Point","coordinates":[-117.0]}')
+    end
+
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"LineString","coordinates":[[1,2],[2]]}')
+    end
+  end
+
+  def test_broken_geojson
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('<gml>NOT_GEO_JSON</gml>')
+    end
+  end
+
+  def test_incompatible_type
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"Line","coordinates":[[1,2],[2,3]]}')
+    end
+  end
+
+  def test_srid_from_options
+    geom = json_reader.read(
+      '{"type":"Point","coordinates":[-117.0,33.0]}',
+      srid: 3857
+    )
+
+    assert_equal(geom.srid, 3857)
+  end
+end

data/test/geojson_writer_tests.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeoJSONWriterTests < Minitest::Test
+  include TestHelper
+
+  attr_reader :json_writer
+
+  def setup
+    super
+
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSGeoJSONWriter_create_r)
+
+    @json_writer = Geos::GeoJSONWriter.new
+  end
+
+  def json_write(*args, **options)
+    json_writer.write(*args, **options)
+  end
+
+  def geojson_tester(expected, geom, **options)
+    assert_equal(expected, json_write(read(geom), **options))
+  end
+
+  def test_point
+    geojson_tester('{"type":"Point","coordinates":[-117.0,33.0]}', 'POINT(-117 33)')
+  end
+
+  def test_line_string
+    geojson_tester('{"type":"LineString","coordinates":[[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]]}', 'LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)')
+  end
+
+  def test_polygon
+    geojson_tester('{"type":"Polygon","coordinates":[[[30.0,10.0],[40.0,40.0],[20.0,40.0],[10.0,20.0],[30.0,10.0]]]}', 'POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))')
+  end
+
+  def test_polygon_with_inner_ring
+    geojson_tester('{"type":"Polygon","coordinates":[[[35.0,10.0],[45.0,45.0],[15.0,40.0],[10.0,20.0],[35.0,10.0]],[[20.0,30.0],[35.0,35.0],[30.0,20.0],[20.0,30.0]]]}', 'POLYGON((35 10, 45 45, 15 40, 10 20, 35 10), (20 30, 35 35, 30 20, 20 30))')
+  end
+
+  def test_multi_point
+    geojson_tester('{"type":"MultiPoint","coordinates":[[10.0,40.0],[40.0,30.0],[20.0,20.0],[30.0,10.0]]}', 'MULTIPOINT ((10 40), (40 30), (20 20), (30 10))')
+  end
+
+  def test_multi_line_string
+    geojson_tester('{"type":"MultiLineString","coordinates":[[[10.0,10.0],[20.0,20.0],[10.0,40.0]],[[40.0,40.0],[30.0,30.0],[40.0,20.0],[30.0,10.0]]]}', 'MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))')
+  end
+
+  def test_multi_polygon
+    geojson_tester('{"type":"MultiPolygon","coordinates":[[[[30.0,20.0],[45.0,40.0],[10.0,40.0],[30.0,20.0]]],[[[15.0,5.0],[40.0,10.0],[10.0,20.0],[5.0,10.0],[15.0,5.0]]]]}', 'MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))')
+  end
+
+  def test_geometry_collection
+    geojson_tester('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,1.0]},{"type":"Point","coordinates":[2.0,2.0]}]}', 'GEOMETRYCOLLECTION(POINT(1 1),POINT(2 2))')
+  end
+
+  def test_write_with_indentation
+    geojson_tester(<<~JSON.strip, 'LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)', indentation: 2)
+      {
+        "type": "LineString",
+        "coordinates": [
+          [
+            102.0,
+            0.0
+          ],
+          [
+            103.0,
+            1.0
+          ],
+          [
+            104.0,
+            0.0
+          ],
+          [
+            105.0,
+            1.0
+          ]
+        ]
+      }
+    JSON
+  end
+
+  def test_empty_point
+    geojson_tester('{"type":"Point","coordinates":[]}', 'POINT EMPTY')
+  end
+
+  def test_empty_line_string
+    geojson_tester('{"type":"LineString","coordinates":[]}', 'LINESTRING EMPTY')
+  end
+
+  def test_empty_polygon
+    geojson_tester('{"type":"Polygon","coordinates":[[]]}', 'POLYGON EMPTY')
+  end
+
+  def test_empty_geometry_collection
+    geojson_tester('{"type":"GeometryCollection","geometries":[]}', 'GEOMETRYCOLLECTION EMPTY')
+  end
+
+  def test_linear_ring
+    geojson_tester('{"type":"LineString","coordinates":[[0.0,0.0],[1.0,1.0],[1.0,0.0],[0.0,0.0]]}', 'LINEARRING (0 0, 1 1, 1 0, 0 0)')
+  end
+end

data/test/geometry_collection_tests.rb

@@ -174,7 +174,7 @@ class GeometryCollectionTests < Minitest::Test
 
   def test_snap_to_grid
     wkt = 'GEOMETRYCOLLECTION (LINESTRING (-10.12 0, -10.12 5, -10.12 5, -10.12 6, -10.12 6, -10.12 6, -10.12 7, -10.12 7, -10.12 7, -10.12 8, -10.12 8, -9 8, -9 9, -10.12 0), ' \
-      'POLYGON ((-10.12 0, -10.12 5, -10.12 5, -10.12 6, -10.12 6, -10.12 6, -10.12 7, -10.12 7, -10.12 7, -10.12 8, -10.12 8, -9 8, -9 9, -10.12 0)), POINT (10.12 10.12))'
+          'POLYGON ((-10.12 0, -10.12 5, -10.12 5, -10.12 6, -10.12 6, -10.12 6, -10.12 7, -10.12 7, -10.12 7, -10.12 8, -10.12 8, -9 8, -9 9, -10.12 0)), POINT (10.12 10.12))'
 
     expected = 'GEOMETRYCOLLECTION (LINESTRING (-10 0, -10 5, -10 5, -10 6, -10 6, -10 6, -10 7, -10 7, -10 7, -10 8, -10 8, -9 8, -9 9, -10 0), POLYGON ((-10 0, -10 5, -10 5, -10 6, -10 6, -10 6, -10 7, -10 7, -10 7, -10 8, -10 8, -9 8, -9 9, -10 0)), POINT (10 10))'
 
@@ -255,7 +255,7 @@ 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 0 -5, 0 0 -5, 0 0 0)))',
       wkt,
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_x,
       wkt,
@@ -282,7 +282,7 @@ 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, 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,
@@ -308,7 +308,7 @@ class GeometryCollectionTests < Minitest::Test
     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,