ffi-gdal 1.0.3 → 1.1.0

data/lib/ogr/extensions/spatial_reference/extensions.rb

@@ -11,8 +11,8 @@ module OGR
       # @raise [NameError] If the +unit_label+ isn't of a known type.
       def angular_units=(unit_label)
         unit_name = unit_label.to_s.upcase
-        unit_label = self.class.const_get("#{unit_name}_LABEL".to_sym)
-        unit_value = self.class.const_get("RADIAN_TO_#{unit_name}".to_sym)
+        unit_label = self.class.const_get(:"#{unit_name}_LABEL")
+        unit_value = self.class.const_get(:"RADIAN_TO_#{unit_name}")
 
         set_angular_units(unit_label, unit_value)
       rescue NameError
@@ -24,8 +24,8 @@ module OGR
       # @raise [NameError] If the +unit_label+ isn't of a known type.
       def linear_units=(unit_label)
         unit_name = unit_label.to_s.upcase
-        unit_label = self.class.const_get("#{unit_name}_LABEL".to_sym)
-        unit_value = self.class.const_get("METER_TO_#{unit_name}".to_sym)
+        unit_label = self.class.const_get(:"#{unit_name}_LABEL")
+        unit_value = self.class.const_get(:"METER_TO_#{unit_name}")
 
         set_linear_units(unit_label, unit_value)
       rescue NameError

data/lib/ogr/geometry.rb

@@ -21,12 +21,7 @@ module OGR
       # @param geometry [OGR::Geometry, FFI::Pointer]
       # @return [OGR::Geometry]
       def factory(geometry)
-        geometry =
-          if geometry.is_a?(OGR::Geometry)
-            geometry
-          else
-            OGR::UnknownGeometry.new(geometry)
-          end
+        geometry = OGR::UnknownGeometry.new(geometry) unless geometry.is_a?(OGR::Geometry)
 
         new_pointer = geometry.c_pointer
         return if new_pointer.nil? || new_pointer.null?
@@ -263,6 +258,14 @@ module OGR
       point
     end
 
+    def is_2d?
+      coordinate_dimension == 2
+    end
+
+    def is_3d?
+      coordinate_dimension == 3
+    end
+
     # Dump as WKT to the given +file_path+; dumps to STDOUT if none is given.
     #
     # @param file_path [String] The text file to write to.

data/lib/ogr/layer.rb

@@ -18,7 +18,7 @@ module OGR
     include LayerMixins::OGRQueryFilterMethods
     include LayerMixins::OGRSQLMethods
 
-    FFI::OGR::Core::OGR_ALTER.constants.each do |_name, obj|
+    FFI::OGR::Core::OGR_ALTER.constants.each_value do |obj|
       const_set(obj.ruby_name, obj.value.to_i(16))
     end
 

data/lib/ogr/spatial_reference.rb

@@ -14,6 +14,8 @@ module OGR
   #   1. "geographic", where positions are measured in long/lat.
   #   2. "projected", where positions are measure in meters or feet.
   class SpatialReference
+    Version = Struct.new(:major, :minor, :patch)
+
     include GDAL::Logger
     include SpatialReferenceMixins::CoordinateSystemGetterSetters
     include SpatialReferenceMixins::Exporters
@@ -23,13 +25,13 @@ module OGR
     include SpatialReferenceMixins::TypeChecks
 
     # class_eval FFI::OGR::SRSAPI::SRS_UL.to_ruby
-    FFI::OGR::SRSAPI::SRS_UL.constants.each do |_name, obj|
+    FFI::OGR::SRSAPI::SRS_UL.constants.each_value do |obj|
       const_set(obj.ruby_name, obj.value)
     end
 
     METER_TO_METER = 1.0
 
-    FFI::OGR::SRSAPI::SRS_UA.constants.each do |_name, obj|
+    FFI::OGR::SRSAPI::SRS_UA.constants.each_value do |obj|
       const_set(obj.ruby_name, obj.value)
     end
 
@@ -125,6 +127,19 @@ module OGR
       FFI::OGR::SRSAPI.OSRRelease(pointer)
     end
 
+    def self.proj_version
+      major_ptr = FFI::MemoryPointer.new(:int)
+      major_ptr.autorelease = false
+      minor_ptr = FFI::MemoryPointer.new(:int)
+      minor_ptr.autorelease = false
+      patch_ptr = FFI::MemoryPointer.new(:int)
+      patch_ptr.autorelease = false
+
+      FFI::OGR::SRSAPI.OSRGetPROJVersion(major_ptr, minor_ptr, patch_ptr)
+
+      Version.new(major_ptr.read_int, minor_ptr.read_int, patch_ptr.read_int)
+    end
+
     # @return [FFI::Pointer] C pointer to the C Spatial Reference.
     attr_reader :c_pointer
 
