ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/ffi/gdal/matching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
 

data/lib/ffi/gdal/rpc_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/gdal/transformer_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/gdal/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta6'.freeze
+    VERSION = '1.0.0.beta11'
   end
 end

data/lib/ffi/gdal/vrt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
 

data/lib/ffi/gdal/warp_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI
@@ -32,14 +34,17 @@ module FFI
         :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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
 
@@ -11,7 +13,7 @@ module FFI
       # Typedefs
       #------------------------------------------------------------------------
       typedef :pointer, :GDALWarpOperationH
-      callback :GDALMaskFunc,
+      MaskFunc = callback :GDALMaskFunc,
         [
           :pointer,
           :int,
@@ -85,6 +87,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/ogr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FFI
   module OGR
     autoload :API, File.expand_path('ogr/api.rb', __dir__)

data/lib/ffi/ogr/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI

data/lib/ffi/ogr/contour_writer_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/ogr/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
 require_relative 'field'

data/lib/ffi/ogr/envelope.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/ogr/envelope_3d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/ogr/featurestyle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/ffi/ogr/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../cpl/conv'
 
 module FFI

data/lib/ffi/ogr/geocoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
 

data/lib/ffi/ogr/srs_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI
@@ -93,6 +95,7 @@ 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
+
       SRS_UL.calculate
 
       SRS_UA = FFI::ConstGenerator.new('SRS_UL') do |gen|

data/lib/ffi/ogr/style_param.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require_relative '../cpl/port'
 

data/lib/ffi/ogr/style_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffi'
 
 module FFI

data/lib/gdal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'ffi-gdal'
 
 module GDAL
@@ -30,6 +32,7 @@ module GDAL
   autoload :Driver,               gdal_require('gdal/driver')
   autoload :GeoTransform,         gdal_require('gdal/geo_transform')
   autoload :Logger,               gdal_require('gdal/logger')
+  autoload :MajorObject,          gdal_require('gdal/major_object')
   autoload :Options,              gdal_require('gdal/options')
   autoload :RasterAttributeTable, gdal_require('gdal/raster_attribute_table')
   autoload :RasterBand,           gdal_require('gdal/raster_band')

data/lib/gdal/color_entry.rb

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

data/lib/gdal/color_entry_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module GDAL
@@ -13,20 +15,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_interpretation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   class ColorInterpretation
     # @param gdal_color_interp [FFI::GDAL::ColorInterp]

data/lib/gdal/color_table.rb

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

data/lib/gdal/color_table_mixins/extensions.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 require 'json'
 
 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)
@@ -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/color_table_types/cmyk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module ColorTableTypes
     module CMYK

data/lib/gdal/color_table_types/gray.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module ColorTableTypes
     module Gray

data/lib/gdal/color_table_types/hls.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module ColorTableTypes
     module HLS

data/lib/gdal/color_table_types/rgb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module ColorTableTypes
     module RGB

data/lib/gdal/cpl_error_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   # This is used to override GDAL's built-in error handling.  By default, GDAL
   # only logs errors to STDOUT, which doesn't allow a whole lot of flexibility.

data/lib/gdal/data_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   # Info about GDAL data types (GDT symbols).
   class DataType

data/lib/gdal/dataset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require_relative '../gdal'
 require_relative '../ogr'
@@ -300,6 +302,7 @@ module GDAL
     # @param band_space [Fixnum] The byte offset from the start of one band's
     #   data to the start of the next. If defaulted (0), the size of
     #   +line_space+ * +buffer_y_size* is used.
+    # rubocop:disable: Metrics/MethodLength
     def raster_io(access_flag, buffer = nil,
       x_size: nil, y_size: nil, x_offset: 0, y_offset: 0,
       buffer_x_size: nil, buffer_y_size: nil, buffer_data_type: nil,
@@ -343,6 +346,7 @@ module GDAL
 
       buffer
     end
+    # rubocop:enable: Metrics/MethodLength
 
     private
 
@@ -353,13 +357,13 @@ module GDAL
     # @return [Fixnum]
     def parse_mask_flag_symbols(*flags)
       flags.reduce(0) do |result, flag|
-        result |= case flag
-                  when :GMF_ALL_VALID then 0x01
-                  when :GMF_PER_DATASET then 0x02
-                  when :GMF_PER_ALPHA then 0x04
-                  when :GMF_NODATA then 0x08
-                  else 0
-                  end
+        result | case flag
+                 when :GMF_ALL_VALID then 0x01
+                 when :GMF_PER_DATASET then 0x02
+                 when :GMF_PER_ALPHA then 0x04
+                 when :GMF_NODATA then 0x08
+                 else 0
+                 end
       end
     end
 

data/lib/gdal/dataset_mixins/algorithm_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module DatasetMixins
     # Wrappers for Warp algorithm methods defined in gdal_alg.h.
@@ -16,7 +18,7 @@ module GDAL
       #   polygon or that are selected by Brezenham's line algorithm.  Defaults to
       #   +false+.
       # @option options burn_value_from ["Z"] Use the Z values of the geometries.
-      # @option @options merge_alg [String] "REPLACE" or "ADD".  REPLACE results
+      # @option options merge_alg [String] "REPLACE" or "ADD".  REPLACE results
       #   in overwriting of value, while ADD adds the new value to the existing
       #   raster, suitable for heatmaps for instance.
       def rasterize_geometries!(band_numbers, geometries, burn_values,
@@ -40,7 +42,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 +96,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
@@ -185,7 +187,8 @@ module GDAL
           pixels_ptr,
           lines_ptr,
           extents_ptr,
-          options)
+          options
+        )
 
         extents_array = extents_ptr.read_array_of_double(4)
 

data/lib/gdal/dataset_mixins/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'narray'
 require_relative '../../ffi-gdal'
@@ -33,8 +35,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 +46,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 +55,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 +70,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 +77,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 +85,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 +101,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 +112,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 +126,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]
@@ -273,7 +258,7 @@ module GDAL
           spatial_ref = OGR::SpatialReference.new(projection)
           begin
             spatial_ref.auto_identify_epsg!
-          rescue
+          rescue StandardError
             OGR::UnsupportedSRS
           end
         end
@@ -291,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 }
@@ -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]