ffi-geos 2.1.0 → 2.3.1

data/lib/ffi-geos/strtree.rb

@@ -23,18 +23,19 @@ module Geos
       geoms_and_objects = nil # forward declaration
       capacity = 10
 
-      if args.first.is_a?(Integer)
-        capacity = args.first
-      elsif args.first.is_a?(Array)
-        geoms_and_objects = if args.first.first.is_a?(Array)
-          args.first
-        else
-          args
-        end
+      case args.first
+        when Integer
+          capacity = args.first
+        when Array
+          geoms_and_objects = if args.first.first.is_a?(Array)
+            args.first
+          else
+            args
+          end
 
-        geoms_and_objects.each do |geom, _obj|
-          check_geometry(geom)
-        end
+          geoms_and_objects.each do |geom, _obj|
+            check_geometry(geom)
+          end
       end
 
       raise ArgumentError, 'STRtree capacity must be greater than 0' if capacity <= 0
@@ -59,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
 
@@ -97,7 +98,7 @@ module Geos
     def remove(geom, item)
       check_geometry(geom)
 
-      key = if storage = @storage.detect { |_k, v| v[:item] == item }
+      key = if (storage = @storage.detect { |_k, v| v[:item] == item })
         storage[0]
       end
 
@@ -137,16 +138,17 @@ module Geos
 
     def query(geom, ret = :item)
       query_all(geom).collect { |storage|
-        item = if ret.is_a?(Array)
-          storage.inject({}) do |memo, k|
-            memo.tap do
-              memo[k] = storage[k]
+        item = case ret
+          when Array
+            storage.inject({}) do |memo, k|
+              memo.tap do
+                memo[k] = storage[k]
+              end
             end
-          end
-        elsif ret == :all
-          storage
-        else
-          storage[ret]
+          when :all
+            storage
+          else
+            storage[ret]
         end
 
         item.tap do
@@ -164,10 +166,8 @@ module Geos
     end
     alias query_geoms query_geometries
 
-    def iterate
-      @storage.each_value do |v|
-        yield(v)
-      end
+    def iterate(&block)
+      @storage.each_value(&block)
     end
 
     if FFIGeos.respond_to?(:GEOSSTRtree_nearest_generic_r)

data/lib/ffi-geos/utils.rb

@@ -30,17 +30,18 @@ module Geos
       def create_point(*args)
         options = extract_options!(args)
 
-        if args.length == 1
-          cs = args.first
-        elsif args.length == 2
-          cs = CoordinateSequence.new(1, 2)
-          cs.x[0] = args[0].to_f
-          cs.y[0] = args[1].to_f
-        elsif args.length == 3
-          cs = CoordinateSequence.new(1, 3)
-          cs.x[0], cs.y[0], cs.z[0] = args.map(&:to_f)
-        else
-          raise ArgumentError, "Wrong number of arguments (#{args.length} for 1-3)"
+        case args.length
+          when 1
+            cs = args.first
+          when 2
+            cs = CoordinateSequence.new(1, 2)
+            cs.x[0] = args[0].to_f
+            cs.y[0] = args[1].to_f
+          when 3
+            cs = CoordinateSequence.new(1, 3)
+            cs.x[0], cs.y[0], cs.z[0] = args.map(&:to_f)
+          else
+            raise ArgumentError, "Wrong number of arguments (#{args.length} for 1-3)"
         end
 
         raise ArgumentError, 'IllegalArgumentException: Point coordinate list must contain a single element' if cs.length != 1

data/lib/ffi-geos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geos
-  VERSION = '2.1.0'
+  VERSION = '2.3.1'
 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

@@ -2,10 +2,7 @@
 
 module Geos
   class WktWriter
-    attr_reader :ptr
-    attr_reader :old_3d
-    attr_reader :rounding_precision
-    attr_reader :trim
+    attr_reader :ptr, :old_3d, :rounding_precision, :trim
 
     def initialize(options = {})
       options = {
@@ -24,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

@@ -50,15 +50,20 @@ module Geos
 
   module FFIGeos
     def self.search_paths
-      @search_paths ||= begin
+      @search_paths ||= \
         if ENV['GEOS_LIBRARY_PATH']
           [ENV['GEOS_LIBRARY_PATH']]
         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
     end
 
     def self.find_lib(lib)
@@ -72,10 +77,9 @@ module Geos
     end
 
     def self.geos_library_path
-      @geos_library_path ||= begin
+      @geos_library_path ||= \
         # On MingW the libraries have version numbers
         find_lib('{lib,}geos_c{,-?}')
-      end
     end
 
     # For backwards compatibility with older ffi-geos versions where this
@@ -406,6 +410,11 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSIntersectionPrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSBufferWithParams_r: [
         # *geom, *handle, *geom, *params, width
         :pointer, :pointer, :pointer, :pointer, :double
@@ -442,11 +451,21 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDifferencePrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSSymDifference_r: [
         # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSSymDifferencePrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSBoundary_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -457,6 +476,11 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSUnionPrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSCoverageUnion_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -467,6 +491,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSUnaryUnionPrec_r: [
+        # *geom, *handle, *geom, precision
+        :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSNode_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -798,6 +827,16 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSMaximumInscribedCircle_r: [
+        # *geom, *handle, *geom, tolerance
+        :pointer, :pointer, :pointer, :double
+      ],
+
+      GEOSLargestEmptyCircle_r: [
+        # *geom, *handle, *geom, *geom, tolerance
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSMinimumWidth_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -1330,12 +1369,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],
@@ -1349,11 +1390,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

@@ -284,7 +284,7 @@ class CoordinateSequenceTests < Minitest::Test
 
     assert_kind_of(Enumerable, cs.x.each)
     assert_kind_of(Enumerable, cs.x.to_enum)
-    assert_equal(cs.x, cs.x.each {})
+    assert_equal(cs.x, cs.x.each(&EMPTY_BLOCK))
   end
 
   def test_options_hash
@@ -299,7 +299,7 @@ class CoordinateSequenceTests < Minitest::Test
 
     assert_kind_of(Enumerable, cs.each)
     assert_kind_of(Enumerable, cs.to_enum)
-    assert_equal(cs, cs.each {})
+    assert_equal(cs, cs.each(&EMPTY_BLOCK))
   end
 
   def test_array_like_access
@@ -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

@@ -16,7 +16,7 @@ class GeometryCollectionTests < Minitest::Test
     geom = read('GEOMETRYCOLLECTION(POINT(0 0))')
     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_geometry_collection_array
@@ -173,7 +173,8 @@ class GeometryCollectionTests < Minitest::Test
   end
 
   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))'
+    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))'
 
     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))'
 
@@ -254,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,
@@ -281,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,
@@ -307,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,