ffi-gdal 1.0.0.beta11 → 1.0.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68052761a1e7169e0827a611d99b825c0922bad173fc449133522d27e53d2bc
-  data.tar.gz: 307f6323e07aa67f3232b9bb2ce4ad3c8aff4722498344cfeb2c3db9dfdc31da
+  metadata.gz: 3afcc101b07f1be65e2cce03ed7d925ae1d94a2fb8f36e6b32c9738f97002619
+  data.tar.gz: caeedcff346cadb107ed4a91970b61a93f61959d6e0f0e69cc96dafc290a8851
 SHA512:
-  metadata.gz: 96bb0bbd71290fc05806883cce455c8000ee494644db02b3c8203f305dea236272713ef02b2c10ef0912e28dd5c4916580b2b33efff2ee67c5ac253004cec2d5
-  data.tar.gz: d8371066d7e1ab28235b1d42397864aade41d2921b7149dd23c2fc3574c0c8c4ac4bc42c663949929adf90f418e7bdcd7e1f4c948a6c6ea11dcf11359ac78d14
+  metadata.gz: 55f9c4e293410626d9fda5e624589f24fede9aeb8faff2378ab72c2fe2cd9d7f412eebfa3dddb313719710d950167e894b4a6abe4833997d27483046cf4f65c5
+  data.tar.gz: b315fe3b339d8d7c1479fd609660cb38e2872e5007500bb896175cd47fbd9322f8ac19f584cd9a8cf55163c5121574670ace63d5d6c6a33e300190a35ad46a04

data/.gitignore

@@ -1,38 +1,39 @@
+*.a
+*.bundle
+*.dbf
 *.gem
+*.o
 *.rbc
+*.shx
+*.so
+*.sqlite
+*.swp
+*.xml
+*.xsd
+
 .bundle
+.byebug_history
 .config
+.idea/
+.rake_tasks
+.tags
 .yardoc
+
 Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
 doc/
 lib/bundler/man
+mkmf.log
+open-datasets-dump
 pkg
 rdoc
+spec/examples.txt
 spec/reports
+tags
 test/tmp
 test/version_tmp
 tmp/*
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-.idea/
-tags
-*.sqlite
-vendor/bundle
-*.xml
-*.dbf
-*.shx
-.rake_tasks
 valgrind_output.log
-*.xsd
-
-*.swp
-
-.byebug_history
-
-.tags
+vendor/bundle

data/History.md

@@ -2,6 +2,29 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 1.0.0.beta14 / 2022-05-06
+
+### Bug Fixes
+
+* [DEV-34133] Don't URI.parse path in `GDAL::Dataset#initialize` and `OGR::DataSource#initialize`.
+
+## 1.0.0.beta13 / 2022-04-20
+
+### Bug Fixes
+
+* [DEV-20247] Fix return value for `OGR::LayerMixins::Extensions#point_values` when no features are found.
+
+## 1.0.0.beta12 / 2021-06-07
+
+### Removed
+
+* Removed `GDAL::MajorObject#description=`, as this shouldn't be called and
+  causes problems.
+
+### Bug Fixes
+
+* [DEV-15804] Remove data that is outside all ranges when classifying.
+
 ## 1.0.0.beta11 / 2020-06-02
 
 ### Bug Fixes

data/lib/ffi/gdal/version.rb

@@ -2,6 +2,6 @@
 
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta11'
+    VERSION = '1.0.0.beta14'
   end
 end

data/lib/ffi/ogr/api.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ffi'
+require_relative '../gdal'
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI

data/lib/ffi/ogr/core.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ffi'
+require_relative '../gdal'
 require_relative '../../ext/ffi_library_function_checks'
 require_relative 'field'
 

data/lib/ffi/ogr/srs_api.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ffi'
+require_relative '../gdal'
 require_relative '../../ext/ffi_library_function_checks'
 
 module FFI
@@ -166,7 +168,7 @@ module FFI
       attach_function :OSRExportToXML, %i[OGRSpatialReferenceH pointer buffer_out], FFI::OGR::Core::Err
       attach_function :OSRExportToMICoordSys, %i[OGRSpatialReferenceH pointer], FFI::OGR::Core::Err
       attach_function :OSRExportToERM,
-        %i[OGRSpatialReferenceH buffer_out buffer_out buffer_out],
+        %i[OGRSpatialReferenceH pointer pointer pointer],
         FFI::OGR::Core::Err
       attach_function :OSRMorphToESRI, %i[OGRSpatialReferenceH], FFI::OGR::Core::Err
       attach_function :OSRMorphFromESRI, %i[OGRSpatialReferenceH], FFI::OGR::Core::Err

data/lib/gdal/dataset.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
 require_relative '../gdal'
 require_relative '../ogr'
 require_relative 'major_object'
@@ -60,17 +59,10 @@ module GDAL
     def initialize(path_or_pointer, access_flag, shared_open = true)
       @c_pointer =
         if path_or_pointer.is_a? String
-          file_path = begin
-            uri = URI.parse(path_or_pointer)
-            uri.scheme.nil? ? ::File.expand_path(path_or_pointer) : path_or_pointer
-          rescue URI::InvalidURIError
-            path_or_pointer
-          end
-
           if shared_open
-            FFI::GDAL::GDAL.GDALOpenShared(file_path, ACCESS_FLAGS[access_flag])
+            FFI::GDAL::GDAL.GDALOpenShared(path_or_pointer, ACCESS_FLAGS[access_flag])
           else
-            FFI::GDAL::GDAL.GDALOpen(file_path, ACCESS_FLAGS[access_flag])
+            FFI::GDAL::GDAL.GDALOpen(path_or_pointer, ACCESS_FLAGS[access_flag])
           end
         else
           path_or_pointer

data/lib/gdal/dataset_mixins/extensions.rb

@@ -281,7 +281,7 @@ module GDAL
           pixel_value_field = layer.feature_definition.field_index(field_name)
           options = { pixel_value_field: pixel_value_field }
           options[:mask_band] = band.mask_band if use_band_masks
-          band.polygonize(layer, options)
+          band.polygonize(layer, **options)
         end
 
         if block_given?

data/lib/gdal/major_object.rb

@@ -67,11 +67,6 @@ module GDAL
       FFI::GDAL::GDAL.GDALGetDescription(@c_pointer)
     end
 
-    # @param new_description [String]
-    def description=(new_description)
-      FFI::GDAL::GDAL.GDALSetDescription(@c_pointer, new_description.to_s)
-    end
-
     def null?
       @c_pointer.null?
     end

data/lib/gdal/raster_band_classifier.rb

@@ -99,6 +99,9 @@ module GDAL
         new_band_pixels[data_pixels & band_pixels.le(r[:range].max) & band_pixels.ge(r[:range].min)] = r[:map_to]
       end
 
+      in_range = @ranges.map { |r| band_pixels.le(r[:range].max) & band_pixels.ge(r[:range].min) }.reduce(:|)
+      new_band_pixels[data_pixels & ~in_range] = 0 if in_range
+
       mask_nan(new_band_pixels, data_pixels) if nodata_is_nan?
       @raster_band.write_xy_narray(new_band_pixels)
     end

data/lib/gdal.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'ffi-gdal'
+require_relative 'ffi/gdal'
 
 module GDAL
   class << self

data/lib/ogr/data_source.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'uri'
 require 'json'
 require_relative '../gdal'
 require_relative '../ogr'
@@ -41,14 +40,12 @@ module OGR
     def initialize(path_or_pointer, access_flag)
       @c_pointer =
         if path_or_pointer.is_a?(String)
-          uri = URI.parse(path_or_pointer)
-          file_path = uri.scheme.nil? ? ::File.expand_path(path_or_pointer) : path_or_pointer
-          FFI::OGR::API.OGROpen(file_path, OGR._boolean_access_flag(access_flag), nil)
+          FFI::OGR::API.OGROpen(path_or_pointer, OGR._boolean_access_flag(access_flag), nil)
         else
           path_or_pointer
         end
 
-      raise OGR::OpenFailure, file_path if @c_pointer.null?
+      raise OGR::OpenFailure, path_or_pointer if @c_pointer.null?
 
       @layers = []
     end

data/lib/ogr/layer_mixins/extensions.rb

@@ -112,7 +112,7 @@ module OGR
       #   encountered that the method doesn't know how to extract point values
       #   from.
       def point_values(with_attributes = {})
-        return [[]] if feature_count.zero?
+        return [] if feature_count.zero?
 
         field_indices = with_attributes.keys.map { |field_name| find_field_index(field_name) }
         values = Array.new(feature_count) { Array.new(2 + with_attributes.size) }

data/lib/ogr/spatial_reference_mixins/exporters.rb

@@ -6,9 +6,9 @@ module OGR
       # @return [Hash]
       # @raise [OGR::NotEnoughData] If name, datum name, and units are not set.
       def to_erm
-        projection_name = FFI::MemoryPointer.new(:string)
-        datum_name = FFI::MemoryPointer.new(:string)
-        units = FFI::MemoryPointer.new(:string)
+        projection_name = FFI::MemoryPointer.new(:string, 32)
+        datum_name = FFI::MemoryPointer.new(:string, 32)
+        units = FFI::MemoryPointer.new(:string, 32)
 
         ogr_err = FFI::OGR::SRSAPI.OSRExportToERM(@c_pointer, projection_name, datum_name, units)
         ogr_err.handle_result 'Required parameters (name, datum name, units) are not defined'

data/spec/integration/gdal/driver_info_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe 'Driver Info', type: :integration do
 
   describe '#short_name' do
     it 'is GTiff' do
-      expect(subject.short_name).to eq 'GTiff'
+      expect(subject.short_name).to eq('GTiff')
     end
   end
 

data/spec/support/shared_examples/gdal/major_object_examples.rb

@@ -49,15 +49,6 @@ RSpec.shared_examples 'a major object' do
     end
   end
 
-  describe '#description=' do
-    context 'new description is a string' do
-      it 'sets the items description' do
-        subject.description = 'a test description'
-        expect(subject.description).to eq 'a test description'
-      end
-    end
-  end
-
   describe '#null?' do
     it { is_expected.to_not be_null }
   end

data/spec/unit/ogr/data_source_mixins/capability_methods_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe OGR::DataSource do
 
     describe '#supports_curve_geometries?' do
       subject { data_source.supports_curve_geometries? }
-      it { is_expected.to eq false }
+      it { is_expected.to eq true }
     end
   end
 end

data/spec/unit/ogr/feature_spec.rb

@@ -210,10 +210,10 @@ RSpec.describe OGR::Feature do
       end
     end
 
-    context 'value is not an array of strings' do
-      it 'returns an empty Array' do
-        subject.set_field_integer_list(5, [1, 2, 3])
-        expect(subject.field_as_string_list(5)).to eq []
+    context 'value is an Array of Integers' do
+      it 'returns an Array of Strings' do
+        subject.set_field_string_list(5, [1, 2, 3])
+        expect(subject.field_as_string_list(5)).to eq %w[1 2 3]
       end
     end
   end

data/spec/unit/ogr/geometries/point_spec.rb

@@ -237,7 +237,7 @@ RSpec.describe OGR::Point do
     let(:wkt) { 'POINT EMPTY' }
 
     describe '#coordinate_dimension' do
-      specify { expect(subject.coordinate_dimension).to eq 0 }
+      specify { expect(subject.coordinate_dimension).to eq 2 }
     end
 
     describe '#geometry_count' do
@@ -299,8 +299,8 @@ RSpec.describe OGR::Point do
     end
 
     describe '#envelope' do
-      it 'returns nil' do
-        expect(subject.envelope).to be_nil
+      it 'returns an OGR::Envelope' do
+        expect(subject.envelope).to be_a OGR::Envelope
       end
     end
   end

data/spec/unit/ogr/geometry_spec.rb

@@ -673,7 +673,8 @@ RSpec.describe OGR::Geometry do
 
     context 'wkbLinearRing' do
       subject { described_class.type_to_name(:wkbLinearRing) }
-      it { is_expected.to eq 'Unrecognised: 101' }
+      # Per GDAL docs, LinearRing is only used for geometry creation.
+      it { is_expected.to eq 'Unrecognized: 101' }
     end
   end
 

data/spec/unit/ogr/layer_mixins/capability_methods_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe OGR::Layer do
 
     describe '#supports_curve_geometries?' do
       subject { layer.supports_curve_geometries? }
-      it { is_expected.to eq false }
+      it { is_expected.to eq true }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta11
+  version: 1.0.0.beta14
 platform: ruby
 authors:
 - Steve Loveless
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -192,7 +192,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
+description:
 email:
 - steve@agrian.com
 executables: []
@@ -528,7 +528,7 @@ homepage: http://bitbucket.org/agrian/ffi-gdal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -543,8 +543,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.
 test_files: