ffi-gdal 1.0.0.beta5 → 1.0.0.beta6

data/examples/remove_small_polygons.rb

@@ -0,0 +1,62 @@
+require 'bundler/setup'
+require 'thor'
+require 'fileutils'
+require 'gdal/dataset'
+require 'gdal/raster_band'
+
+GDAL::Logger.logging_enabled = true
+
+module Examples
+  class RemoveSmallPolygons < ::Thor
+    desc 'filter SOURCE_PATH DEST_PATH SIZE',
+      'Removes polygons from SOURCE that are under SIZE'
+    option :band_number, type: :numeric, default: 1
+    def filter(source_path, dest_path, size)
+      puts "Copying source '#{source_path}' to '#{dest_path}'..."
+      FileUtils.cp(source_path, dest_path)
+
+      size = size.to_f
+      dataset = GDAL::Dataset.open(dest_path, 'w')
+      puts "Raster area: #{dataset.extent.area}"
+      raster_band = dataset.raster_band(options[:band_number])
+
+      puts "Filtering polygons under size #{size}"
+      raster_band.sieve_filter!(size, 4, progress_function: GDAL.simple_progress_formatter)
+      shapefile_dir = "#{File.basename(dest_path, '.tif')}-shapefile"
+
+      make_shapefile(shapefile_dir, dataset.spatial_reference.dup) do |layer|
+        raster_band.polygonize(layer, pixel_value_field: 0)
+      end
+
+      puts "\nDone!"
+    end
+
+    private
+
+    def make_shapefile(dir_path, srs)
+      if File.exist?(dir_path)
+        puts "Removing old shapefile: #{dir_path}"
+        FileUtils.rm_rf(dir_path)
+      end
+
+      shp_driver = OGR::Driver.by_name 'ESRI Shapefile'
+      data_source = shp_driver.create_data_source(dir_path)
+      layer = data_source.create_layer('sieve-filtered', geometry_type: :wkbMultiPolygon,
+                                                         spatial_reference: srs)
+      zone_num_field_def = OGR::FieldDefinition.new 'ZONE', :OFTInteger
+      layer.create_field(zone_num_field_def)
+      yield layer
+
+      puts "feature count: #{layer.feature_count}"
+
+      layer.each_feature.with_index do |feature, i|
+        area = feature.geometry.area
+        puts "Feature #{i} area: #{area}"
+      end
+
+      data_source.close
+    end
+  end
+end
+
+Examples::RemoveSmallPolygons.start(ARGV)

data/examples/testing_gdal.rb

@@ -24,8 +24,6 @@ usg = GDAL::Dataset.open(usg_path, 'r')
 world_file_path = "#{__dir__}/spec/support/worldfiles/SR_50M/SR_50M.tif"
 world_file = GDAL::GeoTransform.from_world_file(world_file_path, 'tfw')
 
-binding.pry
-
 # floyd.image_warp('meow.tif', 'GTiff', 1, cutline: floyd_geometry )
 # extract_ndvi(floyd, 'ndvi.tif', floyd_wkt)
 
@@ -35,7 +33,6 @@ def warp_to_geometry(dataset, wkt_geometry)
   geometry = OGR::Geometry.create_from_wkt(wkt_geometry, wkt_spatial_ref)
   geometry.transform_to!(dataset.spatial_reference)
 
-  binding.pry
   # Create a .shp from the geometry
   shape = geometry.to_vector('geom.shp', 'ESRI Shapefile',
     spatial_reference: dataset.spatial_reference)

data/examples/warping.rb

@@ -0,0 +1,140 @@
+require 'bundler/setup'
+require 'ffi-gdal'
+require 'gdal/dataset'
+require 'gdal/warp_operation'
+require 'gdal/warp_options'
+require 'gdal/transformers/general_image_projection_transformer'
+require 'gdal/transformers/general_image_projection_transformer2'
+require 'byebug'
+
+GDAL::Logger.logging_enabled = true
+
+module Examples
+  module Warping
+    class << self
+      def make_basic_options(source_dataset, dest_dataset)
+        options = GDAL::WarpOptions.new
+        options.source_dataset = source_dataset
+        options.destination_dataset = dest_dataset
+        options.source_bands = [1]
+        options.band_count = 1
+        options.destination_bands = [1]
+        options.progress_formatter = GDAL.simple_progress_formatter
+
+        options
+      end
+
+      def make_general_reprojection_options(source_dataset, dest_dataset)
+        options = make_basic_options(source_dataset, dest_dataset)
+
+        # Reprojection Transformer
+        transformer_arg = GDAL::Transformers::GeneralImageProjectionTransformer.new(
+          source_dataset, destination_dataset: dest_dataset, order: 0
+        )
+        options.transformer_arg = transformer_arg
+
+        options
+      end
+
+      def make_clipped_options(source_dataset, dest_dataset, clip_wkt)
+        options = make_basic_options(source_dataset, dest_dataset)
+
+        geom = OGR::Geometry.create_from_wkt(clip_wkt)
+        spatial_reference = OGR::SpatialReference.new_from_epsg(source_dataset.spatial_reference.authority_code.to_i)
+        geom.spatial_reference = spatial_reference
+        options.cutline_geometry = geom
+        # options.cutline_blend_distance = 100
+        options.resample_algorithm = :GRA_Average
+
+        options.warp_operation_options = {
+          init_dest: 'NO_DATA',
+          cutline: clip_wkt,
+          # cutline_all_touched: 'TRUE'
+          # cutline_all_touched: true
+        }
+
+        transformer_arg = GDAL::Transformers::GeneralImageProjectionTransformer2.new(
+          source_dataset, destination_dataset: dest_dataset,
+                          insert_center_long: 'FALSE',
+        # DST_SRS: spatial_reference.to_wkt
+        )
+        # transformer_arg = GDAL::Transformers::GeneralImageProjectionTransformer.new(
+        #   source_dataset, destination_dataset: dest_dataset,
+        #   # source_wkt: source_dataset.projection, destination_wkt: dest_dataset.projection,
+        #   gcp_use_ok: true, order: 0
+        # )
+
+        options.transformer_arg = transformer_arg
+        # options.transformer = cutline_transformer
+        # options.resample_algorithm = :GRA_CubicSpline
+
+        no_data_value = source_dataset.raster_band(1).no_data_value[:value]
+        puts "source no data value: #{no_data_value}"
+        # options.source_no_data_real = [no_data_value]
+        # options.source_no_data_imaginary = [no_data_value]
+        # options.destination_no_data_real = [no_data_value]
+        # options.destination_no_data_imaginary = [no_data_value]
+
+        options
+      end
+
+      def copy_dataset(source_dataset, dest_path)
+        driver = source_dataset.driver
+
+        driver.copy_dataset(source_dataset, dest_path)
+      end
+
+      def create_destination_reprojected_dataset(source_dataset, path, srid)
+        dest_wkt = OGR::SpatialReference.new_from_epsg(srid).to_wkt
+
+        transformer_arg = GDAL::Transformers::GeneralImageProjectionTransformer.new(
+          source_dataset, destination_wkt: dest_wkt, order: 1
+        )
+
+        suggested_options = source_dataset.suggested_warp_output(transformer_arg)
+
+        driver = GDAL::Driver.by_name 'GTiff'
+        ds = driver.create_dataset(path, suggested_options[:pixels], suggested_options[:lines], data_type: source_dataset.raster_band(1).data_type)
+        ds.geo_transform = suggested_options[:geo_transform]
+        ds.projection = dest_wkt
+        ds.raster_band(1).no_data_value = source_dataset.raster_band(1).no_data_value[:value]
+
+        ds
+      end
+    end
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  args = ARGV.dup
+  raise 'Must only supply 2 args: [source destination]' unless args.length == 2
+
+  # 32616
+  # harper_wkt = <<-WKT
+  # POLYGON ((446272.16070421785116196 3450423.99460560129955411, 446267.51794699463061988 3450225.33339292788878083, 446169.27478282485390082 3450181.28046096721664071, 446167.92126038181595504 3449679.13779170718044043, 446257.50292950111906976 3449447.46736949309706688, 446177.33125468820799142 3449388.86781942518427968, 446181.49593684601131827 3449256.37749340012669563, 446201.94002113211899996 3449230.98345079040154815, 446963.20628352143103257 3449239.17042332561686635, 446960.24312665761681274 3449612.50297579308971763, 446866.33160242711892352 3449708.10946208890527487, 446750.25655526417540386 3449727.9624758935533464, 446691.84310374449705705 3449902.8676586695946753, 446610.46438609907636419 3450082.70331544848158956, 446642.15819176007062197 3450128.30150367366150022, 446528.87474136805394664 3450220.39211917016655207, 446272.16070421785116196 3450423.99460560129955411))
+  # WKT
+  # 4326
+  chualar_wkt = <<-WKT
+Polygon ((-121.52653414366494644 36.58183382122394534, -121.52612663439269625 36.57798512254166923, -121.52503994300006696 36.57793984373364538, -121.52503994300006696 36.57952460201457967, -121.5239985304154402 36.57952460201457967, -121.52404380922347116 36.57789456492562152, -121.52245905094252976 36.57789456492562152, -121.52264016617463938 36.58151686956775706, -121.52413436683951886 36.58165270599183572, -121.52422492445558078 36.58002266890287757, -121.52513050061611466 36.58002266890287757, -121.52653414366494644 36.58183382122394534))
+  WKT
+
+  source_path = args.shift
+  dest_path = args.shift
+
+  source_dataset = GDAL::Dataset.open(source_path, 'r')
+  puts "source srid: #{source_dataset.spatial_reference.authority_code.to_i}"
+
+  dest_dataset = Examples::Warping.create_destination_reprojected_dataset(source_dataset, dest_path, source_dataset.spatial_reference.authority_code.to_i)
+  # Examples::Warping.copy_dataset(source_dataset, dest_path)
+  # dest_dataset = GDAL::Dataset.open(dest_path, 'w')
+
+  options = Examples::Warping.make_clipped_options(source_dataset, dest_dataset, chualar_wkt)
+  warp_operation = GDAL::WarpOperation.new(options)
+  puts "output raster size: #{dest_dataset.raster_x_size}, #{dest_dataset.raster_y_size}"
+  warp_operation.chunk_and_warp_image(0, 0, dest_dataset.raster_x_size, dest_dataset.raster_y_size)
+  # source_dataset.simple_image_warp(dest_dataset, options.transformer, options.transformer_arg,
+  # band_numbers = [1], options)
+
+  source_dataset.close
+  dest_dataset.close
+end

data/ffi-gdal.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |spec|
   spec.name          = 'ffi-gdal'
   spec.version       = FFI::GDAL::VERSION
   spec.authors       = ['Steve Loveless']
-  spec.email         = %w[steve.loveless@gmail.com]
+  spec.email         = %w[steve@agrian.com]
   spec.summary       = 'FFI wrapper for GDAL/OGR.'
-  spec.homepage      = 'https://github.com/turboladen/ffi-gdal'
+  spec.homepage      = 'http://bitbucket.org/agrian/ffi-gdal'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,9 +21,12 @@ 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_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'fakefs'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov', '~> 0.9.0'
 end

data/lib/ext/error_symbols.rb

@@ -1,5 +1,5 @@
 require_relative '../ogr/error_handling'
 
-class ::Symbol
+class Symbol
   include OGR::ErrorHandling
 end

data/lib/ext/ffi_library_function_checks.rb

@@ -5,7 +5,7 @@ module FFI
   # Redefining #attach_function so we can avoid bombing out if a called method
   # is not defined.
   module Library
-    alias_method :old_attach_function, :attach_function
+    alias old_attach_function attach_function
 
     def attach_function(*args)
       old_attach_function(*args)
@@ -13,7 +13,8 @@ module FFI
       @unsupported_gdal_functions ||= []
 
       if $VERBOSE || ENV['VERBOSE']
