ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/gdal/raster_attribute_table.rb

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

data/lib/gdal/raster_attribute_table_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module GDAL
@@ -10,7 +12,7 @@ module GDAL
         case value.class
         when String then set_value_as_string(row, field, value)
         when Float then set_value_as_double(row, field, value)
-        when Fixnum then set_value_as_integer(row, field, value)
+        when Integer then set_value_as_integer(row, field, value)
         else raise GDAL::UnknownRasterAttributeTableType, "Unknown value type for value '#{value}'"
         end
       end
@@ -39,21 +41,6 @@ module GDAL
 
         column_count.times { |i| yield column(i) }
       end
-
-      # @return [Hash]
-      def as_json(_options = nil)
-        {
-          column_count: column_count,
-          columns: columns,
-          linear_binning: linear_binning,
-          row_count: row_count
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
     end
   end
 end

data/lib/gdal/raster_band.rb

@@ -1,4 +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'
@@ -138,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
@@ -149,16 +152,18 @@ module GDAL
     def no_data_value
       associated = FFI::MemoryPointer.new(:bool)
       value = FFI::GDAL::GDAL.GDALGetRasterNoDataValue(@c_pointer, associated)
+      value = nil if value == -10_000_000_000.0
 
       { value: value, is_associated: associated.read_bytes(1).to_bool }
     end
 
-    # Sets the no data value for this band.
+    # Sets the no data value for this band.  Do nothing if attempting to set to nil, because removing a no data value
+    # is impossible until GDAL 2.1.
     #
-    # @param value [Float]
+    # @param value [Float, nil]
     # @return [Boolean]
     def no_data_value=(value)
-      !!FFI::GDAL::GDAL.GDALSetRasterNoDataValue(@c_pointer, value)
+      !!FFI::GDAL::GDAL.GDALSetRasterNoDataValue(@c_pointer, value) if value
     end
 
     # @return [Fixnum]
@@ -214,7 +219,7 @@ module GDAL
       flag_list.reverse_each.with_index do |flag, i|
         flag = flag.to_i
 
-        if i == 0 && flag == 1
+        if i.zero? && flag == 1
           flags << :GMF_ALL_VALID
         elsif i == 1 && flag == 1
           flags << :GMF_PER_DATASET
@@ -271,7 +276,7 @@ module GDAL
       standard_deviation = FFI::MemoryPointer.new(:double)
 
       handler = GDAL::CPLErrorHandler.new
-      handler.on_warning = proc { Hash.new }
+      handler.on_warning = proc { {} }
       handler.on_none = proc do
         {
           minimum: min.read_double,

data/lib/gdal/raster_band_classifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 
 module GDAL
@@ -49,19 +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
-      sorted_and_masked_pixels = sorted_pixels[sorted_pixels.ne(@raster_band.no_data_value[:value])]
-      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|
@@ -71,13 +76,9 @@ module GDAL
         range_for_type(min, max)
       end
 
-      range_count.times.each_with_object([]) do |i, ranges|
+      Array.new(range_count) do |i|
         range = breakpoint_calculator.call(i)
-
-        ranges << {
-          range: range,
-          map_to: (i + 1).to_data_type(@raster_band.data_type)
-        }
+        { range: range, map_to: (i + 1).to_data_type(@raster_band.data_type) }
       end
     end
 
@@ -86,26 +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
+      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[
-          band_pixels.ne(nodata_value).
-          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/algorithm_extensions.rb

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

data/lib/gdal/raster_band_mixins/algorithm_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     module AlgorithmMethods
@@ -34,7 +36,8 @@ module GDAL
             colors,
             color_table.c_pointer,
             progress_function,
-            progress_arg)
+            progress_arg
+          )
 
           color_table
         end
@@ -75,7 +78,8 @@ module GDAL
             output_ptr,
             color_table_ptr,
             progress_function,
-            progress_arg)
+            progress_arg
+          )
 
           output_band
         end
@@ -97,7 +101,8 @@ module GDAL
           x_offset,
           y_offset,
           x_size,
-          y_size)
+          y_size
+        )
       end
 
       # Computes the proximity of all pixels in the proximity_band to those in
@@ -134,7 +139,8 @@ module GDAL
           proximity_band_ptr,
           options_ptr,
           progress_function,
-          progress_arg)
+          progress_arg
+        )
       end
 
       # Fill selected raster regions by interpolation from the edges. It
@@ -324,7 +330,8 @@ module GDAL
           connectedness,
           options_ptr,
           progress_function,
-          progress_arg)
+          progress_arg
+        )
       end
     end
   end

data/lib/gdal/raster_band_mixins/coloring_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     # RasterBand methods added for dealing with colorizing.
@@ -74,7 +76,7 @@ module GDAL
 
       # @param hex [String]
       def hex_to_rgb(hex)
