ffi-gdal 1.0.0.beta1 → 1.0.0.beta3

data/lib/ffi/gdal.rb

@@ -8,7 +8,7 @@ module FFI
       old_attach_function(*args)
     rescue FFI::NotFoundError
       @unsupported_gdal_functions ||= []
-      warn "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')})"
       @unsupported_gdal_functions << args.first
     end
 

data/lib/ffi/gdal/grid_h.rb

@@ -14,9 +14,9 @@ module FFI
     attach_function :GDALGridInverseDistanceToAPower,
       %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
       CPLErr
-    # attach_function :GDALGridInverseDistanceToAPointerNoSearch,
-    #   %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-    #   CPLErr
+    attach_function :GDALGridInverseDistanceToAPointerNoSearch,
+      %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+      CPLErr
 
     attach_function :GDALGridMovingAverage,
       %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],

data/lib/ffi/gdal/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta1'
+    VERSION = '1.0.0.beta3'
   end
 end

data/lib/ffi/ogr/api_h.rb

@@ -267,9 +267,9 @@ module FFI
     attach_function :OGR_FD_DeleteFieldDefn,
       %i[OGRFeatureDefnH int],
       OGRErr
-    # attach_function :OGR_FD_ReorderFieldDefns,
-    #   %i[OGRFeatureDefnH pointer],
-    #   OGRErr
+    attach_function :OGR_FD_ReorderFieldDefns,
+      %i[OGRFeatureDefnH pointer],
+      OGRErr
     attach_function :OGR_FD_GetGeomType, %i[OGRFeatureDefnH], OGRwkbGeometryType
     attach_function :OGR_FD_SetGeomType,
       [:OGRFeatureDefnH, OGRwkbGeometryType],

data/lib/gdal/dataset.rb

@@ -71,7 +71,7 @@ module GDAL
 
       flag = FFI::GDAL.GDALGetAccess(@dataset_pointer)
 
-      FFI::GDAL.GDALAccess[flag]
+      FFI::GDAL::GDALAccess[flag]
     end
 
     # @return [GDAL::Driver] The driver to be used for working with this
@@ -148,11 +148,12 @@ module GDAL
       raster_band(raster_count)
     end
 
-    # Adds a mask band to the dataset
+    # Adds a mask band to the dataset.
     #
+    # @param flags [Fixnum] Any of of the GDAL::RasterBand flags.
     # @return [Boolean]
-    def create_mask_band
-      cpl_err = FFI::GDAL.GDALCreateDatasetMaskBand(@dataset_pointer, 0)
+    def create_mask_band(flags)
+      cpl_err = FFI::GDAL.GDALCreateDatasetMaskBand(@dataset_pointer, flags)
 
       cpl_err.to_bool
     end

data/lib/gdal/dataset_extensions.rb

@@ -472,13 +472,13 @@ module GDAL
     # @param ndvi [NArray]
     # @return [NArray]
     def calculate_ndvi_byte(ndvi)
-      (ndvi + 1) * (127.5)
+      (ndvi + 1) * (255.0 / 2)
     end
 
     # @param ndvi [NArray]
     # @return [NArray]
     def calculate_ndvi_uint16(ndvi)
-      (ndvi + 1) * (2**15 - 1)
+      (ndvi + 1) * (65535.0 / 2)
     end
 
     # Sets any negative values in the NArray to 0.

data/lib/gdal/raster_band.rb

@@ -85,6 +85,7 @@ module GDAL
       FFI::GDAL.GDALGetRasterColorInterpretation(@raster_band_pointer)
     end
 
+    # @param new_color_interp [FFI::GDAL::GDALColorInterp]
     # @return [Boolean]
     def color_interpretation=(new_color_interp)
       cpl_err = FFI::GDAL.GDALSetRasterColorInterpretation(@raster_band_pointer,

data/lib/gdal/raster_band_extensions.rb

@@ -110,17 +110,17 @@ module GDAL
         raise "Can't colorize a #{data_type} band--must be :GDT_Byte or :GDT_UInt16"
       end
 
-      self.color_interpretation = :GCI_PaletteIndex
+      self.color_interpretation ||= :GCI_PaletteIndex
       table.add_color_entry(0, 0, 0, 0, 255)
-      bin_count = (color_entry_index_count / colors.size).to_f
+      bin_count = color_entry_index_count / colors.size.to_f
 
       1.upto(color_entry_index_count - 1) do |color_entry_index|
-        color_number = (color_entry_index / bin_count.to_f).to_i
+        color_number = (color_entry_index / bin_count).to_i
 
         color = colors[color_number]
-        color_array = hex_to_rgb(color) unless color.is_a?(Array)
+        rgb_array = hex_to_rgb(color) unless color.is_a?(Array)
         table.add_color_entry(color_entry_index,
-          color_array[0], color_array[1], color_array[2], 255)
+          rgb_array[0], rgb_array[1], rgb_array[2], 255)
       end
 
       self.color_table = table

data/lib/ogr/geometry.rb

@@ -22,6 +22,7 @@ module OGR
       else
         new(geometry)
       end
+
       case geometry.name
       when 'POINT' then OGR::Point.new(geometry.c_pointer)
       when 'LINESTRING' then OGR::LineString.new(geometry.c_pointer)

data/spec/unit/gdal/color_table_extensions_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+
+describe GDAL::ColorTable do
+  subject do
+    described_class.create(:GPI_RGB)
+  end
+
+  describe '#color_entries_for' do
+    context 'no colors' do
+      it 'returns an empty array' do
+        expect(subject.color_entries_for(1)).to be_empty
+      end
+    end
+
+    context 'colors' do
+      it 'returns all of the color values ColorEntrys for the color number' do
+        subject.add_color_entry(0, 1, 2, 3, 4)
+        subject.add_color_entry(1, 10, 20, 30, 40)
+        expect(subject.color_entries_for(1)).to eq([1, 10])
+      end
+    end
+  end
+
+  describe '#color_entries' do
+    context 'no colors' do
+      it 'returns an empty array' do
+        expect(subject.color_entries).to be_empty
+      end
+    end
+
+    context 'colors' do
+      it 'returns an array of the ColorEntrys' do
+        subject.add_color_entry(0, 1, 2, 3, 4)
+        subject.add_color_entry(1, 10, 20, 30, 40)
+
+        expect(subject.color_entries.size).to eq 2
+        expect(subject.color_entries.first).to be_a GDAL::ColorEntry
+      end
+    end
+  end
+
+  describe '#color_entries_as_rgb' do
+    context 'no colors' do
+      it 'returns an empty array' do
+        expect(subject.color_entries_as_rgb).to be_empty
+      end
+    end
+
+    context 'colors' do
+      it 'returns an array of the ColorEntrys' do
+        subject.add_color_entry(0, 1, 2, 3, 4)
+        subject.add_color_entry(1, 10, 20, 30, 40)
+
+        expect(subject.color_entries_as_rgb.size).to eq 2
+        expect(subject.color_entries_as_rgb.first).to be_a GDAL::ColorEntry
+      end
+    end
+  end
+end

data/spec/unit/gdal/data_type_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe GDAL::DataType do
+  describe '.size' do
+    context 'with valid data type' do
+      it 'returns the size' do
+        expect(described_class.size(:GDT_Byte)).to eq 8
+      end
+    end
+
+    context 'with invalid data type' do
+      it 'raises an ArgumentError' do
+        expect {
+          described_class.size(:Bob)
+        }.to raise_exception(ArgumentError)
+      end
+    end
+  end
+
+  describe '.complex?' do
+    context 'with valid, complex data type' do
+      it 'returns true' do
+        expect(described_class.complex?(:GDT_CFloat64)).to eq true
+      end
+    end
+
+    context 'with valid, simple data type' do
+      it 'returns true' do
+        expect(described_class.complex?(:GDT_Float64)).to eq false
+      end
+    end
+
+    context 'with invalid data type' do
+      it 'raises an ArgumentError' do
+        expect {
+          described_class.complex?(:Bob)
+        }.to raise_exception(ArgumentError)
+      end
+    end
+  end
+
+  describe '.name' do
+    context 'with valid data type' do
+      it 'returns the name' do
+        expect(described_class.name(:GDT_Byte)).to eq 'Byte'
+      end
+    end
+
+    context 'with invalid data type' do
+      it 'raises an ArgumentError' do
+        skip 'Figure out why this causes a segfault'
+
+        expect {
+          described_class.name(:Bob)
+        }.to raise_exception(ArgumentError)
+      end
+    end
+  end
+
+  describe '.by_name' do
+    context 'with valid data type name' do
+      it 'returns the data type' do
+        skip 'Figure out why this causes a segfault'
+
+        expect(described_class.by_name('Byte')).to eq :GDT_Byte
+      end
+    end
+
+    context 'with invalid data type name' do
+      it 'raises an ArgumentError' do
+        skip 'Figure out why this causes a segfault'
+
+        expect {
+          described_class.by_name('Bob')
+        }.to raise_exception(ArgumentError)
+      end
+    end
+  end
+end

