proj4rb 0.4.0-x86-mingw32 → 0.4.1-x86-mingw32

data/test/test_constants.rb

@@ -1,20 +1,18 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 class ConstantsTest < Test::Unit::TestCase
+  def test_version
+    assert 440 < Proj4::LIBVERSION
+  end
 
-    def test_version
-        assert 440 < Proj4::LIBVERSION
-    end
-
-    def test_deg
-        assert_equal Math::PI/180, Proj4::DEG_TO_RAD
-    end
-
-    def test_rad
-        assert_equal 180/Math::PI, Proj4::RAD_TO_DEG
-    end
-
-end
+  def test_deg
+    assert_equal Math::PI/180, Proj4::DEG_TO_RAD
+  end
 
+  def test_rad
+    assert_equal 180/Math::PI, Proj4::RAD_TO_DEG
+  end
+end

data/test/test_create_projection.rb

@@ -1,64 +1,63 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 class CreateProjectionTest < Test::Unit::TestCase
-
-    def setup
-        @proj_wgs84   = Proj4::Projection.new(["init=epsg:4326"])           # WGS84
-        @proj_gk      = Proj4::Projection.new(["init=epsg:31467"])          # Gauss-Kruger Zone 3
-        @proj_conakry = Proj4::Projection.new(["init=epsg:31528"])          # Conakry 1905 / UTM zone 28N
-        @proj_ortel   = Proj4::Projection.new(["proj=ortel", "lon_0=90w"])  # Ortelius Oval Projection
-    end
-
-    def test_has_inverse
-        assert   @proj_wgs84.hasInverse?
-        assert   @proj_gk.hasInverse?
-        assert   @proj_conakry.hasInverse?
-        assert ! @proj_ortel.hasInverse?
-    end
-
-    def test_is_latlong
-        assert   @proj_wgs84.isLatLong?
-        assert ! @proj_gk.isLatLong?
-        assert ! @proj_conakry.isLatLong?
-        assert ! @proj_ortel.isLatLong?
-    end
-
-    def test_is_geocent
-        assert_equal @proj_gk.isGeocent?, @proj_gk.isGeocentric?    # two names for same method
-        assert ! @proj_wgs84.isGeocent?
-        assert ! @proj_gk.isGeocent?
-        assert ! @proj_conakry.isGeocent?
-        assert ! @proj_ortel.isGeocent?
-    end
-
-    def test_get_def
-        assert_equal '+init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0', @proj_wgs84.getDef.strip
-        d = @proj_gk.getDef.strip
-        assert ('+init=epsg:31467 +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs +towgs84=606.0,23.0,413.0' == d || '+init=epsg:31467 +proj=tmerc +lat_0=0 +lon_0=9 +k=1.000000 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs +towgs84=606.0,23.0,413.0' == d)
-        assert_equal '+init=epsg:31528 +proj=utm +zone=28 +a=6378249.2 +b=6356515 +towgs84=-23,259,-9,0,0,0,0 +units=m +no_defs', @proj_conakry.getDef.strip
-        assert_equal '+proj=ortel +lon_0=90w +ellps=WGS84', @proj_ortel.getDef.strip
-    end
-
-    def test_inspect
-        assert_equal '#<Proj4::Projection +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0>', @proj_wgs84.to_s
-        assert_equal '#<Proj4::Projection +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0>', @proj_wgs84.inspect
-    end
-
-    def test_projection
-        assert_equal 'longlat', @proj_wgs84.projection
-        assert_equal 'tmerc',   @proj_gk.projection
-        assert_equal 'utm',     @proj_conakry.projection
-        assert_equal 'ortel',   @proj_ortel.projection
-    end
-
-    def test_datum
-        assert_equal 'WGS84',   @proj_wgs84.datum
-        assert_equal 'potsdam', @proj_gk.datum
-        assert_nil              @proj_conakry.datum
-        assert_nil              @proj_ortel.datum
-    end
-
+  def setup
+    @proj_wgs84   = Proj4::Projection.new(["init=epsg:4326"])       # WGS84
+    @proj_gk    = Proj4::Projection.new(["init=epsg:31467"])      # Gauss-Kruger Zone 3
+    @proj_conakry = Proj4::Projection.new(["init=epsg:31528"])      # Conakry 1905 / UTM zone 28N
+    @proj_ortel   = Proj4::Projection.new(["proj=ortel", "lon_0=90w"])  # Ortelius Oval Projection
+  end
+
+  def test_has_inverse
+    assert   @proj_wgs84.hasInverse?
+    assert   @proj_gk.hasInverse?
+    assert   @proj_conakry.hasInverse?
+    assert ! @proj_ortel.hasInverse?
+  end
+
+  def test_is_latlong
+    assert   @proj_wgs84.isLatLong?
+    assert ! @proj_gk.isLatLong?
+    assert ! @proj_conakry.isLatLong?
+    assert ! @proj_ortel.isLatLong?
+  end
+
+  def test_is_geocent
+    assert_equal @proj_gk.isGeocent?, @proj_gk.isGeocentric?  # two names for same method
+    assert ! @proj_wgs84.isGeocent?
+    assert ! @proj_gk.isGeocent?
+    assert ! @proj_conakry.isGeocent?
+    assert ! @proj_ortel.isGeocent?
+  end
+
+  def test_get_def
+    assert_equal '+init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0', @proj_wgs84.getDef.strip
+    d = @proj_gk.getDef.strip
+    assert ('+init=epsg:31467 +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs +towgs84=606.0,23.0,413.0' == d || '+init=epsg:31467 +proj=tmerc +lat_0=0 +lon_0=9 +k=1.000000 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs +towgs84=606.0,23.0,413.0' == d)
+    assert_equal '+init=epsg:31528 +proj=utm +zone=28 +a=6378249.2 +b=6356515 +towgs84=-23,259,-9,0,0,0,0 +units=m +no_defs', @proj_conakry.getDef.strip
+    assert_equal '+proj=ortel +lon_0=90w +ellps=WGS84', @proj_ortel.getDef.strip
+  end
+
+  def test_inspect
+    assert_equal '#<Proj4::Projection +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0>', @proj_wgs84.to_s
+    assert_equal '#<Proj4::Projection +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0>', @proj_wgs84.inspect
+  end
+
+  def test_projection
+    assert_equal 'longlat', @proj_wgs84.projection
+    assert_equal 'tmerc',   @proj_gk.projection
+    assert_equal 'utm',   @proj_conakry.projection
+    assert_equal 'ortel',   @proj_ortel.projection
+  end
+
+  def test_datum
+    assert_equal 'WGS84',   @proj_wgs84.datum
+    assert_equal 'potsdam', @proj_gk.datum
+    assert_nil        @proj_conakry.datum
+    assert_nil        @proj_ortel.datum
+  end
 end
 

