proj4rb 2.2.1 → 2.2.2

data/lib/prime_meridian.rb

@@ -1,40 +1,40 @@
-module Proj
-  class PrimeMeridian
-    attr_reader :id, :defn
-
-    def self.list
-      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 << self.new(prime_meridian_info[:id], prime_meridian_info[:defn])
-      end
-    end
-
-    def self.get(id)
-      self.list.find {|ellipsoid| ellipsoid.id == id}
-    end
-
-    def initialize(id, defn)
-      @id = id
-      @defn = defn
-    end
-
-    def <=>(other)
-      self.id <=> other.id
-    end
-
-    def ==(other)
-      self.id == other.id
-    end
-
-    def to_s
-      self.id
-    end
-    
-    def inspect
-      "#<#{self.class} id=\"#{id}\", defn=\"#{defn}\">"
-    end
-  end
+module Proj
+  class PrimeMeridian
+    attr_reader :id, :defn
+
+    def self.list
+      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 << self.new(prime_meridian_info[:id], prime_meridian_info[:defn])
+      end
+    end
+
+    def self.get(id)
+      self.list.find {|ellipsoid| ellipsoid.id == id}
+    end
+
+    def initialize(id, defn)
+      @id = id
+      @defn = defn
+    end
+
+    def <=>(other)
+      self.id <=> other.id
+    end
+
+    def ==(other)
+      self.id == other.id
+    end
+
+    def to_s
+      self.id
+    end
+    
+    def inspect
+      "#<#{self.class} id=\"#{id}\", defn=\"#{defn}\">"
+    end
+  end
 end

data/lib/proj.rb

@@ -1,31 +1,31 @@
-# encoding: UTF-8
-
-require_relative 'api/api'
-require_relative './config'
-
-require_relative './area'
-require_relative './context'
-require_relative './coordinate'
-require_relative './ellipsoid'
-require_relative './error'
-require_relative './point'
-require_relative './prime_meridian'
-require_relative './unit'
-
-require_relative './pj_object'
-require_relative './operation'
-require_relative './crs'
-require_relative './projection'
-require_relative './transformation'
-
-module Proj
-  def self.info
-    Api.proj_info
-  end
-
-  def self.version
-    self.info[:version]
-  end
-end
-
+# encoding: UTF-8
+
+require_relative 'api/api'
+require_relative './config'
+
+require_relative './area'
+require_relative './context'
+require_relative './coordinate'
+require_relative './ellipsoid'
+require_relative './error'
+require_relative './point'
+require_relative './prime_meridian'
+require_relative './unit'
+
+require_relative './pj_object'
+require_relative './operation'
+require_relative './crs'
+require_relative './projection'
+require_relative './transformation'
+
+module Proj
+  def self.info
+    Api.proj_info
+  end
+
+  def self.version
+    self.info[:version]
+  end
+end
+
 Proj::Config.instance.set_search_paths

data/lib/projection.rb

@@ -1,207 +1,207 @@
-# encoding: UTF-8
-
-module Proj
-  # @deprecated This class is *DEPRECATED.* It will be removed when Proj 7 is released and removes the
-  #   underlying API's this class uses. Code should be ported to use Crs and Transformation objects.
-  class Projection
-    def self.parse(value)
-      case value
-        when Array
-         value
-        when String
-         value.strip.split(' ')
-        when Hash
-         array = []
-         value.each_pair do |key, value|
-           key = "+#{key}"
-           array << (value.nil? ? key : "#{key}=#{value}")
-         end
-         array
-        when Projection
-         value.getDef.split(' ')
-        else
-         raise ArgumentError, "Unknown type #{value.class} for projection definition"
-      end
-    end
-
-    def self.finalize(pointer)
-      proc do
-        Api.pj_free(pointer)
-      end
-    end
-
-    # Projection classes are created using Proj4 strings which consist of a number of parameters.
-    # For more information please see the +opt arguments section at https://proj.org/apps/proj.html.
-    #
-    # @param value [string, array, hash] Parameters can be specified as strings, arrays or hashes.
-    #
-    # @example
-    #   proj = Projection.new("+proj=utm +zone=21 +units=m")
-    #   proj = Projection.new ["+proj=utm", "+zone=21", "+units=m"]
-    #   proj = Projection.new("proj" => "utm", "zone" => "21", "units" => "m")
-    #
-    # With all variants the plus sign in front of the keys is optional.
-    def initialize(value)
-      params = self.class.parse(value)
-      p_params = FFI::MemoryPointer.new(:pointer, params.length)
-      params.each_with_index do |param, i|
-        p_param = FFI::MemoryPointer.from_string(param)
-        p_params[i].write_pointer(p_param)
-      end
-
-      @pointer = Api.pj_init(params.count, p_params)
-      self.check_error
-
-      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
-    end
-
-    def check_error
-      ptr = Api.pj_get_errno_ref
-      errno = ptr.read_int
-      if errno != 0
-        # If we don't reset the error code it hangs around. This doesn't seem documented anyplace?
-        ptr.write_int(0)
-        Error.check(errno)
-      end
-    end
-
-
-    def to_ptr
-      @pointer
-    end
-
-    # Returns projection definitions
-    #
-    # @return [String]
-    def getDef
-      Api.pj_get_def(self, 0)
-    end
-
-    # Returns if this is a geocentric projection
-    #
-    # @return [Boolean]
-    def isGeocent?
-      Api::pj_is_geocent(self)
-    end
-    alias :isGeocentric? :isGeocent?
-
-    # Returns if this is a lat/long projection
-    #
-    # @return [Boolean]
-    def isLatLong?
-      Api::pj_is_latlong(self)
-    end
-
-    # Get the ID of this projection.
-    #
-    # @return [String]
-    def projection
-      getDef =~ /\+proj=(.+?) / ?  $1 : nil
-    end
-
-    # Get the ID of the datum used in this projection.
-    #
-    # @return [String]
-    def datum
-      getDef =~ /\+datum=(.+?) / ? $1 : nil
-    end
-
-    # Get definition of projection in typical inspect format (#<Proj::Projection +init=... +proj=... ...>).
-    #
-    # @return [String]
-    def to_s
-      "#<#{self.class.name}#{getDef}>"
-    end
-
-    # Forward projection of a point. Returns a copy of the point object with coordinates projected.
-    #
-    # @param point [Point] in radians
-    # @return [Point] in cartesian coordinates
-    def forward(point)
-      struct = Api.pj_fwd(point, self)
-      self.check_error
-      Point.from_pointer(struct)
-    end
-
-    # Convenience function for calculating a forward projection with degrees instead of radians.
-    #
-    # @param point [Point] in degrees
-    # @return [Point] in cartesian coordinates
-    def forwardDeg(point)
-      forward(point.to_radians)
-    end
-
-    # Projects all points in a collection.
-    #
-    # @param collection [Enumerable<Point>] Points specified in radians
-    # @return [Enumerable<Point>] Points specified in cartesian coordinates
-    def forward_all(collection)
-      collection.map do |point|
-        forward(point)
-      end
-    end
-
-    # Inverse projection of a point. Returns a copy of the point object with coordinates projected.
-    #
-    # @param point [Point] in cartesian coordinates
-    # @return [Point] in radians
-    def inverse(point)
-      struct = Api.pj_inv(point, self)
-      self.check_error
-      Point.from_pointer(struct)
-    end
-
-    # Convenience function for calculating an inverse projection with the result in degrees instead of radians.
-    #
-    # @param point [Point] in cartesian coordinates
-    # @return [Point] in degrees
-    def inverseDeg(point)
-      result = inverse(point)
-      result.to_degrees
-    end
-
-    # Inverse projection of all points in a collection.
-    #
-    # @param collection [Enumerable<Point>] Points specified in cartesian coordinates
-    # @return [Enumerable<Point>] Points specified in radians
-    def inverse_all(collection)
-      collection.map do |point|
-        inverse(point)
-      end
-    end
-
-    # Transforms a point from one projection to another.
-    #
-    # @param other [Projection]
-    # @param point [Point]
-    # @return [Point]
-    def transform(other, point)
-      p_x = FFI::MemoryPointer.new(:double, 1)
-      p_x.write_double(point.x)
-
-      p_y = FFI::MemoryPointer.new(:double, 1)
-      p_y.write_double(point.y)
-
-      p_z = FFI::MemoryPointer.new(:double, 1)
-      p_z.write_double(0)
-
-      Api.pj_transform(self, other, 1, 1, p_x, p_y, p_z)
-      self.check_error
-
-      Point.new(p_x.read_double, p_y.read_double)
-    end
-
-    # Transforms all points in a collection from one projection to
-    # another. The +collection+ object must implement the +each+,
-    # +clear+, and << methods (just like an Array) for this to work.
-    #
-    # @param other [Projection]
-    # @param collection [Enumerable, Point]
-    # @return [Enumerable, Point]
-    def transform_all(other, collection)
-      collection.map do |point|
-        transform(other, point)
-      end
-    end
-  end
+# encoding: UTF-8
+
+module Proj
+  # @deprecated This class is *DEPRECATED.* It will be removed when Proj 7 is released and removes the
+  #   underlying API's this class uses. Code should be ported to use Crs and Transformation objects.
+  class Projection
+    def self.parse(value)
+      case value
+        when Array
+         value
+        when String
+         value.strip.split(' ')
+        when Hash
+         array = []
+         value.each_pair do |key, value|
+           key = "+#{key}"
+           array << (value.nil? ? key : "#{key}=#{value}")
+         end
+         array
+        when Projection
+         value.getDef.split(' ')
+        else
+         raise ArgumentError, "Unknown type #{value.class} for projection definition"
+      end
+    end
+
+    def self.finalize(pointer)
+      proc do
+        Api.pj_free(pointer)
+      end
+    end
+
+    # Projection classes are created using Proj4 strings which consist of a number of parameters.
+    # For more information please see the +opt arguments section at https://proj.org/apps/proj.html.
+    #
+    # @param value [string, array, hash] Parameters can be specified as strings, arrays or hashes.
+    #
+    # @example
+    #   proj = Projection.new("+proj=utm +zone=21 +units=m")
+    #   proj = Projection.new ["+proj=utm", "+zone=21", "+units=m"]
+    #   proj = Projection.new("proj" => "utm", "zone" => "21", "units" => "m")
+    #
+    # With all variants the plus sign in front of the keys is optional.
+    def initialize(value)
+      params = self.class.parse(value)
+      p_params = FFI::MemoryPointer.new(:pointer, params.length)
+      params.each_with_index do |param, i|
+        p_param = FFI::MemoryPointer.from_string(param)
+        p_params[i].write_pointer(p_param)
+      end
+
+      @pointer = Api.pj_init(params.count, p_params)
+      self.check_error
+
+      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
+    end
+
+    def check_error
+      ptr = Api.pj_get_errno_ref
+      errno = ptr.read_int
+      if errno != 0
+        # If we don't reset the error code it hangs around. This doesn't seem documented anyplace?
+        ptr.write_int(0)
+        Error.check(errno)
+      end
+    end
+
+
+    def to_ptr
+      @pointer
+    end
+
+    # Returns projection definitions
+    #
+    # @return [String]
+    def getDef
+      Api.pj_get_def(self, 0)
+    end
+
+    # Returns if this is a geocentric projection
+    #
+    # @return [Boolean]
+    def isGeocent?
+      Api::pj_is_geocent(self)
+    end
+    alias :isGeocentric? :isGeocent?
+
+    # Returns if this is a lat/long projection
+    #
+    # @return [Boolean]
+    def isLatLong?
+      Api::pj_is_latlong(self)
+    end
+
+    # Get the ID of this projection.
+    #
+    # @return [String]
+    def projection
+      getDef =~ /\+proj=(.+?) / ?  $1 : nil
+    end
+
+    # Get the ID of the datum used in this projection.
+    #
+    # @return [String]
+    def datum
+      getDef =~ /\+datum=(.+?) / ? $1 : nil
+    end
+
+    # Get definition of projection in typical inspect format (#<Proj::Projection +init=... +proj=... ...>).
+    #
+    # @return [String]
+    def to_s
+      "#<#{self.class.name}#{getDef}>"
+    end
+
+    # Forward projection of a point. Returns a copy of the point object with coordinates projected.
+    #
+    # @param point [Point] in radians
+    # @return [Point] in cartesian coordinates
+    def forward(point)
+      struct = Api.pj_fwd(point, self)
+      self.check_error
+      Point.from_pointer(struct)
+    end
+
+    # Convenience function for calculating a forward projection with degrees instead of radians.
+    #
+    # @param point [Point] in degrees
+    # @return [Point] in cartesian coordinates
+    def forwardDeg(point)
+      forward(point.to_radians)
+    end
+
+    # Projects all points in a collection.
+    #
+    # @param collection [Enumerable<Point>] Points specified in radians
+    # @return [Enumerable<Point>] Points specified in cartesian coordinates
+    def forward_all(collection)
+      collection.map do |point|
+        forward(point)
+      end
+    end
+
+    # Inverse projection of a point. Returns a copy of the point object with coordinates projected.
+    #
+    # @param point [Point] in cartesian coordinates
+    # @return [Point] in radians
+    def inverse(point)
+      struct = Api.pj_inv(point, self)
+      self.check_error
+      Point.from_pointer(struct)
+    end
+
+    # Convenience function for calculating an inverse projection with the result in degrees instead of radians.
+    #
+    # @param point [Point] in cartesian coordinates
+    # @return [Point] in degrees
+    def inverseDeg(point)
+      result = inverse(point)
+      result.to_degrees
+    end
+
+    # Inverse projection of all points in a collection.
+    #
+    # @param collection [Enumerable<Point>] Points specified in cartesian coordinates
+    # @return [Enumerable<Point>] Points specified in radians
+    def inverse_all(collection)
+      collection.map do |point|
+        inverse(point)
+      end
+    end
+
+    # Transforms a point from one projection to another.
+    #
+    # @param other [Projection]
+    # @param point [Point]
+    # @return [Point]
+    def transform(other, point)
+      p_x = FFI::MemoryPointer.new(:double, 1)
+      p_x.write_double(point.x)
+
+      p_y = FFI::MemoryPointer.new(:double, 1)
+      p_y.write_double(point.y)
+
+      p_z = FFI::MemoryPointer.new(:double, 1)
+      p_z.write_double(0)
+
+      Api.pj_transform(self, other, 1, 1, p_x, p_y, p_z)
+      self.check_error
+
+      Point.new(p_x.read_double, p_y.read_double)
+    end
+
+    # Transforms all points in a collection from one projection to
+    # another. The +collection+ object must implement the +each+,
+    # +clear+, and << methods (just like an Array) for this to work.
+    #
+    # @param other [Projection]
+    # @param collection [Enumerable, Point]
+    # @return [Enumerable, Point]
+    def transform_all(other, collection)
+      collection.map do |point|
+        transform(other, point)
+      end
+    end
+  end
 end