data/spec/unit/gdal/dataset_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe GDAL::Dataset do
+  let(:file_path) do
+    File.expand_path('../../support/images/osgeo/geotiff/GeogToWGS84GeoKey/GeogToWGS84GeoKey5.tif', __dir__)
+  end
+
+  subject do
+    described_class.open(file_path, 'r')
+  end
+
+  describe '#access_flag' do
+    it 'returns the flag that was used to open the dataset' do
+      expect(subject.access_flag).to eq :GA_ReadOnly
+    end
+  end
+
+  describe '#driver' do
+    it 'returns the driver that was used to open the dataset' do
+      expect(subject.driver).to be_a GDAL::Driver
+    end
+  end
+
+  describe '#file_list' do
+    it 'returns an array that includes the file that represents the dataset' do
+      expect(subject.file_list).to be_an Array
+      expect(subject.file_list).to include(file_path)
+    end
+  end
+
+  describe '#flush_cache' do
+    it 'returns nil' do
+      expect(subject.flush_cache).to be_nil
+    end
+  end
+
+  describe '#raster_x_size' do
+    it 'returns a Fixnum' do
+      expect(subject.raster_x_size).to eq 101
+    end
+  end
+
+  describe '#raster_y_size' do
+    it 'returns a Fixnum' do
+      expect(subject.raster_y_size).to eq 101
+    end
+  end
+
+  describe '#raster_count' do
+    it 'returns a Fixnum' do
+      expect(subject.raster_count).to eq 1
+    end
+  end
+
+  describe '#raster_band' do
+    it 'returns a GDAL::RasterBand' do
+      expect(subject.raster_band(1)).to be_a GDAL::RasterBand
+    end
+  end
+
+  describe '#add_band' do
+    it 'raises a GDAL::CPLErrFailure' do
+      skip 'Figure out why this causes a segfault'
+
+      expect {
+        subject.add_band(:GDT_Byte)
+      }.to raise_exception(GDAL::CPLErrFailure)
+    end
+  end
+
+  describe '#create_mask_band' do
+    context 'no flags given' do
+      it 'returns true' do
+        expect(subject.create_mask_band(0)).to eq true
+      end
+    end
+  end
+
+  describe '#projection' do
+    it 'returns the projection string' do
+      expect(subject.projection).to eq %(GEOGCS[\"unknown\",DATUM[\"unknown\",SPHEROID[\"Bessel 1841\",6377397.155,299.1528128000008,AUTHORITY[\"EPSG\",\"7004\"]],TOWGS84[598.1,73.7,418.2,0.202,0.045,-2.455,6.7]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]])
+    end
+  end
+
+  describe '#projection=' do
+    it 'returns the new projection' do
+      proj = subject.projection
+      expect(subject.projection = proj).to eq proj
+      expect(subject.projection).to eq proj
+    end
+  end
+
+  describe '#geo_transform' do
+    it 'returns a GDAL::GeoTransform' do
+      expect(subject.geo_transform).to be_a GDAL::GeoTransform
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -137,6 +137,10 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- examples/extract_and_colorize.rb
+- examples/geometries.rb
+- examples/ogr_layer_to_layer.rb
+- examples/testing_gdal.rb
 - ffi-gdal.gemspec
 - lib/ext/error_symbols.rb
 - lib/ext/float_ext.rb
@@ -235,8 +239,6 @@ files:
 - lib/ogr/spatial_reference_extensions.rb
 - lib/ogr/style_table.rb
 - lib/ogr/style_table_extensions.rb
-- linkies.rb
-- readie.rb
 - spec/ffi-gdal_spec.rb
 - spec/integration/color_table_info_spec.rb
 - spec/integration/dataset_info_spec.rb
@@ -259,18 +261,14 @@ files:
 - spec/support/worldfiles/SR_50M/SR_50M.tfw
 - spec/support/worldfiles/SR_50M/SR_50M.tif
 - spec/unit/ext/error_symbols_spec.rb
+- spec/unit/gdal/color_table_extensions_spec.rb
 - spec/unit/gdal/color_table_spec.rb
+- spec/unit/gdal/data_type_spec.rb
+- spec/unit/gdal/dataset_spec.rb
 - spec/unit/ogr/layer_spec.rb
 - spec/unit/ogr/linear_ring_spec.rb
 - spec/unit/ogr/point_spec.rb
 - spec/unit/version_info_spec.rb
-- testing_gdal.rb
-- testing_gdalwarp.rb
-- testing_layer_to_layer.rb
-- testing_ndvi.rb
-- testing_nir.rb
-- testing_ogr.rb
-- things.rb
 homepage: https://github.com/turboladen/ffi-gdal
 licenses:
 - MIT
@@ -318,7 +316,10 @@ test_files:
 - spec/support/worldfiles/SR_50M/SR_50M.tfw
 - spec/support/worldfiles/SR_50M/SR_50M.tif
 - spec/unit/ext/error_symbols_spec.rb
+- spec/unit/gdal/color_table_extensions_spec.rb
 - spec/unit/gdal/color_table_spec.rb
+- spec/unit/gdal/data_type_spec.rb
+- spec/unit/gdal/dataset_spec.rb
 - spec/unit/ogr/layer_spec.rb
 - spec/unit/ogr/linear_ring_spec.rb
 - spec/unit/ogr/point_spec.rb

data/linkies.rb

@@ -1,35 +0,0 @@
-require 'nokogiri'
-require 'open-uri'
-
-abort("Usage: extract_links URL DEST_DIR") if ARGV.size != 2
-
-args = ARGV.dup
-url = args[0]
-dest_dir = args[1]
-
-doc = Nokogiri::HTML(open(url))
-
-hrefs = doc.css("a").map do |link|
-  if (href = link.attr("href")) && !href.empty?
-    URI::join(url, href)
-  end
-end.compact.uniq
-
-Dir.mkdir(dest_dir) unless File.exist?(dest_dir)
-Dir.chdir(dest_dir)
-
-hrefs.each_with_index do |href, i|
-  filename = href.path.split('/').last
-  print "Downloading (#{i + 1}/#{hrefs.size}) #{filename}...\r"
-
-  begin
-    File.write(filename, open(href).read)
-  rescue OpenURI::HTTPError => ex
-    puts "Sonofa!"
-    raise
-  end
-end
-
-puts "\nAll done!"
-
-#  puts(hrefs.join("\n"))