ffi-gdal 1.0.0.beta6 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82ca64b9a92e057bf506f537804b6e26aee42281
-  data.tar.gz: 96ce8a17293f28885113c73df4f06b53780a518d
+  metadata.gz: d67e9f4bf5c35dd5b8fd8bc6661eb1e4d6d3ae26
+  data.tar.gz: bc17e333a2f17d7da911db39cdbfd7494dc620d2
 SHA512:
-  metadata.gz: 0c44973c096820715f5c8860c5ac55f85fa90b94f06a88fec64e257e78478c64f192d4938ec25b38efbac6e74f29289b5ff7cf93a229864c0416365bb058a33c
-  data.tar.gz: f9a8fba2bdcbe83bb2359c48c4559e257b9fed4d30667eb8e878e7bdb0ac1e5afde35fce330636377f5ef7b1fec2bea6436fdd4b3a6088fed5cbb5014557ec52
+  metadata.gz: d6014e176cca5ba88ba825f4eaa2cc41f0117b70c402a622606e463ab21aa3c2a1d41b207edb0e5d1223ecfb95c7644d3a612d6ae265d680f737bd35a5104102
+  data.tar.gz: d88dd91735e49e182793c2bee36b78ab79dc761bec8ac89cecd01e453afb1f4ac30e5124025fcf474f9fae27e92043355981d2994c9123993c2de6e3b13421bd

data/History.md

