ffi-gdal 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3dc48a3584647ad17acba068529c648efd09a4c
-  data.tar.gz: 1f92faa1bc794b5e35ba831d072258daf2942618
+SHA256:
+  metadata.gz: fdaa59a5ef4022ef21872fc621c9f5ff872b07d40334dc002f4802aae99ec4ba
+  data.tar.gz: bcb79fc1ef548adb1b3d32cca73e0762d3b4cbee3bd068fe03fe65d9cf886807
 SHA512:
-  metadata.gz: 5de8ff8356431d9a4d149eb9d93e64462e8eb5a0b7c138bc29dd4683b9e8f747b9e5d7a12e9281eeb405faf13bfd965cf8cae4326beef5db6e125e2cea386c9c
-  data.tar.gz: 34dc5007a0c1f7dc27b9cb698ab244bd7324211d182d9c552d42bdc662311ce8b5b61fcb3c27c3e1f48f539171f1149ee33ecf5fc08498575f74391c5af972b3
+  metadata.gz: 9b20b80ea7995d46e3f9cab97f54c558d3810aea8903a27a44446d05be713b51b6e6ca9dfd57ccb72771cabd28ee560a4ac78e13fd9628c5009d5c6b650c11a6
+  data.tar.gz: f75a07f4a6139a59d022c59de617629d248b45ea79e3de3916f39066ae1a5e4999851d1ddfad146f80b81c35eef1e691a043315a5ac5686fa9b199a013630376

data/.rubocop.yml

@@ -1,6 +1,12 @@
 ---
 inherit_from: .rubocop_todo.yml
 
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
 Lint/UselessAssignment:
   Exclude:
     - examples/geometries.rb
@@ -44,30 +50,37 @@ Metrics/ParameterLists:
     - lib/gdal/warp_operation.rb
     - lib/ogr/spatial_reference_mixins/coordinate_system_getter_setters.rb
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - lib/ogr/layer_mixins/ogr_field_methods.rb
     - lib/ogr/layer_mixins/ogr_query_filter_methods.rb
     - lib/ogr/spatial_reference_mixins/coordinate_system_getter_setters.rb
 
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
+Naming/FileName:
+  Exclude:
+    - Rakefile
+    - lib/ffi-gdal.rb
+    - spec/ffi-gdal_spec.rb
+
+Naming/PredicateName:
+  Exclude:
+    - lib/ogr/geometry_mixins/extensions.rb
+
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - lib/gdal/raster_band_mixins/io_extensions.rb
+    - lib/ogr/geometries/line_string.rb
+    - lib/ogr/geometries/line_string_25d.rb
+    - lib/ogr/geometries/point.rb
+    - lib/ogr/geometries/point_25d.rb
+    - lib/ogr/geometry_types/curve.rb
 
 Style/Documentation:
   Enabled: false
 
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
-Style/FileName:
-  Exclude:
-    - Rakefile
-    - lib/ffi-gdal.rb
-    - spec/ffi-gdal_spec.rb
-
 Style/FormatString:
   EnforcedStyle: percent
 
@@ -77,10 +90,6 @@ Style/PercentLiteralDelimiters:
     '%w': '[]'
     '%W': '[]'
 
-Style/PredicateName:
-  Exclude:
-    - lib/ogr/geometry_mixins/extensions.rb
-
 Style/SymbolArray:
   Enabled: true
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-21 10:44:22 -0700 using RuboCop version 0.48.1.
+# on 2018-03-21 17:46:40 -0700 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,10 +10,10 @@
 Metrics/AbcSize:
   Max: 74
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 29
+  Max: 67
 
 # Offense count: 11
 # Configuration parameters: CountComments.
@@ -24,11 +24,16 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 21
 
-# Offense count: 84
+# Offense count: 82
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 78
 
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 9
+
 # Offense count: 6
 Metrics/PerceivedComplexity:
   Max: 11
@@ -39,24 +44,14 @@ Style/GuardClause:
   Exclude:
     - 'lib/gdal/gridder/point_extracting.rb'
 