-        warn "ffi-gdal warning: function '#{args.first}' is not available in this build of GDAL/OGR (v#{FFI::GDAL.GDALVersionInfo('RELEASE_NAME')})"
+        warn "ffi-gdal warning: function '#{args.first}' is not available in this " \
+          "build of GDAL/OGR (v#{FFI::GDAL.GDALVersionInfo('RELEASE_NAME')})"
       end
 
       @unsupported_gdal_functions << args.first

data/lib/ext/float_ext.rb

@@ -3,13 +3,13 @@ class Float
   #
   # @return [Float]
   def to_decimal_degrees
-    FFI::GDAL.GDALPackedDMSToDec(self)
+    FFI::GDAL::GDAL.GDALPackedDMSToDec(self)
   end
 
   # Converts decimal degrees int a packed DMS value (DDDMMMSSS.SS).
   #
   # @return [Float]
   def to_dms
-    FFI::GDAL.GDALDecToPackedDMS(self)
+    FFI::GDAL::GDAL.GDALDecToPackedDMS(self)
   end
 end

data/lib/ext/narray_ext.rb

@@ -12,7 +12,7 @@ class NArray
     when 7 then :complex
     when 8 then :object
     else
-      fail "Unknown typecode: #{typecode}"
+      raise "Unknown typecode: #{typecode}"
     end
   end
 end

data/lib/ext/numeric_as_data_type.rb

@@ -1,5 +1,5 @@
 module NumericAsDataType
-  # @param data_type [FFI::GDAL::DataType]
+  # @param data_type [FFI::GDAL::GDAL::DataType]
   def to_data_type(data_type)
     case data_type
     when :GDT_Byte, :GDT_UInt16, :GDT_Int16, :GDT_UInt32, :GDT_Int32

data/lib/ext/to_bool.rb

@@ -2,7 +2,7 @@ class Fixnum
   def to_bool
     return true if self == 1
     return false if self == 0
-    fail "Fixnum '#{self}' can't be converted to Boolean."
+    raise "Fixnum '#{self}' can't be converted to Boolean."
   end
 end
 
@@ -10,6 +10,6 @@ class String
   def to_bool
     return true if to_i == 1
     return false if to_i == 0
-    fail "String '#{self}' can't be converted to Boolean."
+    raise "String '#{self}' can't be converted to Boolean."
   end
 end

data/lib/ffi/cpl/conv.rb

@@ -1,6 +1,4 @@
 require 'ffi'
-require_relative 'error'
-require_relative 'port'
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI
@@ -93,7 +91,7 @@ module FFI
       attach_function :CPLPopFinderLocation, %i[], :void
       attach_function :CPLFinderClean, %i[], :void
       attach_function :CPLStat, %i[string pointer], :int
-      attach_function :CPLOpenShared, %i[string string int], :pointer
+      attach_function :CPLOpenShared, %i[string string bool], :pointer
       attach_function :CPLCloseShared, %i[pointer], :void
       attach_function :CPLGetSharedList, %i[pointer], :pointer
       attach_function :CPLDumpSharedList, %i[pointer], :void

data/lib/ffi/cpl/error.rb

@@ -31,9 +31,6 @@ module FFI
       attach_function :CPLGetLastErrorMsg, [], :string
 
       attach_function :CPLGetErrorHandlerUserData, [], :pointer
-      attach_function :CPLErrorSetState,
-        [CPLErr, :int, :string],
-        :void
       attach_function :CPLCleanupErrorMutex, [], :void
       attach_function :CPLLoggingErrorHandler,
         [CPLErr, :int, :string],

data/lib/ffi/cpl/minixml.rb

@@ -1,12 +1,8 @@
 require 'ffi'
-# require_relative 'xml_node'
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI
   module CPL
-    autoload :MiniXML, __FILE__
-    autoload :XMLNode, File.expand_path('xml_node', __dir__)
-
     module MiniXML
       extend ::FFI::Library
       ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
