ffi-geos 1.2.2 → 2.3.0

data/lib/ffi-geos/polygon.rb

@@ -34,7 +34,7 @@ module Geos
     end
 
     def dump_points(cur_path = [])
-      points = [ exterior_ring.dump_points ]
+      points = [exterior_ring.dump_points]
 
       interior_rings.each do |ring|
         points.push(ring.dump_points)
@@ -44,25 +44,25 @@ module Geos
     end
 
     def snap_to_grid!(*args)
-      if !self.empty?
+      unless empty?
         exterior_ring = self.exterior_ring.coord_seq.snap_to_grid!(*args)
 
-        if exterior_ring.length == 0
-          @ptr = Geos.create_empty_polygon(:srid => self.srid).ptr
+        if exterior_ring.empty?
+          @ptr = Geos.create_empty_polygon(srid: srid).ptr
         elsif exterior_ring.length < 4
-          raise Geos::InvalidGeometryError.new("snap_to_grid! produced an invalid number of points in exterior ring - found #{exterior_ring.length} - must be 0 or >= 4")
+          raise Geos::InvalidGeometryError, "snap_to_grid! produced an invalid number of points in exterior ring - found #{exterior_ring.length} - must be 0 or >= 4"
         else
           interior_rings = []
 
-          self.num_interior_rings.times { |i|
-            interior_ring = self.interior_ring_n(i).coord_seq.snap_to_grid!(*args)
+          num_interior_rings.times do |i|
+            interior_ring = interior_ring_n(i).coord_seq.snap_to_grid!(*args)
 
             interior_rings << interior_ring unless interior_ring.length < 4
-          }
+          end
 
           interior_rings.compact!
 
-          polygon = Geos.create_polygon(exterior_ring, interior_rings, :srid => self.srid)
+          polygon = Geos.create_polygon(exterior_ring, interior_rings, srid: srid)
           @ptr = polygon.ptr
         end
       end
@@ -71,33 +71,47 @@ module Geos
     end
 
     def snap_to_grid(*args)
-      ret = self.dup.snap_to_grid!(*args)
-      ret.srid = pick_srid_according_to_policy(self.srid)
+      ret = dup.snap_to_grid!(*args)
+      ret.srid = pick_srid_according_to_policy(srid)
       ret
     end
 
     %w{ max min }.each do |op|
       %w{ x y }.each do |dimension|
-        self.class_eval(<<-EOF, __FILE__, __LINE__ + 1)
-          def #{dimension}_#{op}
-            unless self.empty?
-              self.envelope.exterior_ring.#{dimension}_#{op}
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+
+        if FFIGeos.respond_to?(native_method)
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+            def #{dimension}_#{op}
+              return if empty?
+
+              double_ptr = FFI::MemoryPointer.new(:double)
+              FFIGeos.#{native_method}(Geos.current_handle_pointer, ptr, double_ptr)
+              double_ptr.read_double
             end
-          end
-        EOF
+          RUBY
+        else
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+            def #{dimension}_#{op}
+              unless empty?
+                envelope.exterior_ring.#{dimension}_#{op}
+              end
+            end
+          RUBY
+        end
       end
 
-      self.class_eval(<<-EOF, __FILE__, __LINE__ + 1)
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def z_#{op}
-          unless self.empty?
-            if self.has_z?
-              self.exterior_ring.z_#{op}
+          unless empty?
+            if has_z?
+              exterior_ring.z_#{op}
             else
               0
             end
           end
         end
-      EOF
+      RUBY
     end
 
     %w{
@@ -110,21 +124,21 @@ module Geos
       trans_scale
       translate
     }.each do |m|
-      self.class_eval(<<-EOF, __FILE__, __LINE__ + 1)
-        def #{m}!(*args)
-          self.exterior_ring.coord_seq.#{m}!(*args)
-          self.interior_rings.each do |ring|
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        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 = self.dup.#{m}!(*args)
-          ret.srid = pick_srid_according_to_policy(self.srid)
+        def #{m}(*args, **kwargs)
+          ret = dup.#{m}!(*args, **kwargs)
+          ret.srid = pick_srid_according_to_policy(srid)
           ret
         end
-      EOF
+      RUBY
     end
   end
 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
 

data/lib/ffi-geos/strtree.rb

@@ -23,23 +23,22 @@ module Geos
       geoms_and_objects = nil # forward declaration
       capacity = 10
 
