ffi-geos 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc526266d55420dc48080bdd5e692892c7dbb2a
-  data.tar.gz: f7677af86f57eb3d0a9be0b8b1755b3ddc423ffb
+  metadata.gz: 105d67e566f0d38c5d679438643095c0b633c7cc
+  data.tar.gz: e1b981680f31f9b0b71cb8057ca4e588e03d5d04
 SHA512:
-  metadata.gz: 203cff10e29ac37807026ddc9a2d70965fe368df68ca2a03ea3fa74c28f5604ac86a03e33f5430461e0d0b109194bec66036c24d32058285ce6b03a6a815b33e
-  data.tar.gz: 35a98846b51df19ab97ccc39f610ee442b59a5f1c423b9b58870cda443d66476dff0dccad0340909a8906da1eacb86611eabbc287412ae0456f6bdcd8d92d4c8
+  metadata.gz: abb46c8314cfe017c9802c97b42f621e8ff2f1b84b5a23ca46b26d9ccaf2cefeb77731febde0b70350fed80b3f4c7d0a67373a5779abaad514293c47c3df5126
+  data.tar.gz: d79aa2d5154f1ed6f1bf10001a7a849ccff83f3f08d8b4f4c35fb158bbd8e8ce6296db127632bd47d9389993dcc2cdf6bbe4f487d4fc0c52bd2257383531e0ea

data/.travis.yml

@@ -1,11 +1,14 @@
+cache: bundler
+sudo: false
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.1.0
+  - 2.2.3
+  - 2.1.7
   - 2.0.0
   - 1.9.3
-  - 1.8.7
   - rbx-2
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install libgeos-dev
+  - jruby-19mode
+addons:
+  apt:
+    packages:
+      - libgeos-c1

data/Gemfile

@@ -15,6 +15,7 @@ end
 
 if RUBY_VERSION >= '1.9'
   gem "simplecov"
+  gem "guard"
   gem 'guard-minitest'
 end
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 J Smith <dark.panda@gmail.com>
+Copyright (c) 2010-2015 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

@@ -7,12 +7,15 @@
 * GEOS version 3.3.0 or greater. GEOS 3.2.2 and below will work to an extent,
   but some features and methods will be disabled or missing.
 
-Ruby versions known to work:
+Ruby versions known to work according to travis-ci and local testing:
 
-* Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0+ x86_64, OSX 10.6.5+
-* Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0+ i386, linux
-* Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0+ x86_64, linux
-* JRuby 1.6+, x86_64 OSX 10.6.5+
+* Ruby MRI 1.9.3, 2.0+, 2.1+, 2.2+
+* Ruby MRI 1.8.7 works but as Ruby 1.8 is no longer being maintained, there's
+  no guarantee this will continue in the future and is therefore no longer
+  being tested with the same rigour as more modern versions of Ruby.
+* Rubinius 2
+* JRuby 1.6+, with the exception of versions of JRuby prior to 1.6.3 as per
+  below. This includes both 1.8 and 1.9 modes.
 
 === JRuby Notes
 
@@ -72,11 +75,15 @@ Ruby bindings along with the following enhancements and additions:
   convenience methods and geometry conversion and manipulation methods.
 
 * *NEW IN ffi-geos 1.0.0* -- all errors thrown by ffi-geos are now instances of
-  `Geos::Error` or subclasses thereof. `Geos::Error` itself is a descendant
-  of `RuntimeError` as is the case with the native Geos extension. This means
-  that code like `rescue RuntimeError` should still work but you can now
+  Geos::Error or subclasses thereof. Geos::Error itself is a descendant
+  of RuntimeError as is the case with the native Geos extension. This means
+  that code like rescue RuntimeError should still work but you can now
   further capture more precise error types by capturing errors like
-  `Geos::Error`, `Geos::ParseError`, etc.
+  Geos::Error, Geos::ParseError, etc.
+
+* *NEW IN ffi-geos 1.0.0* -- new methods for Geom::Geometry#voronoi_diagram,
+  Geos::MultiLineString#closed? and Geos::Geometry#clip_by_rect when using
+  GEOS 3.5.0+.
 
 == Thanks
 

data/lib/ffi-geos.rb

