ffi-geos 2.2.0 → 2.3.0

data/Gemfile

@@ -11,11 +11,6 @@ gem 'minitest-reporters'
 gem 'rake'
 gem 'rdoc'
 gem 'rubocop', require: false
-gem 'simplecov', '~> 0.17.0', require: false
-
-platforms :rbx do
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0'
-end
+gem 'simplecov', require: false
 
 instance_eval File.read('Gemfile.local') if File.exist?('Gemfile.local')

data/ffi-geos.gemspec

@@ -7,6 +7,8 @@ Gem::Specification.new do |s|
   s.version = Geos::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = '>= 2.5'
+
   s.authors = ['J Smith']
   s.description = 'An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).'
   s.summary = s.description
@@ -22,4 +24,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency('ffi', ['>= 1.0.0'])
+  s.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/lib/ffi-geos/buffer_params.rb

@@ -36,7 +36,7 @@ module Geos
         end
       end
 
-      def self.release(ptr) #:nodoc:
+      def self.release(ptr) # :nodoc:
         FFIGeos.GEOSBufferParams_destroy_r(Geos.current_handle_pointer, ptr)
       end
 

data/lib/ffi-geos/coordinate_sequence.rb

@@ -123,7 +123,7 @@ module Geos
       @z = CoordinateAccessor.new(self, 2)
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSCoordSeq_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
@@ -287,7 +287,7 @@ module Geos
       RUBY
     end
 
-    def snap_to_grid!(*args)
+    def snap_to_grid!(*args, **kwargs)
       grid = {
         offset_x: 0, # 1
         offset_y: 0, # 2
@@ -299,8 +299,8 @@ module Geos
 
       if args.length == 1 && args[0].is_a?(Numeric)
         grid[:size_x] = grid[:size_y] = grid[:size_z] = args[0]
-      elsif args[0].is_a?(Hash)
-        grid.merge!(args[0])
+      elsif !kwargs.empty?
+        grid.merge!(kwargs)
       end
 
       grid[:size_x] = grid[:size_y] = grid[:size_z] = grid[:size] if grid[:size]
@@ -321,11 +321,11 @@ module Geos
       end
 
       length.times do |i|
-        x[i] = ((x[i] - grid[:offset_x]) / grid[:size_x]).round * grid[:size_x] + grid[:offset_x] if grid[:size_x] != 0
+        x[i] = (((x[i] - grid[:offset_x]) / grid[:size_x]).round * grid[:size_x]) + grid[:offset_x] if grid[:size_x] != 0
 
-        y[i] = ((y[i] - grid[:offset_y]) / grid[:size_y]).round * grid[:size_y] + grid[:offset_y] if grid[:size_y] != 0
+        y[i] = (((y[i] - grid[:offset_y]) / grid[:size_y]).round * grid[:size_y]) + grid[:offset_y] if grid[:size_y] != 0
 
-        z[i] = ((z[i] - grid[:offset_z]) / grid[:size_z]).round * grid[:size_z] + grid[:offset_z] if has_z? && grid[:size_z] != 0
+        z[i] = (((z[i] - grid[:offset_z]) / grid[:size_z]).round * grid[:size_z]) + grid[:offset_z] if has_z? && grid[:size_z] != 0
       end
 
       cs = remove_duplicate_coords
@@ -334,7 +334,7 @@ module Geos
       self
     end
 
-    def snap_to_grid(*args)
+    def snap_to_grid(*args, **)
       dup.snap_to_grid!(*args)
     end
 
@@ -353,17 +353,17 @@ module Geos
           y = self.y[i]
           z = self.z[i]
 
-          self.x[i] = options[:afac] * x + options[:bfac] * y + options[:cfac] * z + options[:xoff]
-          self.y[i] = options[:dfac] * x + options[:efac] * y + options[:ffac] * z + options[:yoff]
-          self.z[i] = options[:gfac] * x + options[:hfac] * y + options[:ifac] * z + options[:zoff]
+          self.x[i] = (options[:afac] * x) + (options[:bfac] * y) + (options[:cfac] * z) + options[:xoff]
+          self.y[i] = (options[:dfac] * x) + (options[:efac] * y) + (options[:ffac] * z) + options[:yoff]
+          self.z[i] = (options[:gfac] * x) + (options[:hfac] * y) + (options[:ifac] * z) + options[:zoff]
         end
       else
         length.times do |i|
           x = self.x[i]
           y = self.y[i]
 
-          self.x[i] = options[:afac] * x + options[:bfac] * y + options[:xoff]
-          self.y[i] = options[:dfac] * x + options[:efac] * y + options[:yoff]
+          self.x[i] = (options[:afac] * x) + (options[:bfac] * y) + options[:xoff]
+          self.y[i] = (options[:dfac] * x) + (options[:efac] * y) + options[:yoff]
         end
       end
 
@@ -395,8 +395,8 @@ module Geos
         gfac: 0,
         hfac: 0,
         ifac: 1,
-        xoff: origin[0] - Math.cos(radians) * origin[0] + Math.sin(radians) * origin[1],
-        yoff: origin[1] - Math.sin(radians) * origin[0] - Math.cos(radians) * origin[1],
+        xoff: origin[0] - (Math.cos(radians) * origin[0]) + (Math.sin(radians) * origin[1]),
+        yoff: origin[1] - (Math.sin(radians) * origin[0]) - (Math.cos(radians) * origin[1]),
         zoff: 0
       )
     end
