ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/ogr/geometries/multi_polygon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/container'
 require_relative '../geometry_types/surface'
 

data/lib/ogr/geometries/multi_polygon_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'multi_polygon'
 
 module OGR

data/lib/ogr/geometries/none_geometry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   class NoneGeometry
     include OGR::Geometry

data/lib/ogr/geometries/point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   class Point
     include OGR::Geometry

data/lib/ogr/geometries/point_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'point'
 
 module OGR

data/lib/ogr/geometries/polygon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/container'
 require_relative '../geometry_types/surface'
 

data/lib/ogr/geometries/polygon_25d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'polygon'
 
 module OGR

data/lib/ogr/geometries/unknown_geometry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   class UnknownGeometry
     include OGR::Geometry

data/lib/ogr/geometry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative 'geometry_mixins/extensions'
 require_relative '../gdal'
@@ -240,7 +242,6 @@ module OGR
     end
 
     # @return [Fixnum]
-    # @todo This regularly crashes, so disabling it.
     def centroid
       point = is_3d? ? OGR::Point25D.new : OGR::Point.new
 
@@ -618,9 +619,7 @@ module OGR
 
       linear_ring = OGR::LinearRing.new
 
-      if line_string.spatial_reference
-        linear_ring.spatial_reference = line_string.spatial_reference.clone
-      end
+      linear_ring.spatial_reference = line_string.spatial_reference.clone if line_string.spatial_reference
 
       linear_ring.import_from_wkt(line_string.to_wkt.tr('LINESTRING', 'LINEARRING'))
       linear_ring.close_rings! if close_rings

data/lib/ogr/geometry_field_definition.rb

@@ -1,9 +1,7 @@
-require_relative 'geometry_field_definition_extensions'
+# frozen_string_literal: true
 
 module OGR
   class GeometryFieldDefinition
-    include GeometryFieldDefinitionExtensions
-
     # @return [FFI::Pointer]
     attr_reader :c_pointer
 
@@ -83,7 +81,8 @@ module OGR
 
       FFI::OGR::API.OGR_GFld_SetSpatialRef(
         @c_pointer,
-        spatial_ref_ptr)
+        spatial_ref_ptr
+      )
     end
 
     # @return [Boolean]

data/lib/ogr/geometry_mixins/container_mixins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module GeometryMixins
     module ContainerMixins

data/lib/ogr/geometry_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -7,18 +9,18 @@ module OGR
       def utm_zone
         return unless spatial_reference
 
-        if spatial_reference.authority_code == '4326'.freeze
-          self_as_4326 = self
+        if spatial_reference.authority_code == '4326'
+          self_as4326 = self
         else
-          self_as_4326 = dup
-          self_as_4326.transform_to!(OGR::SpatialReference.new_from_epsg(4326))
+          self_as4326 = dup
+          self_as4326.transform_to!(OGR::SpatialReference.new_from_epsg(4326))
         end
 
-        self_as_4326 = self_as_4326.buffer(0) unless self_as_4326.valid?
+        self_as4326 = self_as4326.buffer(0) unless self_as4326.valid?
 
-        return unless self_as_4326.point_on_surface.x
+        return unless self_as4326.point_on_surface.x
 
-        ((self_as_4326.point_on_surface.x + 180) / 6.to_f).floor + 1
+        ((self_as4326.point_on_surface.x + 180) / 6.to_f).floor + 1
       end
 
       # @return [Boolean]
@@ -53,35 +55,6 @@ module OGR
         !valid?
       end
 
-      # @return [Hash]
-      def as_json(options = nil)
-        json = {
-          coordinate_dimension: coordinate_dimension,
-          geometry_count: geometry_count,
-          dimension: dimension,
-          is_empty: empty?,
-          is_ring: ring?,
-          is_simple: simple?,
-          is_valid: valid?,
-          name: name,
-          point_count: point_count,
-          spatial_reference: spatial_reference.nil? ? nil : spatial_reference.as_json(options),
-          type: type_to_name,
-          wkb_size: wkb_size
-        }
-
-        json[:area] = area if respond_to? :area
-        json[:length] = length if respond_to? :length
-        json[:points] = points if respond_to? :points
-
-        json
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
-
       def collection?
         false
       end
@@ -97,9 +70,7 @@ module OGR
         # field = FieldDefinition.new('Name', :OFTString)
         # field.width = 32
 
-        unless layer
-          raise OGR::InvalidLayer, "Unable to create layer '#{layer_name}'."
-        end
+        raise OGR::InvalidLayer, "Unable to create layer '#{layer_name}'." unless layer
 
         feature = layer.create_feature(layer_name)
         feature.geometry = self

data/lib/ogr/geometry_types/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_mixins/container_mixins'
 
 module OGR

data/lib/ogr/geometry_types/curve.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module GeometryTypes
     module Curve
