proj4rb 2.2.1 → 2.2.2

data/lib/transformation.rb

@@ -1,61 +1,61 @@
-module Proj
-  # Transformation objects convert {Coordinate Coordinates} from one {Crs} to another.
-  class Transformation < PjObject
-    # Transforms a {Coordinate} from the source {Crs} to the target {Crs}. Coordinates should be expressed in
-    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
-    # be in the units and axis order of the definition of the target CRS.
-    #
-    # For most geographic Crses, the units will be in degrees. For geographic CRS defined by the EPSG authority,
-    # the order of coordinates is latitude first, longitude second. When using a PROJ initialization string,
-    # on contrary, the order will be longitude first, latitude second.
-    #
-    # For projected CRS, the units may vary (metre, us-foot, etc..).
-    #
-    # For projected CRS defined by the EPSG authority, and with EAST / NORTH directions, the axis order might be
-    # easting first, northing second, or the reverse. When using a PROJ string, the order will be
-    # easting first, northing second, except if the +axis parameter modifies it.
-    #
-    # @param source [Crs | String] - The source Crs. See the Crs documentation for the string format
-    # @param target [Crs | String] - The target Crs. See the Crs documentation for the string format
-    # @param context [Context]
-    def initialize(source, target, context=nil)
-      pointer = if source.is_a?(Crs) && target.is_a?(Crs)
-                  if Api.method_defined?(:proj_create_crs_to_crs_from_pj)
-                    Api.proj_create_crs_to_crs_from_pj(context, source, target, nil, nil)
-                  else
-                    Api.proj_create_crs_to_crs(context, source.definition, target.definition, nil)
-                  end
-                else
-                  Api.proj_create_crs_to_crs(context, source, target, nil)
-                end
-
-      if pointer.null?
-        Error.check
-      end
-
-      super(pointer, context)
-    end
-
-    # Transforms a {Coordinate} from the source {Crs} to the target {Crs}. Coordinates should be expressed in
-    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
-    # be in the units and axis order of the definition of the target CRS.
-    #
-    # @param coord [Coordinate]
-    # @return [Coordinate]
-    def forward(coord)
-      struct = Api.proj_trans(self, :PJ_FWD, coord)
-      Coordinate.from_coord(struct)
-    end
-
-    # Transforms a {Coordinate} from the target {Crs} to the source {Crs}. Coordinates should be expressed in
-    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
-    # be in the units and axis order of the definition of the target CRS.
-    #
-    # @param coord [Coordinate]
-    # @return [Coordinate]
-    def inverse(coord)
-      struct = Api.proj_trans(self, :PJ_INV, coord)
-      Coordinate.from_coord(struct)
-    end
-  end
+module Proj
+  # Transformation objects convert {Coordinate Coordinates} from one {Crs} to another.
+  class Transformation < PjObject
+    # Transforms a {Coordinate} from the source {Crs} to the target {Crs}. Coordinates should be expressed in
+    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
+    # be in the units and axis order of the definition of the target CRS.
+    #
+    # For most geographic Crses, the units will be in degrees. For geographic CRS defined by the EPSG authority,
+    # the order of coordinates is latitude first, longitude second. When using a PROJ initialization string,
+    # on contrary, the order will be longitude first, latitude second.
+    #
+    # For projected CRS, the units may vary (metre, us-foot, etc..).
+    #
+    # For projected CRS defined by the EPSG authority, and with EAST / NORTH directions, the axis order might be
+    # easting first, northing second, or the reverse. When using a PROJ string, the order will be
+    # easting first, northing second, except if the +axis parameter modifies it.
+    #
+    # @param source [Crs | String] - The source Crs. See the Crs documentation for the string format
+    # @param target [Crs | String] - The target Crs. See the Crs documentation for the string format
+    # @param context [Context]
+    def initialize(source, target, context=nil)
+      pointer = if source.is_a?(Crs) && target.is_a?(Crs)
+                  if Api.method_defined?(:proj_create_crs_to_crs_from_pj)
+                    Api.proj_create_crs_to_crs_from_pj(context, source, target, nil, nil)
+                  else
+                    Api.proj_create_crs_to_crs(context, source.definition, target.definition, nil)
+                  end
+                else
+                  Api.proj_create_crs_to_crs(context, source, target, nil)
+                end
+
+      if pointer.null?
+        Error.check
+      end
+
+      super(pointer, context)
+    end
+
+    # Transforms a {Coordinate} from the source {Crs} to the target {Crs}. Coordinates should be expressed in
+    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
+    # be in the units and axis order of the definition of the target CRS.
+    #
+    # @param coord [Coordinate]
+    # @return [Coordinate]
+    def forward(coord)
+      struct = Api.proj_trans(self, :PJ_FWD, coord)
+      Coordinate.from_coord(struct)
+    end
+
+    # Transforms a {Coordinate} from the target {Crs} to the source {Crs}. Coordinates should be expressed in
+    # the units and axis order of the definition of the source CRS. The returned transformed coordinate will
+    # be in the units and axis order of the definition of the target CRS.
+    #
+    # @param coord [Coordinate]
+    # @return [Coordinate]
+    def inverse(coord)
+      struct = Api.proj_trans(self, :PJ_INV, coord)
+      Coordinate.from_coord(struct)
+    end
+  end
 end