@@ -23,25 +19,25 @@ module FFI
       #-------------------------------------------------------------------------
       # Functions
       #-------------------------------------------------------------------------
-      attach_function :CPLParseXMLString, %i[string], XMLNode.ptr
-      attach_function :CPLDestroyXMLNode, [XMLNode.ptr], :void
-      attach_function :CPLGetXMLNode, [XMLNode.ptr, :string], XMLNode.ptr
-      attach_function :CPLSearchXMLNode, [XMLNode.ptr, :string], XMLNode.ptr
-      attach_function :CPLGetXMLValue, [XMLNode.ptr, :string, :string], :string
-      attach_function :CPLCreateXMLNode, [XMLNode.ptr, XMLNode.ptr, :string], XMLNode.ptr
-      attach_function :CPLSerializeXMLTree, [XMLNode.ptr], :string
-      attach_function :CPLAddXMLChild, [XMLNode.ptr, XMLNode.ptr], :void
-      attach_function :CPLRemoveXMLChild, [XMLNode.ptr, XMLNode.ptr], :bool
-      attach_function :CPLAddXMLSibling, [XMLNode.ptr, XMLNode.ptr], :void
+      attach_function :CPLParseXMLString, %i[string], CPL::XMLNode.ptr
+      attach_function :CPLDestroyXMLNode, [CPL::XMLNode.ptr], :void
+      attach_function :CPLGetXMLNode, [CPL::XMLNode.ptr, :string], CPL::XMLNode.ptr
+      attach_function :CPLSearchXMLNode, [CPL::XMLNode.ptr, :string], CPL::XMLNode.ptr
+      attach_function :CPLGetXMLValue, [CPL::XMLNode.ptr, :string, :string], :string
+      attach_function :CPLCreateXMLNode, [CPL::XMLNode.ptr, CPL::XMLNode.ptr, :string], CPL::XMLNode.ptr
+      attach_function :CPLSerializeXMLTree, [CPL::XMLNode.ptr], :string
+      attach_function :CPLAddXMLChild, [CPL::XMLNode.ptr, CPL::XMLNode.ptr], :void
+      attach_function :CPLRemoveXMLChild, [CPL::XMLNode.ptr, CPL::XMLNode.ptr], :bool
+      attach_function :CPLAddXMLSibling, [CPL::XMLNode.ptr, CPL::XMLNode.ptr], :void
       attach_function :CPLCreateXMLElementAndValue,
-        [XMLNode.ptr, :string, :string],
-        XMLNode.ptr
-      attach_function :CPLCloneXMLTree, [XMLNode.ptr], XMLNode.ptr
-      attach_function :CPLSetXMLValue, [XMLNode.ptr, :string, :string], :bool
-      attach_function :CPLStripXMLNamespace, [XMLNode.ptr, :string, :bool], :void
+        [CPL::XMLNode.ptr, :string, :string],
+        CPL::XMLNode.ptr
+      attach_function :CPLCloneXMLTree, [CPL::XMLNode.ptr], CPL::XMLNode.ptr
+      attach_function :CPLSetXMLValue, [CPL::XMLNode.ptr, :string, :string], :bool
+      attach_function :CPLStripXMLNamespace, [CPL::XMLNode.ptr, :string, :bool], :void
       attach_function :CPLCleanXMLElementName, %i[string], :void
-      attach_function :CPLParseXMLFile, %i[string], XMLNode.ptr
-      attach_function :CPLSerializeXMLTreeToFile, [XMLNode.ptr, :string], :bool
+      attach_function :CPLParseXMLFile, %i[string], CPL::XMLNode.ptr
+      attach_function :CPLSerializeXMLTreeToFile, [CPL::XMLNode.ptr, :string], :bool
     end
   end
 end

data/lib/ffi/cpl/progress.rb