-# Adding to allow for targeting ruby 2.3, but the fixes for this cop aren't
-# compatible with ruby 2.2. (I want to keep the frozen-string stuff in)
-#
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Style/IndentHeredoc:
+# Offense count: 1
+Style/MixinUsage:
   Exclude:
-    - 'spec/integration/gdal/dataset_info_spec.rb'
-    - 'spec/unit/ogr/spatial_reference_mixins/exporters_spec.rb'
+    - 'examples/ogr_layer_to_layer.rb'
 
-# Adding to allow for targeting ruby 2.3, but the fixes for this cop aren't
-# compatible with ruby 2.2. (I want to keep the frozen-string stuff in)
-#
 # Offense count: 10
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:

data/History.md

@@ -2,6 +2,16 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 1.0.0.beta9 / 2018-03-26
+
+### Bug Fixes
+
+* [AGDEV-30729] Change `OGERR_NONE` to use a lambda.
+
+### Improvements
+
+* Fix some new rubocops.
+
 ## 1.0.0.beta8 / 2017-04-24
 
 ### Improvements

data/ffi-gdal.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ffi/gdal/version'
 
@@ -23,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'log_switch', '~> 1.0.0'
   spec.add_dependency 'multi_xml'
   spec.add_dependency 'narray', '~> 0.6.0'
+  spec.add_dependency 'numo-narray'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'byebug'

data/lib/ffi/gdal/version.rb

@@ -2,6 +2,6 @@
 
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta8'
+    VERSION = '1.0.0.beta9'
   end
 end

data/lib/ffi/gdal/warp_options.rb

@@ -7,48 +7,37 @@ module FFI
     class WarpOptions < FFI::Struct
       layout :warp_operation_options, :pointer,
         :warp_memory_limit, :double,
-
         :resample_alg, FFI::GDAL::Warper::ResampleAlg,
         :working_data_type, FFI::GDAL::GDAL::DataType,
         :source_dataset, GDAL.find_type(:GDALDatasetH),
         :destination_dataset, GDAL.find_type(:GDALDatasetH),
-
         :band_count, :int,
         :source_bands, :pointer,
         :destination_bands, :pointer,
         :source_alpha_band, :int,
         :destination_alpha_band, :int,
-
         :source_no_data_real, :pointer,
         :source_no_data_imaginary, :pointer,
         :destination_no_data_real, :pointer,
         :destination_no_data_imaginary, :pointer,
-
         :progress, GDAL.find_type(:GDALProgressFunc),
         :progress_arg, :pointer,
         :transformer, Alg.find_type(:GDALTransformerFunc),
         :transformer_arg, :pointer,
-
         :source_per_band_validity_mask_function, :pointer,
         :source_per_band_validity_mask_function_arg, :pointer,
-
         :source_validity_mask_function, Warper.find_type(:GDALMaskFunc),
         :source_validity_mask_function_arg, :pointer,
-
         :source_density_mask_function, Warper.find_type(:GDALMaskFunc),
         :source_density_mask_function_arg, :pointer,
-
         :destination_density_mask_function, Warper.find_type(:GDALMaskFunc),
         :destination_density_mask_function_arg, :pointer,
-
         :destination_validity_mask_function, Warper.find_type(:GDALMaskFunc),
         :destination_validity_mask_function_arg, :pointer,
-
         :pre_warp_chunk_processor, callback(%i[pointer pointer], CPL::Error::CPLErr),
         :pre_warp_processor_arg, :pointer,
         :post_warp_chunk_processor, callback(%i[pointer pointer], CPL::Error::CPLErr),
         :post_warp_processor_arg, :pointer,
-
         :cutline, :pointer,
         :cutline_blend_distance, :double
 

data/lib/ffi/gdal.rb

@@ -36,9 +36,7 @@ module FFI
     def self.find_lib(lib)
       lib_file_name = "#{lib}.#{FFI::Platform::LIBSUFFIX}*"
 
