ffi-geos 2.1.0 → 2.2.0

data/.travis.yml

@@ -4,10 +4,9 @@ language: ruby
 dist: trusty
 
 rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
+  - '2.7'
+  - '2.6'
+  - '2.5'
   - jruby-head
 
 addons:

data/FUNDING.yml

@@ -0,0 +1,2 @@
+github:
+  - dark-panda

data/Gemfile

@@ -8,8 +8,8 @@ gem 'guard'
 gem 'guard-minitest'
 gem 'minitest'
 gem 'minitest-reporters'
-gem 'rake', '~> 10.0'
-gem 'rdoc', '~> 3.12'
+gem 'rake'
+gem 'rdoc'
 gem 'rubocop', require: false
 gem 'simplecov', '~> 0.17.0', require: false
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 J Smith <dark.panda@gmail.com>
+Copyright (c) 2010-2021 J Smith <dark.panda@gmail.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/lib/ffi-geos.rb

@@ -50,7 +50,7 @@ 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
@@ -58,7 +58,6 @@ module Geos
         else
           ['/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386}-linux-gnu']
         end
-      end
     end
 
     def self.find_lib(lib)
@@ -72,10 +71,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 +404,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 +445,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 +470,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 +485,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 +821,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

data/lib/ffi-geos/geometry.rb

@@ -83,9 +83,14 @@ module Geos
       CoordinateSequence.new(FFIGeos.GEOSGeom_getCoordSeq_r(Geos.current_handle_pointer, ptr), false, self)
     end
 
-    def intersection(geom)
+    def intersection(geom, precision: nil)
       check_geometry(geom)
