ffi-geos 1.1.1 → 1.2.0

data/test/multi_line_string_tests.rb

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

data/test/point_tests.rb

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

data/test/polygon_tests.rb

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

data/test/prepared_geometry_tests.rb

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

data/test/strtree_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -29,7 +30,7 @@ class STRtreeTests < Minitest::Test
     @tree.query(read('POINT(5 5)'))
 
     assert_raises(Geos::STRtree::AlreadyBuiltError) do
-      @tree.insert(read('POINT(0 0)'), 'test')
+      @tree.insert(read('POINT(0 0)'))
     end
   end
 
@@ -217,5 +218,145 @@ class STRtreeTests < Minitest::Test
       Geos::STRtree.new([])
     end
   end
-end
 
+  def test_create_without_capacity
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree)
+
+    Geos::STRtree.new
+  end
+
+  def test_insert
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree)
+
+    tree = Geos::STRtree.new(2)
+
+    tree.insert(read('POINT (3 3)'), :foo)
+    tree.insert(read('POINT (2 7)'))
+  end
+
+  def test_nearest
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    geom_1 = read('POINT (3 3)')
+    geom_2 = read('POINT (2 7)')
+    geom_3 = read('POINT (5 4)')
+    geom_4 = read('POINT (3 8)')
+
+    tree = Geos::STRtree.new(2)
+    tree.insert(geom_1)
+    tree.insert(geom_2)
+    tree.insert(geom_3)
+
+    nearest_geom = tree.nearest(geom_4)
+    assert_equal(write(geom_2), write(nearest_geom))
+  end
+
+  def test_nearest_with_depth
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    number_of_geoms = 100
+    geoms = []
+    query_points = []
+    tree = Geos::STRtree.new(8)
+
+    number_of_geoms.times do
+      geom = Geos.create_point(rand, rand)
+      geoms << geom
+      tree.insert(geom)
+
+      query_points << Geos.create_point(rand, rand)
+    end
+
+    query_points.each do |query_point|
+      nearest = tree.nearest(query_point)
+      nearest_brute_force = nil
+      nearest_brute_force_distance = Float::MAX
+
+      number_of_geoms.times do |j|
+        distance = query_point.distance(geoms[j])
+
+        if nearest_brute_force_distance.nil? || distance < nearest_brute_force_distance
+          nearest_brute_force = geoms[j]
+          nearest_brute_force_distance = distance
+        end
+      end
+
+      assert(nearest.equals?(nearest_brute_force))
+    end
+  end
+
+  def test_nearest_with_empty_tree
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    tree = Geos::STRtree.new(10)
+    geom_1 = read('POINT (3 3)')
+    nearest_geom = tree.nearest(geom_1)
+
+    assert_nil(nearest_geom)
+  end
+
+  def test_nearest_with_some_empty_geometries
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    geom_1 = read('LINESTRING EMPTY')
+    geom_2 = read('POINT (2 7)')
+    geom_3 = read('POINT (12 97)')
+    geom_4 = read('LINESTRING (3 8, 4 8)')
+
+    tree = Geos::STRtree.new(4)
+    tree.insert(geom_1)
+    tree.insert(geom_2)
+    tree.insert(geom_3)
+
+    nearest_geom = tree.nearest(geom_4)
+
+    assert_equal(write(geom_2), write(nearest_geom))
+  end
+
+  def test_nearest_with_only_empty_geometries
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    geom_1 = read('LINESTRING EMPTY')
+    geom_2 = read('POINT (2 7)')
+
+    tree = Geos::STRtree.new(4)
+    tree.insert(geom_1)
+
+    assert_raises(Geos::GEOSException, %{Geos::GEOSException: Can't compute envelope of item in BoundablePair}) do
+      tree.nearest(geom_2)
+    end
+  end
+
+  def test_disallowed_inserts_on_nearest
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+
+    setup_tree
+
+    @tree.nearest(read('POINT(5 5)'))
+
+    assert_raises(Geos::STRtree::AlreadyBuiltError) do
+      @tree.insert(read('POINT(0 0)'))
+    end
+  end
+
+  def test_nearest_item
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest_item)
+
+    geom_1 = read('POINT (3 3)')
+    geom_2 = read('POINT (2 7)')
+    geom_3 = read('POINT (5 4)')
+    geom_4 = read('POINT (3 8)')
+
+    item_1 = { :item_1 => :test }
+    item_2 = [ :test ]
+    item_3 = Object.new
+
+    tree = Geos::STRtree.new(2)
+    tree.insert(geom_1, item_1)
+    tree.insert(geom_2, item_2)
+    tree.insert(geom_3, item_3)
+
+    nearest_item = tree.nearest_item(geom_4)
+    assert_equal(item_2, nearest_item)
+  end
+end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # encoding: BINARY
+# frozen_string_literal: true
 
 if RUBY_VERSION >= '1.9'
   require 'simplecov'
@@ -41,18 +42,23 @@ module TestHelper
 
   def self.included(base)
     base.class_eval do
-      attr_reader :reader, :writer
+      attr_reader :reader, :reader_hex, :writer
     end
   end
 
   def setup
     GC.start
     @reader = Geos::WktReader.new
+    @reader_hex = Geos::WkbReader.new
     @writer = Geos::WktWriter.new
   end
 
   def read(*args)
-    reader.read(*args)
+    if args[0][0] != '0'
+      reader.read(*args)
+    else
+      reader_hex.read_hex(*args)
+    end
   end
 
   def write(*args)

data/test/tools_tests.rb

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

data/test/utils_tests.rb

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

data/test/wkb_reader_tests.rb

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

data/test/wkb_writer_tests.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 require 'test_helper'
@@ -26,9 +27,7 @@ class WkbWriterTests < Minitest::Test
       @wkb_writer.write(geom)
     end
 
-    if ''.respond_to?(:force_encoding)
-      expected.force_encoding('BINARY')
-    end
+    expected = expected.dup.force_encoding('BINARY') if expected.respond_to?(:encode)
 
     assert_equal(Geos::Tools.symbol_for_enum(Geos::ByteOrders, byte_order), @wkb_writer.byte_order)
     assert_equal(dimensions, @wkb_writer.output_dimensions)
@@ -433,7 +432,7 @@ class WkbWriterTests < Minitest::Test
     geom.srid = 4326
 
     tester = lambda { |expected, *args|
-      expected.force_encoding('BINARY') if expected.respond_to?(:force_encoding)
+      expected = expected.dup.force_encoding('BINARY') if expected.respond_to?(:force_encoding)
 
       assert_equal(
         expected,

data/test/wkt_reader_tests.rb

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

data/test/wkt_writer_tests.rb

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

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - J Smith
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: ffi
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,7 +84,7 @@ homepage: http://github.com/dark-panda/ffi-geos
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -99,9 +99,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.10
+signing_key: 
 specification_version: 4
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 test_files: