ffi-geos 2.4.0 → 2.5.0

data/.rubocop_todo.yml

@@ -1,24 +1,27 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
-# on 2022-06-13 13:21:07 UTC using RuboCop version 1.30.1.
+# on 2024-04-19 02:14:33 UTC using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-Lint/BinaryOperatorWithIdenticalOperands:
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/DeprecatedAttributeAssignment:
   Exclude:
-    - 'test/geometry_tests.rb'
+    - 'ffi-geos.gemspec'
 
 # Offense count: 6
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max.
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/ffi-geos/coordinate_sequence.rb'
     - 'lib/ffi-geos/line_string.rb'
     - 'lib/ffi-geos/utils.rb'
-    - 'test/geometry_tests.rb'
+    - 'test/geometry/polygonize_tests.rb'
 
 # Offense count: 2
 # Configuration parameters: CountComments, Max, CountAsOne.
@@ -28,7 +31,7 @@ Metrics/ClassLength:
     - 'lib/ffi-geos/geometry.rb'
 
 # Offense count: 3
-# Configuration parameters: IgnoredMethods, Max.
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/ffi-geos/coordinate_sequence.rb'
@@ -46,13 +49,22 @@ Metrics/ParameterLists:
   Exclude:
     - 'lib/ffi-geos/utils.rb'
 
-# Offense count: 4
-# Configuration parameters: IgnoredMethods, Max.
+# Offense count: 7
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/ffi-geos/coordinate_sequence.rb'
     - 'lib/ffi-geos/tools.rb'
-    - 'test/geometry_tests.rb'
+    - 'test/geometry/sym_difference_tests.rb'
+    - 'test/geometry/union_tests.rb'
+    - 'test/geometry/voronoi_diagram_tests.rb'
+    - 'test/line_string_tests.rb'
+
+# Offense count: 5
+Minitest/AssertRaisesCompoundBody:
+  Exclude:
+    - 'test/geometry/polygonize_tests.rb'
+    - 'test/utils_tests.rb'
 
 # Offense count: 9
 Naming/AccessorMethodName:
@@ -70,7 +82,7 @@ Naming/FileName:
   Exclude:
     - 'lib/ffi-geos.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -78,17 +90,15 @@ Naming/FileName:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
-    - 'lib/ffi-geos/coordinate_sequence.rb'
     - 'lib/ffi-geos/geometry.rb'
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
-Naming/VariableNumber:
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: Thread.current
+Style/HashEachMethods:
   Exclude:
-    - 'lib/ffi-geos.rb'
-    - 'lib/ffi-geos/geometry.rb'
+    - 'lib/ffi-geos/strtree.rb'
 
 # Offense count: 4
 # Configuration parameters: AllowedMethods.

data/ffi-geos.gemspec

@@ -7,7 +7,7 @@ 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.6'
+  s.required_ruby_version = '>= 2.7'
 
   s.authors = ['J Smith']
   s.description = 'An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).'
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.homepage = 'http://github.com/dark-panda/ffi-geos'
+  s.homepage = 'https://github.com/dark-panda/ffi-geos'
   s.require_paths = ['lib']
 
   s.add_dependency('ffi', ['>= 1.0.0'])

data/lib/ffi-geos/coordinate_sequence.rb

@@ -154,9 +154,10 @@ module Geos
     end
     alias slice []
 
-    def has_z?
+    def z?
       dimensions == 3
     end
+    alias has_z? z?
 
     # Sets the x value of a coordinate. Can also be set via #x[]=.
     def set_x(idx, val)

data/lib/ffi-geos/geometry.rb

@@ -59,6 +59,18 @@ module Geos
     end
     alias normalize normalize!
 
+    if FFIGeos.respond_to?(:GEOSOrientPolygons_r)
+      def orient_polygons!(exterior_cw = false)
+        raise Geos::GEOSException, self.class if FFIGeos.GEOSOrientPolygons_r(Geos.current_handle_pointer, ptr, bool_to_int(exterior_cw)) == -1
+
+        self
+      end
+
+      def orient_polygons(exterior_cw = false)
+        dup.orient_polygons!(exterior_cw)
+      end
+    end
+
     def srid
       FFIGeos.GEOSGetSRID_r(Geos.current_handle_pointer, ptr)
     end