-        hex.sub!(/^#/, '')
+        hex = hex.sub(/^#/, '')
         matches = hex.match(/(?<red>[a-zA-Z0-9]{2})(?<green>[a-zA-Z0-9]{2})(?<blue>[a-zA-Z0-9]{2})/)
 
         [matches[:red].to_i(16), matches[:green].to_i(16), matches[:blue].to_i(16)]

data/lib/gdal/raster_band_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module GDAL
@@ -35,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
@@ -62,41 +68,6 @@ module GDAL
       def pixel_count
         x_size * y_size
       end
-
-      # @return [Hash]
-      def as_json(_options = nil)
-        {
-          raster_band: {
-            block_size: block_size,
-            category_names: category_names,
-            color_interpretation: color_interpretation,
-            color_table: color_table,
-            data_type: data_type,
-            default_histogram: default_histogram(true),
-            default_raster_attribute_table: default_raster_attribute_table,
-            has_arbitrary_overviews: arbitrary_overviews?,
-            mask_flags: mask_flags,
-            maximum_value: maximum_value,
-            minimum_value: minimum_value,
-            no_data_value: no_data_value,
-            number: number,
-            offset: offset,
-            overview_count: overview_count,
-            overviews: overviews,
-            scale: scale,
-            statistics: statistics,
-            unit_type: unit_type,
-            x_size: x_size,
-            y_size: y_size
-          },
-          metadata: all_metadata
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
     end
   end
 end

data/lib/gdal/raster_band_mixins/io_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module RasterBandMixins
     # Methods for reading & writing RasterBands that didn't come from GDAL.
@@ -24,6 +26,7 @@ module GDAL
       # @param pixel_array [NArray] The 2d list of pixels.
       def write_xy_narray(pixel_array)
         data_pointer = FFI::MemoryPointer.new(:buffer_out, block_buffer_size)
+        read_start = 0
 
         block_count[:y].times do |y_block_number|
           block_count[:x].times do |x_block_number|
@@ -31,14 +34,14 @@ module GDAL
             x_block_size = calculate_x_block_size(x_block_number)
 
             pixel_count_per_block = x_block_size * y_block_size
-            read_offset = (y_block_number + 1) * (x_block_number + 1)
-            read_range = ((read_offset - 1) * pixel_count_per_block)...(read_offset * pixel_count_per_block)
+            read_range = (read_start...(read_start + pixel_count_per_block))
             pixels = pixel_array[read_range]
             GDAL._write_pointer(data_pointer, data_type, pixels.to_a)
 
             write_block(x_block_number, y_block_number, data_pointer)
 
             data_pointer.clear
+            read_start = read_range.end
           end
         end
       end
@@ -69,7 +72,7 @@ module GDAL
       # Determines not only x and y block counts (how many blocks there are in
       # the raster band when using GDAL's suggested block size), but remainder
       # x and y counts for when the total number of pixels and lines does not
-      # divide evently using GDAL's block count.
+      # divide evenly using GDAL's block count.
       #
       # @return [Hash{x => Fixnum, x_remainder => Fixnum, y => Fixnum,
       #   y_remainder => Fixnum}]
@@ -135,7 +138,7 @@ module GDAL
             read_block(x_block_number, y_block_number, data_pointer)
             pixels = GDAL._read_pointer(data_pointer, data_type, block_buffer_size)
 
-            yield(pixels, x_block_size, y_block_size)
+            yield(Array(pixels), x_block_size, y_block_size)
           end
         end
       end

data/lib/gdal/rpc_info.rb

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

data/lib/gdal/transformer.rb

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

data/lib/gdal/transformers/approximate_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class ApproximateTransformer
@@ -18,7 +20,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.GDALCreateApproxTransformer(
           base_transformer_function,
           transformer_arg_ptr,
-          max_error)
+          max_error
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/base_general_image_projection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class BaseGeneralImageProjectionTransformer
@@ -32,7 +34,8 @@ module GDAL
         geo_transform_ptr = GDAL._pointer(GDAL::GeoTransform, geo_transform)
 
         FFI::GDAL::Alg.GDALSetGenImgProjTransformerDstGeoTransform(
-          @c_pointer, geo_transform_ptr)
+          @c_pointer, geo_transform_ptr
+        )
       end
     end
   end

data/lib/gdal/transformers/gcp_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class GCPTransformer
@@ -25,13 +27,15 @@ module GDAL
                          gcp_list.size,
                          gcp_list_ptr,
                          requested_polynomial_order,
-                         reversed)
+                         reversed
+                       )
                      else
                        FFI::GDAL::Alg.GDALCreateGCPTransformer(
                          gcp_list.size,
                          gcp_list_ptr,
                          requested_polynomial_order,
-                         reversed)
+                         reversed
+                       )
                      end
       end