@@ -261,5 +276,15 @@ module OGR
     def create_coordinate_transformation(destination_spatial_ref)
       OGR::CoordinateTransformation.new(@c_pointer, destination_spatial_ref)
     end
+
+    # @return [nil] Sets the axis mapping strategy for this spatial reference.
+    def axis_mapping_strategy=(strategy)
+      FFI::OGR::SRSAPI.OSRSetAxisMappingStrategy(@c_pointer, strategy)
+    end
+
+    # @return [FFI::OGR::SRSAPI::AxisMappingStrategy] The axis mapping strategy.
+    def axis_mapping_strategy
+      FFI::OGR::SRSAPI.OSRGetAxisMappingStrategy(@c_pointer)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Steve Loveless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -101,7 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - ".dockerignore"
+- ".github/CODEOWNERS"
 - ".github/dependabot.yml"
 - ".github/workflows/codacy.yml"
 - ".github/workflows/codeql.yml"
@@ -113,7 +116,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-version"
 - ".solargraph.yml"
 - Changelog-0.x.md
 - Changelog.md
@@ -178,9 +180,14 @@ files:
 - lib/ffi/gdal/grid_inverse_distance_to_a_power_options.rb
 - lib/ffi/gdal/grid_moving_average_options.rb
 - lib/ffi/gdal/grid_nearest_neighbor_options.rb
+- lib/ffi/gdal/internal_helpers.rb
+- lib/ffi/gdal/internal_helpers/gdal_version.rb
+- lib/ffi/gdal/internal_helpers/layout_version.rb
+- lib/ffi/gdal/internal_helpers/layout_version_resolver.rb
 - lib/ffi/gdal/matching.rb
 - lib/ffi/gdal/rpc_info.rb
 - lib/ffi/gdal/transformer_info.rb
+- lib/ffi/gdal/utils.rb
 - lib/ffi/gdal/version.rb
 - lib/ffi/gdal/vrt.rb
 - lib/ffi/gdal/warp_options.rb
@@ -236,7 +243,7 @@ files:
 - lib/gdal/geo_transform.rb
 - lib/gdal/grid.rb
 - lib/gdal/grid_algorithms.rb
-- lib/gdal/grid_algorithms/data_metrics_base.rb
+- lib/gdal/grid_algorithms/algorithm_base.rb
 - lib/gdal/grid_algorithms/inverse_distance_to_a_power.rb
 - lib/gdal/grid_algorithms/metric_average_distance.rb
 - lib/gdal/grid_algorithms/metric_average_distance_pts.rb
@@ -265,6 +272,26 @@ files:
 - lib/gdal/transformers/reprojection_transformer.rb
 - lib/gdal/transformers/rpc_transformer.rb
 - lib/gdal/transformers/tps_transformer.rb
+- lib/gdal/utils.rb
+- lib/gdal/utils/dem.rb
+- lib/gdal/utils/dem/options.rb
+- lib/gdal/utils/grid.rb
+- lib/gdal/utils/grid/options.rb
+- lib/gdal/utils/helpers.rb
+- lib/gdal/utils/helpers/dataset_list.rb
+- lib/gdal/utils/helpers/string_list.rb
+- lib/gdal/utils/info.rb
+- lib/gdal/utils/info/options.rb
+- lib/gdal/utils/nearblack.rb
+- lib/gdal/utils/nearblack/options.rb
+- lib/gdal/utils/rasterize.rb
+- lib/gdal/utils/rasterize/options.rb
+- lib/gdal/utils/translate.rb
+- lib/gdal/utils/translate/options.rb
+- lib/gdal/utils/vector_translate.rb
+- lib/gdal/utils/vector_translate/options.rb
+- lib/gdal/utils/warp.rb
+- lib/gdal/utils/warp/options.rb
 - lib/gdal/version_info.rb
 - lib/gdal/virtual_dataset.rb
 - lib/gdal/warp_operation.rb
@@ -362,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.

data/.ruby-version

@@ -1 +0,0 @@
-2.7

data/lib/gdal/grid_algorithms/data_metrics_base.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module GDAL
-  module GridAlgorithms
-    class DataMetricsBase
-      # @return [FFI::GDAL::GridDataMetricsOptions]
-      attr_reader :options
-
-      def initialize
-        @options = FFI::GDAL::GridDataMetricsOptions.new
-      end
-    end
-  end
-end