@@ -102,7 +104,7 @@ module OGR
         y_buffer = FFI::MemoryPointer.new(:buffer_out, buffer_size)
         z_buffer = FFI::MemoryPointer.new(:buffer_out, buffer_size) if coordinate_dimension == 3
 
-        FFI::OGR::API.OGR_G_GetPoints(@c_pointer,
+        num_points = FFI::OGR::API.OGR_G_GetPoints(@c_pointer,
           x_buffer, x_stride, y_buffer,
           y_stride, z_buffer, z_stride)
 

data/lib/ogr/geometry_types/surface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module GeometryTypes
     module Surface

data/lib/ogr/internal_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module OGR

data/lib/ogr/layer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative '../gdal'
 require_relative 'layer_mixins/extensions'
@@ -20,7 +22,9 @@ module OGR
     include LayerMixins::OGRQueryFilterMethods
     include LayerMixins::OGRSQLMethods
 
-    class_eval FFI::OGR::Core::OGR_ALTER.to_ruby
+    FFI::OGR::Core::OGR_ALTER.constants.each do |_name, obj|
+      const_set(obj.ruby_name, obj.value.to_i(16))
+    end
 
     # @return [FFI::Pointer] C pointer to the C Layer.
     attr_reader :c_pointer

data/lib/ogr/layer_mixins/capability_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     # Helper methods for checking what the Layer is capable of.

data/lib/ogr/layer_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module OGR
@@ -22,7 +24,7 @@ module OGR
 
           begin
             yield feature
-          rescue
+          rescue StandardError
             feature.destroy!
             raise
           end
@@ -50,7 +52,7 @@ module OGR
 
           begin
             yield feature_ptr
-          rescue
+          rescue StandardError
             FFI::OGR::API.OGR_F_Destroy(feature_ptr)
             raise
           end
@@ -66,7 +68,7 @@ module OGR
       #
       # @return [Array<OGR::Feature>]
       def features
-        each_feature.map { |f| f.clone }
+        each_feature.map(&:clone)
       end
 
       # @return [OGR::Polygon] A polygon derived from a LinearRing that connects
@@ -122,6 +124,10 @@ module OGR
         x_ptr = FFI::MemoryPointer.new(:double)
         y_ptr = FFI::MemoryPointer.new(:double)
 
+        # This block is intentionally long simply for the sake of performance.
+        # I've tried refactoring chunks of this out to separate methods and
+        # performance suffers greatly. Since this is a key part of gridding (at
+        # least at this point), it needs to be as fast as possible.
         each_feature_pointer do |feature_ptr|
           field_values = field_indices.map.with_index do |j, attribute_index|
             FFI::OGR::API.send("OGR_F_GetFieldAs#{with_attributes.values[attribute_index].capitalize}", feature_ptr, j)
@@ -229,30 +235,6 @@ module OGR
         found_z_geom
       end
 
-      # @return [Hash]
-      def as_json(options = nil)
-        {
-          layer: {
-            extent: extent.as_json(options),
-            feature_count: feature_count,
-            feature_definition: feature_definition.as_json(options),
-            features: each_feature.map { |f| f.as_json(options) },
-            fid_column: fid_column,
-            geometry_column: geometry_column,
-            geometry_type: geometry_type,
-            name: name,
-            spatial_reference: spatial_reference ? spatial_reference.as_json(options) : nil,
-            style_table: style_table ? style_table.as_json(options) : nil
-          },
-          metadata: nil # all_metadata
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
-
       private
 
       # @param geometry_ptr [FFI::Pointer]

data/lib/ogr/layer_mixins/ogr_feature_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRFeatureMethods
@@ -23,9 +25,7 @@ module OGR
       # @param feature [OGR::Feature] [description]
       # @return [Boolean]
       def create_feature(feature)
-        unless can_sequential_write?
-          raise OGR::UnsupportedOperation, 'This layer does not support feature creation.'
-        end
+        raise OGR::UnsupportedOperation, 'This layer does not support feature creation.' unless can_sequential_write?
 
         ogr_err = FFI::OGR::API.OGR_L_CreateFeature(@c_pointer, feature.c_pointer)
 
@@ -39,9 +39,7 @@ module OGR
       # @raise [OGR::Failure] When trying to delete a feature with an ID that
       #   does not exist.
       def delete_feature(feature_id)
-        unless can_delete_feature?
-          raise OGR::UnsupportedOperation, 'This layer does not support feature deletion.'
-        end
+        raise OGR::UnsupportedOperation, 'This layer does not support feature deletion.' unless can_delete_feature?
 
         ogr_err = FFI::OGR::API.OGR_L_DeleteFeature(@c_pointer, feature_id)
 
@@ -61,9 +59,7 @@ module OGR
       #
       # @param new_feature [OGR::Feature, FFI::Pointer]
       def feature=(new_feature)
-        unless can_random_write?
-          raise OGR::UnsupportedOperation, '#feature= not supported by this Layer'
-        end
+        raise OGR::UnsupportedOperation, '#feature= not supported by this Layer' unless can_random_write?
 
         new_feature_ptr = GDAL._pointer(OGR::Feature, new_feature)
         raise OGR::InvalidFeature if new_feature_ptr.nil? || new_feature_ptr.null?
@@ -77,9 +73,7 @@ module OGR
       #   be <= +feature_count+, but no checking is done to ensure.
       # @return [OGR::Feature, nil]
       def feature(index)
-        unless can_random_read?
-          raise OGR::UnsupportedOperation, '#feature(index) not supported by this Layer'
-        end
+        raise OGR::UnsupportedOperation, '#feature(index) not supported by this Layer' unless can_random_read?
 
         feature_pointer = FFI::OGR::API.OGR_L_GetFeature(@c_pointer, index)
         return nil if feature_pointer.null?

data/lib/ogr/layer_mixins/ogr_field_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRFieldMethods
@@ -10,9 +12,7 @@ module OGR
       #   different form, depending on the limitations of the format driver.
       # @return [Boolean]
       def create_field(field_definition, approx_ok = false)
-        unless can_create_field?
-          raise OGR::UnsupportedOperation, 'This layer does not support field creation.'
-        end
+        raise OGR::UnsupportedOperation, 'This layer does not support field creation.' unless can_create_field?
 
         field_definition_ptr = GDAL._pointer(OGR::FieldDefinition, field_definition)
         ogr_err = FFI::OGR::API.OGR_L_CreateField(@c_pointer, field_definition_ptr, approx_ok)
@@ -24,9 +24,7 @@ module OGR
       #
       # @return +true+ if successful, otherwise raises an OGR exception.
       def delete_field(field_id)
-        unless can_delete_field?
-          raise OGR::UnsupportedOperation, 'This driver does not support field deletion.'
-        end
+        raise OGR::UnsupportedOperation, 'This driver does not support field deletion.' unless can_delete_field?
 
         ogr_err = FFI::OGR::API.OGR_L_DeleteField(@c_pointer, field_id)
 
@@ -37,9 +35,7 @@ module OGR
       #   which they should be reordered.  I.e. [0, 2, 3, 1, 4].
       # @return [Boolean]
       def reorder_fields(*new_order)
-        unless can_reorder_fields?
-          raise OGR::UnsupportedOperation, 'This driver does not support field reordering.'
-        end
+        raise OGR::UnsupportedOperation, 'This driver does not support field reordering.' unless can_reorder_fields?
 
         return false if new_order.empty?
         return false if new_order.any? { |i| i > feature_definition.field_count }
@@ -56,9 +52,7 @@ module OGR
       # @param old_position [Fixnum]
       # @param new_position [Fixnum]
       def reorder_field(old_position, new_position)
-        unless can_reorder_fields?
-          raise OGR::UnsupportedOperation, 'This driver does not support field reordering.'
-        end
+        raise OGR::UnsupportedOperation, 'This driver does not support field reordering.' unless can_reorder_fields?
 
         ogr_err = FFI::OGR::API.OGR_L_ReorderField(@c_pointer, old_position, new_position)
 
@@ -81,7 +75,8 @@ module OGR
           @c_pointer,
           field_index,
           new_field_definition_ptr,
-          flags)
+          flags
+        )
 
         ogr_err.handle_result
       end
