ffi-gdal 1.0.0.beta12 → 1.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc64c019c4788ab096e473970c65eb1b029766810a9383d8790d55ea12aa83b0
-  data.tar.gz: 7b20ce76aed3a133996e1c7fcd72dc1b6285ce9dbba37041710ee6f25e63eb8a
+  metadata.gz: 27ce3bb913f0b8635ea76cbf5c4630815f1ac669b96d8d4b9106d51e724b88e7
+  data.tar.gz: 82959d4f4e6c2ebe35aaed9d37ec87c4520b17a96afd4a4ce7fa0ca72542915e
 SHA512:
-  metadata.gz: 2aa9515c30fe4ce19a8776b8347265bef5d308a705c8bbe944b1a3cc1c9972b895c14ce108d3337f8e874566b12a153d732e41c3994108d5f2429166ce1cc06f
-  data.tar.gz: 283356042e8bc70d17caa1a59f2fe5238c9884e1d007a21729f5961111d122ac966c0c6e9f8f08e0df298cf9c43fdf79ece7617ee02dc175a050dd1b9e80d3e0
+  metadata.gz: 305f98803b8e7568a43ac5e5a108283b5a3c16d9c87c440207a48227f1d3c833961ecc278994ab70830f976ac3d3f94d80e79059e9c3335964010ada30a02603
+  data.tar.gz: eb5b7863342eb29246bf892387ad591364fe98b3bc654dc63854d995a75d22ad4143dddebcacdb880ee6c22d8d0bcb1d8db2f6a230a9f4266b013ab4db8d2581

data/History.md

@@ -2,6 +2,24 @@
 
 Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
 
+## 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
+
+* [DEV-20247] Fix return value for `OGR::LayerMixins::Extensions#point_values` when no features are found.
+
 ## 1.0.0.beta12 / 2021-06-07
 
 ### Removed

data/lib/ffi/gdal/version.rb

@@ -2,6 +2,6 @@
 
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta12'
+    VERSION = '1.0.0.beta15'
   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 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/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/spec/unit/gdal/raster_band_classifier_spec.rb

@@ -107,6 +107,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.beta12
+  version: 1.0.0.beta15
 platform: ruby
 authors:
 - Steve Loveless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-05-12 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.1.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.