ffi-geos 2.2.0 → 2.4.0

data/.rubocop_todo.yml

@@ -0,0 +1,100 @@
+# 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.
+# 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:
+  Exclude:
+    - 'test/geometry_tests.rb'
+
+# Offense count: 6
+# Configuration parameters: IgnoredMethods, 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'
+
+# Offense count: 2
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/ffi-geos/coordinate_sequence.rb'
+    - 'lib/ffi-geos/geometry.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/ffi-geos/coordinate_sequence.rb'
+    - 'lib/ffi-geos/tools.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ModuleLength:
+  Exclude:
+    - 'lib/ffi-geos.rb'
+
+# Offense count: 1
+# Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/ffi-geos/utils.rb'
+
+# Offense count: 4
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'lib/ffi-geos/coordinate_sequence.rb'
+    - 'lib/ffi-geos/tools.rb'
+    - 'test/geometry_tests.rb'
+
+# Offense count: 9
+Naming/AccessorMethodName:
+  Exclude:
+    - 'lib/ffi-geos/geojson_writer.rb'
+    - 'lib/ffi-geos/point.rb'
+    - 'lib/ffi-geos/wkb_writer.rb'
+    - 'lib/ffi-geos/wkt_writer.rb'
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/ffi-geos.rb'
+
+# Offense count: 2
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# 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:
+  Exclude:
+    - 'lib/ffi-geos.rb'
+    - 'lib/ffi-geos/geometry.rb'
+
+# Offense count: 4
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/ffi-geos/geometry.rb'
+    - 'test/wkb_reader_tests.rb'
+    - 'test/wkb_writer_tests.rb'

data/Gemfile

@@ -11,11 +11,8 @@ 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 'rubocop-minitest', require: false
+gem 'simplecov', require: false
+gem 'simplecov_json_formatter', require: false
 
 instance_eval File.read('Gemfile.local') if File.exist?('Gemfile.local')

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2021 J Smith <dark.panda@gmail.com>
+Copyright (c) 2010-2022 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/README.rdoc

@@ -54,6 +54,8 @@ Ruby bindings along with the following enhancements and additions:
   GEOS library and perform other work or cancel GEOS calls outright. The
   interruption API was added in GEOS 3.4.0.
 
+* Geos::GeoJSONReader and Geos::GeoJSONWriter support on GEOS 3.10+.
+
 == New Methods and Additions (not exhaustive)
 
 * SRIDs can be copied on many operations. GEOS doesn't usually copy SRIDs

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.6'
+
   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/geojson_reader.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Geos
+  class GeoJSONReader
+    include Geos::Tools
+
+    attr_reader :ptr
+
+    class ParseError < Geos::ParseError
+    end
+
+    def initialize(*args)
+      ptr = if args.first.is_a?(FFI::Pointer)
+        args.first
+      else
+        FFIGeos.GEOSGeoJSONReader_create_r(Geos.current_handle_pointer, *args)
+      end
+
+      @ptr = FFI::AutoPointer.new(
+        ptr,
+        self.class.method(:release)
+      )
+    end
+
+    def read(json, options = {})
+      cast_geometry_ptr(FFIGeos.GEOSGeoJSONReader_readGeometry_r(Geos.current_handle_pointer, ptr, json), srid: options[:srid])
+    rescue Geos::GEOSException => e
+      raise ParseError, e
+    end
+
+    def self.release(ptr) # :nodoc:
+      FFIGeos.GEOSGeoJSONReader_destroy_r(Geos.current_handle_pointer, ptr)
+    end
+  end
+end

data/lib/ffi-geos/geojson_writer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Geos
+  class GeoJSONWriter
+    attr_accessor :indentation
+    attr_reader :ptr
+
+    def initialize(options = {})
+      options = {
+        indentation: -1
+      }.merge(options)
+
+      ptr = FFIGeos.GEOSGeoJSONWriter_create_r(Geos.current_handle_pointer)
+      @ptr = FFI::AutoPointer.new(
+        ptr,
+        self.class.method(:release)
+      )
+
+      set_options(options)
+    end
+
+    def self.release(ptr) # :nodoc:
+      FFIGeos.GEOSGeoJSONWriter_destroy_r(Geos.current_handle_pointer, ptr)
+    end
+
+    def set_options(options) # :nodoc:
+      [:indentation].each do |k|
+        send("#{k}=", options[k]) if respond_to?("#{k}=") && options.key?(k)
+      end
+    end
+    private :set_options
+
+    # Options can be set temporarily for individual writes using an options
+    # Hash. Options include :indentation.
+    def write(geom, options = nil)
+      unless options.nil?
+        old_options = {
+          indentation: indentation
+        }
+
+        set_options(options)
+      end
+
+      FFIGeos.GEOSGeoJSONWriter_writeGeometry_r(Geos.current_handle_pointer, ptr, geom.ptr, indentation)
+    ensure
+      set_options(old_options) unless options.nil?
+    end
+  end
+end

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)
 
@@ -637,6 +637,12 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSConstrainedDelaunayTriangulation_r)
+      def constrained_delaunay_triangulation
+        cast_geometry_ptr(FFIGeos.GEOSConstrainedDelaunayTriangulation_r(Geos.current_handle_pointer, ptr))
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSVoronoiDiagram_r)
       # Available in GEOS 3.5.0+
       #

data/lib/ffi-geos/geometry_collection.rb

@@ -46,7 +46,7 @@ module Geos
 
     %w{ x y z }.each do |dimension|
       %w{ max min }.each do |op|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
@@ -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?
 
@@ -146,7 +146,7 @@ module Geos
 
     %w{ max min }.each do |op|
       %w{ x y }.each do |dimension|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
@@ -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

@@ -78,7 +78,7 @@ module Geos
 
     %w{ max min }.each do |op|
       %w{ x y }.each do |dimension|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
@@ -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
 
@@ -77,5 +77,25 @@ module Geos
       check_geometry(geom)
       bool_result(FFIGeos.GEOSPreparedWithin_r(Geos.current_handle_pointer, ptr, geom.ptr))
     end
+
+    def distance(geom)
+      check_geometry(geom)
+      double_ptr = FFI::MemoryPointer.new(:double)
+      FFIGeos.GEOSPreparedDistance_r(Geos.current_handle_pointer, ptr, geom.ptr, double_ptr)
+      double_ptr.read_double
+    end
+
+    def distance_within?(geom, distance)
+      check_geometry(geom)
+      bool_result(FFIGeos.GEOSPreparedDistanceWithin_r(Geos.current_handle_pointer, ptr, geom.ptr, distance))
+    end
+
+    def nearest_points(geom)
+      check_geometry(geom)
+
+      coord_seq_ptr = FFIGeos.GEOSPreparedNearestPoints_r(Geos.current_handle_pointer, ptr, geom.ptr)
+
+      Geos::CoordinateSequence.new(coord_seq_ptr)
+    end
   end
 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.4.0'
 end