ffi-gdal 1.0.0.beta5 → 1.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e2273d2b75bb5a7af15693af6a84cb32c74852
-  data.tar.gz: f986fe1b75a472ce0a0d663d13ceed15714e0ef0
+  metadata.gz: 82ca64b9a92e057bf506f537804b6e26aee42281
+  data.tar.gz: 96ce8a17293f28885113c73df4f06b53780a518d
 SHA512:
-  metadata.gz: 584e34e7de26e51fff046707de49750f8071d937dac8259ad594387f1ff60c7bca2fa72c22fad48525fdd3cf42a6d734a564d4d054aac675ba48c7a55ed4e3e8
-  data.tar.gz: c8eca7619a1eeaf878582c8efead2bde968a52149e92cd64ad37fbb3475bcc2f25ba2182da3cfa200e9ce8925ca90c60a55be5b59b43998d1d2a867843f35e7a
+  metadata.gz: 0c44973c096820715f5c8860c5ac55f85fa90b94f06a88fec64e257e78478c64f192d4938ec25b38efbac6e74f29289b5ff7cf93a229864c0416365bb058a33c
+  data.tar.gz: f9a8fba2bdcbe83bb2359c48c4559e257b9fed4d30667eb8e878e7bdb0ac1e5afde35fce330636377f5ef7b1fec2bea6436fdd4b3a6088fed5cbb5014557ec52

data/.gitignore

@@ -14,21 +14,25 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp/*
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
 .idea/
-spec/support/images
 tags
 *.sqlite
 vendor/bundle
-*.tif
 *.xml
 *.dbf
 *.shx
 .rake_tasks
 valgrind_output.log
 *.xsd
+
+*.swp
+
+.byebug_history
+
+.tags

data/.rubocop.yml

@@ -51,12 +51,19 @@ Style/PercentLiteralDelimiters:
     '%w': '[]'
     '%W': '[]'
 
+Style/PredicateName:
+  Exclude:
+    - lib/ogr/geometry_mixins/extensions.rb
+
 Style/SymbolArray:
   Enabled: true
 
 AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: true
   Include:
     - Gemfile
     - ffi-gdal.gemspec
   Exclude:
     - vendor/bundle/**/*
+  TargetRubyVersion: 2.2

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.0

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ffi-gdal.gemspec
 gemspec
 
-gem 'byebug'
+gem 'thor'

data/History.md

@@ -2,6 +2,148 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 1.0.0.beta6 / 2016-04-18
+
+### New Features
+
+#### GDAL
+
+* Added wrappers for the Grid API. It uses `GDAL::Gridder`, which is the
+  programmatic equivalent to the `gdal_grid` command-line utility,
+  `GDAL::GridderOptions`, which is an object used to mimic the options you pass
+  to `gdal_grid`, and `GDAL::Grid`, which is the simple object that performs the
+  gridding.
+* Added first wrapper of `gdalwarper.h` methods, found in
+  `GDAL::DatasetMixins::WarpMethods`.
+
+#### OGR
+
+* Added `OGR::CoordinateTransform#transform_ex`.
+
+### Improvements
+
+* Removed all `ObjectSpace.define_finalizer` calls that "cleaned up" C pointers
+  for Ruby-wrapped objects that had not yet been closed/destroyed. This was
+  keeping those Ruby objects from getting collected (?) and effectively causing
+  lots of unnecessary memory use.
+
+#### GDAL
+
+* Added `GDAL::GeoTransformMixins::Extensions.new_from_envelope` which lets you
+  create a `GDAL::GeoTransform` using the points from an `OGR::Envelope` and the
+  destination raster's width and height. It's convenient because it calculates
+  the pixel size for you.
+* Renamed `GDAL::GridTypes` to `GDAL::GridAlgorithms`. This shouldn't impact
+  anyone/thing since it's only relative to the newly added Grid API wrapper.
+  There just happened to me some Grid cruft that had been laying around for some
+  time.
+* Added `GDAL::RasterBand#write_block`. Somehow this went missing from previous
+  `RasterBand` wrapping.
+* Renamed `GDAL::RasterBandMixins::Extenions#each_by_block` to `#read_by_block`.
+  Its functionality was doing reading, yet implied reading or writing; since
+  writing by block isn't needed anywhere internally yet, I just renamed this.
+* Renamed `GDAL::RasterBandMixins#write_array` to `#write_xy_narray`. This
+  method's name inferred that it could write any old Array, but that's not the
+  case--it only writes 2D NArray data.
+* Added `GDAL::InternalHelpers._buffer_from_data_type` to compliment the
+  existing `._pointer_from_data_type`. Useful for creating buffer-specific
+  pointers from a GDAL data type.
+* `GDAL::DatasetMixins::Extensions#extent` now manually builds an `OGR::Polygon`
+  instead of polygonizing the entire dataset and taking the envelope of that.
+  Much faster this way.
+* Refactored `GDAL::RasterBandMixins::Exsentions#projected_points` to return a
+  3D NArray (indicating pixel/row position) instead of just a 2D NArray of
+  coordinates.
+* Added `GDAL::InternalHelpers` methods for creating NArrays based on GDAL
+  data types.
+* `GDAL::Options` values all have `#to_s` called on them to ensure they're
+  Strings before handing them over to GDAL. The GDAL options "hash" requires
+  that both keys and values be Strings.
+* `GDAL::RasterBandMixins::AlgorithmMethods` that use GDALProgressFunc functions
+  can now participate in GDALScaledProgress functions.
+* Added `GDAL::RasterBandMixins::Extensions#pixel_count`.
+* Allow `GDAL::RasterBand#create_mask_band` to take a single flag or many.
+* Allow `GDAL::Dataset`s to be open in shared mode vs non-shared mode. All
+  Datasets now default to use shared mode.
+* Allow `GDAL::Driver#create_dataset` and `GDAL::Dataset.open` to take a block,
+  yielding the dataset then closing it afterwards.
+* `GDAL::RasterBandClassifier` now uses NArray to classify. Can result in quite
+  a large performance gain.
+* `GDAL::Driver#copy_dataset` now properly takes progress block arguments.
+* `GDAL::Driver#copy_dataset` now yields a writable Dataset.
+* Swapped order of params in `GDAL::Driver#rename_dataset` to be (old, new)
+  instead of (new, old).
+* Added enumerator `RasterAttributeTableMixins::Extensions#each_column` to allow
+  nicer iterating over columns.
+* `GDAL::RasterAttributeTable` methods that returned -1 when a value can't be
+  returned now return nil instead.
+* Renamed `GDAL::RasterAttributeTable#value_to_*` methods to be named after
+  their C functions. Also, renamed `#add_value` to `#set_value` and refactored
+  into `RasterAttributeTableMixins::Extensions`.
+
+#### OGR
+
+* Added `OGR::FeatureExtensions#field()` which gets the field using the
+  associated `OGR::FieldDefinition#type`. Makes so you don't always have to
+  request the field by its type (`field_as_double`).
+* Added `OGR::LayerMixins::Extensions#point_values()` which gets values for all
+  of the points in the layer. It also allows you to specify getting field values
+  with that, which helps retrieving data for the Grid API. You can also pass it
+  a block to filter out points that don't match some criteria defined in the
+  block.
+* Added `OGR::LayerMixins::Extensions#any_geometries_with_z?` which simply
+  checks to see if the layer has any geometries with Z values.
+* `GDAL::DataType.by_name` always calls `#to_s` on the param now, letting you
+  pass in Symbols.
+* Added `OGR::Point#set_point`, `OGR::Point25#set_point`, and
+  `OGR::GeometryTypes::Curve#set_point` wrappers for `OGR_G_SetPoint_2D` and
+  `OGR_G_SetPoint`.
+* Added `OGR::LineString#add_geometry` to allow adding a OGR::Point object to
+  the LineString instead of having to pass coordinates in to #add_point.
+* `OGR::LayerMixins::Extensions#geometry_from_extent` now builds an
+  `OGR::Polygon` using the same algorithm that
+  `GDAL::DatasetMixins::Extensions#extent` uses. One could argue that there was
+  also a bug here in that `geometry_from_extent` used to return the convex hull
+  of the extent, not the extent itself.
+* Extracted `OGR::LayerMixins::Extensions#each_feature` from
+  `OGR::LayerMixins::Extensions#features` to provide an Enumerator. This lets
+  consumers utilize yielded `OGR::Feature`s as they're retrieved instead of
+  after the `features` Array has been built.
+  `OGR::LayerMixins::Extensions#features` now uses this too.
+* Added `OGR::GeometryMixins::Extensions#invalid?` to compliment
+  `OGR::Geometry#valid?`.
+* Added `OGR::LayerMixins::Extensions#point_geometry`, `#each_point_geometry`,
+  and `point_geometries`. Since `#point` implies it returns a Point object, but
+  the OGR API's related method returns point values (x, y, z), it seemed like
+  it would be useful to have a method that returned a geometry.
+* `OGR::DataSource.open` can now take a block, yielding the data source, then
+  closing it afterwards.
+
+### Bug Fixes
+
+* Cleanup `OGR::Feature`s that were a result of `OGR::Layer#next_feature`.
+  According to GDAL docs, these *must* be cleaned up before the layer is.
+
+#### GDAL
+
+* `GDAL::RasterBandMixins::AlgorithmMethods#fill_nodata!` was calling the old
+  name of the C function.
+* `GDAL::EnvironmentMethods#dump_open_datasets` now works.
+
+#### OGR
+
+* `OGR::Field#date=` was casting the passed value to a `Time` object, which in
+  doing so was setting the time zone. If a user passes in an object that doesn't
+  have the TZ set, the method shouldn't be setting it for them.
+* `OGR::Geometry#point_on_surface` now properly returns a geometry object.
+* `OGR::CoordinateTransform#transform` never worked. Fixed.
+* `OGR::GeometryMixins::Extensions#utm_zone` no longer creates invalid geometry.
+* `OGR::Feature#dump_readable` never worked. Fixed.
+* `OGR::Geometry#dump_readable` never worked. Fixed.
+* Added missing output_layer param to `OGR::LayerMixins::OGRLayerMethodMethods`.
+* `FFI::OGR::Core::WKBGeometryType` was using an INT32 instead of UINT32 and
+  thus 25D geometry types weren't completely accurate.
+
 ## 1.0.0.beta5 / 2015-06-16
 
 * Improvements
@@ -72,7 +214,7 @@ Lots of changes, so just the highlights here...
     * Allow loading, even when C functions aren't defined in the version of
       GDAL that you're using.
     * Split out additions to GDAL/OGR in `*_extensions.rb` modules.  Methods
-      contained in `Extentions` modules don't directly wrap GDAL/OGR functions,
+      contained in `Extensions` modules don't directly wrap GDAL/OGR functions,
       but either provide new functionality or attempt to make library usage more
       Rubyesque.
     * Added `#as_json`, `#to_json` to many classes.

data/README.md

@@ -28,13 +28,11 @@ you'll just want to use the Ruby-fied library, but if for some reason that
 doesn't get you what you want, direct access to the FFI wrapper (which is
 really just direct access to the C API) is available.
 
-
 ### The Ruby-fied Library
 
 To distinguish this gem from the already-existing gdal gem, you
 `require ffi-gdal` to get access to the `GDAL` module and its children.
 
-
 ### The direct FFI wrapper
 
 Following RubyGem conventions, to get access to the FFI wrapper, you
@@ -46,20 +44,16 @@ For classes that are enabled with logging capabilities, you can turn logging on
 and off like `GDAL::RasterBand.logging_enabled = true`. If you're using ffi-gdal
 in Rails, you can `GDAL::Logger.logger = Rails.logger`.
 
+Additional Libraries
+--------------------
 