@@ -138,6 +138,10 @@ module Geos
 
     FFI_LAYOUT = {
       #### Utility functions ####
+
+      # Initialization and cleanup
+
+      # deprecated in GEOS 3.5.0+
       :initGEOS_r => [
         :pointer,
 
@@ -152,6 +156,26 @@ module Geos
         # void, *handle
         :void, :pointer
       ],
+      # / deprecated in GEOS 3.5.0+
+
+      # GEOS 3.5.0+
+      :GEOS_init_r => [ :pointer ],
+
+      :GEOSContext_setNoticeMessageHandler_r => [
+        # void, *handle, callback, *void
+        :void, :pointer, callback([ :string, :string ], :void), :pointer
+      ],
+
+      :GEOSContext_setErrorMessageHandler_r => [
+        # void, *handle, callback, *void
+        :void, :pointer, callback([ :string, :string ], :void), :pointer
+      ],
+
+      :GEOS_finish_r => [
+        # void, *handle
+        :void, :pointer
+      ],
+      # / GEOS 3.5.0+
 
       :GEOS_interruptRegisterCallback => [
         :pointer,
@@ -430,6 +454,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      :GEOSClipByRect_r => [
+        # *geom, *handle, *geom, xmin, ymin, xmax, ymax
+        :pointer, :pointer, :pointer, :double, :double, :double, :double
+      ],
+
       :GEOSGetCentroid_r => [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -475,6 +504,11 @@ module Geos
         :pointer, :pointer, :pointer, :double, :int
       ],
 
+      :GEOSVoronoiDiagram_r => [
+        # *geom, *handle, *geom, *envelope, tolerance, only_edges
+        :pointer, :pointer, :pointer, :pointer, :double, :int
+      ],
+
       :GEOSRelate_r => [
         # string, *handle, *geom_a, *geom_b
         :string, :pointer, :pointer, :pointer
@@ -1004,27 +1038,43 @@ module Geos
   class Handle
     attr_reader :ptr
 
-    def initialize
-      @ptr = FFI::AutoPointer.new(
-        FFIGeos.initGEOS_r(
-          @notice_handler = self.method(:notice_handler),
-          @error_handler = self.method(:error_handler)
-        ),
-        self.class.method(:release)
-      )
-    end
+    if FFIGeos.respond_to?(:GEOS_init_r)
+      def initialize
+        @ptr = FFI::AutoPointer.new(FFIGeos.GEOS_init_r, self.class.method(:release))
 
-    def self.release(ptr)
-      FFIGeos.finishGEOS_r(ptr)
-    end
+        FFIGeos.GEOSContext_setNoticeMessageHandler_r(@ptr, @notice_handler = self.method(:notice_handler), nil)
+        FFIGeos.GEOSContext_setErrorMessageHandler_r(@ptr, @error_handler = self.method(:error_handler), nil)
+      end
 
-    def notice_handler(*args)
-      # no-op, just to appease initGEOS.
-    end
+      def self.release(ptr)
+        FFIGeos.GEOS_finish_r(ptr)
+      end
 
-    def error_handler(*args)
-      raise Geos::GEOSException.new(args[0] % args[1])
+    # Deprecated initialization and teardown...
+    else
+      def initialize
+        @ptr = FFI::AutoPointer.new(
+          FFIGeos.initGEOS_r(
+            @notice_handler = self.method(:notice_handler),
+            @error_handler = self.method(:error_handler)
+          ),
+          self.class.method(:release)
+        )
+      end
+
+      def self.release(ptr)
+        FFIGeos.finishGEOS_r(ptr)
+      end
     end
+
+    private
+      def notice_handler(*args)
+        # no-op, just to appease initGEOS.
+      end
+
+      def error_handler(*args)
+        raise Geos::GEOSException.new(args[0] % args[1])
+      end
   end
 
   class << self

data/lib/ffi-geos/buffer_params.rb

@@ -69,7 +69,7 @@ module Geos
       end
 
       def single_sided=(value)
-        if bool_result(FFIGeos.GEOSBufferParams_setSingleSided_r(Geos.current_handle, ptr, value ? 1 : 0))
+        if bool_result(FFIGeos.GEOSBufferParams_setSingleSided_r(Geos.current_handle, ptr, Geos::Tools.bool_to_int(value)))
           @params[:single_sided] = value
         end
       end

data/lib/ffi-geos/coordinate_sequence.rb

@@ -109,7 +109,7 @@ module Geos
       if points
         points.each_with_index do |point, idx|
           point.each_with_index do |val, dim|
-            self.set_ordinate(idx, dim, val.to_f)
+            self.set_ordinate(idx, dim, val)
           end
         end
       end
@@ -164,24 +164,24 @@ module Geos
     # Sets the x value of a coordinate. Can also be set via #x[]=.
     def set_x(idx, val)
       self.check_bounds(idx)
-      FFIGeos.GEOSCoordSeq_setX_r(Geos.current_handle, self.ptr, idx, val)
+      FFIGeos.GEOSCoordSeq_setX_r(Geos.current_handle, self.ptr, idx, val.to_f)
     end
 
     # Sets the y value of a coordinate. Can also be set via #y[]=.
     def set_y(idx, val)
       self.check_bounds(idx)
-      FFIGeos.GEOSCoordSeq_setY_r(Geos.current_handle, self.ptr, idx, val)
+      FFIGeos.GEOSCoordSeq_setY_r(Geos.current_handle, self.ptr, idx, val.to_f)
     end
 
     # Sets the z value of a coordinate. Can also be set via #z[]=.
     def set_z(idx, val)
       self.check_bounds(idx)
-      FFIGeos.GEOSCoordSeq_setZ_r(Geos.current_handle, self.ptr, idx, val)
+      FFIGeos.GEOSCoordSeq_setZ_r(Geos.current_handle, self.ptr, idx, val.to_f)
     end
 
     def set_ordinate(idx, dim, val)
       self.check_bounds(idx)
-      FFIGeos.GEOSCoordSeq_setOrdinate_r(Geos.current_handle, self.ptr, idx, dim, val)
+      FFIGeos.GEOSCoordSeq_setOrdinate_r(Geos.current_handle, self.ptr, idx, dim, val.to_f)
     end
 
     # Gets the x value of a coordinate. Can also be retrieved via #x[].

data/lib/ffi-geos/geometry.rb

@@ -207,6 +207,14 @@ module Geos
     end
     alias :representative_point :point_on_surface
 
+    if FFIGeos.respond_to?(:GEOSClipByRect_r)
+      # Available in GEOS 3.5.0+.
+      def clip_by_rect(xmin, ymin, xmax, ymax)
+        cast_geometry_ptr(FFIGeos.GEOSClipByRect_r(Geos.current_handle, self.ptr, xmin, ymin, xmax, ymax))
+      end
+      alias :clip_by_rectangle :clip_by_rect
+    end
+
     def centroid
       cast_geometry_ptr(FFIGeos.GEOSGetCentroid_r(Geos.current_handle, self.ptr), :srid_copy => self.srid)
     end
@@ -566,8 +574,49 @@ module Geos
     end
 
     if FFIGeos.respond_to?(:GEOSDelaunayTriangulation_r)
-      def delaunay_triangulation(tolerance, options = {})
-        cast_geometry_ptr(FFIGeos.GEOSDelaunayTriangulation_r(Geos.current_handle, self.ptr, tolerance, options[:only_edges] ? 1 : 0))
+      # :call-seq:
+      #   delaunay_triangulation(options = {})
+      #   delaunay_triangulation(tolerance, options = {})
+      #
+      #  Options:
+      #
+      #  * :tolerance
+      #  * :only_edges
+      def delaunay_triangulation(*args)
+        options = extract_options!(args)
+
+        tolerance = args.first || options[:tolerance] || 0.0
+        only_edges = bool_to_int(options[:only_edges])
+
+        cast_geometry_ptr(FFIGeos.GEOSDelaunayTriangulation_r(Geos.current_handle, self.ptr, tolerance, only_edges))
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSVoronoiDiagram_r)
+      # Available in GEOS 3.5.0+
+      #
+      # :call-seq:
+      #   voronoi_diagram(options = {})
+      #   voronoi_diagram(tolerance, options = {})
+      #
+      #  Options:
+      #
+      #  * :tolerance
+      #  * :envelope
+      #  * :only_edges
+      def voronoi_diagram(*args)
+        options = extract_options!(args)
+
+        tolerance = args.first || options[:tolerance] || 0.0
+
+        envelope_ptr = if options[:envelope]
+          check_geometry(options[:envelope])
+          options[:envelope].ptr
+        end
+
+        only_edges = bool_to_int(options[:only_edges])
+
+        cast_geometry_ptr(FFIGeos.GEOSVoronoiDiagram_r(Geos.current_handle, self.ptr, envelope_ptr, tolerance, only_edges))
       end
     end
 

data/lib/ffi-geos/interrupt.rb

@@ -35,7 +35,7 @@ module Geos
               FFIGeos.GEOS_interruptRegisterCallback(method_or_block)
               method_or_block
             elsif block_given?
-              FFIGeos.GEOS_interruptRegisterCallback(&block)
+              FFIGeos.GEOS_interruptRegisterCallback(block)
               block
             end
 

data/lib/ffi-geos/multi_line_string.rb

@@ -2,5 +2,11 @@
 
 module Geos
   class MultiLineString < GeometryCollection
+    if FFIGeos.respond_to?(:GEOSisClosed_r) && Geos::GEOS_VERSION >= '3.5.0'
+      # Available in GEOS 3.5.0+.
+      def closed?
+        bool_result(FFIGeos.GEOSisClosed_r(Geos.current_handle, self.ptr))
+      end
+    end
   end
 end

data/lib/ffi-geos/tools.rb

@@ -105,6 +105,14 @@ module Geos
       end
     end
 
+    def bool_to_int(bool)
+      if bool
+        1
+      else
+        0
+      end
+    end
+
     def check_enum_value(enum, value)
       enum[value] or
         raise TypeError.new("Couldn't find valid #{enum.tag} value: #{value}")

data/lib/ffi-geos/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Geos
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
 

data/lib/ffi-geos/wkb_writer.rb

@@ -73,7 +73,7 @@ module Geos
 
     def include_srid=(val)
       FFIGeos.GEOSWKBWriter_setIncludeSRID_r(Geos.current_handle, self.ptr,
-        val ? 1 : 0
+        Geos::Tools.bool_to_int(val)
       )
     end
 

data/lib/ffi-geos/wkt_writer.rb

@@ -60,7 +60,7 @@ module Geos
       def trim=(val)
         @trim = !!val
         FFIGeos.GEOSWKTWriter_setTrim_r(Geos.current_handle, self.ptr,
-          @trim ? 1 : 0
+          Geos::Tools.bool_to_int(@trim)
         )
       end
     end
@@ -83,7 +83,7 @@ module Geos
       def old_3d=(val)
         @old_3d = !!val
         FFIGeos.GEOSWKTWriter_setOld3D_r(Geos.current_handle, self.ptr,
-          @old_3d ? 1 : 0
+          Geos::Tools.bool_to_int(@old_3d)
         )
       end
     end

data/test/geometry_tests.rb

@@ -449,6 +449,50 @@ class GeometryTests < Minitest::Test
     end
   end
 
+  def test_clip_by_rect
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:clip_by_rect)
+
+    %w{
+      clip_by_rect
+      clip_by_rectangle
+    }.each do |method|
+      simple_tester(
+        method,
+        'POINT (0 0)',
+        'POINT (0 0)',
+        -1, -1, 1, 1
+      )
+
+      simple_tester(
+        method,
+        'GEOMETRYCOLLECTION EMPTY',
+        'POINT (0 0)',
+        0, 0, 2, 2
+      )
+
+      simple_tester(
+        method,
+        'LINESTRING (1 0, 2 0)',
+        'LINESTRING (0 0, 10 0)',
+        1, -1, 2, 1
+      )
+
+      simple_tester(
+        method,
+        'POLYGON ((1 1, 1 5, 5 5, 5 1, 1 1))',
+        'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0))',
+        1, 1, 5, 5
+      )
+
+      simple_tester(
+        method,
+        'POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))',
+        'POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0))',
+        -1, -1, 5, 5
+      )
+    end
+  end
+
   def test_centroid_and_center
     %w{
       centroid
@@ -1559,5 +1603,36 @@ class GeometryTests < Minitest::Test
 
     # four points with a tolerance making one collapse
     tester['MULTILINESTRING ((10 0, 10 10), (0 0, 10 10), (0 0, 10 0))', 'MULTIPOINT(0 0, 10 0, 10 10, 11 10)', 2.0, { :only_edges => true }]
+
+    # tolerance as an option
+    tester['MULTILINESTRING ((10 0, 10 10), (0 0, 10 10), (0 0, 10 0))', 'MULTIPOINT(0 0, 10 0, 10 10, 11 10)', { :tolerance => 2.0, :only_edges => true }]
+  end
+
+  def test_voronoi_diagram
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:voronoi_diagram)
+
+    tester = lambda { |expected, geom, *args|
+      geom = read(geom)
+      voronoi_diagram = geom.voronoi_diagram(*args)
+
+      assert_equal(expected, write(voronoi_diagram))
+    }
+
+    writer.trim = true
+
+    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['MULTILINESTRING ((50 50, 50 200), (200 50, 50 50), (50 50, -100 50), (50 50, 50 -100))', geom, { :tolerance => 0, :only_edges => true }]
+
+    tester['MULTILINESTRING ((50 50, 50 1100), (1100 50, 50 50), (50 50, -1000 50), (50 50, 50 -1000))', geom, {
+      :only_edges => true,
+      :envelope => read(geom).buffer(1000)
+    }]
+
+    # 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]
   end
 end

data/test/interrupt_tests.rb

@@ -41,6 +41,8 @@ class InterruptTests < Minitest::Test
       begin
         buffer = geom.buffer(1, 8)
       rescue => e
+        # no-op
+      ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called
@@ -62,6 +64,8 @@ class InterruptTests < Minitest::Test
       begin
         buffer = geom.buffer(1, 8)
       rescue => e
+        # no-op
+      ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called
@@ -85,6 +89,8 @@ class InterruptTests < Minitest::Test
       begin
         buffer = geom.buffer(1, 8)
       rescue => e
+        # no-op
+      ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called
@@ -118,6 +124,8 @@ class InterruptTests < Minitest::Test
       begin
         buffer = geom.buffer(1, 8)
       rescue => e
+        # no-op
+      ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called(1)

data/test/multi_line_string_tests.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+class MultiLineStringTests < Minitest::Test
+  include TestHelper
+
+  def setup
+    super
+    writer.trim = true
+  end
+
+  def test_closed
+    skip unless ENV['FORCE_TESTS'] || Geos::MultiLineString.method_defined?(:closed?)
+
+    simple_tester(:closed?, false, 'MULTILINESTRING ((1 1, 1 2, 2 2, 1 1), (0 0, 0 1, 1 1))')
+    simple_tester(:closed?, true, 'MULTILINESTRING ((1 1, 1 2, 2 2, 1 1), (0 0, 0 1, 1 1, 0 0))')
+  end
+end

data/test/tools_tests.rb

@@ -21,6 +21,15 @@ class ToolsTests < Minitest::Test
     end
   end
 
+  def test_bool_to_int
+    assert_equal(1, Geos::Tools.bool_to_int(1))
+    assert_equal(1, Geos::Tools.bool_to_int(true))
+    assert_equal(1, Geos::Tools.bool_to_int(""))
+    assert_equal(1, Geos::Tools.bool_to_int(0))
+    assert_equal(0, Geos::Tools.bool_to_int(false))
+    assert_equal(0, Geos::Tools.bool_to_int(nil))
+  end
+
   def test_pick_srid_from_geoms
     Geos.srid_copy_policy = :default
     assert_equal(0, Geos::Tools.pick_srid_from_geoms(4326, 4269))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -68,6 +68,7 @@ files:
 - test/line_string_tests.rb
 - test/linear_ring_tests.rb
 - test/misc_tests.rb
+- test/multi_line_string_tests.rb
 - test/point_tests.rb
 - test/polygon_tests.rb
 - test/prepared_geometry_tests.rb
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
@@ -111,6 +112,7 @@ test_files:
 - test/line_string_tests.rb
 - test/linear_ring_tests.rb
 - test/misc_tests.rb
+- test/multi_line_string_tests.rb
 - test/point_tests.rb
 - test/polygon_tests.rb
 - test/prepared_geometry_tests.rb