ffi-gdal 1.0.0.beta13 → 1.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7da9b47c629fe9a1b116f1c12175858e4c259d01b1f1b87027e3060656a06b
-  data.tar.gz: 13275d69e24bda923196ac121ddc55ea61fa61351c7ea5245b91991a2266d5a3
+  metadata.gz: 001e1f9a99984fee7d2578b7afdb7c04508d113895d2892b457685a03290efed
+  data.tar.gz: 896c51e4d85abdce2f743de84b0fcd199f7ac48339fefb99dea0220812073296
 SHA512:
-  metadata.gz: a46c6f0b1c318ff9ce7c0cb44d6f863cd8903194271bf9e5b93c0581b2dbd5129235829d97e64f725a561741933eadeb959d421fff09f562508097311afe0379
-  data.tar.gz: a3efb551a19524168ffc9540854e3d99860018a062ed026621de787875576a1f6df74f3ca5f3eb0f34c31571be21b087a1262d16fbcd2e7b692da34671eefb2a
+  metadata.gz: 2e5d07dfc1ced24a5a6491d57cc32ab177de432f54477be7cda2d051633c124f07a83bec92f17551d2ca88ce113bf6589a187b3cf2dad0db70eb761a23643063
+  data.tar.gz: d3e425012f6ad7d119e8a3d307ece8f5b168c850037974264e01c50939105677d161ea1b430ad923ae1e85955f7d2d461ea46e0635b658535aaf3b84cf6374e5

data/History.md

@@ -2,6 +2,24 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 1.0.0.beta16 / 2022-06-09
+
+### Bug Fixes
+
+* [DEV-34269] Ensure `GDAL::RasterBandClassifier#equal_count_ranges` returns a range when only one is requested.
+
+## 1.0.0.beta15 / 2022-05-12
+
+### Improvements
+
+* [DEV-20059] Ensure `GDAL::RasterBandClassifier#equal_count_ranges` has a minimum spacing between breakpoints.
+
+## 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

data/lib/ffi/gdal/version.rb

@@ -2,6 +2,6 @@
 
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta13'
+    VERSION = '1.0.0.beta16'
   end
 end

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/raster_band_classifier.rb

@@ -19,6 +19,8 @@ module GDAL
   #
   # @param ranges [Array<Hash{range => Range, map_to => Number}>]
   class RasterBandClassifier
+    MIN_GAP_PERCENTAGE = 0.005
+
     include GDAL::Logger
 
     attr_reader :ranges
@@ -64,14 +66,16 @@ module GDAL
       log "Max pixel value: #{sorted_and_masked_pixels.max}"
       log "Range size: #{range_size}"
 
-      break_values = Array.new(range_count) { |i| sorted_and_masked_pixels[range_size * i] }.uniq
+      break_values = [*Array.new(range_count) { |i| sorted_and_masked_pixels[range_size * i] }.uniq,
+                      sorted_and_masked_pixels.max]
+      ensure_min_gap(break_values)
       log "Break values: #{break_values}"
 
-      return if break_values.uniq.size != range_count
+      return if range_count != 1 && break_values.uniq.size - 1 != range_count
 
       breakpoint_calculator = lambda do |range_number|
         min = break_values[range_number]
-        max = break_values[range_number + 1] || sorted_and_masked_pixels.max
+        max = break_values[range_number + 1]
 
         range_for_type(min, max)
       end
@@ -131,6 +135,23 @@ module GDAL
       end
     end
 
+    # @param break_values [Array<Numeric>]
+    def ensure_min_gap(break_values)
+      min_gap = (break_values.last - break_values.first) * MIN_GAP_PERCENTAGE
+
+      (1...break_values.size).each do |index|
+        left, right = break_values[index - 1, 2]
+        diff = right - left
+        adjustment = (min_gap / 2) - (diff / 2)
+
+        next unless diff < min_gap
+
+        log "Index #{index} diff #{diff} smaller than min_gap #{min_gap}, adjusting by #{adjustment}"
+        break_values.fill(0...index) { |x| break_values[x] - adjustment }
+        break_values.fill(index..) { |x| break_values[x] + adjustment }
+      end
+    end
+
     def range_for_type(min, max)
       min.to_data_type(@raster_band.data_type)..max.to_data_type(@raster_band.data_type)
     end

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/spec/unit/gdal/raster_band_classifier_spec.rb

@@ -97,6 +97,15 @@ RSpec.describe GDAL::RasterBandClassifier do
       it { is_expected.to be_nil }
     end
 
+    context 'all same value' do
+      let(:band_narray) { Numo::Int8.new(3, 5).fill(1) }
+      before { allow(raster_band).to receive(:to_nna).and_return(band_narray) }
+
+      it 'returns a single range when 1 is requested' do
+        expect(subject.equal_count_ranges(1)).to eq [{ range: 1..1, map_to: 1 }]
+      end
+    end
+
     context 'all nodata pixels' do
       let(:band_narray) { Numo::Int8.new(3, 5).fill(0) }
       before { allow(raster_band).to receive(:to_nna).and_return(band_narray) }
@@ -107,6 +116,22 @@ RSpec.describe GDAL::RasterBandClassifier do
     end
   end
 
+  describe '#ensure_min_gap' do
+    let(:break_values) do
+      [29_491.177616329518, 34_999.999999999985, 34_999.99999999999, 35_000.0, 35_000.01582852495, 36_499.9508667737]
+    end
+
+    let(:expected_values) do
+      [29_438.61973121367, 34_947.44211488414, 34_982.48598113636, 35_017.52984738857, 35_052.57371364079,
+       36_552.508751889545]
+    end
+
+    it 'ensures breakpoints have a gap between them of 0.5% of the total range' do
+      subject.send(:ensure_min_gap, break_values)
+      expect(break_values).to eq expected_values
+    end
+  end
+
   describe '#classify!' do
     before do
       ranges = subject.equal_count_ranges(10)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta13
+  version: 1.0.0.beta16
 platform: ruby
 authors:
 - Steve Loveless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -543,7 +543,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.