ffi-geos 1.1.1 → 1.2.0

data/lib/ffi-geos/geometry_collection.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class GeometryCollection < Geometry
@@ -22,7 +23,7 @@ module Geos
       if n < 0 || n >= self.num_geometries
         nil
       else
-        cast_geometry_ptr(FFIGeos.GEOSGetGeometryN_r(Geos.current_handle, self.ptr, n), :auto_free => false)
+        cast_geometry_ptr(FFIGeos.GEOSGetGeometryN_r(Geos.current_handle_pointer, self.ptr, n), :auto_free => false)
       end
     end
     alias_method :geometry_n, :get_geometry_n

data/lib/ffi-geos/interrupt.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   module Interrupt

data/lib/ffi-geos/line_string.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class LineString < Geometry
@@ -19,7 +20,7 @@ module Geos
 
     if FFIGeos.respond_to?(:GEOSGeomGetNumPoints_r)
       def num_points
-        FFIGeos.GEOSGeomGetNumPoints_r(Geos.current_handle, self.ptr)
+        FFIGeos.GEOSGeomGetNumPoints_r(Geos.current_handle_pointer, self.ptr)
       end
     else
       def num_points
@@ -32,7 +33,7 @@ module Geos
         raise Geos::IndexBoundsError.new
       else
         cast_geometry_ptr(
-          FFIGeos.GEOSGeomGetPointN_r(Geos.current_handle, self.ptr, n), {
+          FFIGeos.GEOSGeomGetPointN_r(Geos.current_handle_pointer, self.ptr, n), {
             :srid_copy => self.srid
           }
         )
@@ -52,7 +53,7 @@ module Geos
       options = Constants::BUFFER_PARAM_DEFAULTS.merge(options)
 
       cast_geometry_ptr(FFIGeos.GEOSOffsetCurve_r(
-          Geos.current_handle,
+          Geos.current_handle_pointer,
           self.ptr,
           width,
           options[:quad_segs],
@@ -65,7 +66,7 @@ module Geos
 
     if FFIGeos.respond_to?(:GEOSisClosed_r)
       def closed?
-        bool_result(FFIGeos.GEOSisClosed_r(Geos.current_handle, self.ptr))
+        bool_result(FFIGeos.GEOSisClosed_r(Geos.current_handle_pointer, self.ptr))
       end
     end
 

data/lib/ffi-geos/linear_ring.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class LinearRing < LineString

data/lib/ffi-geos/multi_line_string.rb

@@ -1,11 +1,12 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 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))
+        bool_result(FFIGeos.GEOSisClosed_r(Geos.current_handle_pointer, self.ptr))
       end
     end
   end

data/lib/ffi-geos/multi_point.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class MultiPoint < GeometryCollection

data/lib/ffi-geos/multi_polygon.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class MultiPolygon < GeometryCollection

data/lib/ffi-geos/point.rb

@@ -1,11 +1,12 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class Point < Geometry
     if FFIGeos.respond_to?(:GEOSGeomGetX_r)
       def get_x
         double_ptr = FFI::MemoryPointer.new(:double)
-        FFIGeos.GEOSGeomGetX_r(Geos.current_handle, self.ptr, double_ptr)
+        FFIGeos.GEOSGeomGetX_r(Geos.current_handle_pointer, self.ptr, double_ptr)
         double_ptr.read_double
       end
     else
@@ -18,7 +19,7 @@ module Geos
     if FFIGeos.respond_to?(:GEOSGeomGetY_r)
       def get_y
         double_ptr = FFI::MemoryPointer.new(:double)
-        FFIGeos.GEOSGeomGetY_r(Geos.current_handle, self.ptr, double_ptr)
+        FFIGeos.GEOSGeomGetY_r(Geos.current_handle_pointer, self.ptr, double_ptr)
         double_ptr.read_double
       end
     else
@@ -31,7 +32,7 @@ module Geos
     if FFIGeos.respond_to?(:GEOSGeomGetZ_r)
       def get_z
         double_ptr = FFI::MemoryPointer.new(:double)
-        FFIGeos.GEOSGeomGetZ_r(Geos.current_handle, self.ptr, double_ptr)
+        FFIGeos.GEOSGeomGetZ_r(Geos.current_handle_pointer, self.ptr, double_ptr)
         double_ptr.read_double
       end
     else

data/lib/ffi-geos/polygon.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class Polygon < Geometry
     def num_interior_rings
-      FFIGeos.GEOSGetNumInteriorRings_r(Geos.current_handle, self.ptr)
+      FFIGeos.GEOSGetNumInteriorRings_r(Geos.current_handle_pointer, self.ptr)
     end
 
     def interior_ring_n(n)
@@ -11,7 +12,7 @@ module Geos
         raise Geos::IndexBoundsError.new
       else
         cast_geometry_ptr(
-          FFIGeos.GEOSGetInteriorRingN_r(Geos.current_handle, self.ptr, n), {
+          FFIGeos.GEOSGetInteriorRingN_r(Geos.current_handle_pointer, self.ptr, n), {
             :auto_free => false,
             :srid_copy => self.srid,
             :parent => self
@@ -23,7 +24,7 @@ module Geos
 
     def exterior_ring
       cast_geometry_ptr(
-        FFIGeos.GEOSGetExteriorRing_r(Geos.current_handle, self.ptr), {
+        FFIGeos.GEOSGetExteriorRing_r(Geos.current_handle_pointer, self.ptr), {
           :auto_free => false,
           :srid_copy => self.srid,
           :parent => self

data/lib/ffi-geos/prepared_geometry.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class PreparedGeometry
@@ -16,7 +17,7 @@ module Geos
       }.merge(options)
 
       @ptr = FFI::AutoPointer.new(
-        FFIGeos.GEOSPrepare_r(Geos.current_handle, geom.ptr),
+        FFIGeos.GEOSPrepare_r(Geos.current_handle_pointer, geom.ptr),
         self.class.method(:release)
       )
       @geometry = geom
@@ -25,57 +26,57 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSPreparedGeom_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSPreparedGeom_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
     def contains?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedContains_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedContains_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def contains_properly?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedContainsProperly_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedContainsProperly_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def covered_by?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedCoveredBy_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedCoveredBy_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def covers?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedCovers_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedCovers_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def crosses?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedCrosses_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedCrosses_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def disjoint?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedDisjoint_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedDisjoint_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def intersects?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedIntersects_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedIntersects_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def overlaps?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedOverlaps_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedOverlaps_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def touches?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedTouches_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedTouches_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
 
     def within?(geom)
       check_geometry(geom)
-      bool_result(FFIGeos.GEOSPreparedWithin_r(Geos.current_handle, self.ptr, geom.ptr))
+      bool_result(FFIGeos.GEOSPreparedWithin_r(Geos.current_handle_pointer, self.ptr, geom.ptr))
     end
   end
 end

data/lib/ffi-geos/strtree.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class STRtree
@@ -21,10 +22,11 @@ module Geos
     #
     def initialize(*args)
       geoms_and_objects = nil # forward declaration
+      capacity = 10
 
-      capacity = if args.length == 1 && args.first.is_a?(Fixnum)
-        args.first
-      else
+      if args.first.is_a?(Integer)
+        capacity = args.first
+      elsif args.first.is_a?(Array)
         geoms_and_objects = if args.first.first.is_a?(Array)
           args.first
         else
@@ -34,15 +36,13 @@ module Geos
         geoms_and_objects.each do |geom, obj|
           check_geometry(geom)
         end
-
-        geoms_and_objects.length
       end
 
       if capacity <= 0
         raise ArgumentError.new("STRtree capacity must be greater than 0")
       end
 
-      ptr = FFIGeos.GEOSSTRtree_create_r(Geos.current_handle, capacity)
+      ptr = FFIGeos.GEOSSTRtree_create_r(Geos.current_handle_pointer, capacity)
 
       @ptr = FFI::AutoPointer.new(
         ptr,
@@ -63,19 +63,23 @@ module Geos
     end
 
     def self.release(ptr) #:nodoc:
-      FFIGeos.GEOSSTRtree_destroy_r(Geos.current_handle, ptr)
+      FFIGeos.GEOSSTRtree_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
     def built?
       @built
     end
 
+    def built!
+      @built = true
+    end
+
     def next_key
       @storage_key += 1
     end
     private :next_key
 
-    def insert(geom, item)
+    def insert(geom, item = nil)
       if self.built?
         raise AlreadyBuiltError.new
       else
@@ -91,7 +95,7 @@ module Geos
         }
         @ptrs[key] = key_ptr
 
-        FFIGeos.GEOSSTRtree_insert_r(Geos.current_handle, self.ptr, geom.ptr, key_ptr)
+        FFIGeos.GEOSSTRtree_insert_r(Geos.current_handle_pointer, self.ptr, geom.ptr, key_ptr)
       end
     end
 
@@ -104,8 +108,8 @@ module Geos
 
       if key
         key_ptr = @ptrs[key]
-        result = FFIGeos.GEOSSTRtree_remove_r(Geos.current_handle, self.ptr, geom.ptr, key_ptr)
-        @built = true
+        result = FFIGeos.GEOSSTRtree_remove_r(Geos.current_handle_pointer, self.ptr, geom.ptr, key_ptr)
+        built!
 
         if result == 1
           @storage.delete(key)
@@ -116,7 +120,7 @@ module Geos
     def query_all(geom)
       check_geometry(geom)
 
-      @built = true
+      built!
       retval = []
 
       callback = proc { |*args|
@@ -130,7 +134,7 @@ module Geos
       }
 
       FFIGeos.GEOSSTRtree_query_r(
-        Geos.current_handle,
+        Geos.current_handle_pointer,
         self.ptr,
         geom.ptr,
         callback,
@@ -178,5 +182,49 @@ module Geos
         yield(v)
       end
     end
+
+    if FFIGeos.respond_to?(:GEOSSTRtree_nearest_generic_r)
+      def nearest_generic(geom)
+        check_geometry(geom)
+
+        built!
+
+        return nil if @storage.empty?
+
+        callback = proc { |item, _item2, distance_ptr|
+          key = item.read_int
+          geom_from_storage = @storage[key][:geometry]
+
+          next 0 if geom_from_storage.empty?
+
+          distance = geom.distance(geom_from_storage)
+          distance_ptr.write_double(distance)
+
+          next 1
+        }
+
+        key_ptr = FFIGeos.GEOSSTRtree_nearest_generic_r(
+          Geos.current_handle_pointer,
+          self.ptr,
+          geom.ptr,
+          geom.envelope.ptr,
+          callback,
+          nil
+        )
+
+        @storage[key_ptr.read_int] unless key_ptr.null?
+      end
+
+      def nearest(geom)
+        item = nearest_generic(geom)
+        item[:geometry] if item
+      end
+      alias_method :nearest_geometry, :nearest
+
+      def nearest_item(geom)
+        item = nearest_generic(geom)
+        item[:item] if item
+      end
+    end
   end
 end

data/lib/ffi-geos/tools.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   class NullPointerError < Geos::Error
@@ -31,7 +32,7 @@ module Geos
         raise Geos::NullPointerError.new
       end
 
-      klass = case FFIGeos.GEOSGeomTypeId_r(Geos.current_handle, geom_ptr)
+      klass = case FFIGeos.GEOSGeomTypeId_r(Geos.current_handle_pointer, geom_ptr)
         when GEOS_POINT
           Point
         when GEOS_LINESTRING

data/lib/ffi-geos/utils.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Geos
   module Utils
@@ -14,7 +15,7 @@ module Geos
         # Available in GEOS 3.3.0+.
         def orientation_index(ax, ay, bx, by, px, py)
           FFIGeos.GEOSOrientationIndex_r(
-            Geos.current_handle,
+            Geos.current_handle_pointer,
             ax, ay, bx, by, px, py
           )
         end
@@ -23,7 +24,7 @@ module Geos
       if FFIGeos.respond_to?(:GEOSRelatePatternMatch_r)
         # Available in GEOS 3.3.0+.
         def relate_match(mat, pat)
-          bool_result(FFIGeos.GEOSRelatePatternMatch_r(Geos.current_handle, mat, pat))
+          bool_result(FFIGeos.GEOSRelatePatternMatch_r(Geos.current_handle_pointer, mat, pat))
         end
       end
 
@@ -49,7 +50,7 @@ module Geos
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle, cs_dup.ptr), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle_pointer, cs_dup.ptr), {
           :srid => options[:srid]
         })
       end
@@ -64,7 +65,7 @@ module Geos
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle, cs_dup.ptr), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle_pointer, cs_dup.ptr), {
           :srid => options[:srid]
         })
       end
@@ -78,7 +79,7 @@ module Geos
 
         cs.ptr.autorelease = false
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle, cs.ptr), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle_pointer, cs.ptr), {
           :srid => options[:srid]
         })
       end
