ffi-gdal 1.0.0.beta6 → 1.0.0.beta11

data/lib/gdal/transformers/general_image_projection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL

data/lib/gdal/transformers/general_image_projection_transformer2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL
@@ -43,7 +45,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.GDALCreateGenImgProjTransformer2(
           source_ptr,
           destination_ptr,
-          options_ptr)
+          options_ptr
+        )
 
         super()
       end

data/lib/gdal/transformers/general_image_projection_transformer3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_general_image_projection_transformer'
 
 module GDAL
@@ -16,7 +18,8 @@ module GDAL
           source_wkt,
           source_ptr,
           destination_wkt,
-          destination_ptr)
+          destination_ptr
+        )
 
         super()
       end

data/lib/gdal/transformers/geolocation_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class GeolocationTransformer
@@ -19,7 +21,8 @@ module GDAL
         @c_pointer = FFI::GDAL::Alg.CreateGeoLocTransformer(
           base_dataset_ptr,
           geolocation_info_ptr,
-          reversed)
+          reversed
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/reprojection_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class ReprojectionTransformer

data/lib/gdal/transformers/rpc_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class RPCTransformer
@@ -33,7 +35,8 @@ module GDAL
           rpc_info,
           reversed,
           pixel_error_threshold,
-          options_ptr)
+          options_ptr
+        )
       end
 
       def destroy!

data/lib/gdal/transformers/tps_transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GDAL
   module Transformers
     class TPSTransformer

data/lib/gdal/version_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module GDAL
@@ -6,33 +8,33 @@ module GDAL
     #
     # @return [String]
     def version_num
-      FFI::GDAL.GDALVersionInfo('VERSION_NUM'.freeze)
+      FFI::GDAL.GDALVersionInfo('VERSION_NUM')
     end
 
     # @return [Date]
     def release_date
-      Date.parse(FFI::GDAL.GDALVersionInfo('RELEASE_DATE'.freeze))
+      Date.parse(FFI::GDAL.GDALVersionInfo('RELEASE_DATE'))
     end
 
     # Version in the form "1.1.7".
     #
     # @return [String]
     def release_name
-      FFI::GDAL.GDALVersionInfo('RELEASE_NAME'.freeze)
+      FFI::GDAL.GDALVersionInfo('RELEASE_NAME')
     end
 
     # The long licensing info.
     #
     # @return [String]
     def license
-      FFI::GDAL.GDALVersionInfo('LICENSE'.freeze)
+      FFI::GDAL.GDALVersionInfo('LICENSE')
     end
 
     # Options used when building GDAL.
     #
     # @return [Hash{String => String}]
     def build_info
-      key_value_pairs = FFI::GDAL.GDALVersionInfo('BUILD_INFO'.freeze)
+      key_value_pairs = FFI::GDAL.GDALVersionInfo('BUILD_INFO')
       key_value_pairs.split.each_with_object({}) do |kv, obj|
         key, value = kv.split('=', 2)
         obj[key] = value
@@ -41,7 +43,7 @@ module GDAL
 
     # @return [String]
     def long_version
-      FFI::GDAL.GDALVersionInfo('--version'.freeze)
+      FFI::GDAL.GDALVersionInfo('--version')
     end
 
     # @param major [Fixnum]
@@ -49,7 +51,7 @@ module GDAL
     # @return [Boolean] +true+ if the runtime GDAL library matches the given
     #   version params.
     def check_version(major, minor)
-      FFI::GDAL.GDALCheckVersion(major, minor, 'FFI::GDAL'.freeze)
+      FFI::GDAL.GDALCheckVersion(major, minor, 'FFI::GDAL')
     end
   end
 end

data/lib/gdal/virtual_dataset.rb

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

data/lib/gdal/warp_operation.rb

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

data/lib/gdal/warp_options.rb

@@ -1,14 +1,32 @@
+# frozen_string_literal: true
+
 require_relative '../gdal'
 
 module GDAL
   class WarpOptions
     attr_reader :c_struct
+    attr_reader :source_dataset
+    attr_reader :destination_dataset
+    attr_reader :cutline
 
     def initialize(options = {})
       @c_struct = FFI::GDAL::WarpOptions.new
