ffi-geos 1.1.1 → 1.2.0

data/lib/ffi-geos/version.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
-  VERSION = "1.1.1".freeze
+  VERSION = '1.2.0'.freeze
 end
 

data/lib/ffi-geos/wkb_reader.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class WkbReader
@@ -13,7 +14,7 @@ module Geos
       ptr = if args.first.is_a?(FFI::Pointer)
         args.first
       else
-        FFIGeos.GEOSWKBReader_create_r(Geos.current_handle, *args)
+        FFIGeos.GEOSWKBReader_create_r(Geos.current_handle_pointer, *args)
       end
 
       @ptr = FFI::AutoPointer.new(
@@ -23,7 +24,7 @@ module Geos
     end
 
     def read(wkb, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKBReader_read_r(Geos.current_handle, self.ptr, wkb, wkb.bytesize), {
+      cast_geometry_ptr(FFIGeos.GEOSWKBReader_read_r(Geos.current_handle_pointer, self.ptr, wkb, wkb.bytesize), {
         :srid => options[:srid]
       })
     rescue Geos::GEOSException => e
@@ -31,7 +32,7 @@ module Geos
     end
 
     def read_hex(wkb, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKBReader_readHEX_r(Geos.current_handle, self.ptr, wkb, wkb.bytesize), {
+      cast_geometry_ptr(FFIGeos.GEOSWKBReader_readHEX_r(Geos.current_handle_pointer, self.ptr, wkb, wkb.bytesize), {
         :srid => options[:srid]
       })
     rescue Geos::GEOSException => e
@@ -39,7 +40,7 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSWKBReader_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSWKBReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end
 end

data/lib/ffi-geos/wkb_writer.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class WkbWriter
@@ -11,7 +12,7 @@ module Geos
         :include_srid => false
       }.merge(options)
 
-      ptr = FFIGeos.GEOSWKBWriter_create_r(Geos.current_handle)
+      ptr = FFIGeos.GEOSWKBWriter_create_r(Geos.current_handle_pointer)
       @ptr = FFI::AutoPointer.new(
         ptr,
         self.class.method(:release)
@@ -21,7 +22,7 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSWKBWriter_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSWKBWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
     # Options can be set temporarily for individual writes using an options
@@ -36,7 +37,7 @@ module Geos
       end
 
       size_t = FFI::MemoryPointer.new(:size_t)
-      FFIGeos.GEOSWKBWriter_write_r(Geos.current_handle, self.ptr, geom.ptr, size_t).get_bytes(0, size_t.read_int)
+      FFIGeos.GEOSWKBWriter_write_r(Geos.current_handle_pointer, self.ptr, geom.ptr, size_t).get_bytes(0, size_t.read_int)
     ensure
       set_options(old_options) unless old_options.nil?
     end
@@ -51,7 +52,7 @@ module Geos
       end
 
       size_t = FFI::MemoryPointer.new(:size_t)
-      FFIGeos.GEOSWKBWriter_writeHEX_r(Geos.current_handle, self.ptr, geom.ptr, size_t).get_string(0, size_t.read_int)
+      FFIGeos.GEOSWKBWriter_writeHEX_r(Geos.current_handle_pointer, self.ptr, geom.ptr, size_t).get_string(0, size_t.read_int)
     ensure
       set_options(old_options) unless old_options.nil?
     end
@@ -60,30 +61,30 @@ module Geos
       if dim < 2 || dim > 3
         raise ArgumentError.new("Output dimensions must be either 2 or 3")
       end
-      FFIGeos.GEOSWKBWriter_setOutputDimension_r(Geos.current_handle, self.ptr, dim)
+      FFIGeos.GEOSWKBWriter_setOutputDimension_r(Geos.current_handle_pointer, self.ptr, dim)
     end
 
     def output_dimensions
-      FFIGeos.GEOSWKBWriter_getOutputDimension_r(Geos.current_handle, self.ptr)
+      FFIGeos.GEOSWKBWriter_getOutputDimension_r(Geos.current_handle_pointer, self.ptr)
     end
 
     def include_srid
-      bool_result(FFIGeos.GEOSWKBWriter_getIncludeSRID_r(Geos.current_handle, self.ptr))
+      bool_result(FFIGeos.GEOSWKBWriter_getIncludeSRID_r(Geos.current_handle_pointer, self.ptr))
     end
 
     def include_srid=(val)
-      FFIGeos.GEOSWKBWriter_setIncludeSRID_r(Geos.current_handle, self.ptr,
+      FFIGeos.GEOSWKBWriter_setIncludeSRID_r(Geos.current_handle_pointer, self.ptr,
         Geos::Tools.bool_to_int(val)
       )
     end
 
     def byte_order
-      FFIGeos.GEOSWKBWriter_getByteOrder_r(Geos.current_handle, self.ptr)
+      FFIGeos.GEOSWKBWriter_getByteOrder_r(Geos.current_handle_pointer, self.ptr)
     end
 
     def byte_order=(val)
       check_enum_value(Geos::ByteOrders, val)
-      FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle, self.ptr, val)
+      FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle_pointer, self.ptr, val)
     end
 
     private

data/lib/ffi-geos/wkt_reader.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class WktReader
@@ -13,7 +14,7 @@ module Geos
       ptr = if args.first.is_a?(FFI::Pointer)
         args.first
       else
-        FFIGeos.GEOSWKTReader_create_r(Geos.current_handle, *args)
+        FFIGeos.GEOSWKTReader_create_r(Geos.current_handle_pointer, *args)
       end
 
       @ptr = FFI::AutoPointer.new(
@@ -23,7 +24,7 @@ module Geos
     end
 
     def read(wkt, options = {})
-      cast_geometry_ptr(FFIGeos.GEOSWKTReader_read_r(Geos.current_handle, self.ptr, wkt), {
+      cast_geometry_ptr(FFIGeos.GEOSWKTReader_read_r(Geos.current_handle_pointer, self.ptr, wkt), {
         :srid => options[:srid]
       })
     rescue Geos::GEOSException => e
@@ -31,7 +32,7 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSWKTReader_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSWKTReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end
 end

data/lib/ffi-geos/wkt_writer.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class WktWriter
@@ -15,7 +16,7 @@ module Geos
         :output_dimensions => 2
       }.merge(options)
 
-      ptr = FFIGeos.GEOSWKTWriter_create_r(Geos.current_handle)
+      ptr = FFIGeos.GEOSWKTWriter_create_r(Geos.current_handle_pointer)
       @ptr = FFI::AutoPointer.new(
         ptr,
         self.class.method(:release)
@@ -25,7 +26,7 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSWKTWriter_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSWKTWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
     def set_options(options) #:nodoc:
@@ -50,7 +51,7 @@ module Geos
         set_options(options)
       end
 
-      FFIGeos.GEOSWKTWriter_write_r(Geos.current_handle, self.ptr, geom.ptr)
+      FFIGeos.GEOSWKTWriter_write_r(Geos.current_handle_pointer, self.ptr, geom.ptr)
     ensure
       set_options(old_options) unless options.nil?
     end
@@ -59,7 +60,7 @@ module Geos
       # Available in GEOS 3.3+.
       def trim=(val)
         @trim = !!val
-        FFIGeos.GEOSWKTWriter_setTrim_r(Geos.current_handle, self.ptr,
+        FFIGeos.GEOSWKTWriter_setTrim_r(Geos.current_handle_pointer, self.ptr,
           Geos::Tools.bool_to_int(@trim)
         )
       end
@@ -74,7 +75,7 @@ module Geos
         end
 
         @rounding_precision = r
-        FFIGeos.GEOSWKTWriter_setRoundingPrecision_r(Geos.current_handle, self.ptr, @rounding_precision)
+        FFIGeos.GEOSWKTWriter_setRoundingPrecision_r(Geos.current_handle_pointer, self.ptr, @rounding_precision)
       end
     end
 
@@ -82,7 +83,7 @@ module Geos
       # Available in GEOS 3.3+.
       def old_3d=(val)
         @old_3d = !!val
-        FFIGeos.GEOSWKTWriter_setOld3D_r(Geos.current_handle, self.ptr,
+        FFIGeos.GEOSWKTWriter_setOld3D_r(Geos.current_handle_pointer, self.ptr,
           Geos::Tools.bool_to_int(@old_3d)
         )
       end
@@ -95,14 +96,14 @@ module Geos
         if dim < 2 || dim > 3
           raise ArgumentError.new("Output dimensions must be either 2 or 3")
         end
-        FFIGeos.GEOSWKTWriter_setOutputDimension_r(Geos.current_handle, self.ptr, dim)
+        FFIGeos.GEOSWKTWriter_setOutputDimension_r(Geos.current_handle_pointer, self.ptr, dim)
       end
     end
 
     if FFIGeos.respond_to?(:GEOSWKTWriter_getOutputDimension_r)
       # Available in GEOS 3.3+.
       def output_dimensions
-        FFIGeos.GEOSWKTWriter_getOutputDimension_r(Geos.current_handle, self.ptr)
+        FFIGeos.GEOSWKTWriter_getOutputDimension_r(Geos.current_handle_pointer, self.ptr)
       end
     end
   end

data/test/coordinate_sequence_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/geometry_collection_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/geometry_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -1635,4 +1636,91 @@ class GeometryTests < Minitest::Test
     @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]
   end
+
+  def test_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:precision)
+
+    geom = read('POLYGON EMPTY')
+    scale = geom.precision
+    assert_equal(0.0, scale)
+
+    geom_with_precision = geom.with_precision(2.0)
+
+    assert_equal('POLYGON EMPTY', write(geom_with_precision))
+    scale = geom_with_precision.precision
+    assert_equal(2.0, scale)
+  end
+
+  def test_with_precision
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:with_precision)
+
+    geom = read('LINESTRING(1 0, 2 0)')
+
+    geom_with_precision = geom.with_precision(5.0)
+    assert_equal('LINESTRING EMPTY', write(geom_with_precision))
+
+    geom_with_precision = geom.with_precision(5.0, :keep_collapsed => true)
+    assert_equal('LINESTRING (0 0, 0 0)', write(geom_with_precision))
+  end
+
+  def test_minimum_rotated_rectangle
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_rotated_rectangle)
+
+    geom = read('POLYGON ((1 6, 6 11, 11 6, 6 1, 1 6))')
+    minimum_rotated_rectangle = geom.minimum_rotated_rectangle
+
+    assert_equal('POLYGON ((6 1, 11 6, 6 11, 1 6, 6 1))', write(minimum_rotated_rectangle))
+  end
+
+  def test_minimum_clearance
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_clearance)
+
+    tester = lambda { |expected_clearance, geom|
+      geom = read(geom)
+      clearance = geom.minimum_clearance
+
+      if expected_clearance.eql?(Float::INFINITY)
+        assert(clearance.infinite?)
+      else
+        assert_in_delta(expected_clearance, clearance, TOLERANCE)
+      end
+    }
+
+    tester[Float::INFINITY, 'LINESTRING EMPTY']
+    tester[20, 'LINESTRING (30 100, 10 100)']
+    tester[100, 'LINESTRING (200 200, 200 100)']
+    tester[3.49284983912134e-05, 'LINESTRING (-112.712119 33.575919, -112.712127 33.575885)']
+  end
+
+  def test_minimum_clearance_line
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_clearance_line)
+
+    tester = lambda { |expected_geom, geom|
+      geom = read(geom)
+      clearance_geom = geom.minimum_clearance_line
+
+      assert_equal(expected_geom, write(clearance_geom))
+    }
+
+    tester['LINESTRING EMPTY', 'MULTIPOINT ((100 100), (100 100))']
+    tester['LINESTRING (30 100, 10 100)', 'MULTIPOINT ((100 100), (10 100), (30 100))']
+    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'
+    ]
+    tester['LINESTRING EMPTY', 'POLYGON EMPTY']
+  end
+
+  def test_minimum_width
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:minimum_width)
+
+    geom = read('POLYGON ((0 0, 0 15, 5 10, 5 0, 0 0))')
+    output = geom.minimum_width
+    assert_equal('LINESTRING (0 0, 5 0)', write(output))
+
+    geom = read('LINESTRING (0 0,0 10, 10 10)')
+    output = geom.minimum_width
+    assert_equal('LINESTRING (5 5, 0 10)', write(output))
+  end
 end

data/test/interrupt_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/line_string_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/linear_ring_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'

data/test/misc_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -105,4 +106,102 @@ class MiscTests < Minitest::Test
       Geos::BufferParams.new.dup
     end
   end
+
+  def notice_handler_tester
+    results = ''.dup
+    geom = read('POLYGON((0 0, 0 5, 5 0, 5 5, 0 0))')
+
+    yield results
+
+    refute(geom.valid?, "Expected geom to be invalid")
+    assert_match(/^NOTICE: .+$/, results)
+  ensure
+    Geos.current_handle.reset_notice_handler
+  end
+
+  def notice_handler_method(results, *args)
+    results << "NOTICE: #{args[0] % args[1]}"
+  end
+
+  def test_setting_notice_handler_with_method
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:notice_handler=)
+
+    notice_handler_tester do |results|
+      Geos.current_handle.notice_handler = method(:notice_handler_method).curry(2)[results]
+    end
+  end
+
+  def test_setting_notice_handler_with_proc
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:notice_handler=)
+
+    notice_handler_tester do |results|
+      Geos.current_handle.notice_handler = proc do |*args|
+        results << "NOTICE: #{args[0] % args[1]}"
+      end
+    end
+  end
+
+  def test_setting_notice_handler_with_block
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:notice_handler=)
+
+    notice_handler_tester do |results|
+      Geos.current_handle.notice_handler do |*args|
+        results << "NOTICE: #{args[0] % args[1]}"
+      end
+    end
+  end
+
+  def error_handler_tester
+    results = ''.dup
+    geom = nil
+
+    yield results
+
+    assert_raises(RuntimeError) do
+      geom = read('POLYGON((0 0, 0 5, 5 0, 5 5))')
+    end
+
+    assert_nil(geom)
+    assert_match(/^ERROR: .+$/, results)
+  ensure
+    Geos.current_handle.reset_error_handler
+  end
+
+  def error_handler_method(results, *args)
+    message = "ERROR: #{args[0] % args[1]}".dup
+    results << message
+    raise message
+  end
+
+  def test_setting_error_handler_with_method
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:error_handler=)
+
+    error_handler_tester do |results|
+      Geos.current_handle.error_handler = method(:error_handler_method).curry(2)[results]
+    end
+  end
+
+  def test_setting_error_handler_with_proc
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:error_handler=)
+
+    error_handler_tester do |results|
+      Geos.current_handle.error_handler = proc do |*args|
+        message = "ERROR: #{args[0] % args[1]}".dup
+        results << message
+        raise message
+      end
+    end
+  end
+
+  def test_setting_error_handler_with_block
+    skip unless ENV['FORCE_TESTS'] || Geos::Handle.method_defined?(:error_handler=)
+
+    error_handler_tester do |results|
+      Geos.current_handle.error_handler do |*args|
+        message = "ERROR: #{args[0] % args[1]}".dup
+        results << message
+        raise message
+      end
+    end
+  end
 end