-      cast_geometry_ptr(FFIGeos.GEOSIntersection_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+
+      if precision
+        cast_geometry_ptr(FFIGeos.GEOSIntersectionPrec_r(Geos.current_handle_pointer, ptr, geom.ptr, precision), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      else
+        cast_geometry_ptr(FFIGeos.GEOSIntersection_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      end
     end
 
     if FFIGeos.respond_to?(:GEOSBufferWithParams_r)
@@ -139,14 +144,24 @@ module Geos
       cast_geometry_ptr(FFIGeos.GEOSConvexHull_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
     end
 
-    def difference(geom)
+    def difference(geom, precision: nil)
       check_geometry(geom)
-      cast_geometry_ptr(FFIGeos.GEOSDifference_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+
+      if precision
+        cast_geometry_ptr(FFIGeos.GEOSDifferencePrec_r(Geos.current_handle_pointer, ptr, geom.ptr, precision), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      else
+        cast_geometry_ptr(FFIGeos.GEOSDifference_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      end
     end
 
-    def sym_difference(geom)
+    def sym_difference(geom, precision: nil)
       check_geometry(geom)
-      cast_geometry_ptr(FFIGeos.GEOSSymDifference_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+
+      if precision
+        cast_geometry_ptr(FFIGeos.GEOSSymDifferencePrec_r(Geos.current_handle_pointer, ptr, geom.ptr, precision), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      else
+        cast_geometry_ptr(FFIGeos.GEOSSymDifference_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+      end
     end
     alias symmetric_difference sym_difference
 
@@ -157,10 +172,15 @@ module Geos
     # Calling without a geom argument is equivalent to calling unary_union when
     # using GEOS 3.3+ and is equivalent to calling union_cascaded in older
     # versions.
-    def union(geom = nil)
+    def union(geom = nil, precision: nil)
       if geom
         check_geometry(geom)
-        cast_geometry_ptr(FFIGeos.GEOSUnion_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+
+        if precision
+          cast_geometry_ptr(FFIGeos.GEOSUnionPrec_r(Geos.current_handle_pointer, ptr, geom.ptr, precision), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+        else
+          cast_geometry_ptr(FFIGeos.GEOSUnion_r(Geos.current_handle_pointer, ptr, geom.ptr), srid_copy: pick_srid_from_geoms(srid, geom.srid))
+        end
       elsif respond_to?(:unary_union)
         unary_union
       else
@@ -181,8 +201,12 @@ module Geos
 
     if FFIGeos.respond_to?(:GEOSUnaryUnion_r)
       # Available in GEOS 3.3+
-      def unary_union
-        cast_geometry_ptr(FFIGeos.GEOSUnaryUnion_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
+      def unary_union(precision = nil)
+        if precision
+          cast_geometry_ptr(FFIGeos.GEOSUnaryUnionPrec_r(Geos.current_handle_pointer, ptr, precision), srid_copy: srid)
+        else
+          cast_geometry_ptr(FFIGeos.GEOSUnaryUnion_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
+        end
       end
     end
 
@@ -695,6 +719,18 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSMaximumInscribedCircle_r)
+      def maximum_inscribed_circle(precision)
+        cast_geometry_ptr(FFIGeos.GEOSMaximumInscribedCircle_r(Geos.current_handle_pointer, ptr, precision))
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSLargestEmptyCircle_r)
+      def largest_empty_circle(precision, boundary: nil)
+        cast_geometry_ptr(FFIGeos.GEOSLargestEmptyCircle_r(Geos.current_handle_pointer, ptr, boundary ? boundary.ptr : nil, precision))
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSMinimumWidth_r)
       def minimum_width
         cast_geometry_ptr(FFIGeos.GEOSMinimumWidth_r(Geos.current_handle_pointer, ptr))

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
@@ -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.2.0'
 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 = {

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

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))'
 

data/test/geometry_tests.rb

@@ -13,12 +13,36 @@ class GeometryTests < Minitest::Test
   def test_intersection
     comparison_tester(
       :intersection,
-      'POLYGON ((5 10, 10 10, 10 5, 5 5, 5 10))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((10 10, 10 5, 5 5, 5 10, 10 10))'
+      else
+        'POLYGON ((5 10, 10 10, 10 5, 5 5, 5 10))'
+      end,
       'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON ((5 5, 15 5, 15 15, 5 15, 5 5))'
     )
   end
 
+  def test_intersection_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSIntersectionPrec_r)
+
+    comparison_tester(
+      :intersection,
+      'GEOMETRYCOLLECTION (POLYGON ((1 2, 1 1, 0.5 1, 1 2)), POLYGON ((9.5 1, 2 1, 2 2, 9 2, 9.5 1)), LINESTRING (1 1, 2 1), LINESTRING (2 2, 1 2))',
+      'MULTIPOLYGON(((0 0,5 10,10 0,0 0),(1 1,1 2,2 2,2 1,1 1),(100 100,100 102,102 102,102 100,100 100)))',
+      'POLYGON((0 1,0 2,10 2,10 1,0 1))',
+      precision: 0
+    )
+
+    comparison_tester(
+      :intersection,
+      'GEOMETRYCOLLECTION (LINESTRING (2 0, 4 0), POINT (0 0), POINT (10 0))',
+      'LINESTRING(0 0, 10 0)',
+      'LINESTRING(9 0, 12 0, 12 20, 4 0, 2 0, 2 10, 0 10, 0 -10)',
+      precision: 2
+    )
+  end
+
   def test_buffer
     simple_tester(
       :buffer,
@@ -182,26 +206,50 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :difference,
-      'POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10))'
+      else
+        'POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(5 -10, 5 10)'
     )
 
     comparison_tester(
       :difference,
-      'POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10))'
+      else
+        'POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(10 0, 20 0)'
     )
 
     comparison_tester(
       :difference,
-      'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10))'
+      else
+        'POLYGON ((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
     )
   end
 
+  def test_difference_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSDifferencePrec_r)
+
+    comparison_tester(
+      :difference,
+      'MULTILINESTRING ((2 8, 4 8), (6 8, 10 8))',
+      'LINESTRING (2 8, 10 8)',
+      'LINESTRING (3.9 8.1, 6.1 7.9)',
+      precision: 2
+    )
+  end
+
   def test_sym_difference
     %w{ sym_difference symmetric_difference }.each do |method|
       comparison_tester(
@@ -255,27 +303,51 @@ class GeometryTests < Minitest::Test
 
       comparison_tester(
         method,
-        'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))',
+        if Geos::GEOS_VERSION > '3.9.0'
+          'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'
+        else
+          'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'LINESTRING(5 -10, 5 10)'
       )
 
       comparison_tester(
         method,
-        'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))',
+        if Geos::GEOS_VERSION > '3.9.0'
+          'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'
+        else
+          'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'LINESTRING(10 0, 20 0)'
       )
 
       comparison_tester(
         method,
-        'MULTIPOLYGON (((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))',
+        if Geos::GEOS_VERSION > '3.9.0'
+          'MULTIPOLYGON (((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10)), ((10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0, 10 0)))'
+        else
+          'MULTIPOLYGON (((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))'
+        end,
         'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
         'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
       )
     end
   end
 
+  def test_sym_difference_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSSymDifferencePrec_r)
+
+    comparison_tester(
+      :sym_difference,
+      'GEOMETRYCOLLECTION (POLYGON ((0 10, 6 10, 10 10, 10 0, 6 0, 0 0, 0 10)), LINESTRING (6 -10, 6 0))',
+      'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
+      'LINESTRING(5 -10, 5 10)',
+      precision: 2
+    )
+  end
+
   def test_boundary
     simple_tester(
       :boundary,
@@ -348,32 +420,59 @@ class GeometryTests < Minitest::Test
 
     comparison_tester(
       :union,
-      'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'
+      else
+        'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(5 -10, 5 10)'
     )
 
     comparison_tester(
       :union,
-      'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'
+      else
+        'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'LINESTRING(10 0, 20 0)'
     )
 
     comparison_tester(
       :union,
-      'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0, 0 10))'
+      else
+        'POLYGON ((0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0))'
+      end,
       'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
       'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
     )
   end
 
+  def test_union_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSUnionPrec_r)
+
+    geom_a = read('POINT (1.9 8.2)')
+    geom_b = read('POINT (4.1 9.8)')
+
+    result = geom_a.union(geom_b, precision: 2)
+
+    assert_equal('MULTIPOINT (2 8, 4 10)', write(result))
+  end
+
   def test_union_cascaded
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:union_cascaded)
 
     simple_tester(
       :union_cascaded,
-      'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
+      else
+        'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -388,7 +487,11 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :union_cascaded,
-      'POLYGON ((0 0, 0 1, 1 1, 2 1, 2 0, 1 0, 0 0))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 1, 1 1, 2 1, 2 0, 1 0, 0 0, 0 1))'
+      else
+        'POLYGON ((0 0, 0 1, 1 1, 2 1, 2 0, 1 0, 0 0))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 0 1, 1 1, 1 0, 0 0)),
         ((1 0, 1 1, 2 1, 2 0, 1 0))
@@ -401,7 +504,11 @@ class GeometryTests < Minitest::Test
 
     simple_tester(
       :unary_union,
-      'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
+      else
+        'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -411,6 +518,22 @@ class GeometryTests < Minitest::Test
     )
   end
 
+  def test_unary_union_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSUnaryUnionPrec_r)
+
+    simple_tester(
+      :unary_union,
+      'POLYGON ((0 0, 0 12, 9 12, 9 15, 15 15, 15 9, 12 9, 12 0, 0 0))',
+      '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)),
+        ((0 0, 11 0, 11 11, 0 11, 0 0))
+      ))',
+      3
+    )
+  end
+
   def test_node
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:node)
 
@@ -424,7 +547,11 @@ class GeometryTests < Minitest::Test
   def test_union_without_arguments
     simple_tester(
       :union,
-      'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))',
+      if Geos::GEOS_VERSION > '3.9.0'
+        'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))'
+      else
+        'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))'
+      end,
       'MULTIPOLYGON(
         ((0 0, 1 0, 1 1, 0 1, 0 0)),
         ((10 10, 10 14, 14 14, 14 10, 10 10),
@@ -1230,7 +1357,11 @@ class GeometryTests < Minitest::Test
       cs = geom_1.nearest_points(geom_2)
       result = cs.to_s if cs
 
-      assert_equal(expected, result)
+      if expected.nil?
+        assert_nil(result)
+      else
+        assert_equal(expected, result)
+      end
     }
 
     tester[
@@ -1424,7 +1555,14 @@ class GeometryTests < Minitest::Test
 
     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))
+    assert_equal(
+      if Geos::GEOS_VERSION > '3.9.0'
+        'MULTIPOLYGON (((1 0, 0 0, 0.5 0.5, 1 0)), ((1 1, 0.5 0.5, 0 1, 1 1)))'
+      else
+        'MULTIPOLYGON (((0 0, 0.5 0.5, 1 0, 0 0)), ((0.5 0.5, 0 1, 1 1, 0.5 0.5)))'
+      end,
+      write(geom.make_valid)
+    )
   end
 
   def test_shared_paths
@@ -1482,7 +1620,7 @@ class GeometryTests < Minitest::Test
     geom = read('LINESTRING(0 0, 10 10))')
     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_normalize
@@ -1668,7 +1806,9 @@ class GeometryTests < Minitest::Test
 
     # polygon with a hole
     tester[
-      'GEOMETRYCOLLECTION (POLYGON ((8 2, 10 10, 8.5 1, 8 2)), POLYGON ((7 8, 10 10, 8 2, 7 8)), POLYGON ((3 8, 10 10, 7 8, 3 8)), POLYGON ((2 2, 8 2, 8.5 1, 2 2)), POLYGON ((2 2, 7 8, 8 2, 2 2)), POLYGON ((2 2, 3 8, 7 8, 2 2)), POLYGON ((0.5 9, 10 10, 3 8, 0.5 9)), POLYGON ((0.5 9, 3 8, 2 2, 0.5 9)), POLYGON ((0 0, 2 2, 8.5 1, 0 0)), POLYGON ((0 0, 0.5 9, 2 2, 0 0)))',
+      'GEOMETRYCOLLECTION (POLYGON ((8 2, 10 10, 8.5 1, 8 2)), POLYGON ((7 8, 10 10, 8 2, 7 8)), POLYGON ((3 8, 10 10, 7 8, 3 8)), ' \
+        'POLYGON ((2 2, 8 2, 8.5 1, 2 2)), POLYGON ((2 2, 7 8, 8 2, 2 2)), POLYGON ((2 2, 3 8, 7 8, 2 2)), POLYGON ((0.5 9, 10 10, 3 8, 0.5 9)), ' \
+        'POLYGON ((0.5 9, 3 8, 2 2, 0.5 9)), POLYGON ((0 0, 2 2, 8.5 1, 0 0)), POLYGON ((0 0, 0.5 9, 2 2, 0 0)))',
       'POLYGON((0 0, 8.5 1, 10 10, 0.5 9, 0 0),(2 2, 3 8, 7 8, 8 2, 2 2)))',
       0
     ]
@@ -1701,7 +1841,14 @@ class GeometryTests < Minitest::Test
 
     geom = 'MULTIPOINT(0 0, 100 0, 100 100, 0 100)'
 
-    tester['GEOMETRYCOLLECTION (POLYGON ((50 200, 200 200, 200 50, 50 50, 50 200)), POLYGON ((-100 50, -100 200, 50 200, 50 50, -100 50)), POLYGON ((50 -100, -100 -100, -100 50, 50 50, 50 -100)), POLYGON ((200 50, 200 -100, 50 -100, 50 50, 200 50)))', geom]
+    tester[
+      if Geos::GEOS_VERSION > '3.9.0'
+        'GEOMETRYCOLLECTION (POLYGON ((200 200, 200 50, 50 50, 50 200, 200 200)), POLYGON ((-100 200, 50 200, 50 50, -100 50, -100 200)), POLYGON ((-100 -100, -100 50, 50 50, 50 -100, -100 -100)), POLYGON ((200 -100, 50 -100, 50 50, 200 50, 200 -100)))'
+      else
+        'GEOMETRYCOLLECTION (POLYGON ((50 200, 200 200, 200 50, 50 50, 50 200)), POLYGON ((-100 50, -100 200, 50 200, 50 50, -100 50)), POLYGON ((50 -100, -100 -100, -100 50, 50 50, 50 -100)), POLYGON ((200 50, 200 -100, 50 -100, 50 50, 200 50)))'
+      end,
+      geom
+    ]
 
     tester['MULTILINESTRING ((50 50, 50 200), (200 50, 50 50), (50 50, -100 50), (50 50, 50 -100))', geom, tolerance: 0, only_edges: true]
 
@@ -1712,7 +1859,15 @@ 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[
+      if Geos::GEOS_VERSION > '3.9.0'
+        'GEOMETRYCOLLECTION (POLYGON ((290 140, 185 140, 185 215, 188 235, 290 252, 290 140)), POLYGON ((80 340, 101 340, 188 235, 185 215, 80 215, 80 340)), POLYGON ((80 140, 80 215, 185 215, 185 140, 80 140)), POLYGON ((290 340, 290 252, 188 235, 101 340, 290 340)))'
+      else
+        '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)))'
+      end,
+      'MULTIPOINT ((150 210), (210 270), (150 220), (220 210), (215 269))',
+      10
+    ]
   end
 
   def test_precision
@@ -1785,11 +1940,37 @@ class GeometryTests < Minitest::Test
     tester['LINESTRING (200 200, 200 100)', 'POLYGON ((100 100, 300 100, 200 200, 100 100))']
     tester[
       'LINESTRING (-112.712119 33.575919, -112.712127 33.575885)',
-      '0106000000010000000103000000010000001a00000035d42824992d5cc01b834e081dca404073b9c150872d5cc03465a71fd4c940400ec00644882d5cc03b8a73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc0698995d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a08499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb87361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
+      '0106000000010000000103000000010000001a00000035d42824992d5cc01b834e081dca404073b9c150872d5cc03465a71fd4c940400ec00644882d5cc03b8a' \
+        '73d4d1c94040376dc669882d5cc0bf9cd9aed0c940401363997e892d5cc002f4fbfecdc94040ca4e3fa88b2d5cc0a487a1d5c9c940408f1ce90c8c2d5cc06989' \
+        '95d1c8c94040fab836548c2d5cc0bd175fb4c7c940409f1f46088f2d5cc0962023a0c2c940407b15191d902d5cc068041bd7bfc940400397c79a912d5cc0287d' \
+        '21e4bcc940403201bf46922d5cc065e3c116bbc940409d9d0c8e922d5cc0060fd3beb9c940400ef7915b932d5cc09012bbb6b7c940404fe61f7d932d5cc0e4a0' \
+        '8499b6c94040fc71fbe5932d5cc0ea9106b7b5c94040eaec6470942d5cc0c2323674b3c94040601dc70f952d5cc043588d25acc94040aea06989952d5cc03ecf' \
+        '9f36aac94040307f85cc952d5cc0e5eb32fca7c94040dd0a6135962d5cc01b615111a7c9404048a7ae7c962d5cc00a2aaa7ea5c94040f4328ae5962d5cc05eb8' \
+        '7361a4c94040c49448a2972d5cc04d81cccea2c940407c80eecb992d5cc06745d4449fc9404035d42824992d5cc01b834e081dca4040'
     ]
     tester['LINESTRING EMPTY', 'POLYGON EMPTY']
   end
 
+  def test_maximum_inscribed_circle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:maximum_inscribed_circle)
+
+    geom = read('POLYGON ((100 200, 200 200, 200 100, 100 100, 100 200))')
+    output = geom.maximum_inscribed_circle(0.001)
+    assert_equal('LINESTRING (150 150, 150 200)', write(output))
+  end
+
+  def test_largest_empty_circle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:largest_empty_circle)
+
+    geom = read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))')
+    output = geom.largest_empty_circle(0.001)
+    assert_equal('LINESTRING (150 150, 100 100)', write(output))
+
+    geom = read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))')
+    output = geom.largest_empty_circle(0.001, boundary: read('MULTIPOINT ((100 100), (100 200), (200 200), (200 100))'))
+    assert_equal('LINESTRING (100 100, 100 100)', write(output))
+  end
+
   def test_minimum_width
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_width)
 
