ffi-gdal 1.0.0.beta1 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b085e002a7e05915f5335245a0a316090d927c38
-  data.tar.gz: c5e22d016ba55c3c421c03ad2e043befba56b8e6
+  metadata.gz: 9e43588d5789cf95019883b698d2b68b67281f35
+  data.tar.gz: b9b2ab12a3e3c9014ff2bb7d21b8bed1e899fffc
 SHA512:
-  metadata.gz: ebeace61156bee523ef19aa7d4babd67fc0274e85b105d9bf54b5086c886615bcee9532c1e5b238dd611bcaac2e6eb209276da046a99581511e35a8aeecbaed0
-  data.tar.gz: d0586998a7010b8f41d20018764f6daa06e0be1a3f563d5ad4e7dc6251ef7d2b5d38238e7b4d80203fff21f4eed4f11e1a14dbb9679e909927c9dcd049f9919f
+  metadata.gz: 9295b6fb9a37c545603887b71cc59b68013b1601543a6623f4a681adb816b7320ca100b7b4de0313ae236d6db3965a0c2b1d03e05eebab6cf25bb00ae5cbe591
+  data.tar.gz: 22947cf2a0b33db1ef198ac73fcc182259f0746061687cc727ffceeb8f471c17ae1e598966cc34536d41177601ea1dacdc8305af105a814053682f878fee5cef

data/History.md

@@ -1,3 +1,35 @@
+### 1.0.0.beta3 / 2014-11-11
+
+* Bug fixes
+    * `ogr/exceptions` wasn't being required for `ext/error_symbols.rb`, thus
+      any use of an OGR exception was causing a `NameError`.
+
+### 1.0.0.beta2 / 2014-10-23
+
+* Improvements
+    * Added more documentation
+    * Uncommented `attach_function` calls that had been commented out due to
+      lack of support in versions I'd tested on.  These get handled now on load.
+
+### 1.0.0.beta1 / 2014-10-23
+
+* Lots of changes, so just the highlights here...
+* API Improvements
+    * Added C and Ruby wrapper for most of OGR.
+    * Better handling of CPLErr return values.
+    * 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,
+      but either provide new functionality or attempt to make library usage more
+      Rubyesque.
+    * Added `#as_json`, `#to_json` to many classes.
+* Internal Improvements
+    * Lots of cleanup of class internals.
+    * `autoload` child GDAL and OGR Ruby classes.
+    * Renamed files under ffi/ that were derived from GDAL/OGR header files to
+      include `_h` in the name.
+
 ### 0.0.4 / 2014-09-27
 
 * Bug fixes

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Steve Loveless
+Copyright (c) 2014 Agrian, Inc.
 
 MIT License
 

data/TODO.md

@@ -1,7 +1,5 @@
-* Use autoload for C wrappers
 * Documentation
 * add more OGR::StyleTable
-* normalize c_pointer instance variable names
 * set attributes to instance variables
 * more GDALDriver
 * Finish MajorObject

data/examples/extract_and_colorize.rb

@@ -0,0 +1,81 @@
+require 'bundler/setup'
+require 'pry'
+require 'ffi-gdal'
+
+GDAL::Logger.logging_enabled = true
+
+colors = %w[644d1e 745924 856728 95742b a5812d b69930 c8b22d d8cb3c e8e65a
+  f4ee79 e0e457 c8da42 afd135 97b73c 7e993c 657e36 4b612c 314441 23295e
+  282973]
+
+floyd_path = File.join(__dir__, '../spec/support/images/Floyd/Floyd_1058_20140612_NRGB.tif')
+floyd = GDAL::Dataset.open(floyd_path, 'r')
+
+#---
+# Extracting...
+#---
+
+# NIR
+floyd.extract_nir('nir.tif', 1).close
+
+# Natural Color
+floyd.extract_natural_color('nc.tif', band_order: %i[nir red green blue]).close
+
+# NDVI as Float32
+floyd.extract_ndvi('ndvi_float.tif', band_order: %i[nir red green blue],
+  data_type: :GDT_Float32,
+  remove_negatives: true
+).close
+
+# NDVI as Byte
+floyd.extract_ndvi('ndvi_byte.tif', band_order: %i[nir red green blue],
+  data_type: :GDT_Byte,
+  remove_negatives: true,
+  photometric: 'PALETTE'
+).close
+
+# NDVI as UInt16
+floyd.extract_ndvi('ndvi_uint16.tif', band_order: %i[nir red green blue],
+  data_type: :GDT_UInt16,
+  remove_negatives: true,
+  photometric: 'PALETTE'
+).close
+
+# GNDVI as Byte
+floyd.extract_gndvi('gndvi_byte.tif', band_order: %i[nir red green blue],
+  data_type: :GDT_Byte,
+  remove_negatives: true,
+  photometric: 'PALETTE'
+).close
+
+# GNDVI as UInt16
+floyd.extract_gndvi('gndvi_uint16.tif', band_order: %i[nir red green blue],
+  data_type: :GDT_UInt16,
+  remove_negatives: true,
+  photometric: 'PALETTE'
+).close
+
+#---
+# Colorize after extraction...
+#---
+
+byte_dataset = GDAL::Dataset.open('ndvi_byte.tif', 'w')
+byte_band = byte_dataset.raster_band(1)
+byte_band.colorize!(*colors)
+byte_dataset.close
+
+uint16_dataset = GDAL::Dataset.open('ndvi_uint16.tif', 'w')
+uint16_band = uint16_dataset.raster_band(1)
+uint16_band.colorize!(*colors)
+uint16_dataset.close
+
+g_byte_dataset = GDAL::Dataset.open('gndvi_byte.tif', 'w')
+g_byte_band = g_byte_dataset.raster_band(1)
+g_byte_band.colorize!(*colors)
+g_byte_dataset.close
+
+g_uint16_dataset = GDAL::Dataset.open('gndvi_uint16.tif', 'w')
+g_uint16_band = g_uint16_dataset.raster_band(1)
+g_uint16_band.colorize!(*colors)
+g_uint16_dataset.close
+

data/{testing_ogr.rb → examples/geometries.rb}

@@ -43,21 +43,9 @@ multi_polygon = OGR::Geometry.create_from_wkt(multi_polygon_wkt)
 # boundary: #{boundary}
 # POINT
 #
-def things(geometry)
-  geometry = geometry.clone
-  ls = geometry.to_line_string
-  mls = geometry.to_multi_line_string
-  #mpoint = geometry.to_multi_point
-  #mpolygon = geometry.to_multi_polygon
-  polygon = geometry.to_polygon
-
-  {
-    line_string_points: ls ? ls.point_count : nil,
-    multi_line_string_points: mls ? mls.point_count : nil,
-    #multi_point_points: mpoint ? mpoint.point_count : nil,
-    #multi_polygon_points: mpolygon ? mpolygon.point_count : nil,
-    #polygon_points: polygon ? polygon.point_count : nil
-  }
-end
+
+geometry = geometry.clone
+ls = geometry.to_line_string
+mls = geometry.to_multi_line_string
 
 binding.pry

data/{testing_layer_to_layer.rb → examples/ogr_layer_to_layer.rb}

@@ -8,7 +8,7 @@ GDAL::Logger.logging_enabled = true
 # http://pcjericks.github.io/py-gdalogr-cookbook/vector_layers.html#create-a-new-layer-from-the-extent-of-an-existing-layer
 
 # Get a Layer's Extent
-data_source = OGR::DataSource.open('spec/support/shapefiles/states_21basic/states.shp', 'r')
+data_source = OGR::DataSource.open('../spec/support/shapefiles/states_21basic/states.shp', 'r')
 layer = data_source.layer(0)
 extent = layer.extent
 

data/examples/testing_gdal.rb

@@ -0,0 +1,46 @@
+require 'RMagick'
+require 'bundler/setup'
+require 'pry'
+require 'ffi-gdal'
+
+GDAL::Logger.logging_enabled = true
+
+floyd_too_big_wkt = 'MULTIPOLYGON (((-87.55634718933241 31.168633650404765, -87.552227316286 31.16870709121005, -87.55234533348232 31.169808696448463, -87.5478606800096 31.1698913163249, -87.54777484932141 31.168679550914895, -87.54380517997858 31.168615290194918, -87.54396611251944 31.16511760526154, -87.55647593536513 31.164906454793982, -87.55634718933241 31.168633650404765)))'
+floyd_wkt = 'MULTIPOLYGON (((-87.5530099868775 31.16710573359053,-87.5530099868775 31.165600160261103,-87.55384683609009 31.16710573359053,-87.5530099868775 31.16710573359053)))'
+floyd_srid = 4326
+
+harper_path = '/Users/sloveless/Development/projects/ffi-gdal/spec/support/images/Harper/Harper_1058_20140612_NRGB.tif'
+harper = GDAL::Dataset.open(harper_path, 'r')
+
+floyd_path = '/Users/sloveless/Development/projects/ffi-gdal/spec/support/images/Floyd/Floyd_1058_20140612_NRGB.tif'
+floyd = GDAL::Dataset.open(floyd_path, 'r')
+
+spatial_ref = OGR::SpatialReference.new(floyd.projection)
+floyd_geometry = OGR::Geometry.create_from_wkt(floyd_wkt, spatial_ref)
+
+usg_path = '/Users/sloveless/Development/projects/ffi-gdal/spec/support/images/osgeo/geotiff/usgs/c41078a1.tif'
+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)
+
+def warp_to_geometry(dataset, wkt_geometry)
+
+  # Create an OGR::Geometry from the WKT and convert to dataset's projection.
+  wkt_spatial_ref = OGR::SpatialReference.new_from_epsg(4326)
+  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)
+  shape.close
+end
+
+#warp_to_geometry(floyd, floyd_wkt)

data/lib/ext/error_symbols.rb

@@ -1,4 +1,5 @@
 require_relative '../gdal/exceptions'
+require_relative '../ogr/exceptions'
 
 
 class ::Symbol

data/lib/ffi/cpl/conv_h.rb

@@ -109,7 +109,7 @@ module FFI
     attach_function :CPLCloseShared, %i[pointer], :void
     attach_function :CPLGetSharedList, %i[pointer], :pointer
     attach_function :CPLDumpSharedList, %i[pointer], :void
-    #attach_function :CPLCleanupSharedFileMutex, %i[], :void
+    attach_function :CPLCleanupSharedFileMutex, %i[], :void
 
     attach_function :CPLDMSToDec, %i[string], :double
     attach_function :CPLDecToDMS, %i[double string int], :string
@@ -123,21 +123,21 @@ module FFI
     #---------
     # Zip Files
     #---------
-    #attach_function :CPLCreateZip, %i[string pointer], :pointer
-    #attach_function :CPLCreateFileInZip, %i[pointer string pointer], CPLErr
-    #attach_function :CPLWriteFileInZip, %i[pointer pointer int], CPLErr
-    #attach_function :CPLCloseFileInZip, %i[pointer], CPLErr
-    #attach_function :CPLCloseZip, %i[pointer], CPLErr
-    #attach_function :CPLZLibDeflate,
-    #  %i[pointer size_t int pointer size_t pointer],
-    #  :pointer
-    #attach_function :CPLZLibInflate,
-    #  %i[pointer size_t pointer size_t pointer],
-    #  :pointer
+    attach_function :CPLCreateZip, %i[string pointer], :pointer
+    attach_function :CPLCreateFileInZip, %i[pointer string pointer], CPLErr
+    attach_function :CPLWriteFileInZip, %i[pointer pointer int], CPLErr
+    attach_function :CPLCloseFileInZip, %i[pointer], CPLErr
+    attach_function :CPLCloseZip, %i[pointer], CPLErr
+    attach_function :CPLZLibDeflate,
+      %i[pointer size_t int pointer size_t pointer],
+      :pointer
+    attach_function :CPLZLibInflate,
+      %i[pointer size_t pointer size_t pointer],
+      :pointer
 
-    #attach_function :CPLValidateXML, %i[string string pointer], :int
-    #attach_function :CPLsetlocale, %i[int string], :string
+    attach_function :CPLValidateXML, %i[string string pointer], :int
+    attach_function :CPLsetlocale, %i[int string], :string
 
-    #attach_function :CPLCleanupSetlocaleMutex, %i[], :void
+    attach_function :CPLCleanupSetlocaleMutex, %i[], :void
   end
 end

data/lib/ffi/cpl/error_h.rb

@@ -20,18 +20,18 @@ module FFI
     #------------------------------------------------------------------------
     attach_function :CPLError, [CPLErr, :int, :string], :void
     attach_function :CPLErrorV, [CPLErr, :int, :string, :pointer], :void
-    #attach_function :CPLEmergencyError, [:void], :void
+    attach_function :CPLEmergencyError, [:void], :void
     attach_function :CPLErrorReset, [:void], :void
 
     attach_function :CPLGetLastErrorNo, [:void], :int
     attach_function :CPLGetLastErrorType, [:void], CPLErr
     attach_function :CPLGetLastErrorMsg, [:void], :string
 
-    #attach_function :CPLGetErrorHandlerUserData, [:void], :pointer
-    #attach_function :CPLErrorSetState,
-    #[CPLErr, :int, :string],
-    #:void
-    #attach_function :CPLCleanupErrorMutex, [:void], :void
+    attach_function :CPLGetErrorHandlerUserData, [:void], :pointer
+    attach_function :CPLErrorSetState,
+      [CPLErr, :int, :string],
+      :void
+    attach_function :CPLCleanupErrorMutex, [:void], :void
     attach_function :CPLLoggingErrorHandler,
       [CPLErr, :int, :string],
       :void
@@ -41,20 +41,20 @@ module FFI
     attach_function :CPLQuietErrorHandler,
       [CPLErr, :int, :string],
       :void
-    #attach_function :CPLTurnFailureIntoWarning, [:int], :void
+    attach_function :CPLTurnFailureIntoWarning, [:int], :void
 
     attach_function :CPLSetErrorHandler,
       [:CPLErrorHandler],
       :CPLErrorHandler
-    #attach_function :CPLSetErrorHandlerEx,
-    #  [:CPLErrorHandler, :pointer],
-    #  :CPLErrorHandler
+    attach_function :CPLSetErrorHandlerEx,
+      [:CPLErrorHandler, :pointer],
+      :CPLErrorHandler
     attach_function :CPLPushErrorHandler,
       [:CPLErrorHandler],
       :void
-    #attach_function :CPLPushErrorHandlerEx,
-    #  [:CPLErrorHandler, :pointer],
-    #  :void
+    attach_function :CPLPushErrorHandlerEx,
+      [:CPLErrorHandler, :pointer],
+      :void
     attach_function :CPLPopErrorHandler, [:void], :void
 
     attach_function :CPLDebug, [:string, :string], :void

data/lib/ffi/cpl/string_h.rb

@@ -32,7 +32,7 @@ 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 :CSLFindStringCaseSensitive, %i[pointer string], :int
     attach_function :CSLPartialFindString, %i[pointer string], :int
     attach_function :CSLFindName, %i[pointer string], :int
 
@@ -55,27 +55,27 @@ module FFI
     attach_function :CPLUnescapeString, %i[string pointer int], :string
     attach_function :CPLBinaryToHex, %i[int pointer], :string
     attach_function :CPLHexToBinary, %i[string pointer], :pointer
-    #attach_function :CPLBase64Encode, %i[int pointer], :string
-    #attach_function :CPLBase64DecodeInPlace, %i[pointer], :int
+    attach_function :CPLBase64Encode, %i[int pointer], :string
+    attach_function :CPLBase64DecodeInPlace, %i[pointer], :int
 
     attach_function :CPLGetValueType, %i[string], CPLValueType
     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 :CPLEncodingCharSize, %i[string], :int
+    attach_function :CPLEncodingCharSize, %i[string], :int
 
-    #attach_function :CPLClearRecodeWarningFlags, [], :void
+    attach_function :CPLClearRecodeWarningFlags, [], :void
     attach_function :CPLRecode, %i[string string string], :string
     attach_function :CPLRecodeFromWChar, %i[string string string], :string
     attach_function :CPLRecodeToWChar, %i[string string string], :string
 
     attach_function :CPLIsUTF8, %i[string int], :int
     attach_function :CPLForceToASCII, %i[string int char], :string
-    #attach_function :CPLStrlenUTF8, %i[string], :int
+    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
+    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
 end

data/lib/ffi/cpl/vsi_h.rb

@@ -46,23 +46,23 @@ module FFI
     attach_function :VSIFTellL, %i[pointer], :vsi_l_offset
     attach_function :VSIRewindL, %i[pointer], :void
     attach_function :VSIFReadL, %i[pointer size_t size_t pointer], :size_t