@@ -140,10 +152,43 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSDensify_r)
+      def densify(tolerance = 0.0)
+        cast_geometry_ptr(FFIGeos.GEOSDensify_r(Geos.current_handle_pointer, ptr, tolerance), srid_copy: srid)
+      end
+    end
+
     def convex_hull
       cast_geometry_ptr(FFIGeos.GEOSConvexHull_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
     end
 
+    if FFIGeos.respond_to?(:GEOSConcaveHull_r) && FFIGeos.respond_to?(:GEOSConcaveHullByLength_r)
+      def concave_hull(ratio: 0.0, allow_holes: false, length: nil)
+        cast_geometry_ptr(
+          case length
+            when Numeric
+              FFIGeos.GEOSConcaveHullByLength_r(Geos.current_handle_pointer, ptr, length, bool_to_int(allow_holes))
+            else
+              FFIGeos.GEOSConcaveHull_r(Geos.current_handle_pointer, ptr, ratio, bool_to_int(allow_holes))
+          end,
+          srid_copy: srid
+        )
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSPolygonHullSimplify_r) && FFIGeos.respond_to?(:GEOSPolygonHullSimplifyMode_r)
+      def polygon_hull_simplify(parameter, outer: false, mode: :vertex_ratio)
+        check_enum_value(Geos::PolygonHullSimplifyModes, mode)
+
+        case mode
+          when :vertex_ratio
+            cast_geometry_ptr(FFIGeos.GEOSPolygonHullSimplify_r(Geos.current_handle_pointer, ptr, bool_to_int(outer), parameter), srid_copy: srid)
+          when :area_ratio
+            cast_geometry_ptr(FFIGeos.GEOSPolygonHullSimplifyMode_r(Geos.current_handle_pointer, ptr, bool_to_int(outer), 2, parameter), srid_copy: srid)
+        end
+      end
+    end
+
     def difference(geom, precision: nil)
       check_geometry(geom)
 
@@ -199,6 +244,13 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSDisjointSubsetUnion_r)
+      # Added in GEOS 3.12+
+      def disjoint_subset_union
+        cast_geometry_ptr(FFIGeos.GEOSDisjointSubsetUnion_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSUnaryUnion_r)
       # Available in GEOS 3.3+
       def unary_union(precision = nil)
@@ -235,6 +287,15 @@ module Geos
     end
     alias center centroid
 
+    if FFIGeos.respond_to?(:GEOSHilbertCode_r)
+      def hilbert_code(extent, level)
+        check_geometry(extent)
+        code_ptr = FFI::MemoryPointer.new(:uint)
+        FFIGeos.GEOSHilbertCode_r(Geos.current_handle_pointer, ptr, extent.ptr, level, code_ptr)
+        code_ptr.read_uint
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSMinimumBoundingCircle_r)
       # Added in GEOS 3.8+. Does not yet support the radius or center
       # arguments.
@@ -273,6 +334,19 @@ module Geos
       cast_geometry_ptr(FFIGeos.GEOSLineMerge_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
     end
 
+    if FFIGeos.respond_to?(:GEOSLineMergeDirected_r)
+      def line_merge_directed
+        cast_geometry_ptr(FFIGeos.GEOSLineMergeDirected_r(Geos.current_handle_pointer, ptr), srid_copy: srid)
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSLineSubstring_r)
+      # Added in GEOS 3.12+
+      def line_substring(start_fraction, end_fraction)
+        cast_geometry_ptr(FFIGeos.GEOSLineSubstring_r(Geos.current_handle_pointer, ptr, start_fraction, end_fraction), srid_copy: srid)
+      end
+    end
+
     def simplify(tolerance)
       cast_geometry_ptr(FFIGeos.GEOSSimplify_r(Geos.current_handle_pointer, ptr, tolerance), srid_copy: srid)
     end
@@ -384,6 +458,14 @@ module Geos
     alias equals_exact? eql_exact?
     alias exactly_equals? eql_exact?
 
+    if FFIGeos.respond_to?(:GEOSEqualsIdentical_r)
+      def eql_identical?(other)
+        check_geometry(other)
+        bool_result(FFIGeos.GEOSEqualsIdentical_r(Geos.current_handle_pointer, ptr, other.ptr))
+      end
+      alias equals_identical? eql_identical?
+    end
+
     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)))
@@ -439,6 +521,12 @@ module Geos
       bool_result(FFIGeos.GEOSHasZ_r(Geos.current_handle_pointer, ptr))
     end
 
+    if FFIGeos.respond_to?(:GEOSHasM_r)
+      def has_m?
+        bool_result(FFIGeos.GEOSHasM_r(Geos.current_handle_pointer, ptr))
+      end
+    end
+
     # 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_NICE_VERSION >= '030300'
@@ -533,7 +621,7 @@ module Geos
         check_geometry(geom)
         nearest_points_ptr = FFIGeos.GEOSNearestPoints_r(Geos.current_handle_pointer, ptr, geom.ptr)
 
-        return CoordinateSequence.new(nearest_points_ptr) unless nearest_points_ptr.null?
+        CoordinateSequence.new(nearest_points_ptr) unless nearest_points_ptr.null?
       end
     end
 
@@ -705,6 +793,12 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSConcaveHullOfPolygons_r)
+      def concave_hull_of_polygons(length_ratio, tight: false, allow_holes: false)
+        cast_geometry_ptr(FFIGeos.GEOSConcaveHullOfPolygons_r(Geos.current_handle_pointer, ptr, length_ratio, bool_to_int(tight), bool_to_int(allow_holes)), srid_copy: srid)
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSMinimumRotatedRectangle_r)
       def minimum_rotated_rectangle
         cast_geometry_ptr(FFIGeos.GEOSMinimumRotatedRectangle_r(Geos.current_handle_pointer, ptr))

data/lib/ffi-geos/point.rb

@@ -41,6 +41,15 @@ module Geos
     end
     alias z get_z
 
+    if FFIGeos.respond_to?(:GEOSGeomGetM_r)
+      def get_m
+        double_ptr = FFI::MemoryPointer.new(:double)
+        FFIGeos.GEOSGeomGetM_r(Geos.current_handle_pointer, ptr, double_ptr)
+        double_ptr.read_double
+      end
+      alias m get_m
+    end
+
     def area
       0
     end

data/lib/ffi-geos/version.rb

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

data/lib/ffi-geos.rb

@@ -54,7 +54,7 @@ module Geos
 
   module FFIGeos
     def self.search_paths
-      @search_paths ||= \
+      @search_paths ||=
         if ENV['GEOS_LIBRARY_PATH']
           [ENV['GEOS_LIBRARY_PATH']]
         elsif FFI::Platform::IS_WINDOWS
@@ -81,7 +81,7 @@ module Geos
     end
 
     def self.geos_library_path
-      @geos_library_path ||= \
+      @geos_library_path ||=
         # On MingW the libraries have version numbers
         find_lib('{lib,}geos_c{,-?}')
     end
@@ -153,6 +153,11 @@ module Geos
       :keep_collapsed, 1 << 1
     ])
 
+    Geos::PolygonHullSimplifyModes = enum(:polygon_hull_simplify_mode, [
+      :vertex_ratio, 1,
+      :area_ratio, 2
+    ])
+
     FFI_LAYOUT = {
       #### Utility functions ####
 
@@ -439,6 +444,11 @@ module Geos
         :pointer, :pointer, :pointer, :double, :int, :buffer_cap_style, :buffer_join_style, :double
       ],
 