-
-      options.keys do |k|
-        @c_struct[k] = options[k]
+      @source_dataset = nil
+      @destination_dataset = nil
+
+      options.each_key do |k|
+        assign_meth = "#{k}=".to_sym
+
+        begin
+          if respond_to?(assign_meth)
+            send(assign_meth, options[k])
+          else
+            @c_struct[k] = options[k]
+          end
+        rescue ArgumentError => ex
+          new_message = "#{k}; #{ex.message}"
+          raise $ERROR_INFO, new_message, $ERROR_INFO.backtrace
+        end
       end
     end
 
@@ -21,42 +39,40 @@ module GDAL
       @c_struct[:warp_operation_options] = GDAL::Options.pointer(options)
     end
 
-    # @param limit [Float]
-    def warp_memory_limit=(limit)
-      @c_struct[:warp_memory_limit] = limit
-    end
-
-    # @param algorithm_type [FFI::GDAL::Warper::ResampleAlg]
-    def resample_algorithm=(algorithm_type)
-      @c_struct[:resample_alg] = algorithm_type
-    end
+    # @return [Hash]
+    def warp_operation_options
+      options = @c_struct[:warp_operation_options]
 
-    # @param data_type [FFI::GDAL::GDAL::DataType]
-    def working_data_type=(data_type)
-      @c_struct[:working_data_type] = data_type
+      GDAL::Options.to_hash(options)
     end
 
     # @param dataset [GDAL::Dataset]
     def source_dataset=(dataset)
+      @source_dataset = dataset
       @c_struct[:source_dataset] = dataset.c_pointer
     end
 
     # @param dataset [GDAL::Dataset]
     def destination_dataset=(dataset)
+      @destination_dataset = dataset
       @c_struct[:destination_dataset] = dataset.c_pointer
     end
 
-    # @param count [Fixnum]
-    def band_count=(count)
-      @c_struct[:band_count] = count
-    end
-
     # @param band_numbers [Array<Fixnum>]
     def source_bands=(band_numbers)
-      bands_ptr = FFI::MemoryPointer.new(:pointer, band_numbers.length)
+      bands_ptr = FFI::MemoryPointer.new(:int, band_numbers.length)
       bands_ptr.write_array_of_int(band_numbers)
 
       @c_struct[:source_bands] = bands_ptr
+      @c_struct[:band_count] = band_numbers.length if band_numbers.length > @c_struct[:band_count]
+    end
+
+    # @return [Array<Fixnum>]
+    def source_bands
+      pointer = @c_struct[:source_bands]
+      return [] if pointer.null?
+
+      pointer.read_array_of_int(@c_struct[:band_count])
     end
 
     # @param band_numbers [Array<Fixnum>]
@@ -65,33 +81,32 @@ module GDAL
       bands_ptr.write_array_of_int(band_numbers)
 
       @c_struct[:destination_bands] = bands_ptr
+      @c_struct[:band_count] = band_numbers.length if band_numbers.length > @c_struct[:band_count]
     end
 
-    def transformer_arg=(transformation_object)
-      @c_struct[:transformer_arg] = transformation_object.c_pointer
+    # @return [Array<Fixnum>]
+    def destination_bands
+      pointer = @c_struct[:destination_bands]
+      return [] if pointer.null?
 
-      @c_struct[:transformer] = transformation_object.function
+      pointer.read_array_of_int(@c_struct[:band_count])
     end
 
-    def transformer=(transformer)
-      @c_struct[:transformer] = transformer
-    end
+    def transformer_arg=(transformation_object)
+      @c_struct[:transformer_arg] = transformation_object.c_pointer
 
-    def progress_formatter=(output_proc)
-      @c_struct[:progress] = output_proc
+      @c_struct[:transformer] = transformation_object.function
     end
 
-    def cutline_geometry=(geometry)
+    # @param geometry [OGR::Geometry]
+    def cutline=(geometry)
       raise 'Not a geom' unless geometry.is_a?(OGR::Geometry)
+      @cutline = geometry
 
       @c_struct[:cutline] = geometry.c_pointer
-      # @c_struct[:cutline] = geometry.clone.c_pointer
-    end
-
-    def cutline_blend_distance=(distance)
-      @c_struct[:cutline_blend_distance] = distance
     end
 