-      if ENV['GDAL_LIBRARY_PATH']
-        return Dir[File.join(ENV['GDAL_LIBRARY_PATH'], lib_file_name)]
-      end
+      return Dir[File.join(ENV['GDAL_LIBRARY_PATH'], lib_file_name)] if ENV['GDAL_LIBRARY_PATH']
 
       search_paths.map do |search_path|
         Dir.glob(search_path).map do |path|

data/lib/ffi/ogr/srs_api.rb

@@ -39,7 +39,6 @@ module FFI
       # -----------------------------------------------------------------------
       # Constants
       # -----------------------------------------------------------------------
-      # rubocop:disable Metrics/BlockLength
       SRS_UL = FFI::ConstGenerator.new('SRS_UL') do |gen|
         gen.include FFI::GDAL._file_with_constants('ogr_srs_api.h')
         gen.const :SRS_UL_METER,              '%s', nil, :METER_LABEL, &:inspect
@@ -96,7 +95,6 @@ module FFI
         gen.const :SRS_UL_INDIAN_CHAIN,       '%s', nil, :INDIAN_CHAIN_LABEL, &:inspect
         gen.const :SRS_UL_INDIAN_CHAIN_CONV,  '%s', nil, :METER_TO_INDIAN_CHAIN, &:to_f
       end
-      # rubocop:enable Metrics/BlockLength
 
       SRS_UL.calculate
 

data/lib/gdal/color_table_mixins/extensions.rb

@@ -6,9 +6,7 @@ module GDAL
   module ColorTableMixins
     module Extensions
       def color_entries_for(color_number)
-        unless (1..4).to_a.include? color_number
-          raise "Invalid ColorEntry number 'color#{color_number}'"
-        end
+        raise "Invalid ColorEntry number 'color#{color_number}'" unless (1..4).to_a.include? color_number
 
         Array.new(color_entry_count) do |i|
           color_entry(i).send("color#{color_number}".to_sym)

data/lib/gdal/dataset_mixins/extensions.rb

@@ -258,7 +258,7 @@ module GDAL
           spatial_ref = OGR::SpatialReference.new(projection)
           begin
             spatial_ref.auto_identify_epsg!
-          rescue
+          rescue StandardError
             OGR::UnsupportedSRS
           end
         end
@@ -276,9 +276,7 @@ module GDAL
           layer.create_field(OGR::FieldDefinition.new(field_name, :OFTInteger))
           band = raster_band(band_number)
 
-          unless band
-            raise GDAL::InvalidBandNumber, "Unknown band number: #{band_number}"
-          end
+          raise GDAL::InvalidBandNumber, "Unknown band number: #{band_number}" unless band
 
           pixel_value_field = layer.feature_definition.field_index(field_name)
           options = { pixel_value_field: pixel_value_field }

data/lib/gdal/driver.rb

@@ -27,9 +27,7 @@ module GDAL
     def self.by_name(name)
       driver_ptr = FFI::GDAL::GDAL.GDALGetDriverByName(name)
 
-      if driver_ptr.null?
-        raise InvalidDriverName, "'#{name}' is not a valid driver name."
-      end
+      raise InvalidDriverName, "'#{name}' is not a valid driver name." if driver_ptr.null?
 
       new(driver_ptr)
     end
@@ -39,9 +37,7 @@ module GDAL
     # @return [GDAL::Driver]
     # @raise [GDAL::InvalidDriverIndex] If driver at +index+ does not exist.
     def self.at_index(index)
-      if index > count
-        raise InvalidDriverIndex, "index must be between 0 and #{count - 1}."
-      end
+      raise InvalidDriverIndex, "index must be between 0 and #{count - 1}." if index > count
 
       driver_ptr = FFI::GDAL::GDAL.GDALGetDriver(index)
 
@@ -176,7 +172,7 @@ module GDAL
     def copy_dataset(source_dataset, destination_path, progress_block = nil, progress_arg = nil, strict: true,
       **options)
       source_dataset_ptr = make_dataset_pointer(source_dataset)
-      raise GDAL::OpenFailure, "Source dataset couldn't be read" if source_dataset_ptr && source_dataset_ptr.null?
+      raise GDAL::OpenFailure, "Source dataset couldn't be read" if source_dataset_ptr&.null?
 
       options_ptr = GDAL::Options.pointer(options)
 