@@ -0,0 +1,27 @@
+require 'ffi'
+require_relative '../../ext/ffi_library_function_checks'
+
+module FFI
+  module CPL
+    module Progress
+      extend ::FFI::Library
+      ffi_lib [FFI::CURRENT_PROCESS, FFI::GDAL.gdal_library_path]
+
+      #-------------------------------------------------------------------------
+      # Functions
+      #-------------------------------------------------------------------------
+      attach_function :GDALCreateScaledProgress,
+        [:double, :double, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
+        :pointer
+      attach_function :GDALDestroyScaledProgress,
+        %i[pointer],
+        :void
+      ScaledProgress = attach_function :GDALScaledProgress,
+        %i[double string pointer],
+        :int
+      TermProgress = attach_function :GDALTermProgress,
+        %i[double string pointer],
+        :int
+    end
+  end
+end

data/lib/ffi/cpl/string.rb

@@ -40,7 +40,6 @@ module FFI
       attach_function :CSLInsertString, %i[pointer int string], :pointer
       attach_function :CSLRemoveStrings, %i[pointer int int pointer], :pointer
       attach_function :CSLFindString, %i[pointer string], :int
-      attach_function :CSLFindStringCaseSensitive, %i[pointer string], :int
       attach_function :CSLPartialFindString, %i[pointer string], :int
       attach_function :CSLFindName, %i[pointer string], :int
 
@@ -66,11 +65,6 @@ module FFI
       attach_function :CPLStrlcpy, %i[string string size_t], :size_t
       attach_function :CPLStrlcat, %i[string string size_t], :size_t
       attach_function :CPLStrnlen, %i[string size_t], :size_t
-      attach_function :CPLvsnprintf, %i[string size_t string varargs], :size_t
-      attach_function :CPLsnprintf, %i[string size_t varargs], :size_t
-      attach_function :CPLsprintf, %i[string varargs], :size_t
-      attach_function :CPLprintf, %i[varargs], :size_t
-      attach_function :CPLsscanf, %i[string varargs], :size_t
       attach_function :CPLSPrintf, %i[string varargs], :string
       attach_function :CSLAppendPrintf, %i[pointer string varargs], :pointer
       attach_function :CPLVASPrintf, %i[pointer string varargs], :pointer
@@ -86,8 +80,6 @@ module FFI
       attach_function :CPLForceToASCII, %i[string int char], :string
       attach_function :CPLStrlenUTF8, %i[string], :int
 
-      attach_function :CPLOPrintf, %i[string varargs], :CPLString
-      attach_function :CPLOvPrintf, %i[string varargs], :CPLString
       attach_function :CPLURLGetValue, %i[string string], :CPLString
       attach_function :CPLURLAddKVP, %i[string string string], :CPLString
     end

data/lib/ffi/cpl/vsi.rb

@@ -1,5 +1,4 @@
 require 'ffi'
-require_relative 'port'
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI

data/lib/ffi/cpl/xml_node.rb

@@ -1,5 +1,4 @@
 require 'ffi'
-require_relative 'minixml'
 
 module FFI
   module CPL

data/lib/ffi/cpl.rb

@@ -0,0 +1,15 @@
+module FFI
+  module CPL
+    autoload :Conv, File.expand_path('cpl/conv.rb', __dir__)
+    autoload :Error, File.expand_path('cpl/error.rb', __dir__)
+    autoload :HashSet, File.expand_path('cpl/hash_set.rb', __dir__)
+    autoload :HTTP, File.expand_path('cpl/http.rb', __dir__)
+    autoload :MiniXML, File.expand_path('cpl/minixml.rb', __dir__)
+    autoload :Port, File.expand_path('cpl/port.rb', __dir__)
+    autoload :Progress, File.expand_path('cpl/progress.rb', __dir__)
+    autoload :QuadTree, File.expand_path('cpl/quad_tree.rb', __dir__)
+    autoload :String, File.expand_path('cpl/string.rb', __dir__)
+    autoload :VSI, File.expand_path('cpl/vsi.rb', __dir__)
+    autoload :XMLNode, File.expand_path('cpl/xml_node.rb', __dir__)
+  end
+end