data/test/test_datums.rb

@@ -1,44 +1,45 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 if Proj4::LIBVERSION >= 449
-    class DatumsTest < Test::Unit::TestCase
-
-        def test_get_all
-            datums = Proj4::Datum.list.sort.collect{ |u| u.id }
-            assert datums.index('WGS84')
-            assert datums.index('potsdam')
-            assert datums.index('ire65')
-        end
-
-        def test_one
-            datum = Proj4::Datum.get('potsdam')
-            assert_kind_of Proj4::Datum, datum
-            assert_equal 'potsdam', datum.id
-            assert_equal 'potsdam', datum.to_s
-            assert_equal 'bessel', datum.ellipse_id
-            assert_equal 'towgs84=606.0,23.0,413.0', datum.defn
-            assert_equal 'Potsdam Rauenberg 1950 DHDN', datum.comments
-            assert_equal '#<Proj4::Datum id="potsdam", ellipse_id="bessel", defn="towgs84=606.0,23.0,413.0", comments="Potsdam Rauenberg 1950 DHDN">', datum.inspect
-        end
-
-        def test_compare
-            u1 = Proj4::Datum.get('potsdam')
-            u2 = Proj4::Datum.get('potsdam')
-            assert u1 == u2
-        end
-
-        def test_failed_get
-            datum = Proj4::Datum.get('foo')
-            assert_nil datum
-        end
-
-        def test_new
-            assert_raise TypeError do
-                Proj4::Datum.new
-            end
-        end
+  class DatumsTest < Test::Unit::TestCase
+
+    def test_get_all
+      datums = Proj4::Datum.list.sort.collect{ |u| u.id }
+      assert datums.index('WGS84')
+      assert datums.index('potsdam')
+      assert datums.index('ire65')
+    end
+
+    def test_one
+      datum = Proj4::Datum.get('potsdam')
+      assert_kind_of Proj4::Datum, datum
+      assert_equal 'potsdam', datum.id
+      assert_equal 'potsdam', datum.to_s
+      assert_equal 'bessel', datum.ellipse_id
+      assert_equal 'towgs84=606.0,23.0,413.0', datum.defn
+      assert_equal 'Potsdam Rauenberg 1950 DHDN', datum.comments
+      assert_equal '#<Proj4::Datum id="potsdam", ellipse_id="bessel", defn="towgs84=606.0,23.0,413.0", comments="Potsdam Rauenberg 1950 DHDN">', datum.inspect
+    end
 
