ffi-gdal 1.0.0.beta7 → 1.0.0.beta8

data/lib/ogr/geocoder.rb

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

data/lib/ogr/geometries/geometry_collection.rb

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

data/lib/ogr/geometries/geometry_collection_25d.rb

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

data/lib/ogr/geometries/line_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../geometry_types/curve'
 
 module OGR
@@ -5,6 +7,7 @@ module OGR
     include OGR::Geometry
     include GeometryTypes::Curve
 
+    # rubocop:disable Metrics/ParameterLists
     def self.approximate_arc_angles(center_x, center_y, z, primary_radius, secondary_radius,
       rotation, start_angle, end_angle, max_angle_step_size_degrees = 0)
       geometry_ptr = FFI::GDAL::GDAL.OGR_G_ApproximateArcAngles(
@@ -22,6 +25,7 @@ module OGR
 
       new(geometry_ptr)
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def initialize(geometry_ptr = nil, spatial_reference: nil)
       geometry_ptr ||= OGR::Geometry.create(:wkbLineString)

data/lib/ogr/geometries/line_string_25d.rb

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

data/lib/ogr/geometries/linear_ring.rb

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

data/lib/ogr/geometries/multi_line_string.rb

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

data/lib/ogr/geometries/multi_line_string_25d.rb

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

data/lib/ogr/geometries/multi_point.rb

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

data/lib/ogr/geometries/multi_point_25d.rb

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

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'

data/lib/ogr/geometry_field_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   class GeometryFieldDefinition
     # @return [FFI::Pointer]
@@ -79,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]

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

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'

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
@@ -122,6 +124,11 @@ 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.
+        # rubocop:disable Metrics/BlockLength
         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)
@@ -204,6 +211,7 @@ module OGR
             "Not sure how to extract point_values for a #{geom_type}"
           end
         end
+        # rubocop:enable Metrics/BlockLength
 
         log "#point_values took #{Time.now - start}s"
 

data/lib/ogr/layer_mixins/ogr_feature_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRFeatureMethods

data/lib/ogr/layer_mixins/ogr_field_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRFieldMethods
@@ -81,7 +83,8 @@ module OGR
           @c_pointer,
           field_index,
           new_field_definition_ptr,
-          flags)
+          flags
+        )
 
         ogr_err.handle_result
       end
@@ -115,7 +118,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

data/lib/ogr/layer_mixins/ogr_sql_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module LayerMixins
     module OGRSQLMethods

data/lib/ogr/spatial_reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative '../gdal'
 require_relative 'spatial_reference_extensions'

data/lib/ogr/spatial_reference_extensions.rb

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

data/lib/ogr/spatial_reference_mixins/coordinate_system_getter_setters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module CoordinateSystemGetterSetters
@@ -76,7 +78,8 @@ module OGR
           @c_pointer,
           x_distance, y_distance, z_distance,
           x_rotation, y_rotation, z_rotation,
-          scaling_factor)
+          scaling_factor
+        )
 
         ogr_err.handle_result
       end
@@ -93,7 +96,8 @@ module OGR
           @c_pointer,
           name,
           horizontal_spatial_ref_ptr,
-          vertical_spatial_ref_ptr)
+          vertical_spatial_ref_ptr
+        )
 
         ogr_err.handle_result
       end
@@ -186,7 +190,8 @@ module OGR
           @c_pointer,
           target_key,
           authority,
-          code)
+          code
+        )
 
         ogr_err.handle_result
       end
@@ -278,7 +283,8 @@ module OGR
           zone,
           nad83,
           override_unit_label,
-          override_unit_transform)
+          override_unit_transform
+        )
 
         ogr_err.handle_result
       end
@@ -458,7 +464,8 @@ module OGR
           @c_pointer,
           center_lat, center_long,
           scale,
-          false_easting, false_northing)
+          false_easting, false_northing
+        )
 
         ogr_err.handle_result
       end

data/lib/ogr/spatial_reference_mixins/exporters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Exporters

data/lib/ogr/spatial_reference_mixins/importers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Importers
@@ -198,7 +200,8 @@ module OGR
           projection_system_code,
           zone,
           proj_ptr,
-          datum)
+          datum
+        )
 
         ogr_err.handle_result
       end