@@ -115,7 +110,8 @@ module OGR
         ogr_err = FFI::OGR::API.OGR_L_CreateGeomField(
           @c_pointer,
           geometry_field_definition_ptr,
-          approx_ok)
+          approx_ok
+        )
 
         ogr_err.handle_result
       end

data/lib/ogr/layer_mixins/ogr_layer_method_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     # OGR::Layer methods: Ruby methods that operate on a OGR::Layer using a

data/lib/ogr/layer_mixins/ogr_query_filter_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRQueryFilterMethods
@@ -29,7 +31,8 @@ module OGR
         geometry_ptr = GDAL._pointer(OGR::Geometry, geometry)
 
         FFI::OGR::API.OGR_L_SetSpatialFilterEx(
-          @c_pointer, geometry_field_index, geometry_ptr)
+          @c_pointer, geometry_field_index, geometry_ptr
+        )
       end
 
       # Only features that geometrically intersect the given rectangle will be
@@ -47,7 +50,8 @@ module OGR
           min_x,
           min_y,
           max_x,
-          max_y)
+          max_y
+        )
       end
 
       # Only features that geometrically intersect the given rectangle will be
@@ -68,7 +72,8 @@ module OGR
           min_x,
           min_y,
           max_x,
-          max_y)
+          max_y
+        )
       end
 
       # Sets the attribute query string to be used when fetching Features using