+    def test_compare
+      u1 = Proj4::Datum.get('potsdam')
+      u2 = Proj4::Datum.get('potsdam')
+      assert u1 == u2
     end
+
+    def test_failed_get
+      datum = Proj4::Datum.get('foo')
+      assert_nil datum
+    end
+
+    def test_new
+      assert_raise TypeError do
+        Proj4::Datum.new
+      end
+    end
+
+  end
 end

data/test/test_ellipsoids.rb

@@ -1,45 +1,46 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 if Proj4::LIBVERSION >= 449
-    class EllipsoidsTest < Test::Unit::TestCase
-
-        def test_get_all
-            ellipsoids = Proj4::Ellipsoid.list.sort.collect{ |u| u.id }
-            assert ellipsoids.index('WGS84')
-            assert ellipsoids.index('bessel')
-            assert ellipsoids.index('lerch')
-        end
-
-        def test_one
-            ellipsoid = Proj4::Ellipsoid.get('bessel')
-            assert_kind_of Proj4::Ellipsoid, ellipsoid
-            assert_equal 'bessel', ellipsoid.id
-            assert_equal 'a=6377397.155', ellipsoid.major
-            assert_equal 'rf=299.1528128', ellipsoid.ell
-            assert_equal 'Bessel 1841', ellipsoid.name
-            assert_equal 'bessel', ellipsoid.to_s
-            assert_equal '#<Proj4::Ellipsoid id="bessel", major="a=6377397.155", ell="rf=299.1528128", name="Bessel 1841">', ellipsoid.inspect
-        end
-
-        def test_compare
-            e1 = Proj4::Ellipsoid.get('bessel')
-            e2 = Proj4::Ellipsoid.get('bessel')
-            assert e1 == e2
-        end
-
-        def test_failed_get
-            ellipsoid = Proj4::Ellipsoid.get('foo')
-            assert_nil ellipsoid
-        end
-
-        def test_new
-            assert_raise TypeError do
-                Proj4::Ellipsoid.new
-            end
-        end
+  class EllipsoidsTest < Test::Unit::TestCase
+
+    def test_get_all
+      ellipsoids = Proj4::Ellipsoid.list.sort.collect{ |u| u.id }
+      assert ellipsoids.index('WGS84')
+      assert ellipsoids.index('bessel')
+      assert ellipsoids.index('lerch')
+    end
+
+    def test_one
+      ellipsoid = Proj4::Ellipsoid.get('bessel')
+      assert_kind_of Proj4::Ellipsoid, ellipsoid
+      assert_equal 'bessel', ellipsoid.id
+      assert_equal 'a=6377397.155', ellipsoid.major
+      assert_equal 'rf=299.1528128', ellipsoid.ell
+      assert_equal 'Bessel 1841', ellipsoid.name
+      assert_equal 'bessel', ellipsoid.to_s
+      assert_equal '#<Proj4::Ellipsoid id="bessel", major="a=6377397.155", ell="rf=299.1528128", name="Bessel 1841">', ellipsoid.inspect
+    end
 
+    def test_compare
+      e1 = Proj4::Ellipsoid.get('bessel')
+      e2 = Proj4::Ellipsoid.get('bessel')
+      assert e1 == e2
     end
+
+    def test_failed_get
+      ellipsoid = Proj4::Ellipsoid.get('foo')
+      assert_nil ellipsoid
+    end
+
+    def test_new
+      assert_raise TypeError do
+        Proj4::Ellipsoid.new
+      end
+    end
+
+  end
 end
 

data/test/test_errors.rb

@@ -1,70 +1,66 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 class ErrorsTest < Test::Unit::TestCase
 