-Testing
--------
-
-You'll need some images to run the integration specs against, and instead of
-keeping those as part of this repo, there's a Rake task that will pull OSGeo's
-set of sample geotiffs down via FTP.  Running `rake get_tiffs` will pull
-everything down from ftp://downloads.osgeo.org/geotiff/samples and put the
-files under spec/support/images/osgeo/geotiff.
+[ffi-gdal-extensions](https://bitbucket.org/agrian/ffi-gdal-extensions) provides
+additional functionality, not provided in this core, GDAL-wrapper library.
 
 Contributing
 ------------
 
-1. Fork it ( https://github.com/turboladen/ffi-gdal/fork )
+1. Fork it ( https://bitbucket.org/agrian/ffi-gdal/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,64 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-desc 'Download files for running integration tests against'
-task :get_tiffs do
-  require 'net/ftp'
-  require 'fileutils'
-
-  base_dest_dir = 'spec/support/images/osgeo/geotiff'
-
-  if Dir.exist? base_dest_dir
-    puts 'Tiff dir already exists.  Exiting.'
-    exit
-  end
-
-  Net::FTP.open('downloads.osgeo.org') do |ftp|
-    ftp.login
-    ftp.binary = true
-
-    base_dir = 'geotiff/samples'
-    _, dirs = files_and_dirs(base_dir, ftp)
-
-    dirs.each do |dir_name|
-      path = "#{base_dir}/#{dir_name}"
-      files, dirs = files_and_dirs(path, ftp)
-      dest_dir = "#{base_dest_dir}/#{dir_name}"
-
-      FileUtils.mkdir_p(dest_dir) unless Dir.exist?(dest_dir)
-
-      files.each do |file|
-        src_file = "#{path}/#{file}"
-        dest_file = "#{dest_dir}/#{file}"
-
-        puts "Getting file '#{src_file}' to '#{dest_file}'..."
-        ftp.get("#{src_file}", "#{dest_file}")
-      end
-    end
-  end
-end
-
-# @return [Array{files => Array, dirs => Array}]
-def files_and_dirs(in_dir, ftp)
-  dirs = []
-  files = []
-
-  puts "Getting stuff from #{in_dir}..."
-
-  ftp.list("#{in_dir}/*") do |item|
-    item_name = item.split(' ').last
-
-    if item.start_with? 'd'
-      dirs << item_name
-    else
-      files << item_name
-    end
-  end
-
-  [files, dirs]
-end
-
-
 namespace :spec do
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = 'spec/unit/**/*_spec.rb'
@@ -86,5 +28,5 @@ namespace :spec do
   end
 end
 
-task spec: 'spec:unit'
-task default: 'spec:unit'
+task(:spec) { RSpec::Core::RakeTask.new }
+task default: :spec

data/TODO.md

@@ -7,3 +7,13 @@
     * MajorObject#metadata
     * ColorTable color entries
     * Raster bands in a dataset
+* Functions that take a GDALProgressFunc arg should no longer be a block; they
+  should be a Proc. _Then_ the other argument should also be accepted so that
+  the function can take advantage of the meta function (the one that can handle
+  many layers deep of functions & their progress).
+* rubocop
+* Make sure extensions are in their extension files.
+* Extract non-core-GDAL/OGR things into another gem?
+* Fix circular dependencies. Autoload things.
+* Make Enumerators for classes that do iterating over child objects
+* Tame down integration tests--don't need to test so many files now.

data/examples/geometries.rb

@@ -10,9 +10,9 @@ other_point_wkt = 'POINT (1 2)'
 other_point = OGR::Geometry.create_from_wkt(point_wkt)
 
 line_string_wkt = 'LINESTRING (1 2, 10 30, 40 40, 1 2)'
-line_string =  OGR::Geometry.create_from_wkt(line_string_wkt)
+line_string = OGR::Geometry.create_from_wkt(line_string_wkt)
 other_line_string_wkt = 'LINESTRING (10 10, 0 30, 40 10)'
-other_line_string =  OGR::Geometry.create_from_wkt(other_line_string_wkt)
+other_line_string = OGR::Geometry.create_from_wkt(other_line_string_wkt)
 
 polygon_wkt = 'POLYGON ((0 0,4 0,4 4,0 4,0 0), (1 1, 2 1, 2 2, 1 1))'
 polygon = OGR::Geometry.create_from_wkt(polygon_wkt)
@@ -20,10 +20,10 @@ other_polygon_wkt = 'POLYGON ((1 1,5 1,5 5,1 5,1 1), (10 10, 20 10, 20 20, 10 10
 other_polygon = OGR::Geometry.create_from_wkt(other_polygon_wkt)
 
 multi_point_wkt = 'MULTIPOINT ((10 40), (40 30), (20 20), (30 10))'
-multi_point =  OGR::Geometry.create_from_wkt(multi_point_wkt)
+multi_point = OGR::Geometry.create_from_wkt(multi_point_wkt)
 
 multi_line_string_wkt = 'MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))'
-multi_line_string =  OGR::Geometry.create_from_wkt(multi_line_string_wkt)
+multi_line_string = OGR::Geometry.create_from_wkt(multi_line_string_wkt)
 
 multi_polygon_wkt = 'MULTIPOLYGON (((-120.03296317083633 44.226828996384285, -120.03199741570855 44.230616638863914, -120.03305119285443 44.23322276021398, -120.03305439612939 44.23323503554639, -120.03305423080232 44.233247523039175, -120.03305070309673 44.23325975261691, -120.03304394580853 44.233271263913274, -120.03303421330706 44.233281623601044, -120.0330218719597 44.23329044170392, -120.03300738634044 44.23329738627662, -120.03299130174162 44.23330219590042, -120.03297422364709 44.23330468952384, -120.03295679493954 44.23330477327791, -120.0329396717 44.23330244400986, -120.03259652218235 44.23323046886841, -120.03259605091168 44.23323469214073, -120.03259130838445 44.233246748969734, -120.03258339633375 44.23325791928269, -120.03257261443646 44.233267779993575, -120.03255937106756 44.233275957618844, -120.03254416783288 44.23328214242357, -120.03252758057009 44.23328610015274, -120.03251023753826 44.2332876809039, -120.032492795622 44.23328682480475, -120.0324759154512 44.23328356428076, -120.03246023637918 44.23327802282714, -120.03244635226639 44.233270410331386, -120.03229057481504 44.233166296752856, -120.03144275436163 44.23298846700243, -120.03135705202111 44.23542539118272, -120.03135483571377 44.23543806847976, -120.0313491680669 44.2354501823413, -120.0313402724131 44.23546125542315, -120.03132849928409 44.23547085139311, -120.03131431259804 44.235478592124444, -120.03129827137883 44.235484172595754, -120.03128100772805 44.23548737291011, -120.03126320191683 44.23548806696012, -120.03124555558011 44.235486227396926, -120.03122876406881 44.235481926707976, -120.03121348904955 44.23547533436071, -120.03120033243181 44.23546671012462, -120.03118981264993 44.23545639383555, -120.02629194435607 44.229488174527326, -120.0262841759258 44.22947593881562, -120.0262801234077 44.229462813795166, -120.02627996353844 44.22944937186798, -120.0262837032901 44.22943619925734, -120.02629117956641 44.22942387044152, -120.02630206631528 44.22941292309999, -120.02631588874878 44.229403834664076, -120.02650834059244 44.22930162063937, -120.02596466290531 44.22893822933382, -120.02595288197551 44.22892861642798, -120.02594398682248 44.22891752390089, -120.02593832881524 44.2289053899198, -120.02593613145164 44.22889269379079, -120.02593748153026 44.22887993702566, -120.02594232572132 44.2288676235318, -120.02595047267361 44.22885623970722, -120.0259616005729 44.228846235226946, -120.02597526985406 44.22883800528063, -120.0259909405644 44.22883187496161, -120.02600799369236 44.22882808642537, -120.02602575561929 44.228826789324046, -120.02604352472815 44.22882803489487, -120.02606059911827 44.2288317739361, -120.02607630433104 44.22883785875077, -120.02675839864344 44.229168810839475, -120.02688733695234 44.22910032953997, -120.02611125484312 44.228061533840545, -120.02610457348571 44.22805003875662, -120.02610110582951 44.22803783693943, -120.02610098163969 44.228025384999874, -120.02610420556363 44.2280131489091, -120.02611065695699 44.22800158656121, -120.0261200943985 44.22799113063793, -120.02613216472427 44.22798217241707, -120.02614641624366 44.227975047130094, -120.0261623156424 44.22797002141719, -120.02617926794002 44.22796728334896, -120.0261966387548 44.227966935388565, -120.02621377804353 44.22796899055725, -120.02623004442708 44.22797337194719, -120.0262448291917 44.2279799155993, -120.02625757906833 44.22798837663918, -120.02626781693645 44.22799843844071, -120.02754662923428 44.229551257921585, -120.030836241635 44.23114734101261, -120.03136956622194 44.229959117652726, -120.03138391393463 44.22955111324294, -120.03138620312208 44.229538207384174, -120.0313920671636 44.22952589494864, -120.03140126651873 44.229514678887824, -120.03141342540293 44.229505017367465, -120.03142804713777 44.22949730505196, -120.03144453443974 44.229491856982676, -120.03146221381887 44.22948889570851, -120.03148036308987 44.22948854219496, -120.03149824087296 44.229490810882744, -120.03151511687828 44.22949560909792, -120.03153030173767 44.22950274083756, -120.03154317516459 44.22951191477631, -120.0315532112922 44.22952275616695, -120.03156000257852 44.22953482814357, -120.03278854263438 44.22679758476189, -120.03286127379035 44.226512326846944, -120.03286465252121 44.226503048718484, -120.03286991708133 44.22649423317623, -120.03301731535839 44.22629080564284, -120.03302703028369 44.22628013425537, -120.03303948802117 44.22627104306898, -120.03305420051213 44.22626388825138, -120.03307059136289 44.22625895010873, -120.0330880184265 44.22625642210408, -120.03310579896007 44.22625640327766, -120.03312323637284 44.226258894367135, -120.03313964751646 44.22626379777834, -120.03315438944897 44.22627092140904, -120.03316688462326 44.22627998617475, -120.03317664351395 44.22629063694302, -120.03318328379541 44.22630245644617, -120.03318654532022 44.226314981629145, -120.03318630031114 44.22632772179051, -120.0331825583669 44.22634017780693, -120.03296317083633 44.226828996384285)))'
 multi_polygon = OGR::Geometry.create_from_wkt(multi_polygon_wkt)
@@ -47,5 +47,3 @@ multi_polygon = OGR::Geometry.create_from_wkt(multi_polygon_wkt)
 geometry = geometry.clone
 ls = geometry.to_line_string
 mls = geometry.to_multi_line_string
-
-binding.pry

data/examples/gridding.rb

@@ -1,106 +1,107 @@
 require 'bundler/setup'
-require 'pry'
 require 'ffi-gdal'
+require 'gdal/gridder'
+require 'ogr/data_source'
+require 'ogr/spatial_reference'
 
 GDAL::Logger.logging_enabled = true
 
-test_points_file = File.expand_path('points.txt', __dir__)
-test_points = File.read(test_points_file).split.map { |point_group| point_group.split(',').map(&:to_f) }
-
-output_formatter = lambda do |d, _, _|
-  print "#{Time.now}: #{(d * 100).round(2)}%\r"
-  true
-end
-
-# IDW Test
-def idtap(test_points)
-  grid = GDAL::Grid.new(:inverse_distance_to_a_power, data_type: :GDT_Float32)
-  grid.points = NArray[*test_points]
-
-  grid.options[:angle] = 10
-  # grid.options[:max_points] = 5
-  # grid.options[:min_points] = 1
-  grid.options[:no_data_value] = -9999
-  grid.options[:power] = 2
-  grid.options[:radius1] = 20
-  grid.options[:radius2] = 15
-  grid.options[:smoothing] = 5
-
-  [grid, 'gridded-idtap.tif']
-end
-
-def moving_average(test_points)
-  grid = GDAL::Grid.new(:moving_average, data_type: :GDT_Float32)
-  grid.points = NArray[*test_points]
-
-  grid.options[:angle] = 20
-  grid.options[:min_points] = 2
-  grid.options[:no_data_value] = -9999
-  grid.options[:radius1] = 20
-  grid.options[:radius2] = 51
-
-  [grid, 'gridded-ma.tif']
-end
-
-def nearest_neighbor(test_points)
-  grid = GDAL::Grid.new(:nearest_neighbor, data_type: :GDT_Float32)
-  grid.points = NArray[*test_points]
-
-  grid.options[:angle] = 30
-  grid.options[:no_data_value] = -9999
-  grid.options[:radius1] = 20
-  grid.options[:radius2] = 15
-
-  [grid, 'gridded-nn.tif']
-end
-
-def metric_range(test_points)
-  grid = GDAL::Grid.new(:metric_range, data_type: :GDT_Float32)
-  grid.points = NArray[*test_points]
-
-  grid.options[:angle] = 30
-  # grid.options[:no_data_value] = -9999
-  grid.options[:radius1] = 20
-  grid.options[:radius2] = 15
-  [grid, 'gridded-metric-range.tif']
-end
-
-def make_file(file_name, grid, data)
-  driver = GDAL::Driver.by_name('GTiff')
-  dataset = driver.create_dataset(
-    file_name,
-    grid.x_size.round.to_i,
-    grid.y_size.round.to_i,
-    data_type: grid.data_type
-  )
-
-  dataset.geo_transform = grid.geo_transform
-  dataset.projection = OGR::SpatialReference.new_from_epsg(32_632).to_wkt
-
-  dataset.raster_io('w', data, data_type: grid.data_type)
-  if grid.options[:no_data_value]
-    dataset.raster_band(1).no_data_value = grid.options[:no_data_value]
+module Examples
+  module Gridding
+    class << self
+      # IDW Test
+      def make_idtap_options
+        gridder_options = GDAL::GridderOptions.new(:inverse_distance_to_a_power)
+
+        gridder_options.algorithm_options[:angle] = 10
+        gridder_options.algorithm_options[:max_points] = 5
+        gridder_options.algorithm_options[:min_points] = 1
+        gridder_options.algorithm_options[:no_data_value] = -9999
+        gridder_options.algorithm_options[:power] = 2
+        gridder_options.algorithm_options[:radius1] = 20
+        gridder_options.algorithm_options[:radius2] = 15
+        gridder_options.algorithm_options[:smoothing] = 5
+
+        [gridder_options, 'gridded-idtap.tif']
+      end
+
+      def make_moving_average_options
+        gridder_options = GDAL::GridderOptions.new(:moving_average)
+
+        gridder_options.algorithm_options[:angle] = 20
+        gridder_options.algorithm_options[:min_points] = 2
+        gridder_options.algorithm_options[:no_data_value] = -9999
+        gridder_options.algorithm_options[:radius1] = 20
+        gridder_options.algorithm_options[:radius2] = 51
+
+        [gridder_options, 'gridded-ma.tif']
+      end
+
+      def make_nearest_neighbor_options
+        gridder_options = GDAL::GridderOptions.new(:nearest_neighbor)
+
+        gridder_options.algorithm_options[:angle] = 30
+        gridder_options.algorithm_options[:no_data_value] = -9999
+        gridder_options.algorithm_options[:radius1] = 20
+        gridder_options.algorithm_options[:radius2] = 15
+
+        [gridder_options, 'gridded-nn.tif']
+      end
+
+      def make_metric_range_options
+        gridder_options = GDAL::GridderOptions.new(:metric_range)
+
+        gridder_options.algorithm_options[:angle] = 30
+        gridder_options.algorithm_options[:no_data_value] = -9999
+        gridder_options.algorithm_options[:radius1] = 20
+        gridder_options.algorithm_options[:radius2] = 15
+
+        [gridder_options, 'gridded-metric-range.tif']
+      end
+
+      def make_file(source_layer, file_name, gridder_options)
+        start = Time.now
+
+        output_formatter = lambda do |d, _, _|
+          print "Duration: #{(Time.now - start).to_i}s\t| #{(d * 100).round(2)}%\r"
+          true
+        end
+
+        gridder_options.input_field_name = 'STATE_FIPS'
+        gridder_options.progress_formatter = output_formatter
+        gridder_options.output_size = { width: 1600, height: 1480 }
+
+        gridder = GDAL::Gridder.new(source_layer, file_name, gridder_options)
+        gridder.grid!
+
+        puts ''
+        puts "Duration for #{file_name}: #{Time.now - start}"
+      end
+    end
   end
-  dataset.close
-  puts "\nDone writing #{file_name}"
 end
 
-grid, output_file_name = idtap(test_points)
-output = grid.create(&output_formatter)
-puts ''
-make_file(output_file_name, grid, output)
-
-grid, output_file_name = moving_average(test_points)
-output = grid.create(&output_formatter)
-puts ''
-make_file(output_file_name, grid, output)
-
-grid, output_file_name = nearest_neighbor(test_points)
-output = grid.create(&output_formatter)
-puts ''
-make_file(output_file_name, grid, output)
-
-grid, output_file_name = metric_range(test_points)
-output = grid.create(&output_formatter)
-puts ''
-make_file(output_file_name, grid, output)
+if $PROGRAM_NAME == __FILE__
+  shp_path = './spec/support/shapefiles/states_21basic'
+  ds = OGR::DataSource.open(shp_path, 'r')
+
+  # Inverse Distance To A Power
+  gridder_options, output_file_name = Examples::Gridding.make_idtap_options
+  puts ''
+  Examples::Gridding.make_file(ds.layer(0), output_file_name, gridder_options)
+
+  # Moving Average
+  gridder_options, output_file_name = Examples::Gridding.make_moving_average_options
+  puts ''
+  Examples::Gridding.make_file(ds.layer(0), output_file_name, gridder_options)
+
+  # Nearest Neighbor
+  gridder_options, output_file_name = Examples::Gridding.make_nearest_neighbor_options
+  puts ''
+  Examples::Gridding.make_file(ds.layer(0), output_file_name, gridder_options)
+
+  # Metric Range
+  gridder_options, output_file_name = Examples::Gridding.make_metric_range_options
+  puts ''
+  Examples::Gridding.make_file(ds.layer(0), output_file_name, gridder_options)
+end

data/examples/ogr_layer_to_layer.rb

@@ -31,5 +31,3 @@ ring.add_point(extent.x_min, extent.y_max)
 ring.add_point(extent.x_min, extent.y_min)
 poly = OGR::Geometry.create(:wkbPolygon)
 poly.add_geometry(ring)
-
-binding.pry

data/examples/raster_erasing.rb

@@ -0,0 +1,47 @@
+require 'bundler/setup'
+require 'thor'
+require 'fileutils'
+require 'gdal/dataset'
+require 'gdal/raster_band'
+
+GDAL::Logger.logging_enabled = true
+
+module Examples
+  class RasterErasing < ::Thor
+    desc 'erase SOURCE DEST', 'Erase (clip) pixels from the center of the first raster band in SOURCE to DEST'
+    def erase(source_path, dest_path)
+      FileUtils.cp(source_path, dest_path)
+      dest_dataset = GDAL::Dataset.open(dest_path, 'w')
+      geo_transform = dest_dataset.geo_transform
+
+      raster_band = dest_dataset.raster_band(1)
+      extent_polygon = dest_dataset.extent
+      buffer_size = if extent_polygon.area > 1
+                      extent_polygon.area / -5000
+                    else
+                      extent_polygon.area / -0.5
+                    end
+
+      extent_polygon = extent_polygon.buffer(buffer_size)
+
+      if extent_polygon.empty?
+        raise 'Poorly buffered extent--you should play with these values to get this demo to work.'
+      end
+
+      raster_point = OGR::Point.new
+      start = Time.now
+
+      raster_band.simple_erase! do |x, y|
+        coords = geo_transform.apply_geo_transform(x, y)
+        raster_point.set_point(0, coords[:x_geo], coords[:y_geo])
+        !raster_point.within? extent_polygon
+      end
+
+      dest_dataset.close
+
+      puts "Erased dataset in #{Time.now - start}s. Output at '#{dest_path}'"
+    end
+  end
+end
+
+Examples::RasterErasing.start(ARGV)