proj4rb 4.1.0 → 5.0.0

data/lib/proj/pj_objects.rb

@@ -1,45 +1,45 @@
-# encoding: UTF-8
-module Proj
-  class PjObjects
-    # @!visibility private
-    def self.finalize(pointer)
-      proc do
-        Api.proj_list_destroy(pointer)
-      end
-    end
-
-    def initialize(pointer, context)
-      @pointer = pointer
-      @context = context
-      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
-    end
-
-    def to_ptr
-      @pointer
-    end
-
-    def context
-      @context || Context.current
-    end
-
-    def count
-      Api.proj_list_get_count(self)
-    end
-    alias :size :count
-
-    def [](index)
-      ptr = Api.proj_list_get(context, self, index)
-      PjObject.create_object(ptr, self.context)
-    end
-
-    # Returns the index of the operation that would be the most appropriate to transform the specified coordinates.
-    #
-    # @param direction [PJ_DIRECTION] - Direction into which to transform the point.
-    # @param coord [Coordinate] - Coordinate to transform
-    #
-    # @return [Integer] - Index of operation
-    def suggested_operation(direction, coord)
-      Api.proj_get_suggested_operation(self.context, self, direction, coord)
-    end
-  end
-end
+# encoding: UTF-8
+module Proj
+  class PjObjects
+    # @!visibility private
+    def self.finalize(pointer)
+      proc do
+        Api.proj_list_destroy(pointer)
+      end
+    end
+
+    def initialize(pointer, context)
+      @pointer = pointer
+      @context = context
+      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
+    end
+
+    def to_ptr
+      @pointer
+    end
+
+    def context
+      @context || Context.current
+    end
+
+    def count
+      Api.proj_list_get_count(self)
+    end
+    alias :size :count
+
+    def [](index)
+      ptr = Api.proj_list_get(context, self, index)
+      PjObject.create_object(ptr, self.context)
+    end
+
+    # Returns the index of the operation that would be the most appropriate to transform the specified coordinates.
+    #
+    # @param direction [PJ_DIRECTION] - Direction into which to transform the point.
+    # @param coord [Coordinate] - Coordinate to transform
+    #
+    # @return [Integer] - Index of operation
+    def suggested_operation(direction, coord)
+      Api.proj_get_suggested_operation(self.context, self, direction, coord)
+    end
+  end
+end

data/lib/proj/pj_param_description.rb

@@ -0,0 +1,28 @@
+module Proj
+  module Api
+    class PjParamDescription
+      attr_accessor :retained_ptrs
+
+      def self.create(name:, auth_name: nil, code: nil, value:, unit_name: nil, unit_conv_factor:, unit_type:)
+        result = PjParamDescription.new
+        result.retained_ptrs = []
+        result.put_string(:name, name)
+        result.put_string(:auth_name, auth_name)
+        result.put_string(:code, code)
+        result[:value] = value
+        result.put_string(:unit_name, unit_name)
+        result[:unit_conv_factor] = unit_conv_factor
+        result[:unit_type] = unit_type
+        result
+      end
+
+      # Write a string into a :string field and retain the pointer to prevent GC.
+      def put_string(field, value)
+        return if value.nil?
+        ptr = FFI::MemoryPointer.from_string(value)
+        @retained_ptrs << ptr
+        pointer.put_pointer(offset_of(field), ptr)
+      end
+    end
+  end
+end

data/lib/proj/prime_meridian.rb

@@ -1,66 +1,66 @@
-module Proj
-  class PrimeMeridian < PjObject
-    # Returns a list of Prime Meridians that are built into Proj. A more comprehensive
-    # list is stored in the Proj database and can be queried via PjObject#create_from_database
-    def self.built_in
-      pointer_to_array = FFI::Pointer.new(Api::PJ_PRIME_MERIDIANS, Api.proj_list_prime_meridians)
-      result = Array.new
-      0.step do |i|
-        prime_meridian_info = Api::PJ_PRIME_MERIDIANS.new(pointer_to_array[i])
-        break result if prime_meridian_info[:id].nil?
-        result << prime_meridian_info
-      end
-      result
-    end
-
-    # Returns prime meridian parameters
-    #
-    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
-    #
-    # @return [Hash] Hash of ellipsoid parameters. Axes are in meters
-    def parameters
-      @parameters ||= begin
-                        out_longitude = FFI::MemoryPointer.new(:double)
-                        out_unit_conv_factor = FFI::MemoryPointer.new(:double)
-                        out_unit_name = FFI::MemoryPointer.new(:string)
-
-                        result = Api.proj_prime_meridian_get_parameters(self.context, self, out_longitude, out_unit_conv_factor, out_unit_name)
-
-                        if result != 1
-                          Error.check_object(self)
-                        end
-
-                        {longitude: out_longitude.read_double,
-                         unit_conv_factor: out_unit_conv_factor.read_double,
-                         unit_name: out_unit_name.read_pointer.read_string_to_null}
-                      end
-    end
-
-    # Returns the longitude of the prime meridian in its native unit
-    #
-    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
-    #
-    # @return [Float]
-    def longitude
-      self.parameters[:longitude]
-    end
-
-    # Returns the conversion factor of the prime meridian longitude unit to radians
-    #
-    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
-    #
-    # @return [Float]
-    def unit_conv_factor
-      self.parameters[:unit_conv_factor]
-    end
-
-    # Returns the unit name
-    #
-    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
-    #
-    # @return [String ]
-    def unit_name
-      self.parameters[:unit_name]
-    end
-  end
+module Proj
+  class PrimeMeridian < PjObject
+    # Returns a list of Prime Meridians that are built into Proj. A more comprehensive
+    # list is stored in the Proj database and can be queried via PjObject#create_from_database
+    def self.built_in
+      pointer_to_array = FFI::Pointer.new(Api::PjPrimeMeridians, Api.proj_list_prime_meridians)
+      result = Array.new
+      0.step do |i|
+        prime_meridian_info = Api::PjPrimeMeridians.new(pointer_to_array[i])
+        break result if prime_meridian_info[:id].nil?
+        result << prime_meridian_info
+      end
+      result
+    end
+
+    # Returns prime meridian parameters
+    #
+    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
+    #
+    # @return [Hash] Hash of ellipsoid parameters. Axes are in meters
+    def parameters
+      @parameters ||= begin
+                        out_longitude = FFI::MemoryPointer.new(:double)
+                        out_unit_conv_factor = FFI::MemoryPointer.new(:double)
+                        out_unit_name = FFI::MemoryPointer.new(:string)
+
+                        result = Api.proj_prime_meridian_get_parameters(self.context, self, out_longitude, out_unit_conv_factor, out_unit_name)
+
+                        if result != 1
+                          Error.check_object(self)
+                        end
+
+                        {longitude: out_longitude.read_double,
+                         unit_conv_factor: out_unit_conv_factor.read_double,
+                         unit_name: out_unit_name.read_pointer.read_string_to_null}
+                      end
+    end
+
+    # Returns the longitude of the prime meridian in its native unit
+    #
+    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
+    #
+    # @return [Float]
+    def longitude
+      self.parameters[:longitude]
+    end
+
+    # Returns the conversion factor of the prime meridian longitude unit to radians
+    #
+    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
+    #
+    # @return [Float]
+    def unit_conv_factor
+      self.parameters[:unit_conv_factor]
+    end
+
+    # Returns the unit name
+    #
+    # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
+    #
+    # @return [String ]
+    def unit_name
+      self.parameters[:unit_name]
+    end
+  end
 end