-    def test_list
-        assert_equal "Unknown",             Proj4::Error.error(0)
-        assert_equal "NoOptionsInInitFile", Proj4::Error.error(2)
-        assert_equal "NoOptionsInInitFile", Proj4::Error.error(-2)
-        assert_equal "Unknown",             Proj4::Error.error(-2000)
-    end
+  def test_list
+    assert_equal "Unknown",       Proj4::Error.error(0)
+    assert_equal "NoOptionsInInitFile", Proj4::Error.error(2)
+    assert_equal "NoOptionsInInitFile", Proj4::Error.error(-2)
+    assert_equal "Unknown",       Proj4::Error.error(-2000)
+  end
 
-    def test_parenting
-        assert_kind_of Proj4::Error,  Proj4::UnknownError.new
-        assert_kind_of Proj4::Error,  Proj4::ToleranceConditionError.new
-        assert_kind_of StandardError, Proj4::UnknownError.new
-    end
+  def test_parenting
+    assert_kind_of Proj4::Error,  Proj4::UnknownError.new
+    assert_kind_of Proj4::Error,  Proj4::ToleranceConditionError.new
+    assert_kind_of StandardError, Proj4::UnknownError.new
+  end
 
-    def test_num
-        assert 0, Proj4::UnknownError.errnum
-        assert 1, Proj4::NoArgsInInitListError.errnum
-    end
+  def test_num
+    assert 0, Proj4::UnknownError.errnum
+    assert 1, Proj4::NoArgsInInitListError.errnum
+  end
 
-    def test_raise
-        assert_raise Proj4::UnknownError do
-            Proj4::Error.raise_error(0)
-        end
-        assert_raise Proj4::NoOptionsInInitFileError do
-            Proj4::Error.raise_error(2)
-        end
-        assert_raise Proj4::ProjectionNotNamedError do
-            Proj4::Error.raise_error(-4)
-        end
-        assert_raise Proj4::UnknownError do
-            Proj4::Error.raise_error(2000)
-        end
+  def test_raise
+    assert_raise Proj4::UnknownError do
+      Proj4::Error.raise_error(0)
     end
-
-    def test_strerrno
-        assert_equal 'no arguments in initialization list', Proj4::Error.message(-1)
-        assert_equal 'reciprocal flattening (1/f) = 0',     Proj4::Error.message(-10)
-        assert_equal 'unknown error',                       Proj4::Error.message(0)
-        assert_match /^invalid projection system error/,    Proj4::Error.message(-2000)
+    assert_raise Proj4::NoOptionsInInitFileError do
+      Proj4::Error.raise_error(2)
     end
-
-    def test_raise_err0
-        begin
-            Proj4::Error.raise_error(0)
-        rescue => exception
-            assert_equal Proj4::UnknownError, exception.class
-            assert_equal "unknown error", exception.message
-            assert_equal 0, exception.errnum
-            assert_match %r{test/test_errors.rb:[0-9]+:in .test_raise_err0.$} , exception.backtrace[0]
-        end
+    assert_raise Proj4::ProjectionNotNamedError do
+      Proj4::Error.raise_error(-4)
+    end
+    assert_raise Proj4::UnknownError do
+      Proj4::Error.raise_error(2000)
     end
+  end
 
-    def test_raise_err1
-        begin
-            Proj4::Error.raise_error(1)
-        rescue => exception
-            assert_equal Proj4::NoArgsInInitListError, exception.class
-            assert_equal 'no arguments in initialization list', exception.message
-            assert_equal 1, exception.errnum
-            assert_match %r{test/test_errors.rb:[0-9]+:in .test_raise_err1.$} , exception.backtrace[0]
-        end
+  def test_strerrno
+    assert_equal 'no arguments in initialization list', Proj4::Error.message(-1)
+    assert_equal 'reciprocal flattening (1/f) = 0',   Proj4::Error.message(-10)
+    assert_equal 'unknown error',             Proj4::Error.message(0)
+    assert_match /^invalid projection system error/,  Proj4::Error.message(-2000)
+  end
+
+  def test_raise_err0
+    exception = assert_raise(Proj4::UnknownError) do
+      Proj4::Error.raise_error(0)
     end