data/lib/gdal/geo_transform.rb

@@ -170,9 +170,7 @@ module GDAL
     def compose(other_geo_transform)
       other_ptr = GDAL._pointer(GDAL::GeoTransform, other_geo_transform)
 
-      unless other_ptr
-        raise GDAL::NullObject, "Unable to access pointer for '#{other_geo_transform}'"
-      end
+      raise GDAL::NullObject, "Unable to access pointer for '#{other_geo_transform}'" unless other_ptr
 
       new_gt_ptr = self.class.new_pointer
       FFI::GDAL::GDAL.GDALComposeGeoTransforms(@c_pointer, other_ptr, new_gt_ptr)

data/lib/gdal/grid.rb

@@ -33,7 +33,6 @@ module GDAL
     # @param progress_block [Proc]
     # @param progress_arg [FFI::Pointer]
     # @return [FFI::MemoryPointer] Pointer to the grid data.
-    # rubocop:disable Metrics/ParameterLists
     def create(points, extents, data_pointer, output_size = { x: 256, y: 256 },
       progress_block = nil, progress_arg = nil)
       points = points.to_a if points.is_a? NArray
@@ -69,7 +68,6 @@ module GDAL
         progress_arg                                    # pProgressArg
       )
     end
-    # rubocop:enable Metrics/ParameterLists
 
     private
 

data/lib/gdal/raster_band.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'narray'
+require 'numo/narray'
 require_relative '../gdal'
 require_relative 'raster_band_mixins/algorithm_extensions'
 require_relative 'raster_band_mixins/algorithm_methods'
@@ -140,7 +141,7 @@ module GDAL
     def category_names=(names)
       names_pointer = GDAL._string_array_to_pointer(names)
 
-      !!FFI::GDAL::GDAL.GDALSetRasterCategoryNames(@c_pointer, names_pointer)
+      FFI::GDAL::GDAL.GDALSetRasterCategoryNames(@c_pointer, names_pointer)
     end
 
     # The no data value for a band is generally a special marker value used to

data/lib/gdal/raster_band_classifier.rb

@@ -51,20 +51,22 @@ module GDAL
     # @param range_count [Fixnum] The number of ranges to create.
     # @return [Array<Hash>, nil]
     def equal_count_ranges(range_count)
-      sorted_pixels = @raster_band.to_na.sort
-      no_data = @raster_band.no_data_value[:value]
-      sorted_and_masked_pixels = no_data ? sorted_pixels[sorted_pixels.ne(no_data)] : sorted_pixels
-      return [] if sorted_and_masked_pixels.empty?
+      pixels = @raster_band.to_nna
+      masked_pixels = masked_pixels(pixels)
+
+      return [] if masked_pixels.empty?
 
+      sorted_and_masked_pixels = masked_pixels.to_a.sort
       range_size = (sorted_and_masked_pixels.size / range_count).to_i
 
-      log "Masked pixel count/total pixel count: #{sorted_and_masked_pixels.size}/#{sorted_pixels.size}"
+      log "Masked pixel count/total pixel count: #{sorted_and_masked_pixels.size}/#{pixels.size}"
       log "Min pixel value: #{sorted_and_masked_pixels.min}"
       log "Max pixel value: #{sorted_and_masked_pixels.max}"
       log "Range size: #{range_size}"
 
       break_values = Array.new(range_count) { |i| sorted_and_masked_pixels[range_size * i] }.uniq
       log "Break values: #{break_values}"
+
       return if break_values.uniq.size != range_count
 
       breakpoint_calculator = lambda do |range_number|
@@ -85,27 +87,58 @@ module GDAL
     # values, so if you don't want to overwrite the Dataset you're working with,
     # you should copy it first.
     def classify!