@@ -102,32 +103,32 @@ module Geos
           i.ptr.autorelease = false
         }
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle, outer_dup.ptr, ary, inner_dups.length), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle_pointer, outer_dup.ptr, ary, inner_dups.length), {
           :srid => options[:srid]
         })
       end
 
       def create_empty_point(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPoint_r(Geos.current_handle), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPoint_r(Geos.current_handle_pointer), {
           :srid => options[:srid]
         })
       end
 
       def create_empty_line_string(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyLineString_r(Geos.current_handle), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyLineString_r(Geos.current_handle_pointer), {
           :srid => options[:srid]
         })
       end
 
       def create_empty_polygon(options = {})
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPolygon_r(Geos.current_handle), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyPolygon_r(Geos.current_handle_pointer), {
           :srid => options[:srid]
         })
       end
 
       def create_empty_collection(t, options = {})
         check_enum_value(Geos::GeometryTypes, t)
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyCollection_r(Geos.current_handle, t), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createEmptyCollection_r(Geos.current_handle_pointer, t), {
           :srid => options[:srid]
         })
       end
@@ -182,7 +183,7 @@ module Geos
         ary = FFI::MemoryPointer.new(:pointer, geoms.length)
         ary.write_array_of_pointer(geoms_dups.map(&:ptr))
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle, t, ary, geoms_dups.length), {
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle_pointer, t, ary, geoms_dups.length), {
           :srid => options[:srid]
         })
       end