+      GEOSDensify_r: [
+        # *geom, *handle, *geom, tolerence
+        :pointer, :pointer, :pointer, :double
+      ],
+
       # Deprecated in GEOS 3.3.0.
       GEOSSingleSidedBuffer_r: [
         # *geom, *handle, *geom, width, quad_segs, buffer_join_style, mitre_limit, is_left
@@ -455,6 +465,26 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSConcaveHull_r: [
+        # *geom, *handle, *geom, ratio, allow_holes
+        :pointer, :pointer, :pointer, :double, :uint
+      ],
+
+      GEOSConcaveHullByLength_r: [
+        # *geom, *handle, *geom, length, allow_holes
+        :pointer, :pointer, :pointer, :double, :uint
+      ],
+
+      GEOSPolygonHullSimplify_r: [
+        # *geom, *handle, *geom, is_outer, vertex_num_fraction
+        :pointer, :pointer, :pointer, :uint, :double
+      ],
+
+      GEOSPolygonHullSimplifyMode_r: [
+        # *geom, *handle, *geom, is_outer, parameter_mode, parameter
+        :pointer, :pointer, :pointer, :uint, :uint, :double
+      ],
+
       GEOSDifference_r: [
         # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
@@ -495,6 +525,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSDisjointSubsetUnion_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSUnaryUnion_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -531,6 +566,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSHilbertCode_r: [
+        # int, *handler, *geom, *extent, level, *code
+        :int, :pointer, :pointer, :pointer, :uint, :pointer
+      ],
+
       GEOSMinimumBoundingCircle_r: [
         # *geom, *handle, *geom, *double radius, **geom center
         :pointer, :pointer, :pointer, :pointer, :pointer
@@ -546,6 +586,16 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSLineMergeDirected_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
+      GEOSLineSubstring_r: [
+        # *geom, *handle, *geom, start_fraction, end_fraction
+        :pointer, :pointer, :pointer, :double, :double
+      ],
+
       GEOSGeom_getXMin_r: [
         # 0 on exception, *handle, (double *) value
         :int, :pointer, :pointer, :pointer
@@ -681,6 +731,11 @@ module Geos
         :char, :pointer, :pointer, :pointer, :double
       ],
 
+      GEOSEqualsIdentical_r: [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
+        :char, :pointer, :pointer, :pointer
+      ],
+
       GEOSisEmpty_r: [
         # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
@@ -716,6 +771,11 @@ module Geos
         :char, :pointer, :pointer
       ],
 
+      GEOSHasM_r: [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
+        :char, :pointer, :pointer
+      ],
+
       GEOSisClosed_r: [
         # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
@@ -776,6 +836,11 @@ module Geos
         :int, :pointer, :pointer
       ],
 
+      GEOSOrientPolygons_r: [
+        # -1 on exception, *handle, *geom, exterior_cw
+        :int, :pointer, :pointer, :int
+      ],
+
       GEOSGetInteriorRingN_r: [
         # *geom, *handle, *geom, n
         :pointer, :pointer, :pointer, :int
@@ -806,6 +871,11 @@ module Geos
         :int, :pointer, :pointer, :pointer
       ],
 
+      GEOSGeomGetM_r: [
+        # -1 on exception, *handle, *geom, *point
+        :int, :pointer, :pointer, :pointer
+      ],
+
       GEOSGeomGetPointN_r: [
         # *point, *handle, *geom, n
         :pointer, :pointer, :pointer, :int
@@ -831,6 +901,11 @@ module Geos
         :double, :pointer, :pointer
       ],
 
+      GEOSConcaveHullOfPolygons_r: [
+        # *geom, *handle, *geom, length_ratio, tight, allow_holes
+        :pointer, :pointer, :pointer, :double, :uint, :uint
+      ],
+
       GEOSMinimumRotatedRectangle_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -1330,7 +1405,7 @@ module Geos
       end
 
       def default_error_handler(*args)
-        raise Geos::GEOSException, args[0] % args[1]
+        raise Geos::GEOSException, sprintf(args[0], *args[1])
       end
   end
 

data/test/coordinate_sequence_tests.rb

@@ -12,16 +12,19 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_set_and_get_x
     @cs.set_x(0, 10.01)
+
     assert_in_delta(10.01, @cs.get_x(0), TOLERANCE)
   end
 
   def test_set_and_get_y
     @cs.set_y(0, 20.02)
+
     assert_in_delta(20.02, @cs.get_y(0), TOLERANCE)
   end
 
   def test_set_and_get_z
     @cs.set_z(0, 20.02)
+
     assert_in_delta(20.02, @cs.get_z(0), TOLERANCE)
   end
 
@@ -53,7 +56,7 @@ class CoordinateSequenceTests < Minitest::Test
       [0, 0]
     ])
 
-    assert(cs.counter_clockwise?)
+    assert_predicate(cs, :counter_clockwise?)
 
     cs = Geos::CoordinateSequence.new([
       [0, 0],
@@ -62,7 +65,7 @@ class CoordinateSequenceTests < Minitest::Test
       [0, 0]
     ])
 
-    refute(cs.counter_clockwise?)
+    refute_predicate(cs, :counter_clockwise?)
   end
 
   def test_check_bounds
@@ -115,6 +118,7 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_with_no_arguments
     cs = Geos::CoordinateSequence.new
+
     assert_equal(0, cs.size)
     assert_equal(3, cs.dimensions)
   end
@@ -153,6 +157,7 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_to_point
     cs = Geos::CoordinateSequence.new([5, 7])
+
     assert_equal('POINT (5 7)', write(cs.to_point, trim: true))
   end
 
@@ -170,9 +175,11 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_empty
     cs = Geos::CoordinateSequence.new
+
     assert_geom_empty(cs)
 
     cs = Geos::CoordinateSequence.new([4, 1])
+
     refute_geom_empty(cs)
   end
 
@@ -219,11 +226,13 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_to_s_2d
     cs = Geos::CoordinateSequence.new([[1, 2], [10, 11]])
+
     assert_equal('1.0 2.0, 10.0 11.0', cs.to_s)
   end
 
   def test_to_s_3d
     cs = Geos::CoordinateSequence.new([[1, 2, 3], [10, 11, 12]])
+
     assert_equal('1.0 2.0 3.0, 10.0 11.0 12.0', cs.to_s)
   end
 
@@ -358,37 +367,45 @@ class CoordinateSequenceTests < Minitest::Test
 
   def test_x_max
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
+
     assert_equal(10, cs.x_max)
   end
 
   def test_x_min
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
+
     assert_equal(-10, cs.x_min)
   end
 
   def test_y_max
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
+
     assert_equal(20, cs.y_max)
   end
 
   def test_y_min
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
+
     assert_equal(-15, cs.y_min)
   end
 
   def test_z_max
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
-    assert(cs.z_max.nan?, ' Expected NaN')
+
+    assert_predicate(cs.z_max, :nan?, ' Expected NaN')
 
     cs = Geos::CoordinateSequence.new([-10, -15, -20], [0, 5, 10], [10, 20, 30])
+
     assert_equal(30, cs.z_max)
   end
 
   def test_z_min
     cs = Geos::CoordinateSequence.new([-10, -15], [0, 5], [10, 20])
-    assert(cs.z_min.nan?, ' Expected NaN')
+
+    assert_predicate(cs.z_min, :nan?, ' Expected NaN')
 
     cs = Geos::CoordinateSequence.new([-10, -15, -20], [0, 5, 10], [10, 20, 30])
+
     assert_equal(-20, cs.z_min)
   end
 
@@ -422,6 +439,7 @@ class CoordinateSequenceTests < Minitest::Test
 
       cs = Geos::CoordinateSequence.new(*coordinates)
       snapped = cs.snap_to_grid(10 ** -i)
+
       assert_equal(coordinates, cs.to_a)
       assert_equal(expected[i].inspect, snapped.to_a.inspect)
     end

data/test/geojson_reader_tests.rb

@@ -55,7 +55,11 @@ class GeoJSONReaderTests < Minitest::Test
 
   def test_multi_point
     geojson_tester(
-      'MULTIPOINT (10.000 40.000, 40.000 30.000, 20.000 20.000, 30.000 10.000)',
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        'MULTIPOINT ((10.000 40.000), (40.000 30.000), (20.000 20.000), (30.000 10.000))'
+      else
+        'MULTIPOINT (10.000 40.000, 40.000 30.000, 20.000 20.000, 30.000 10.000)'
+      end,
       '{"type":"MultiPoint","coordinates":[[10, 40], [40, 30], [20, 20], [30, 10]]}'
     )
   end
@@ -165,6 +169,6 @@ class GeoJSONReaderTests < Minitest::Test
       srid: 3857
     )
 
-    assert_equal(geom.srid, 3857)
+    assert_equal(3857, geom.srid)
   end
 end

data/test/geometry/area_tests.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeometryAreaTests < Minitest::Test
+  include TestHelper
+
+  def setup
+    super
+    writer.trim = true
+  end
+
+  def test_area
+    simple_tester(:area, 1.0, 'POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))')
+    simple_tester(:area, 0.0, 'POINT (0 0)')
+    simple_tester(:area, 0.0, 'LINESTRING (0 0 , 10 0)')
+  end
+end

data/test/geometry/boundary_tests.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeometryBoundaryTests < Minitest::Test
+  include TestHelper
+
+  def setup
+    super
+    writer.trim = true
+  end
+
+  def test_boundary
+    simple_tester(
+      :boundary,
+      'GEOMETRYCOLLECTION EMPTY',
+      'POINT(0 0)'
+    )
+
+    simple_tester(
+      :boundary,
+      if Geos::GEOS_NICE_VERSION >= '031200'
+        'MULTIPOINT ((0 0), (10 10))'
+      else
+        'MULTIPOINT (0 0, 10 10)'
+      end,
+      'LINESTRING(0 0, 10 10)'
+    )
+
+    simple_tester(
+      :boundary,
+      'MULTILINESTRING ((0 0, 10 0, 10 10, 0 10, 0 0), (5 5, 5 6, 6 6, 6 5, 5 5))',
+      'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),( 5 5, 5 6, 6 6, 6 5, 5 5))'
+    )
+  end
+end