@@ -1856,7 +2037,13 @@ class GeometryTests < Minitest::Test
     simple_tester(:reverse, 'POINT (3 5)', 'POINT (3 5)')
     simple_tester(:reverse, 'MULTIPOINT (100 100, 10 100, 30 100)', 'MULTIPOINT (100 100, 10 100, 30 100)')
     simple_tester(:reverse, 'LINESTRING (200 200, 200 100)', 'LINESTRING (200 100, 200 200)')
-    simple_tester(:reverse, 'MULTILINESTRING ((1 1, 2 2), (3 3, 4 4))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 1))')
+
+    if Geos::GEOS_VERSION >= '3.8.1'
+      simple_tester(:reverse, 'MULTILINESTRING ((3 3, 4 4), (1 1, 2 2))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 1))')
+    else
+      simple_tester(:reverse, 'MULTILINESTRING ((1 1, 2 2), (3 3, 4 4))', 'MULTILINESTRING ((4 4, 3 3), (2 2, 1 1))')
+    end
+
     simple_tester(:reverse, 'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1))', 'POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 1 2, 2 2, 2 1, 1 1))')
     simple_tester(:reverse, 'MULTIPOLYGON (((0 0, 10 0, 10 10, 0 10, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), ((100 100, 100 200, 200 200, 100 100)))', 'MULTIPOLYGON (((0 0, 0 10, 10 10, 10 0, 0 0), (1 1, 1 2, 2 2, 2 1, 1 1)), ((100 100, 200 200, 100 200, 100 100)))')
     simple_tester(:reverse, 'GEOMETRYCOLLECTION (LINESTRING (1 1, 2 2), GEOMETRYCOLLECTION (LINESTRING (3 5, 2 9)))', 'GEOMETRYCOLLECTION (LINESTRING (2 2, 1 1), GEOMETRYCOLLECTION(LINESTRING (2 9, 3 5)))')