data/lib/unit.rb

@@ -1,54 +1,54 @@
-module Proj
-  class Unit
-    attr_reader :id, :to_meter, :factor, :name
-
-    def self.list
-      # First get linear units
-      pointer_to_array = FFI::Pointer.new(Api::PJ_UNITS, Api.proj_list_units)
-      result = Array.new
-      0.step do |i|
-        ellipse_info = Api::PJ_UNITS.new(pointer_to_array[i])
-        break if ellipse_info[:id].nil?
-        result << self.new(ellipse_info[:id], ellipse_info[:to_meter], ellipse_info[:factor], ellipse_info[:name])
-      end
-
-      # Now get angular linear units
-      if Api.method_defined?(:proj_list_angular_units)
-        pointer_to_array = FFI::Pointer.new(Api::PJ_UNITS, Api.proj_list_angular_units)
-        0.step do |i|
-          ellipse_info = Api::PJ_UNITS.new(pointer_to_array[i])
-          break result if ellipse_info[:id].nil?
-          result << self.new(ellipse_info[:id], ellipse_info[:to_meter], ellipse_info[:factor], ellipse_info[:name])
-        end
-      end
-      result
-    end
-
-    def self.get(id)
-      self.list.find {|ellipsoid| ellipsoid.id == id}
-    end
-
-    def initialize(id, to_meter, factor, name)
-      @id = id
-      @to_meter = to_meter
-      @factor = factor
-      @name = name
-    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}\", to_meter=\"#{to_meter}\", factor=\"#{factor}\", name=\"#{name}\">"
-    end
-  end
+module Proj
+  class Unit
+    attr_reader :id, :to_meter, :factor, :name
+
+    def self.list
+      # First get linear units
+      pointer_to_array = FFI::Pointer.new(Api::PJ_UNITS, Api.proj_list_units)
+      result = Array.new
+      0.step do |i|
+        ellipse_info = Api::PJ_UNITS.new(pointer_to_array[i])
+        break if ellipse_info[:id].nil?
+        result << self.new(ellipse_info[:id], ellipse_info[:to_meter], ellipse_info[:factor], ellipse_info[:name])
+      end
+
+      # Now get angular linear units
+      if Api.method_defined?(:proj_list_angular_units)
+        pointer_to_array = FFI::Pointer.new(Api::PJ_UNITS, Api.proj_list_angular_units)
+        0.step do |i|
+          ellipse_info = Api::PJ_UNITS.new(pointer_to_array[i])
+          break result if ellipse_info[:id].nil?
+          result << self.new(ellipse_info[:id], ellipse_info[:to_meter], ellipse_info[:factor], ellipse_info[:name])
+        end
+      end
+      result
+    end
+
+    def self.get(id)
+      self.list.find {|ellipsoid| ellipsoid.id == id}
+    end
+
+    def initialize(id, to_meter, factor, name)
+      @id = id
+      @to_meter = to_meter
+      @factor = factor
+      @name = name
+    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}\", to_meter=\"#{to_meter}\", factor=\"#{factor}\", name=\"#{name}\">"
+    end
+  end
 end

data/proj4rb.gemspec

@@ -1,33 +1,33 @@
-Gem::Specification.new do |spec|
-  spec.name = 'proj4rb'
-  spec.version = '2.2.1'
-  spec.summary = 'Ruby bindings for the Proj.4 Carthographic Projection library'
-  spec.description = <<-EOF
-    Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datumspec.
-  EOF
-  spec.platform = Gem::Platform::RUBY
-  spec.authors = ['Guilhem Vellut', 'Jochen Topf', 'Charlie Savage']
-  spec.homepage = 'https://github.com/cfis/proj4rb'
-  spec.required_ruby_version = '>= 2.4.1'
-  spec.license = 'MIT'
-
-  spec.requirements << 'Proj (Proj4) Library'
-  spec.require_path = 'lib'
-  spec.files = Dir['ChangeLog',
-                   'Gemfile',
-                   'MIT-LICENSE',
-                   'proj4rb.gemspec',
-                   'Rakefile',
-                   'README.rdoc',
-                   'lib/**/*.rb',
-                   'test/*.rb']
-
-  spec.test_files = Dir["test/test_*.rb"]
-
-  spec.add_dependency "ffi"
-
-  spec.add_development_dependency('bundler')
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('minitest')
-  spec.add_development_dependency('yard')
+Gem::Specification.new do |spec|
+  spec.name = 'proj4rb'
+  spec.version = '2.2.2'
+  spec.summary = 'Ruby bindings for the Proj.4 Carthographic Projection library'
+  spec.description = <<-EOF
+    Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datumspec.
+  EOF
+  spec.platform = Gem::Platform::RUBY
+  spec.authors = ['Guilhem Vellut', 'Jochen Topf', 'Charlie Savage']
+  spec.homepage = 'https://github.com/cfis/proj4rb'
+  spec.required_ruby_version = '>= 2.4.1'
+  spec.license = 'MIT'
+
+  spec.requirements << 'Proj (Proj4) Library'
+  spec.require_path = 'lib'
+  spec.files = Dir['ChangeLog',
+                   'Gemfile',
+                   'MIT-LICENSE',
+                   'proj4rb.gemspec',
+                   'Rakefile',
+                   'README.rdoc',
+                   'lib/**/*.rb',
+                   'test/*.rb']
+
+  spec.test_files = Dir["test/test_*.rb"]
+
+  spec.add_dependency "ffi"
+
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('minitest')
+  spec.add_development_dependency('yard')
 end

data/test/abstract_test.rb

@@ -1,7 +1,7 @@
-require 'bundler/setup'
-require 'minitest/autorun'
-require 'proj'
-
-class AbstractTest < Minitest::Test
-end
-
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'proj'
+
+class AbstractTest < Minitest::Test
+end
+

data/test/context_test.rb

@@ -1,82 +1,82 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class ContextTest < AbstractTest
-  def test_create
-    context = Proj::Context.new
-    assert(context.to_ptr)
-  end
-
-  def test_finalize
-    500.times do
-      context = Proj::Context.new
-      assert(context.to_ptr)
-      GC.start
-    end
-    assert(true)
-  end
-
-  def test_one_per_thread
-    context_1 = Proj::Context.current
-    context_2 = Proj::Context.current
-    assert_same(context_1, context_2)
-  end
-
-  def test_database_path
-    refute_nil(Proj::Context.current.database_path)
-  end
-
-  def test_log_level
-    assert_equal(:PJ_LOG_NONE, Proj::Context.current.log_level)
-  end
-
-  def test_set_log_level
-    context = Proj::Context.new
-    context.log_level = :PJ_LOG_ERROR
-    assert_equal(:PJ_LOG_ERROR, context.log_level)
-  end
-
-  def test_invalid_database_path
-    path = '/wrong'
-    error = assert_raises(Proj::Error) do
-      Proj::Context.current.database_path = path
-    end
-    # TODO - if you run this test on its own you get a useful error message, if you run all tests
-    # at once you get a useless error message. Not sure what is causing the difference
-    assert_match(/No such file or directory|generic error of unknown origin/, error.to_s)
-  end
-
-  def test_set_log_function
-    context = Proj::Context.new
-    called = false
-
-    data = FFI::MemoryPointer.new(:int)
-    data.write_int(5)
-
-    context.set_log_function(data) do |pointer, int, message|
-      called = true
-      refute(pointer.null?)
-      assert_equal(5, pointer.read_int)
-      assert_equal(1, int)
-      assert_equal('proj_context_set_database_path: Open of /wrong failed', message)
-    end
-
-    begin
-      context.database_path = '/wrong'
-    rescue
-    end
-
-    assert(called)
-  end
-
-  def test_use_proj4_init_rules
-    refute(Proj::Context.current.use_proj4_init_rules)
-
-    Proj::Context.current.use_proj4_init_rules = true
-    assert(Proj::Context.current.use_proj4_init_rules)
-
-    Proj::Context.current.use_proj4_init_rules = false
-    refute(Proj::Context.current.use_proj4_init_rules)
-  end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+
+class ContextTest < AbstractTest
+  def test_create
+    context = Proj::Context.new
+    assert(context.to_ptr)
+  end
+
+  def test_finalize
+    500.times do
+      context = Proj::Context.new
+      assert(context.to_ptr)
+      GC.start
+    end
+    assert(true)
+  end
+
+  def test_one_per_thread
+    context_1 = Proj::Context.current
+    context_2 = Proj::Context.current
+    assert_same(context_1, context_2)
+  end
+
+  def test_database_path
+    refute_nil(Proj::Context.current.database_path)
+  end
+
+  def test_log_level
+    assert_equal(:PJ_LOG_NONE, Proj::Context.current.log_level)
+  end
+
+  def test_set_log_level
+    context = Proj::Context.new
+    context.log_level = :PJ_LOG_ERROR
+    assert_equal(:PJ_LOG_ERROR, context.log_level)
+  end
+
+  def test_invalid_database_path
+    path = '/wrong'
+    error = assert_raises(Proj::Error) do
+      Proj::Context.current.database_path = path
+    end
+    # TODO - if you run this test on its own you get a useful error message, if you run all tests
+    # at once you get a useless error message. Not sure what is causing the difference
+    assert_match(/No such file or directory|generic error of unknown origin/, error.to_s)
+  end
+
+  def test_set_log_function
+    context = Proj::Context.new
+    called = false
+
+    data = FFI::MemoryPointer.new(:int)
+    data.write_int(5)
+
+    context.set_log_function(data) do |pointer, int, message|
+      called = true
+      refute(pointer.null?)
+      assert_equal(5, pointer.read_int)
+      assert_equal(1, int)
+      assert_equal('proj_context_set_database_path: Open of /wrong failed', message)
+    end
+
+    begin
+      context.database_path = '/wrong'
+    rescue
+    end
+
+    assert(called)
+  end
+
+  def test_use_proj4_init_rules
+    refute(Proj::Context.current.use_proj4_init_rules)
+
+    Proj::Context.current.use_proj4_init_rules = true
+    assert(Proj::Context.current.use_proj4_init_rules)
+
+    Proj::Context.current.use_proj4_init_rules = false
+    refute(Proj::Context.current.use_proj4_init_rules)
+  end
 end