-      nodata_value = @raster_band.no_data_value[:value]
-      band_pixels = @raster_band.to_na
-      new_band_pixels = GDAL._narray_from_data_type(@raster_band.data_type, @raster_band.x_size, @raster_band.y_size)
-      new_band_pixels[band_pixels.eq(nodata_value)] = nodata_value if nodata_value
-      data_pixels = nodata_value ? band_pixels.ne(nodata_value) : band_pixels
+      band_pixels = @raster_band.to_nna
+      new_band_pixels = band_pixels.clone
+      data_pixels = if nodata_value
+                      nodata_is_nan? ? ~band_pixels.isnan : band_pixels.ne(nodata_value)
+                    else
+                      Numo::Bit.cast(band_pixels.new_ones)
+                    end
 
       @ranges.each do |r|
-        new_band_pixels[
-          data_pixels.
-          and(band_pixels.le(r[:range].max)).
-          and(band_pixels.ge(r[:range].min))
-        ] = r[:map_to]
+        new_band_pixels[data_pixels & band_pixels.le(r[:range].max) & band_pixels.ge(r[:range].min)] = r[:map_to]
       end
 
+      mask_nan(new_band_pixels, data_pixels) if nodata_is_nan?
       @raster_band.write_xy_narray(new_band_pixels)
     end
 
+    # @return [Numeric] NODATA value for the @raster_band.
+    def nodata_value
+      @raster_band.no_data_value[:value]
+    end
+
+    # @return [Boolean] True if NODATA is NaN.
+    def nodata_is_nan?
+      nodata_value.is_a?(Float) && nodata_value.nan?
+    end
+
     private
 
+    # @param pixels [Numo::NArray]
+    # @return [Numo::NArray]
+    def masked_pixels(pixels)
+      no_data = @raster_band.no_data_value[:value]
+
+      if no_data
+        mask = no_data.is_a?(Float) && no_data.nan? ? ~pixels.isnan : pixels.ne(no_data)
+        pixels[mask]
+      else
+        pixels
+      end
+    end
+
     def range_for_type(min, max)
       min.to_data_type(@raster_band.data_type)..max.to_data_type(@raster_band.data_type)
     end
+
+    # Set nodata pixels to 0 and set the nodata value to 0.
+    #
+    # @param new_band_pixels [Numo::NArray]
+    # @param data_pixels [Numo::Bit]
+    def mask_nan(new_band_pixels, data_pixels)
+      new_band_pixels[~data_pixels] = 0
+      @raster_band.no_data_value = 0
+    end
   end
 end

data/lib/gdal/raster_band_mixins/extensions.rb

@@ -37,6 +37,10 @@ module GDAL
         narray.to_type(narray_type)
       end
 
+      def to_nna
+        Numo::NArray[to_a]
+      end
+
       # Each pixel of the raster projected using the dataset's geo_transform.
       # The output NArray is a 3D array where the inner-most array is a the
       # lat an lon, those are contained in an array per pixel line, and finally

data/lib/ogr/data_source.rb

@@ -112,9 +112,7 @@ module OGR
     # @param options [Hash] Driver-specific options.
     # @return [OGR::Layer]
     def create_layer(name, geometry_type: :wkbUnknown, spatial_reference: nil, **options)
-      unless can_create_layer?
-        raise OGR::UnsupportedOperation, 'This data source does not support creating layers.'
-      end
+      raise OGR::UnsupportedOperation, 'This data source does not support creating layers.' unless can_create_layer?
 
       spatial_ref_ptr = GDAL._pointer(OGR::SpatialReference, spatial_reference) if spatial_reference
       options_obj = GDAL::Options.pointer(options)
@@ -122,9 +120,7 @@ module OGR
       layer_ptr = FFI::OGR::API.OGR_DS_CreateLayer(@c_pointer, name,
         spatial_ref_ptr, geometry_type, options_obj)
 
-      unless layer_ptr
-        raise OGR::InvalidLayer, "Unable to create layer '#{name}'."
-      end
+      raise OGR::InvalidLayer, "Unable to create layer '#{name}'." unless layer_ptr
 
       @layers << OGR::Layer.new(layer_ptr)
 