@@ -455,9 +455,9 @@ module Geos
       dup.rotate!(radians)
     end
 
-    def scale!(*args)
-      x, y, z = if args.length == 1 && args[0].is_a?(Hash)
-        args[0].values_at(:x, :y, :z)
+    def scale!(*args, **kwargs)
+      x, y, z = if !kwargs.empty?
+        kwargs.values_at(:x, :y, :z)
       elsif args.length.between?(1, 3)
         args.values_at(0...3)
       else
@@ -480,13 +480,13 @@ module Geos
       )
     end
 
-    def scale(*args)
-      dup.scale!(*args)
+    def scale(*args, **kwargs)
+      dup.scale!(*args, **kwargs)
     end
 
-    def trans_scale!(*args)
-      delta_x, delta_y, x_factor, y_factor = if args.length == 1 && args[0].is_a?(Hash)
-        args[0].values_at(:delta_x, :delta_y, :x_factor, :y_factor)
+    def trans_scale!(*args, **kwargs)
+      delta_x, delta_y, x_factor, y_factor = if !kwargs.empty?
+        kwargs.values_at(:delta_x, :delta_y, :x_factor, :y_factor)
       elsif args.length.between?(1, 4)
         args.values_at(0...4)
       else
@@ -514,13 +514,13 @@ module Geos
       )
     end
 
-    def trans_scale(*args)
-      dup.trans_scale!(*args)
+    def trans_scale(*args, **kwargs)
+      dup.trans_scale!(*args, **kwargs)
     end
 
-    def translate!(*args)
-      x, y, z = if args.length == 1 && args[0].is_a?(Hash)
-        args[0].values_at(:x, :y, :z)
+    def translate!(*args, **kwargs)
+      x, y, z = if !kwargs.empty?
+        kwargs.values_at(:x, :y, :z)
       elsif args.length.between?(1, 3)
         args.values_at(0...3)
       else
@@ -543,17 +543,17 @@ module Geos
       )
     end
 
-    def translate(*args)
-      dup.translate!(*args)
+    def translate(*args, **kwargs)
+      dup.translate!(*args, **kwargs)
     end
 
     protected
 
-      def check_bounds(idx) #:nodoc:
+      def check_bounds(idx) # :nodoc:
         raise Geos::IndexBoundsError, 'Index out of bounds' if idx.negative? || idx >= length
       end
 
-      def build_coordinate(n) #:nodoc:
+      def build_coordinate(n) # :nodoc:
         [
           get_x(n),
           (dimensions >= 2 ? get_y(n) : nil),

data/lib/ffi-geos/geometry.rb

@@ -38,7 +38,7 @@ module Geos
       self.srid = source.srid
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSGeom_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
@@ -330,7 +330,7 @@ module Geos
         bool_result(FFIGeos.GEOSCovers_r(Geos.current_handle_pointer, ptr, geom.ptr))
       end
     else
-      def covers?(geom) #:nodoc:
+      def covers?(geom) # :nodoc:
         check_geometry(geom)
         !!%w{
           T*****FF*
@@ -352,7 +352,7 @@ module Geos
         bool_result(FFIGeos.GEOSCoveredBy_r(Geos.current_handle_pointer, ptr, geom.ptr))
       end
     else
-      def covered_by?(geom) #:nodoc:
+      def covered_by?(geom) # :nodoc:
         check_geometry(geom)
         !!%w{
           T*F**F***
@@ -386,7 +386,7 @@ module Geos
 
     def eql_almost?(other, decimal = 6)
       check_geometry(other)
-      bool_result(FFIGeos.GEOSEqualsExact_r(Geos.current_handle_pointer, ptr, other.ptr, 0.5 * 10 ** -decimal))
+      bool_result(FFIGeos.GEOSEqualsExact_r(Geos.current_handle_pointer, ptr, other.ptr, 0.5 * (10 ** -decimal)))
     end
     alias equals_almost? eql_almost?
     alias almost_equals? eql_almost?
@@ -441,7 +441,7 @@ module Geos
 
     # GEOS versions prior to 3.3.0 didn't handle exceptions and can crash on
     # bad input.
-    if FFIGeos.respond_to?(:GEOSProject_r) && Geos::GEOS_VERSION >= '3.3.0'
+    if FFIGeos.respond_to?(:GEOSProject_r) && Geos::GEOS_NICE_VERSION >= '030300'
       def project(geom, normalized = false)
         raise TypeError, 'Expected Geos::Point type' unless geom.is_a?(Geos::Point)
 

data/lib/ffi-geos/geometry_collection.rb

@@ -82,18 +82,18 @@ module Geos
       translate
     }.each do |m|
       class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{m}!(*args)
+        def #{m}!(*args, **kwargs)
           unless self.empty?
             self.num_geometries.times do |i|
-              self[i].#{m}!(*args)
+              self[i].#{m}!(*args, **kwargs)
             end
           end
 
           self
         end
 
-        def #{m}(*args)
-          ret = self.dup.#{m}!(*args)
+        def #{m}(*args, **kwargs)
+          ret = self.dup.#{m}!(*args, **kwargs)
           ret.srid = pick_srid_according_to_policy(self.srid)
           ret
         end

data/lib/ffi-geos/line_string.rb

@@ -42,7 +42,7 @@ module Geos
     end
     alias slice []
 
-    def offset_curve(width, options = {})
+    def offset_curve(width, **options)
       options = Constants::BUFFER_PARAM_DEFAULTS.merge(options)
 
       cast_geometry_ptr(
@@ -81,7 +81,7 @@ module Geos
       cur_path.concat(to_a)
     end
 
-    def snap_to_grid!(*args)
+    def snap_to_grid!(*args, **)
       unless empty?
         cs = coord_seq.snap_to_grid!(*args)
 
@@ -97,7 +97,7 @@ module Geos
       self
     end
 
-    def snap_to_grid(*args)
+    def snap_to_grid(*args, **)
       ret = dup.snap_to_grid!(*args)
       ret.srid = pick_srid_according_to_policy(srid)
       ret
@@ -126,9 +126,9 @@ module Geos
               dseg = (fraction - total_length) / seg_length
 
               args = []
-              args << p_1.x + ((p_2.x - p_1.x) * dseg)
-              args << p_1.y + ((p_2.y - p_1.y) * dseg)
-              args << p_1.z + ((p_2.z - p_1.z) * dseg) if has_z?
+              args << (p_1.x + ((p_2.x - p_1.x) * dseg))
+              args << (p_1.y + ((p_2.y - p_1.y) * dseg))
+              args << (p_1.z + ((p_2.z - p_1.z) * dseg)) if has_z?
 
               args << { srid: pick_srid_according_to_policy(srid) } unless srid.zero?
 
@@ -193,16 +193,16 @@ module Geos
       translate
     }.each do |m|
       class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{m}!(*args)
+        def #{m}!(*args, **kwargs)
           unless self.empty?
-            self.coord_seq.#{m}!(*args)
+            self.coord_seq.#{m}!(*args, **kwargs)
           end
 
           self
         end
 
-        def #{m}(*args)
-          ret = self.dup.#{m}!(*args)
+        def #{m}(*args, **kwargs)
+          ret = self.dup.#{m}!(*args, **kwargs)
           ret.srid = pick_srid_according_to_policy(self.srid)
           ret
         end

data/lib/ffi-geos/multi_line_string.rb

@@ -2,7 +2,7 @@
 
 module Geos
   class MultiLineString < GeometryCollection
-    if FFIGeos.respond_to?(:GEOSisClosed_r) && Geos::GEOS_VERSION >= '3.5.0'
+    if FFIGeos.respond_to?(:GEOSisClosed_r) && Geos::GEOS_NICE_VERSION >= '030500'
       # Available in GEOS 3.5.0+.
       def closed?
         bool_result(FFIGeos.GEOSisClosed_r(Geos.current_handle_pointer, ptr))

data/lib/ffi-geos/point.rb

@@ -118,16 +118,16 @@ module Geos
       translate
     }.each do |m|
       class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{m}!(*args)
+        def #{m}!(*args, **kwargs)
           unless empty?
-            coord_seq.#{m}!(*args)
+            coord_seq.#{m}!(*args, **kwargs)
           end
 
           self
         end
 
-        def #{m}(*args)
-          ret = dup.#{m}!(*args)
+        def #{m}(*args, **kwargs)
+          ret = dup.#{m}!(*args, **kwargs)
           ret.srid = pick_srid_according_to_policy(srid)
           ret
         end

data/lib/ffi-geos/polygon.rb

@@ -125,16 +125,16 @@ module Geos
       translate
     }.each do |m|
       class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{m}!(*args)
-          exterior_ring.coord_seq.#{m}!(*args)
+        def #{m}!(*args, **kwargs)
+          exterior_ring.coord_seq.#{m}!(*args, **kwargs)
           interior_rings.each do |ring|
             ring.coord_seq.#{m}!(*args)
           end
           self
         end
 
-        def #{m}(*args)
-          ret = dup.#{m}!(*args)
+        def #{m}(*args, **kwargs)
+          ret = dup.#{m}!(*args, **kwargs)
           ret.srid = pick_srid_according_to_policy(srid)
           ret
         end

data/lib/ffi-geos/prepared_geometry.rb

@@ -24,7 +24,7 @@ module Geos
       @ptr.autorelease = !!options[:auto_free]
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSPreparedGeom_destroy_r(Geos.current_handle_pointer, ptr)
     end
 

data/lib/ffi-geos/strtree.rb

@@ -60,7 +60,7 @@ module Geos
       end
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSSTRtree_destroy_r(Geos.current_handle_pointer, ptr)
     end
 

data/lib/ffi-geos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geos
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

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
 
@@ -85,7 +85,7 @@ module Geos
 
     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

@@ -56,7 +56,7 @@ 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}', '/usr/lib/{x86_64,i386,aarch64}-linux-gnu']
         end
     end
 
@@ -1363,12 +1363,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 +1384,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/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,