+    assert_equal "unknown error", exception.message
+    assert_equal 0, exception.errnum
+    assert_match %r{test/test_errors.rb:[0-9]+:in .test_raise_err0.$} , exception.backtrace[0]
+  end
 
+  def test_raise_err1
+    exception = assert_raise(Proj4::NoArgsInInitListError) do
+      Proj4::Error.raise_error(1)
+    end
+    assert_equal 'no arguments in initialization list', exception.message
+    assert_equal 1, exception.errnum
+    assert_match %r{test/test_errors.rb:[0-9]+:in .test_raise_err1.$} , exception.backtrace[0]
+  end
 end
 

data/test/test_init_projection.rb

@@ -1,108 +1,109 @@
-$: << 'lib' << 'ext'
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'proj4')
 require 'test/unit'
 
 class InitProjectionTest < Test::Unit::TestCase
 
-    def setup
-        # NAD27(76) / UTM zone 17N
-        # <2029> +proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs  no_defs <>
-        @epsg2029i = ['init=epsg:2029']
-        @epsg2029x = ['proj=utm', 'zone=17', 'ellps=clrk66', 'units=m', 'no_defs'].sort
-
-        @nad = ' +init=epsg:2029 +proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs'
-    end
-
-    def test_arg_fail
-        assert_raise ArgumentError do
-            Proj4::Projection._parse_init_parameters()
-        end
-        assert_raise ArgumentError do
-            Proj4::Projection._parse_init_parameters(nil)
-        end
-        assert_raise ArgumentError do
-            Proj4::Projection._parse_init_parameters(1)
-        end
-    end
-
-    def test_arg_string
-        args = Proj4::Projection._parse_init_parameters('init=epsg:2029')
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters('  proj=utm zone=17 ellps=clrk66 units=m no_defs  ')
-        assert_equal @epsg2029x, args.sort
-    end
-
-    def test_arg_string_with_plus
-        args = Proj4::Projection._parse_init_parameters('+init=epsg:2029')
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters('+proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs')
-        assert_equal @epsg2029x, args.sort
-    end
-
-    def test_arg_array
-        args = Proj4::Projection._parse_init_parameters(['init=epsg:2029'])
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters(['proj=utm', 'zone=17', 'ellps=clrk66', 'units=m', 'no_defs'])
-        assert_equal @epsg2029x, args.sort
-    end
-
-    def test_arg_array_with_plus
-        args = Proj4::Projection._parse_init_parameters(['+init=epsg:2029'])
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters(['+proj=utm', '+zone=17', '+ellps=clrk66', '+units=m', '+no_defs'])
-        assert_equal @epsg2029x, args.sort
-    end
+  def setup
+    # NAD27(76) / UTM zone 17N
+    # <2029> +proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs  no_defs <>
+    @epsg2029i = ['init=epsg:2029']
+    @epsg2029x = ['proj=utm', 'zone=17', 'ellps=clrk66', 'units=m', 'no_defs'].sort
 
-    def test_arg_hash_with_string
-        args = Proj4::Projection._parse_init_parameters( {'init' => 'epsg:2029'} )
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters( {'proj' => 'utm', 'zone' => '17', 'ellps' => 'clrk66', 'units' => 'm', 'no_defs' => nil} )
-        assert_equal @epsg2029x, args.sort
-    end
+    @nad = ' +init=epsg:2029 +proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs'
+  end
 
-    def test_arg_hash_with_symbol
-        args = Proj4::Projection._parse_init_parameters( {:init => 'epsg:2029'} )
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters( {:proj => 'utm', :zone => '17', :ellps => 'clrk66', :units => 'm', :no_defs => nil} )
-        assert_equal @epsg2029x, args.sort
+  def test_arg_fail
+    assert_raise ArgumentError do
+      Proj4::Projection._parse_init_parameters()
     end
-
-    def test_arg_hash_with_symbol_simple
-        args = Proj4::Projection._parse_init_parameters( :init => 'epsg:2029' )
-        assert_equal @epsg2029i, args
-        args = Proj4::Projection._parse_init_parameters( :proj => 'utm', :zone => '17', :ellps => 'clrk66', :units => 'm', :no_defs => nil )
-        assert_equal @epsg2029x, args.sort
+    assert_raise ArgumentError do
+      Proj4::Projection._parse_init_parameters(nil)
     end