@@ -149,9 +145,7 @@ module OGR
     # @param index [Fixnum]
     # @return +true+ if successful, otherwise raises an OGR exception.
     def delete_layer(index)
-      unless can_delete_layer?
-        raise OGR::UnsupportedOperation, 'This data source does not support deleting layers.'
-      end
+      raise OGR::UnsupportedOperation, 'This data source does not support deleting layers.' unless can_delete_layer?
 
       ogr_err = FFI::OGR::API.OGR_DS_DeleteLayer(@c_pointer, index)
 

data/lib/ogr/driver.rb

@@ -74,9 +74,7 @@ module OGR
 
       data_source_ptr = FFI::OGR::API.OGR_Dr_Open(@c_pointer, file_name, update)
 
-      if data_source_ptr.null?
-        raise OGR::InvalidDataSource, "Unable to open data source at #{file_name}"
-      end
+      raise OGR::InvalidDataSource, "Unable to open data source at #{file_name}" if data_source_ptr.null?
 
       OGR::DataSource.new(data_source_ptr, nil)
     end
@@ -124,9 +122,7 @@ module OGR
     def copy_data_source(source_data_source, new_file_name, **options)
       source_ptr = GDAL._pointer(OGR::DataSource, source_data_source)
 
-      if source_ptr.nil? || source_ptr.null?
-        raise OGR::InvalidDataSource, source_data_source
-      end
+      raise OGR::InvalidDataSource, source_data_source if source_ptr.nil? || source_ptr.null?
 
       options_ptr = GDAL::Options.pointer(options)
 

data/lib/ogr/envelope.rb

@@ -71,7 +71,7 @@ module OGR
 
     # @param new_z_min [Float]
     def z_min=(new_z_min)
-      return nil unless @c_struct.is_a? FFI::OGR::Envelope3D
+      return unless @c_struct.is_a? FFI::OGR::Envelope3D
 
       @c_struct[:min_z] = new_z_min
     end
@@ -85,7 +85,7 @@ module OGR
 
     # @param new_z_max [Float]
     def z_max=(new_z_max)
-      return nil unless @c_struct.is_a? FFI::OGR::Envelope3D
+      return unless @c_struct.is_a? FFI::OGR::Envelope3D
 
       @c_struct[:max_z] = new_z_max
     end

data/lib/ogr/error_handling.rb

@@ -25,7 +25,7 @@ module OGR
     # @return [Proc]
     def error_class_map(error_class)
       {
-        OGRERR_NONE: proc { true },
+        OGRERR_NONE: ->(_msg) { true },
         OGRERR_NOT_ENOUGH_DATA: ->(msg) { raise_exception(OGR::NotEnoughData, msg) },
         OGRERR_NOT_ENOUGH_MEMORY: ->(msg) { raise_exception(::NoMemoryError, msg) },
         OGRERR_UNSUPPORTED_GEOMETRY_TYPE: ->(msg) { raise_exception(OGR::UnsupportedGeometryType, msg) },

data/lib/ogr/feature.rb

@@ -392,6 +392,7 @@ module OGR
 
       formatted_tz = OGR._format_time_zone_for_ruby(time_zone_flag_ptr.read_int)
 
+      # rubocop:disable Style/DateTime
       if formatted_tz
         DateTime.new(
           year_ptr.read_int,
@@ -412,6 +413,7 @@ module OGR
           second_ptr.read_int
         )
       end
+      # rubocop:enable Style/DateTime
     end
 
     # @return [String]

data/lib/ogr/field.rb

@@ -52,7 +52,7 @@ module OGR
 
     # TODO: This blows up when another value type has been set.
     def string
-      return '' if @c_struct[:string] && @c_struct[:string].null?
+      return '' if @c_struct[:string]&.null?
 
       @c_struct[:string].read_string
     end
@@ -186,6 +186,7 @@ module OGR
 
       formatted_tz = OGR._format_time_zone_for_ruby(c_date[:tz_flag].to_i)
 
+      # rubocop:disable Style/DateTime
       DateTime.new(c_date[:year],
         c_date[:month],
         c_date[:day],
@@ -193,6 +194,7 @@ module OGR
         c_date[:minute],
         c_date[:second],
         formatted_tz)
+      # rubocop:enable Style/DateTime
     end
 
     # @param new_date [Date, Time, DateTime]

data/lib/ogr/geometries/line_string.rb

@@ -6,8 +6,6 @@ module OGR
   class LineString
     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(
@@ -25,7 +23,6 @@ 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/geometry.rb

@@ -619,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_mixins/extensions.rb

@@ -70,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/layer_mixins/extensions.rb

@@ -24,7 +24,7 @@ module OGR
 
           begin
             yield feature
-          rescue
+          rescue StandardError
             feature.destroy!
             raise
           end
@@ -52,7 +52,7 @@ module OGR
 
           begin
             yield feature_ptr
-          rescue
+          rescue StandardError
             FFI::OGR::API.OGR_F_Destroy(feature_ptr)
             raise
           end
@@ -128,7 +128,6 @@ module OGR
         # 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)
@@ -211,7 +210,6 @@ 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

@@ -25,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)
 
@@ -41,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)
 