-    #attach_function :VSIFReadMultiRangeL,
-    #  %i[int pointer pointer pointer pointer],
-    #  :int
+    attach_function :VSIFReadMultiRangeL,
+      %i[int pointer pointer pointer pointer],
+      :int
     attach_function :VSIFWriteL, %i[pointer size_t size_t pointer], :size_t
     attach_function :VSIFEofL, %i[pointer], :int
-    #attach_function :VSIFTruncateL, %i[pointer vsi_l_offset], :int
+    attach_function :VSIFTruncateL, %i[pointer vsi_l_offset], :int
     attach_function :VSIFFlushL, %i[pointer], :int
     attach_function :VSIFPrintfL, %i[pointer string varargs], :int
     attach_function :VSIFPutcL, %i[int pointer], :int
-    #attach_function :VSIIngestFile,
-    #  %i[pointer string pointer pointer GIntBig],
-    #  :int
+    attach_function :VSIIngestFile,
+      %i[pointer string pointer pointer GIntBig],
+      :int
     attach_function :VSIStatL, %i[string pointer], :int
-    #attach_function :VSIStatExL, %i[string pointer int], :int
+    attach_function :VSIStatExL, %i[string pointer int], :int
 
-    #attach_function :VSIIsCaseSensitiveFS, %i[string], :int
-    #attach_function :VSIFGetNativeFileDescriptorL, %i[pointer], :pointer
+    attach_function :VSIIsCaseSensitiveFS, %i[string], :int
+    attach_function :VSIFGetNativeFileDescriptorL, %i[pointer], :pointer
 
     attach_function :VSICalloc, %i[size_t size_t], :pointer
     attach_function :VSIMalloc, %i[size_t], :pointer
@@ -73,7 +73,7 @@ module FFI
     attach_function :VSIMalloc3, %i[size_t size_t size_t], :pointer
 
     attach_function :VSIReadDir, %i[string], :pointer
-    #attach_function :VSIReadDirRecursive, %i[string], :pointer
+    attach_function :VSIReadDirRecursive, %i[string], :pointer
     attach_function :VSIMkdir, %i[string long], :int
     attach_function :VSIRmdir, %i[string], :int
     attach_function :VSIUnlink, %i[string], :int
@@ -84,15 +84,15 @@ module FFI
     attach_function :VSIInstallMemFileHandler, [], :void
     attach_function :VSIInstallLargeFileHandler, [], :void
     attach_function :VSIInstallSubFileHandler, [], :void
-    #attach_function :VSIInstallCurlFileHandler, [], :void
-    #attach_function :VSIInstallCurlStreamingFileHandler, [], :void
-    #attach_function :VSIInstallGZipFileHandler, [], :void
-    #attach_function :VSIInstallZipFileHandler, [], :void
-    #attach_function :VSIInstallStdinHandler, [], :void
-    #attach_function :VSIInstallStdoutHandler, [], :void
-    #attach_function :VSIInstallSparseFileHandler, [], :void
-    #attach_function :VSIInstallTarFileHandler, [], :void
-    #attach_function :VSICleanupFileManager, [], :void
+    attach_function :VSIInstallCurlFileHandler, [], :void
+    attach_function :VSIInstallCurlStreamingFileHandler, [], :void
+    attach_function :VSIInstallGZipFileHandler, [], :void
+    attach_function :VSIInstallZipFileHandler, [], :void
+    attach_function :VSIInstallStdinHandler, [], :void
+    attach_function :VSIInstallStdoutHandler, [], :void
+    attach_function :VSIInstallSparseFileHandler, [], :void
+    attach_function :VSIInstallTarFileHandler, [], :void
+    attach_function :VSICleanupFileManager, [], :void
 
     attach_function :VSIFileFromMemBuffer,
       %i[string pointer vsi_l_offset int],
@@ -100,9 +100,9 @@ module FFI
     attach_function :VSIGetMemFileBuffer,
       %i[string pointer int],
       :pointer
-    # attach_function :VSIStdoutSetRedirection,
-    #   %i[VSIWriteFunction pointer],
-    #   :pointer
+    attach_function :VSIStdoutSetRedirection,
+      %i[VSIWriteFunction pointer],
+      :pointer
 
     attach_function :VSITime, %i[pointer], :ulong
     attach_function :VSICTime, %i[ulong], :string