-
-    def test_arg_projection
-        proj = Proj4::Projection.new(['init=epsg:2029'])
-        args = Proj4::Projection._parse_init_parameters(proj)
-        assert_equal [@epsg2029i, @epsg2029x].flatten.sort, args.sort
+    assert_raise ArgumentError do
+      Proj4::Projection._parse_init_parameters(1)
     end
-
-    def test_init_arg_string
-        proj = Proj4::Projection.new('+init=epsg:2029')
-        assert_equal @nad, proj.getDef
+  end
+
+  def test_arg_string
+    args = Proj4::Projection._parse_init_parameters('init=epsg:2029')
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters('  proj=utm zone=17 ellps=clrk66 units=m no_defs  ')
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_string_with_plus
+    args = Proj4::Projection._parse_init_parameters('+init=epsg:2029')
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters('+proj=utm +zone=17 +ellps=clrk66 +units=m +no_defs')
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_array
+    args = Proj4::Projection._parse_init_parameters(['init=epsg:2029'])
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters(['proj=utm', 'zone=17', 'ellps=clrk66', 'units=m', 'no_defs'])
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_array_with_plus
+    args = Proj4::Projection._parse_init_parameters(['+init=epsg:2029'])
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters(['+proj=utm', '+zone=17', '+ellps=clrk66', '+units=m', '+no_defs'])
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_hash_with_string
+    args = Proj4::Projection._parse_init_parameters( {'init' => 'epsg:2029'} )
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters( {'proj' => 'utm', 'zone' => '17', 'ellps' => 'clrk66', 'units' => 'm', 'no_defs' => nil} )
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_hash_with_symbol
+    args = Proj4::Projection._parse_init_parameters( {:init => 'epsg:2029'} )
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters( {:proj => 'utm', :zone => '17', :ellps => 'clrk66', :units => 'm', :no_defs => nil} )
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_hash_with_symbol_simple
+    args = Proj4::Projection._parse_init_parameters( :init => 'epsg:2029' )
+    assert_equal @epsg2029i, args
+    args = Proj4::Projection._parse_init_parameters( :proj => 'utm', :zone => '17', :ellps => 'clrk66', :units => 'm', :no_defs => nil )
+    assert_equal @epsg2029x, args.sort
+  end
+
+  def test_arg_projection
+    proj = Proj4::Projection.new(['init=epsg:2029'])
+    args = Proj4::Projection._parse_init_parameters(proj)
+    assert_equal [@epsg2029i, @epsg2029x].flatten.sort, args.sort
+  end
+
+  def test_init_arg_string
+    proj = Proj4::Projection.new('+init=epsg:2029')
+    assert_equal @nad, proj.getDef
+  end
+
+  def test_init_arg_array
+    proj = Proj4::Projection.new(['init=epsg:2029'])
+    assert_equal @nad, proj.getDef
+  end
+
+  def test_init_arg_hash
+    proj = Proj4::Projection.new( :proj => 'utm', 'zone' => '17', '+ellps' => 'clrk66', :units => 'm', :no_defs => nil )
+    assert_equal @epsg2029x, proj.getDef.strip.split(' ').collect{ |a| a.sub(/^\+/, '') }.sort
+  end
+
+  def test_init_arg_fail
+    assert_raise Proj4::UnknownProjectionIdError do
+      Proj4::Projection.new( :proj => 'xxxx' )
     end
-
-    def test_init_arg_array
-        proj = Proj4::Projection.new(['init=epsg:2029'])
-        assert_equal @nad, proj.getDef
-    end
-
-    def test_init_arg_hash
-        proj = Proj4::Projection.new( :proj => 'utm', 'zone' => '17', '+ellps' => 'clrk66', :units => 'm', :no_defs => nil )
-        assert_equal @epsg2029x, proj.getDef.strip.split(' ').collect{ |a| a.sub(/^\+/, '') }.sort
-    end
-
-    def test_init_arg_fail
-        assert_raise Proj4::UnknownProjectionIdError do
-            Proj4::Projection.new( :proj => 'xxxx' )
-        end
-        assert_raise Proj4::ProjectionNotNamedError do
-            Proj4::Projection.new( :foo => 'xxxx' )
-        end
+    assert_raise Proj4::ProjectionNotNamedError do
+      Proj4::Projection.new( :foo => 'xxxx' )
     end
+  end
 
 end