@@ -63,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?
@@ -79,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

@@ -12,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)
@@ -26,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)
 
@@ -39,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 }
@@ -58,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)
 

data/lib/ogr/layer_mixins/ogr_sql_methods.rb

@@ -37,9 +37,7 @@ module OGR
 
       # @return [Boolean]
       def transact
-        unless supports_transactions?
-          raise OGR::UnsupportedOperation, 'This layer does not support transactions.'
-        end
+        raise OGR::UnsupportedOperation, 'This layer does not support transactions.' unless supports_transactions?
 
         ogr_err = yield
 

data/spec/integration/gdal/dataset_info_spec.rb

@@ -79,18 +79,18 @@ RSpec.describe 'Dataset Info', type: :integration do
 
     context 'param is an valid projection string' do
       let(:wkt) do
-        <<-WKT
-GEOGCS["WGS 84",
-  DATUM["WGS_1984",
-    SPHEROID["WGS 84",6378137,298.257223563,
-        AUTHORITY["EPSG",7030]],
-    TOWGS84[0,0,0,0,0,0,0],
-    AUTHORITY["EPSG",6326]],
-  PRIMEM["Greenwich",0,AUTHORITY["EPSG",8901]],
-  UNIT["DMSH",0.0174532925199433,AUTHORITY["EPSG",9108]],
-  AXIS["Lat",NORTH],
-  AXIS["Long",EAST],
-  AUTHORITY["EPSG",4326]]
+        <<~WKT
+          GEOGCS["WGS 84",
+            DATUM["WGS_1984",
+              SPHEROID["WGS 84",6378137,298.257223563,
+                  AUTHORITY["EPSG",7030]],
+              TOWGS84[0,0,0,0,0,0,0],
+              AUTHORITY["EPSG",6326]],
+            PRIMEM["Greenwich",0,AUTHORITY["EPSG",8901]],
+            UNIT["DMSH",0.0174532925199433,AUTHORITY["EPSG",9108]],
+            AXIS["Lat",NORTH],
+            AXIS["Long",EAST],
+            AUTHORITY["EPSG",4326]]
         WKT
       end
 

data/spec/integration/gdal/raster_band_info_spec.rb

@@ -58,9 +58,7 @@ RSpec.describe 'Raster Band Info', type: :integration do
 
   describe '#color_table' do
     it 'is a GDAL::ColorTable' do
-      if subject.color_table
-        expect(subject.color_table).to be_a GDAL::ColorTable
-      end
+      expect(subject.color_table).to be_a GDAL::ColorTable if subject.color_table
     end
   end
 

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ SimpleCov.start do
   add_group 'ext', 'lib/ext'
 end
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'ffi-gdal'
 require 'byebug'
 

data/spec/unit/gdal/raster_band_classifier_spec.rb

@@ -98,8 +98,8 @@ RSpec.describe GDAL::RasterBandClassifier do
     end
 
     context 'all nodata pixels' do