@@ -2,6 +2,46 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 1.0.0.beta7 / 2016-09-21
+
+### Improvements
+
+* Removed all `#as_json` and `#to_json` definitions. They were out of date, not
+  used, and sometimes confusing (ex OGR::Geometries#to_json vs #to_geo_json).
+
+#### GDAL
+
+* Added wrapper for GDALCreateAndReprojectImage in
+  `gdal/dataset_mixins/warp_methods.rb`.
+* (BREAKING CHANGE) Additionally, changed
+  `GDAL::DatasetMixins::WarpMethods#reproject_image`'s
+  `destination_spatial_reference` named param to `destination_projection` which
+  takes a String of WKT for a projection instead of an `OGR::SpatialReference`.
+* Added `GDAL::Options.to_hash` to convert a pointer of options to a Ruby Hash.
+* Return `nil` for missing NODATA values in `GDAL::RasterBand#no_data_value` and
+  `#no_data_value=`.
+
+### Bug Fixes
+
+#### Core
+
+* Fixed specifying an alternate GDAL library using the `GDAL_LIBRARY_PATH`.
+
+#### GDAL
+
+* `GDAL::RasterBandMixins::IOExtensions#write_xy_narray` no longer duplicates
+  data when blocks have a remainder.
+* `GDAL::WarpOptions` should properly act as a wrapper for `FFI::GDAL::WarpOptions`.
+* `Updated extract methods to be compatible with latest `GDAL::Driver#create_dataset`.
+* `GDAL::MajorObject` now gets autoloaded.
+* Fix `GDAL::DatasetMixins::AlgorithmMethods` to use the right `FFI` module for
+  `#rasterize_geometries` and `#rasterize_layers`.
+
+#### OGR
+
+* [AGDEV-17357] Define constants from C using `const_set` instead of `class_eval`.
+* Fixed `OGR::GeometryTypes::Curve#points` (missing local variable).
+
 ## 1.0.0.beta6 / 2016-04-18
 
 ### New Features

data/bitbucket-pipelines.yml

@@ -0,0 +1,16 @@
+# You can use a Docker image from Docker Hub or your own container
+# registry for your build environment.
+image: agrian/ubuntugis-ruby:latest
+
+pipelines:
+  default:
+    - step:
+        script: # Modify the commands below to build your repository.
+          - ruby --version
+          - gem install bundler
+          - gem sources -a http://$AGRIAN_GEMS_USERNAME:$AGRIAN_GEMS_PASSWORD@gems.agrian.com/
+          - bundle config gems.agrian.com $AGRIAN_GEMS_USERNAME:$AGRIAN_GEMS_PASSWORD
+          - bundler --version
+          - bundle install
+          - bundle exec rake spec
+          # - bundle exec rubocop

data/lib/ffi/gdal/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta6'.freeze
+    VERSION = '1.0.0.beta7'.freeze
   end
 end

data/lib/ffi/gdal/warp_options.rb

@@ -5,41 +5,55 @@ 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, CPL::Error::CPLErr,
-        :pre_warp_chunk_processor, :pointer,
+
+        :pre_warp_chunk_processor, callback(%i[pointer pointer], CPL::Error::CPLErr),
         :pre_warp_processor_arg, :pointer,
-        # :post_warp_chunk_processor, CPL::Error::CPLErr,
-        :post_warp_chunk_processor, :pointer,
+        :post_warp_chunk_processor, callback(%i[pointer pointer], CPL::Error::CPLErr),
         :post_warp_processor_arg, :pointer,
+
         :cutline, :pointer,
         :cutline_blend_distance, :double
+
+      def initialize
+        super
+        self[:progress] = proc { true } if self[:progress].null?
+      end
     end
   end
 end

data/lib/ffi/gdal/warper.rb

@@ -11,7 +11,7 @@ module FFI
       # Typedefs
       #------------------------------------------------------------------------
       typedef :pointer, :GDALWarpOperationH
-      callback :GDALMaskFunc,
+      MaskFunc = callback :GDALMaskFunc,
         [
           :pointer,
           :int,
@@ -85,6 +85,22 @@ module FFI
           FFI::GDAL::WarpOptions.ptr
         ],
         CPL::Error::CPLErr
+      attach_function :GDALCreateAndReprojectImage,
+        [
+          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+          :string,
+          :string,
+          :string,
+          FFI::GDAL::GDAL.find_type(:GDALDriverH),
+          :pointer,
+          ResampleAlg,
+          :double,
+          :double,
+          FFI::GDAL::GDAL.find_type(:GDALProgressFunc),
+          :pointer,
+          FFI::GDAL::WarpOptions.ptr
+        ],
+        CPL::Error::CPLErr
       attach_function :GDALAutoCreateWarpedVRT,
         [
           FFI::GDAL::GDAL.find_type(:GDALDatasetH),

data/lib/ffi/gdal.rb

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

data/lib/gdal/color_entry_mixins/extensions.rb

@@ -13,20 +13,6 @@ module GDAL
           [color1, color2, color3]
         end
       end
-
-      def as_json(_options = nil)
-        {
-          color1: color1,
-          color2: color2,
-          color3: color3,
-          color4: color4
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
     end
   end
 end

data/lib/gdal/color_table_mixins/extensions.rb

@@ -29,20 +29,6 @@ module GDAL
           color_entry_as_rgb(i)
         end
       end
-
-      # @return [Hash]
-      def as_json(_options = nil)
-        {
-          color_entry_count: color_entry_count,
-          color_entries: color_entries.map(&:as_json),
-          palette_interpretation: palette_interpretation
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
     end
   end
 end

data/lib/gdal/dataset_mixins/algorithm_methods.rb

@@ -40,7 +40,7 @@ module GDAL
         burn_values_ptr = FFI::MemoryPointer.new(:pointer, burn_values.size)
         burn_values_ptr.write_array_of_double(burn_values)
 
-        FFI::GDAL::GDAL.GDALRasterizeGeometries(@c_pointer,
+        FFI::GDAL::Alg.GDALRasterizeGeometries(@c_pointer,
           band_numbers.size,
           band_numbers_ptr,
           geometries.size,
@@ -94,7 +94,7 @@ module GDAL
         burn_values_ptr.write_array_of_double(burn_values)
         log "burn value ptr null? #{burn_values_ptr.null?}"
 
-        FFI::GDAL::GDAL.GDALRasterizeLayers(@c_pointer,     # hDS
+        FFI::GDAL::Alg.GDALRasterizeLayers(@c_pointer,      # hDS
           band_numbers.size,                                # nBandCount
           band_numbers_ptr,                                 # panBandList
           layers.size,                                      # nLayerCount

data/lib/gdal/dataset_mixins/extensions.rb

@@ -33,8 +33,6 @@ module GDAL
       #   Defaults to -9999.0.
       # @param options [Hash] Options that get used for creating the new NDVI
       #   dataset. See docs for GDAL::Driver#create_dataset.
-      # @return [GDAL::Dataset] The new NDVI dataset. *Be sure to call #close on
-      #   this object or the data may not persist!*
       def extract_ndvi(destination, red_band_number, nir_band_number, driver_name: 'GTiff',
         output_data_type: nil, remove_negatives: false, no_data_value: -9999.0, **options)
         red = raster_band(red_band_number)
@@ -46,7 +44,7 @@ module GDAL
         the_array = calculate_ndvi(red.to_na, nir.to_na, no_data_value, remove_negatives, output_data_type)
         driver = GDAL::Driver.by_name(driver_name)
 
-        ndvi = driver.create_dataset(destination, raster_x_size, raster_y_size,
+        driver.create_dataset(destination, raster_x_size, raster_y_size,
           data_type: output_data_type, **options) do |ndvi_dataset|
           ndvi_dataset.geo_transform = geo_transform
           ndvi_dataset.projection = projection
@@ -55,10 +53,6 @@ module GDAL
           ndvi_band.write_xy_narray(the_array)
           ndvi_band.no_data_value = no_data_value
         end
-
-        ndvi.close
-
-        ndvi
       end
 
       # Extracts the NIR band and writes to a new file.  NOTE: be sure to close
@@ -74,8 +68,6 @@ module GDAL
       #   in this data type. Defaults to use the current data type.
       # @param options [Hash] Options that get used for creating the new NDVI
       #   dataset. See docs for GDAL::Driver#create_dataset.
-      # @return [GDAL::Dataset] The new NIR dataset. *Be sure to call #close on
-      #   this object or the data may not persist!*
       def extract_nir(destination, band_number, driver_name: 'GTiff', output_data_type: nil, **options)
         original_nir_band = raster_band(band_number)
         raise InvalidBandNumber, "Band #{band_number} found but was nil." if original_nir_band.nil?
@@ -83,7 +75,7 @@ module GDAL
         output_data_type ||= original_nir_band.data_type
         driver = GDAL::Driver.by_name(driver_name)
 
-        nir = driver.create_dataset(destination, raster_x_size, raster_y_size,
+        driver.create_dataset(destination, raster_x_size, raster_y_size,
           data_type: output_data_type, **options) do |nir_dataset|
           nir_dataset.geo_transform = geo_transform
           nir_dataset.projection = projection
@@ -91,10 +83,6 @@ module GDAL
           nir_band = nir_dataset.raster_band(1)
           original_nir_band.copy_whole_raster(nir_band)
         end
-
-        nir.close
-
-        nir
       end
 
       # Extracts the RGB bands and writes to a new file.  NOTE: this closes the
@@ -111,7 +99,6 @@ module GDAL
       #   in this data type. Defaults to use the current data type.
       # @param options [Hash] Options that get used for creating the new NDVI
       #   dataset. See docs for GDAL::Driver#create_dataset.
-      # @return [GDAL::Dataset]
       def extract_natural_color(destination, red_band_number, green_band_number, blue_band_number,
         driver_name: 'GTiff', output_data_type: nil, **options)
         original_bands = {
@@ -123,7 +110,7 @@ module GDAL
         output_data_type ||= raster_band(1).data_type
         driver = GDAL::Driver.by_name(driver_name)
 
-        natural_color = driver.create_dataset(destination, raster_x_size, raster_y_size,
+        driver.create_dataset(destination, raster_x_size, raster_y_size,
           band_count: 3, data_type: output_data_type, **options) do |new_dataset|
           new_dataset.geo_transform = geo_transform
           new_dataset.projection = projection
@@ -137,10 +124,6 @@ module GDAL
           new_blue_band = new_dataset.raster_band(3)
           original_bands[:blue].copy_whole_raster(new_blue_band)
         end
-
-        natural_color.close
-
-        natural_color
       end
 
       # @param red_band_array [NArray]
@@ -367,29 +350,6 @@ module GDAL
         NArray[*na.transpose]
       end
 
-      # @return [Hash]
-      def as_json(options = nil)
-        {
-          dataset: {
-            driver: driver.long_name,
-            file_list: file_list,
-            gcp_count: gcp_count,
-            gcp_projection: gcp_projection,
-            geo_transform: geo_transform.as_json(options),
-            projection: projection,
-            raster_count: raster_count,
-            raster_bands: raster_bands.map(&:as_json),
-            spatial_reference: spatial_reference.as_json(options)
-          },
-          metadata: all_metadata
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
-
       private
 
       # @param ndvi [NArray]

data/lib/gdal/dataset_mixins/warp_methods.rb

@@ -4,7 +4,7 @@ module GDAL
     module WarpMethods
       # @param destination_dataset [GDAL::Dataset]
       # @param resample_algorithm [Symbol] One from FFI::GDAL::Warper::GDALResampleAlg.
-      # @param destination_spatial_reference [OGR::SpatialReference]
+      # @param destination_spatial_reference [String]
       # @param warp_memory_limit [Float] The amount of memory (in bytes) the API
       #   is allowed to use for caching. This is in addition to the amount of
       #   memory already allocated for caching (using GDALSetCacheMax). 0.0 uses
@@ -15,26 +15,65 @@ module GDAL
       #   callback for reporting progress.
       # @param progress_arg [FFI::Pointer] Argument to be passed to
       #   +progress_function+.
-      # @param options [Hash] Warp options, normally empty.
-      def reproject_image(destination_dataset, resample_algorithm, destination_spatial_reference: nil,
-        warp_memory_limit: 0.0, max_error: 0.0, progress_function: nil, progress_arg: nil, **options)
-        destination_spatial_reference_wkt = if destination_spatial_reference
-                                              destination_spatial_reference.to_wkt
-                                            end
-
-        options_ptr = GDAL::Options.pointer(options)
+      # @param warp_options [GDAL::WarpOptions] Warp options, normally empty.
+      def reproject_image(destination_dataset, resample_algorithm, destination_projection: nil,
+        warp_memory_limit: 0.0, max_error: 0.0, progress_function: nil, progress_arg: nil, warp_options: nil)
+        warp_options_struct = warp_options ? warp_options.c_struct : nil
 
         FFI::GDAL::Warper.GDALReprojectImage(
           @c_pointer,                           # hSrcDS
           nil,                                  # pszSrcWKT
           destination_dataset.c_pointer,        # hDstDS
-          destination_spatial_reference_wkt,    # pszDstWKT
+          destination_projection,               # pszDstWKT
+          resample_algorithm,                   # eResampleAlg
+          warp_memory_limit,                    # dfWarpMemoryLimit
+          max_error,                            # dfMaxError
+          progress_function,                    # pfnProgress
+          progress_arg,                         # pProgressArg
+          warp_options_struct                   # psOptions
+        )
+      end
+
+      # @param destination_file_name [String] Path to the output dataset.
+      # @param resample_algorithm [Symbol] One from FFI::GDAL::Warper::GDALResampleAlg.
+      # @param destination_projection [String] WKT of the projection to
+      #   be used for the destination dataset.
+      # @param destination_driver [GDAL::Driver] Driver to use for the
+      #   destination dataset.
+      # @param creation_options [Hash] Driver-specific options to use during
+      #   creation.
+      # @param warp_memory_limit [Float] The amount of memory (in bytes) the API
+      #   is allowed to use for caching. This is in addition to the amount of
+      #   memory already allocated for caching (using GDALSetCacheMax). 0.0 uses
+      #   default settings.
+      # @param max_error [Float] Maximum error, measured in input pixels that is
+      #   allowed in approximating the transformation. Defaults to 0.0.
+      # @param progress_function [Proc, FFI::GDAL::GDAL::GDALProgressFunc] A
+      #   callback for reporting progress.
+      # @param progress_arg [FFI::Pointer] Argument to be passed to
+      #   +progress_function+.
+      # @param warp_options [GDAL::WarpOptions] Warp options, normally empty.
+      def create_and_reproject_image(destination_file_name, resample_algorithm, destination_projection,
+        destination_driver, creation_options: {},
+        warp_memory_limit: 0.0, max_error: 0.0,
+        progress_function: nil, progress_arg: nil,
+        warp_options: nil)
+        creation_options_ptr = GDAL::Options.pointer(creation_options)
+        warp_options_struct = warp_options ? warp_options.c_struct : nil
+
+        FFI::GDAL::Warper.GDALCreateAndReprojectImage(
+          @c_pointer,                           # hSrcDS
+          nil,                                  # pszSrcWKT
+          destination_file_name,                # pszDstFilename
+          destination_projection,               # pszDstWKT
+          destination_driver.c_pointer,         # hDstDriver
+          creation_options_ptr,                 # papszCreateOptions
           resample_algorithm,                   # eResampleAlg
           warp_memory_limit,                    # dfWarpMemoryLimit
           max_error,                            # dfMaxError
           progress_function,                    # pfnProgress
           progress_arg,                         # pProgressArg
-          options_ptr                           # psOptions
+          warp_options_struct                   # psOptions
         )
       end
     end

data/lib/gdal/geo_transform_mixins/extensions.rb

@@ -90,23 +90,6 @@ module GDAL
           pixel_height
         ]
       end
-
-      # @return [Hash]
-      def as_json(_options = nil)
-        {
-          x_origin: x_origin,
-          x_rotation: x_rotation,
-          pixel_width: pixel_width,
-          y_origin: y_origin,
-          y_rotation: y_rotation,
-          pixel_height: pixel_height
-        }
-      end
-
-      # @return [String]
-      def to_json(options = nil)
-        as_json(options).to_json
-      end
     end
   end
 end

data/lib/gdal/grid.rb

@@ -36,8 +36,9 @@ module GDAL
       points = points.to_a if points.is_a? NArray
       point_count = points.length
       log "Number of points: #{point_count}"
-      points = points.transpose
+      raise GDAL::NoValuesToGrid, 'No points to grid' if point_count.zero?
 
+      points = points.transpose
       x_input_coordinates_ptr = make_points_pointer(points[0])
       y_input_coordinates_ptr = make_points_pointer(points[1])
       z_input_coordinates_ptr = make_points_pointer(points[2])

data/lib/gdal/gridder/point_extracting.rb

@@ -39,8 +39,7 @@ module GDAL
       #   set and the layer has no Z values.
       def ensure_z_values
         if layer_missing_specified_field?
-          raise OGR::InvalidFieldName,
-            "Field name not found in layer: '#{@options.input_field_name}'"
+          raise OGR::InvalidFieldName, "Field name not found in layer: '#{@options.input_field_name}'"
         elsif !@options.input_field_name && !@source_layer.any_geometries_with_z?
           raise GDAL::NoValuesToGrid,
             "No input_field_name option given and source layer #{@source_layer.name} has no Z values."

data/lib/gdal/gridder.rb

@@ -287,8 +287,13 @@ module GDAL
     # @return [Fixnum] The total number of blocks that should be iterated
     #   through during the grid+rasterize process.
     def build_block_count(block_x_size, block_y_size, raster_width, raster_height)
-      ((raster_width + block_x_size - 1) / block_x_size) *
-        ((raster_height + block_y_size - 1) / block_y_size)
+      build_block_size(raster_width, block_x_size) * build_block_size(raster_height, block_y_size)
+    end
+
+    # @param total_pixels [Fixnum] Number of pixels in the width or height.
+    # @param block_size [Fixnum] Size of the reported block.
+    def build_block_size(total_pixels, block_size)
+      (total_pixels + block_size - 1) / block_size
     end
   end
 end

data/lib/gdal/options.rb

@@ -11,10 +11,20 @@ module GDAL
     #   +nil+.  If +false+, creates a 0-size pointer.
     # @return [FFI::MemoryPointer, nil]
     def self.pointer(hash, nil_on_empty: true)
-      if nil_on_empty
-        hash.empty? ? nil : new(hash).c_pointer
-      else
-        new(hash).c_pointer
+      return if nil_on_empty && hash.empty?
+
+      new(hash).c_pointer
+    end
+
+    # Takes a GDAL options pointer and turns it into a Ruby Hash.
+    #
+    # @param pointer [FFI::Pointer]
+    # @return [Hash]
+    def self.to_hash(pointer)
+      FFI::CPL::String.CSLCount(pointer).times.each_with_object({}) do |i, o|
+        key_and_value = FFI::CPL::String.CSLGetField(pointer, i)
+        key, value = key_and_value.split('=')
+        o[key.downcase.to_sym] = value
       end
     end
 
@@ -37,15 +47,6 @@ module GDAL
       options_ptr
     end
 
-    # def to_s
-    #   options_ptr = to_gdal
-    #   options_array = options_ptr.read_array_of_pointer(self.size)
-    #
-    #   0.upto(self.size).map do |i|
-    #     options_array[i].first.read_string
-    #   end
-    # end
-
     private
 
     def capitalize_keys!(hash)

data/lib/gdal/raster_attribute_table_mixins/extensions.rb

@@ -39,21 +39,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

@@ -149,16 +149,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]

data/lib/gdal/raster_band_classifier.rb

@@ -50,7 +50,8 @@ module GDAL
     # @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])]
+      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?
 
       range_size = (sorted_and_masked_pixels.size / range_count).to_i
@@ -89,11 +90,12 @@ module GDAL
       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
+      new_band_pixels[band_pixels.eq(nodata_value)] = nodata_value if nodata_value
+      data_pixels = nodata_value ? band_pixels.ne(nodata_value) : band_pixels
 
       @ranges.each do |r|
         new_band_pixels[
-          band_pixels.ne(nodata_value).
+          data_pixels.
           and(band_pixels.le(r[:range].max)).
           and(band_pixels.ge(r[:range].min))
         ] = r[:map_to]

data/lib/gdal/raster_band_mixins/extensions.rb

@@ -62,41 +62,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