@@ -227,7 +230,8 @@ module OGR
           @c_pointer,
           projection_name,
           datum_name,
-          linear_unit_name)
+          linear_unit_name
+        )
 
         ogr_err.handle_result
       end

data/lib/ogr/spatial_reference_mixins/morphers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module Morphers

data/lib/ogr/spatial_reference_mixins/parameter_getter_setters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module ParameterGetterSetters

data/lib/ogr/spatial_reference_mixins/type_checks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OGR
   module SpatialReferenceMixins
     module TypeChecks

data/lib/ogr/style_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../ogr'
 require_relative 'style_table_extensions'
 

data/lib/ogr/style_table_extensions.rb

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

data/lib/ogr/style_tool.rb

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

data/lib/ogr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'ffi-gdal'
 require_relative 'ogr/internal_helpers'
 require_relative 'ogr/exceptions'

data/spec/ffi-gdal_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 

data/spec/integration/gdal/color_table_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/dataset_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -185,7 +187,7 @@ GEOGCS["WGS 84",
 
   describe '#gcp_count' do
     it 'is a Fixnum' do
-      expect(subject.gcp_count).to be_a Fixnum
+      expect(subject.gcp_count).to be_a Integer
     end
   end
 

data/spec/integration/gdal/driver_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -20,7 +22,7 @@ RSpec.describe 'Driver Info', type: :integration do
 
   describe '.count' do
     it 'is a non-zero Integer' do
-      expect(GDAL::Driver.count).to be_a Fixnum
+      expect(GDAL::Driver.count).to be_a Integer
       expect(GDAL::Driver.count).to be > 0
     end
   end

data/spec/integration/gdal/geo_transform_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/gridder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'gdal/gridder'
 require 'ogr/data_source'

data/spec/integration/gdal/raster_attribute_table_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'

data/spec/integration/gdal/raster_band_algorithms_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'gdal/dataset'
 require 'gdal/raster_band'

data/spec/integration/gdal/raster_band_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ffi-gdal'
 require 'gdal'
@@ -24,14 +26,14 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#x_size' do
     it 'is a non-zero Integer' do
-      expect(subject.x_size).to be_a Fixnum
+      expect(subject.x_size).to be_a Integer
       expect(subject.x_size).to be > 0
     end
   end
 
   describe '#y_size' do
     it 'is a non-zero Integer' do
-      expect(subject.y_size).to be_a Fixnum
+      expect(subject.y_size).to be_a Integer
       expect(subject.y_size).to be > 0
     end
   end
@@ -42,7 +44,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#number' do
     it 'is a non-zero Integer' do
-      expect(subject.number).to be_a Fixnum
+      expect(subject.number).to be_a Integer
       expect(subject.number).to be > 0
     end
   end
@@ -122,7 +124,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#overview_count' do
     it 'is a Fixnum' do
-      expect(subject.overview_count).to be_a Fixnum
+      expect(subject.overview_count).to be_a Integer
     end
   end
 
@@ -169,7 +171,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
     it 'has a :minimum that ranges between 0.0/-32768.0 and 255.0' do
       min = subject.statistics[:minimum]
       unless min == -32_768.0
-        expect(subject.statistics[:minimum]).to satisfy { |v| v >= 0 || v == -32_768 }
+        expect(subject.statistics[:minimum]).to(satisfy { |v| v >= 0 || v == -32_768 })
         expect(subject.statistics[:minimum]).to be <= 255.0
       end
     end
@@ -255,14 +257,14 @@ RSpec.describe 'Raster Band Info', type: :integration do
     end
 
     it 'has :buckets as a Fixnum' do
-      expect(histogram[:buckets]).to be_a Fixnum if histogram
+      expect(histogram[:buckets]).to be_a Integer if histogram
     end
 
     it 'has :totals as an Array of 0 or 256 Fixnums' do
       if histogram
         expect(histogram[:totals]).to be_an Array
         expect(histogram[:totals].size).to eq(256).or eq(0)
-        expect(histogram[:totals].all? { |t| t.class == Fixnum }).to eq true
+        expect(histogram[:totals].all? { |t| t.class == Integer }).to eq true
       end
     end
   end

data/spec/integration/ogr/layer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ogr'