-      let(:band_narray) { NArray.byte(0) }
-      before { allow(raster_band).to receive(:to_na).and_return(band_narray) }
+      let(:band_narray) { Numo::Int8.new(3, 5).fill(0) }
+      before { allow(raster_band).to receive(:to_nna).and_return(band_narray) }
 
       it 'returns an empty Array' do
         expect(subject.equal_count_ranges(10)).to eq([])
@@ -196,4 +196,40 @@ RSpec.describe GDAL::RasterBandClassifier do
       end
     end
   end
+
+  describe '#masked_pixels' do
+    let(:pixels) { dataset.raster_band(1).to_nna }
+    let(:raster_band) { double 'Band', no_data_value: { value: nodata_value } }
+
+    before { subject.instance_variable_set(:@raster_band, raster_band) }
+
+    context 'nodata is NaN' do
+      let(:nodata_value) { Float::NAN }
+      let(:pixels) { Numo::DFloat.cast(dataset.raster_band(1).to_nna) }
+
+      before do
+        pixels[pixels.eq(0)] = nodata_value
+      end
+
+      it 'removes all nodata values' do
+        expect(subject.send(:masked_pixels, pixels).isnan.count_true).to eq 0
+      end
+    end
+
+    context 'nodata is a number' do
+      let(:nodata_value) { 0 }
+
+      it 'removes all nodata values' do
+        expect(subject.send(:masked_pixels, pixels).eq(0).count_true).to eq 0
+      end
+    end
+
+    context 'nodata is nil' do
+      let(:nodata_value) { nil }
+
+      it 'returns the original pixels' do
+        expect(subject.send(:masked_pixels, pixels)).to eq pixels
+      end
+    end
+  end
 end

data/spec/unit/ogr/feature_spec.rb

@@ -275,7 +275,7 @@ RSpec.describe OGR::Feature do
   end
 
   describe '#set_field_date_time + #field_as_date_time' do
-    let(:date_time) { DateTime.now }
+    let(:date_time) { DateTime.now } # rubocop:disable Style/DateTime
 
     context 'to a valid index' do
       it 'adds the field' do

data/spec/unit/ogr/field_spec.rb

@@ -184,7 +184,7 @@ RSpec.describe OGR::Field do
 
   describe '#date= + #date' do
     context 'valid date' do
-      let(:now) { DateTime.now }
+      let(:now) { DateTime.now } # rubocop:disable Style/DateTime
 
       it 'sets the date' do
         subject.date = now

data/spec/unit/ogr/spatial_reference_mixins/exporters_spec.rb

@@ -109,18 +109,18 @@ RSpec.describe OGR::SpatialReference do
       subject { described_class.new_from_epsg(4322) }
 
       it 'returns a well-known text String' do
-        expect(subject.to_pretty_wkt).to eq <<-WKT.strip
-GEOGCS["WGS 72",
-    DATUM["WGS_1972",
-        SPHEROID["WGS 72",6378135,298.26,
-            AUTHORITY["EPSG","7043"]],
-        TOWGS84[0,0,4.5,0,0,0.554,0.2263],
-        AUTHORITY["EPSG","6322"]],
-    PRIMEM["Greenwich",0,
-        AUTHORITY["EPSG","8901"]],
-    UNIT["degree",0.0174532925199433,
-        AUTHORITY["EPSG","9122"]],
-    AUTHORITY["EPSG","4322"]]
+        expect(subject.to_pretty_wkt).to eq <<~WKT.strip
+          GEOGCS["WGS 72",
+              DATUM["WGS_1972",
+                  SPHEROID["WGS 72",6378135,298.26,
+                      AUTHORITY["EPSG","7043"]],
+                  TOWGS84[0,0,4.5,0,0,0.554,0.2263],
+                  AUTHORITY["EPSG","6322"]],
+              PRIMEM["Greenwich",0,
+                  AUTHORITY["EPSG","8901"]],
+              UNIT["degree",0.0174532925199433,
+                  AUTHORITY["EPSG","9122"]],
+              AUTHORITY["EPSG","4322"]]
         WKT
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: numo-narray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -530,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.