+    # @param values [Array<Float>]
     def source_no_data_real=(values)
       values_ptr = FFI::MemoryPointer.new(:double, values.length)
       values_ptr.write_array_of_double(values)
@@ -99,6 +114,15 @@ module GDAL
       @c_struct[:source_no_data_real] = values_ptr
     end
 
+    # @return [Array<Float>]
+    def source_no_data_real
+      pointer = @c_struct[:source_no_data_real]
+      return [] if pointer.null?
+
+      pointer.read_array_of_double(@c_struct[:band_count])
+    end
+
+    # @param values [Array<Float>]
     def source_no_data_imaginary=(values)
       values_ptr = FFI::MemoryPointer.new(:double, values.length)
       values_ptr.write_array_of_double(values)
@@ -106,6 +130,15 @@ module GDAL
       @c_struct[:source_no_data_imaginary] = values_ptr
     end
 
+    # @return [Array<Float>]
+    def source_no_data_imaginary
+      pointer = @c_struct[:source_no_data_imaginary]
+      return [] if pointer.null?
+
+      pointer.read_array_of_double(@c_struct[:band_count])
+    end
+
+    # @param values [Array<Float>]
     def destination_no_data_real=(values)
       values_ptr = FFI::MemoryPointer.new(:double, values.length)
       values_ptr.write_array_of_double(values)
@@ -113,6 +146,15 @@ module GDAL
       @c_struct[:destination_no_data_real] = values_ptr
     end
 
+    # @return [Array<Float>]
+    def destination_no_data_real
+      pointer = @c_struct[:destination_no_data_real]
+      return [] if pointer.null?
+
+      pointer.read_array_of_double(@c_struct[:band_count])
+    end
+
+    # @param values [Array<Float>]
     def destination_no_data_imaginary=(values)
       values_ptr = FFI::MemoryPointer.new(:double, values.length)
       values_ptr.write_array_of_double(values)
@@ -120,6 +162,30 @@ module GDAL
       @c_struct[:destination_no_data_imaginary] = values_ptr
     end
 
+    # @return [Array<Float>]
+    def destination_no_data_imaginary
+      pointer = @c_struct[:destination_no_data_imaginary]
+      return [] if pointer.null?
+
+      pointer.read_array_of_double(@c_struct[:band_count])
+    end
+
+    # Set a Proc per source band; number of procs in +band_procs+ should equal
+    # {band_count}.
+    #
+    # @param band_procs [Array<Proc>]
+    def source_per_band_validity_mask_function=(band_procs)
+      mask_func = FFI::GDAL::Warper::MaskFunc
+
+      funcs = band_procs.map do |band_proc|
+        FFI::Function.new(mask_func.result_type, mask_func.param_types, band_proc, blocking: true)
+      end
+
+      pointer = FFI::MemoryPointer.new(:pointer, band_procs.length)
+      pointer.write_array_of_pointer(funcs)
+      @c_struct[:source_per_band_validity_mask_function] = pointer
+    end
+
     # Used for getting attributes of the internal WarpOptions struct.
     #
     # @param meth [Symbol] The FFI::GDAL::WarpOptions key.
@@ -128,5 +194,9 @@ module GDAL
 
       @c_struct[meth]
     end
+
+    def respond_to_missing?(method_name, include_private = false)
+      FFI::GDAL::WarpOptions.members.include?(method_name) || super
+    end
   end
 end

data/lib/ogr.rb

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

data/lib/ogr/coordinate_transformation.rb

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

data/lib/ogr/data_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'json'
 require_relative '../gdal'
@@ -110,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)
@@ -120,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)
 
@@ -147,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/data_source_extensions.rb

@@ -1,27 +1,10 @@
+# frozen_string_literal: true
+
 module OGR
   module DataSourceExtensions
     # @return [Array<OGR::Layer>]
     def layers
       @layers = Array.new(layer_count) { |i| layer(i) }
     end
-
-    # @return [Hash]
-    def as_json(options = nil)
-      {
-        data_source: {
-          driver: driver.name,
-          layer_count: layer_count,
-          layers: layers.map(&:as_json),
-          name: name,
-          style_table: style_table ? style_table.as_json(options) : nil
-        },
-        metadata: all_metadata
-      }
-    end
-
-    # @return [String]
-    def to_json(options = nil)
-      as_json(options).to_json
-    end
   end
 end