-      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
-          args
-        end
+      case args.first
+        when Integer
+          capacity = args.first
+        when Array
+          geoms_and_objects = if args.first.first.is_a?(Array)
+            args.first
+          else
+            args
+          end
 
-        geoms_and_objects.each do |geom, _obj|
-          check_geometry(geom)
-        end
+          geoms_and_objects.each do |geom, _obj|
+            check_geometry(geom)
+          end
       end
 
-      if capacity <= 0
-        raise ArgumentError, 'STRtree capacity must be greater than 0'
-      end
+      raise ArgumentError, 'STRtree capacity must be greater than 0' if capacity <= 0
 
       ptr = FFIGeos.GEOSSTRtree_create_r(Geos.current_handle_pointer, capacity)
 
@@ -61,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
 
@@ -99,7 +98,7 @@ module Geos
     def remove(geom, item)
       check_geometry(geom)
 
-      key = if storage = @storage.detect { |k, v| v[:item] == item }
+      key = if (storage = @storage.detect { |_k, v| v[:item] == item })
         storage[0]
       end
 
@@ -139,16 +138,17 @@ module Geos
 
     def query(geom, ret = :item)
       query_all(geom).collect { |storage|
-        item = if ret.is_a?(Array)
-          storage.inject({}) do |memo, k|
-            memo.tap do
-              memo[k] = storage[k]
+        item = case ret
+          when Array
+            storage.inject({}) do |memo, k|
+              memo.tap do
+                memo[k] = storage[k]
+              end
             end
-          end
-        elsif ret == :all
-          storage
-        else
-          storage[ret]
+          when :all
+            storage
+          else
+            storage[ret]
         end
 
         item.tap do
@@ -166,10 +166,8 @@ module Geos
     end
     alias query_geoms query_geometries
 
-    def iterate
-      @storage.each_value do |v|
-        yield(v)
-      end
+    def iterate(&block)
+      @storage.each_value(&block)
     end
 
     if FFIGeos.respond_to?(:GEOSSTRtree_nearest_generic_r)
@@ -180,7 +178,7 @@ module Geos
 
         return nil if @storage.empty?
 
-        callback = proc { |item, _item2, distance_ptr|
+        callback = proc { |item, _item_2, distance_ptr|
           key = item.read_int
           geom_from_storage = @storage[key][:geometry]
 

data/lib/ffi-geos/tools.rb

@@ -47,7 +47,7 @@ module Geos
         when GEOS_GEOMETRYCOLLECTION
           GeometryCollection
         else
-          raise Geos::InvalidGeometryTypeError.new
+          raise Geos::InvalidGeometryTypeError
       end
 
       klass.new(geom_ptr, options).tap do |ret|

data/lib/ffi-geos/utils.rb

@@ -30,22 +30,21 @@ module Geos
       def create_point(*args)
         options = extract_options!(args)
 
-        if args.length == 1
-          cs = args.first
-        elsif args.length == 2
-          cs = CoordinateSequence.new(1, 2)
-          cs.x[0] = args[0].to_f
-          cs.y[0] = args[1].to_f
-        elsif args.length == 3
-          cs = CoordinateSequence.new(1, 3)
-          cs.x[0], cs.y[0], cs.z[0] = args.map(&:to_f)
-        else
-          raise ArgumentError, "Wrong number of arguments (#{args.length} for 1-3)"
+        case args.length
+          when 1
+            cs = args.first
+          when 2
+            cs = CoordinateSequence.new(1, 2)
+            cs.x[0] = args[0].to_f
+            cs.y[0] = args[1].to_f
+          when 3
+            cs = CoordinateSequence.new(1, 3)
+            cs.x[0], cs.y[0], cs.z[0] = args.map(&:to_f)
+          else
+            raise ArgumentError, "Wrong number of arguments (#{args.length} for 1-3)"
         end
 
-        if cs.length != 1
-          raise ArgumentError, 'IllegalArgumentException: Point coordinate list must contain a single element'
-        end
+        raise ArgumentError, 'IllegalArgumentException: Point coordinate list must contain a single element' if cs.length != 1
 
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
@@ -56,9 +55,7 @@ module Geos
       def create_line_string(cs, options = {})
         cs = cs_from_cs_or_geom(cs)
 
-        if cs.length <= 1 && cs.length != 0
-          raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements'
-        end
+        raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements' if cs.length <= 1 && !cs.empty?
 
         cs_dup = cs.dup
         cs_dup.ptr.autorelease = false
@@ -69,9 +66,7 @@ module Geos
       def create_linear_ring(cs, options = {})
         cs = cs_from_cs_or_geom(cs)
 
-        if cs.length <= 1 && cs.length != 0
-          raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements'
-        end
+        raise ArgumentError, 'IllegalArgumentException: point array must contain 0 or >1 elements' if cs.length <= 1 && !cs.empty?
 
         cs.ptr.autorelease = false
 
@@ -154,9 +149,7 @@ module Geos
         options = extract_options!(args)
 
         geoms = Array(args).flatten.tap do |i|
-          if i.detect { |g| !g.is_a?(klass) }
-            raise TypeError, "Expected geoms Array to contain #{klass} objects"
-          end
+          raise TypeError, "Expected geoms Array to contain #{klass} objects" if i.detect { |g| !g.is_a?(klass) }
         end
 
         geoms_dups = geoms.map(&:dup)

data/lib/ffi-geos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geos
-  VERSION = '1.2.2'.freeze
+  VERSION = '2.3.0'
 end

data/lib/ffi-geos/wkb_reader.rb

@@ -34,7 +34,7 @@ module Geos
       raise ParseError, e
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKBReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end

data/lib/ffi-geos/wkb_writer.rb

@@ -20,7 +20,7 @@ module Geos
       set_options(options)
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKBWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
@@ -57,9 +57,8 @@ module Geos
     end
 
     def output_dimensions=(dim)
-      if dim < 2 || dim > 3
-        raise ArgumentError, 'Output dimensions must be either 2 or 3'
-      end
+      raise ArgumentError, 'Output dimensions must be either 2 or 3' if dim < 2 || dim > 3
+
       FFIGeos.GEOSWKBWriter_setOutputDimension_r(Geos.current_handle_pointer, ptr, dim)
     end
 
@@ -86,7 +85,7 @@ module Geos
 
     private
 
-      def set_options(options) #:nodoc:
+      def set_options(options) # :nodoc:
         self.include_srid = options[:include_srid] if options.key?(:include_srid)
       end
   end

data/lib/ffi-geos/wkt_reader.rb

@@ -28,7 +28,7 @@ module Geos
       raise ParseError, e
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKTReader_destroy_r(Geos.current_handle_pointer, ptr)
     end
   end

data/lib/ffi-geos/wkt_writer.rb

@@ -2,10 +2,7 @@
 
 module Geos
   class WktWriter
-    attr_reader :ptr
-    attr_reader :old_3d
-    attr_reader :rounding_precision
-    attr_reader :trim
+    attr_reader :ptr, :old_3d, :rounding_precision, :trim
 
     def initialize(options = {})
       options = {
@@ -24,12 +21,12 @@ module Geos
       set_options(options)
     end
 
-    def self.release(ptr) #:nodoc:
+    def self.release(ptr) # :nodoc:
       FFIGeos.GEOSWKTWriter_destroy_r(Geos.current_handle_pointer, ptr)
     end
 
-    def set_options(options) #:nodoc:
-      [ :trim, :old_3d, :rounding_precision, :output_dimensions ].each do |k|
+    def set_options(options) # :nodoc:
+      [:trim, :old_3d, :rounding_precision, :output_dimensions].each do |k|
         send("#{k}=", options[k]) if respond_to?("#{k}=") && options.key?(k)
       end
     end
@@ -67,9 +64,7 @@ module Geos
       # Available in GEOS 3.3+.
       def rounding_precision=(r)
         r = r.to_i
-        if r > 255
-          raise ArgumentError, 'Rounding precision cannot be greater than 255'
-        end
+        raise ArgumentError, 'Rounding precision cannot be greater than 255' if r > 255
 
         @rounding_precision = r
         FFIGeos.GEOSWKTWriter_setRoundingPrecision_r(Geos.current_handle_pointer, ptr, @rounding_precision)
@@ -88,9 +83,8 @@ module Geos
       # Available in GEOS 3.3+.
       def output_dimensions=(dim)
         dim = dim.to_i
-        if dim < 2 || dim > 3
-          raise ArgumentError, 'Output dimensions must be either 2 or 3'
-        end
+        raise ArgumentError, 'Output dimensions must be either 2 or 3' if dim < 2 || dim > 3
+
         FFIGeos.GEOSWKTWriter_setOutputDimension_r(Geos.current_handle_pointer, ptr, dim)
       end
     end