proj4rb 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd77e892a3126bb4c0b4c984356e9ba6a32e73811813c2d5dcc5a2eb36a02ae
-  data.tar.gz: 0217052b386be354cd4b48c5bc0536c179336c5c73026a3cb544e9630ad66810
+  metadata.gz: cc96e86f24cffe40c1a80db776c80e5e83fd76a6194b3267c9e6e2c4b5641326
+  data.tar.gz: bd9043ce0c2c1c0640b783ff802d4bd23adc6419bd59bb038a03abd8b9466438
 SHA512:
-  metadata.gz: 9d0e577ede5260d24da9b474e10c52700f9179fe9a42e61728fba85f051be1b152af847c6c45c8df9ef9ad9f5b5ea71ca82ecbef977056b2361dfb2de3be7dac
-  data.tar.gz: 050366cf1ce478ee809a4d82af9a9ed0a9e54e3fd28d4fd58d4fac4b22c0ddbb431969a61581c8a5e3990525e567f2fb7f03b1f9a010b734867c67c9795f7369
+  metadata.gz: e47e9dbb00d9cfe529aaab596dae15aff43a09a04d6550641a71674a626fd4e79ad177ee18dd402e8d0f1ebae1cd1e05fa61459534e2f601164b9ad1edbc545c
+  data.tar.gz: 752a5933c869f26be5fd84e085fe6c12b602dd969b7a363929cf47757abb23f0c65b607dd273f891046c1d8a986cffddda518a738b20f1a7a792b3427594d55a

data/ChangeLog

@@ -1,16 +1,27 @@
-2.0.0 (December 30, 2019)
+2.1.0 (January 7, 2020)
+=========================
+* Fix broken gem - was not including all api files (Jan Klimke)
+* Add paths on MacOS when using Brew (Jan Klimke)
+* Various code cleanups (Charlie Savage)
+
+2.0.1 (January 5, 2020)
 =========================
-- Full rewrite to support API changes in Proj versions 5 and 6
-- As part of rewrite switch bindings to use FFI versus a C extension
-- Split Ruby code into multiple files based on classes
-- Add in a bunch of new classes including Context, Crs, Coordinate, Ellipsoid, Prime Meridian and Transform
-- Deprecate Projection and Point - these will stop working with Proj 7 since the use an older deprecated API
+* Set Ruby 2.4.1 to be the minimum allowed version (Samuel Williams)
+* Fix incorrect use of context, reduce warnings when running tests (Samuel Williams)
+* Fix `bundle exec rake test` (Samuel Williams)
+* Add 2.4.1 to the travis test matrix  (Samuel Williams)
 
-- Calling this 1.0.0 since its a very stable gem
+2.0.0 (December 30, 2019)
+=========================
+- Full rewrite to support API changes in Proj versions 5 and 6 (Charlie Savage)
+- As part of rewrite switch bindings to use FFI versus a C extension (Charlie Savage)
+- Split Ruby code into multiple files based on classes (Charlie Savage)
+- Add in a bunch of new classes including Context, Crs, Coordinate, Ellipsoid, Prime Meridian and Transform (Charlie Savage)
+- Deprecate Projection and Point - these will stop working with Proj 7 since the use an older deprecated API (Charlie Savage)
 
 1.0.0 (December 14, 2014)
 =========================
-- Calling this 1.0.0 since its a very stable gem
+- Calling this 1.0.0 since its a very stable gem  (Charlie Savage)
 
 0.4.3 (August 30, 2011)
 =========================

data/README.rdoc

@@ -1,7 +1,10 @@
-=Proj4rb
+= Proj4rb
 This gem provides Ruby bindings for the Proj Library (https://proj.org). The Proj Library supports converting coordinates
 between a number of different coordinate systems and projections.
 
+== Documentation
+Besides this readme file, reference documentation is available at https://rubydoc.info/github/cfis/proj4rb.
+
 == Installation
 First install the gem in the usual manner:
 
@@ -76,24 +79,20 @@ the +forward+ or +inverse+ methods. The forward transformation looks like this:
     from = Proj::Coordinate.new(x: 5428192.0, y: 3458305.0, z: -5.1790915237)
     to = transform.forward(from)
 
-    assert_in_delta(48.98963932450735, to.x, PRECISION)
-    assert_in_delta(8.429263044355544, to.y, PRECISION)
-    assert_in_delta(-5.1790915237, to.z, PRECISION)
-    assert_in_delta(0, to.t, PRECISION)
+    assert_in_delta(48.98963932450735, to.x, 0.01)
+    assert_in_delta(8.429263044355544, to.y, 0.01)
+    assert_in_delta(-5.1790915237, to.z, 0.01)
+    assert_in_delta(0, to.t, 0.01)
 
 While the inverse transformation looks like this:
 
     from = Proj::Coordinate.new(lam: 48.9906726079, phi: 8.4302123334)
     to = transform.inverse(from)
 
-    assert_in_delta(5428306.389495558, to.x, PRECISION)
-    assert_in_delta(3458375.3367194114, to.y, PRECISION)
-    assert_in_delta(0, to.z, PRECISION)
-    assert_in_delta(0, to.t, PRECISION)
-
-Transformation objects can also be created directly like this:
-
-    transform = Proj::Transformation.new('epsg:31467', 'epsg:4326')
+    assert_in_delta(5428306.389495558, to.x, 0.01)
+    assert_in_delta(3458375.3367194114, to.y, 0.01)
+    assert_in_delta(0, to.z, 0.01)
+    assert_in_delta(0, to.t, 0.01)
 
 === Coordinate
 Notice the examples above transform Coordinate objects. A Coordinate consists
@@ -114,8 +113,8 @@ Both Crs and Transformation objects take a context object in their constructors.
 to using Context.current
 
 === Projection
-If you are using Proj 4, then instead of using Coordinates, Crses and Tranformations you use Points and Projections. Those
-are deprecated classes but will continue to work until the release of Proj 7.  Please refer to the documentation
+If you are using Proj 4, then instead of using Coordinates, Crses and Tranformations you need to us Points and Projections.
+Those are deprecated classes but will continue to work until the release of Proj 7.  Please refer to the documentation
 for more information.
 
 == Error handling
@@ -133,15 +132,16 @@ variable and have it work correctly (at least not on windows).
 == Backwards Compatibility
 Proj versions 5 and 6 are *very* different than Proj version 4. Changes are documented at
 https://proj.org/development/migration.html. Note that the gem should gracefully degrade
-(as in newer functionality stops working) depending on if you are using Proj 6, Proj 5 or Proj 4.
+(as in newer functionality stops working but older functionality keeps working) depending on
+the version of Proj you are using.
 
 To ensure backwards compatiblity, the Ruby bindings still include the older Point and Projection
 classes. However, these classes are no longer documented in this Readme because they will be
-removed upon the release of Proj 7 which will remove the underlying API's they are dependent upon.
+removed upon the release of Proj 7 which will remove the underlying API's they depend on.
 So please port your code! But take note of the changes in Proj 6 described below.
 
-Proj 5 introduced the the Coordinate, Crs and Tranformation apis. However, it wasn't until Proj 6 that additional
-metadata APIs were added, so the amount of information about each object is somewhat limited.
+Proj 5 introduced the Coordinate, Crs and Tranformation APIs. However, it wasn't until Proj 6 that additional
+metadata APIs were added, so the amount of information about each object is somewhat limited in Proj 5.
 
 Proj 6 makes a big change compared to previous releases that is not well documented (see
 https://github.com/OSGeo/PROJ/pull/1182). When creating tranformations with EPSG values Proj 6
@@ -166,5 +166,5 @@ Proj4rb is released under the MIT license.
 ==Authors
 The proj4rb Ruby bindings were started by Guilhem Vellut with most of the code 
 written by Jochen Topf.  Charlie Savage ported the code to Windows and added 
-the Windows build infrastructure. Later, he updated the code to support
-Proj version 5 and 6 and ported the code to use FFI.
+the Windows build infrastructure. Later, he rewrote the code to support
+Proj version 5 and 6 and ported it to use FFI.

data/Rakefile

@@ -23,5 +23,6 @@ YARD::Rake::YardocTask.new
 # Test Task
 Rake::TestTask.new do |t|
   t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end

data/lib/api/api.rb

@@ -0,0 +1,64 @@
+require 'ffi'
+
+module Proj
+  module Api
+    extend FFI::Library
+    ffi_lib ['libproj-15', # Mingw64 Proj 6
+             'libproj.so.15', # Linux (Postgresql repository )Proj 6
+             'libproj.so.13', # Linux (Fedora 31) Proj 5
+             'libproj.so.12', # Linux (Ubuntu 18.04 ) Proj 4
+             'libproj-12', # Mingw64 Proj 4
+             '/opt/local/lib/proj6/lib/libproj.15.dylib', # Macports Proj 6
+             '/opt/local/lib/proj5/lib/libproj.13.dylib', # Macports Proj 5
+             '/opt/local/lib/proj49/lib/libproj.12.dylib', # Macports Proj 5
+             '/usr/local/lib/libproj.15.dylib', # mac homebrew mac Proj 6
+             '/usr/local/lib/libproj.13.dylib', # mac howbrew Proj 5
+             '/usr/local/lib/libproj.12.dylib' # mac howbrew Proj 5
+            ] 
+
+    # Load the old deprecated api - supported by all Proj versions (until Proj 7!)
+    require_relative './api_4_9'
+
+    library = ffi_libraries.first
+
+    # proj_info was introduced in Proj 5
+    if library.find_function('proj_info')
+      require_relative './api_5_0'
+      PROJ_VERSION = Gem::Version.new(self.proj_info[:version])
+    else
+      release = self.pj_get_release
+      version = release.match(/\d\.\d\.\d/)
+      PROJ_VERSION = Gem::Version.new(version)
+    end
+  end
+
+  if Api::PROJ_VERSION < Gem::Version.new('5.0.0')
+    def Api.proj_torad(value)
+      value * 0.017453292519943296
+    end
+
+    def Api.proj_todeg(value)
+      value * 57.295779513082321
+    end
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('5.1.0')
+    require_relative './api_5_1'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('5.2.0')
+    require_relative './api_5_2'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.0.0')
+    require_relative './api_6_0'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.1.0')
+    require_relative './api_6_1'
+  end
+
+  if Api::PROJ_VERSION >= Gem::Version.new('6.2.0')
+    require_relative './api_6_2'
+  end
+end

data/lib/api/api_4_9.rb

@@ -0,0 +1,31 @@
+module Proj
+  module Api
+    #########  Deprecated API from proj_api.h. Don't use these anymore! ##############
+    typedef :pointer, :projPJ
+
+    class ProjUV < FFI::Struct
+      layout :u, :double,
+             :v, :double
+    end
+
+    ProjXY = ProjUV
+    ProjLP = ProjUV
+
+    attach_function :pj_init, [:int, :pointer], :projPJ
+    attach_function :pj_free, [:projPJ], :void
+
+    attach_function :pj_get_release, [], :string
+    attach_function :pj_set_searchpath, [:int, :pointer], :void
+
+    attach_function :pj_get_errno_ref, [], :pointer
+    attach_function :pj_strerrno, [:int], :string
+
+    attach_function :pj_get_def, [:projPJ, :int], :string
+    attach_function :pj_is_latlong, [:projPJ], :bool
+    attach_function :pj_is_geocent, [:projPJ], :bool
+
+    attach_function :pj_fwd, [ProjLP.by_value, :projPJ], ProjXY.by_value
+    attach_function :pj_inv, [ProjXY.by_value, :projPJ], ProjLP.by_value
+    attach_function :pj_transform, [:projPJ, :projPJ, :long, :int, :pointer, :pointer, :pointer], :bool
+  end
+end

data/lib/api/api_5_0.rb

@@ -0,0 +1,301 @@
+module Proj
+  module Api
+    typedef :pointer, :PJ
+    typedef :pointer, :PJ_CONTEXT
+    typedef :pointer, :PJ_AREA
+
+    class P5_FACTORS < FFI::Struct
+      layout :meridional_scale, :double,               # h 
+             :parallel_scale, :double,                 # k 
+             :areal_scale, :double,                    # s 
+         
+             :angular_distortion, :double,             # omega 
+             :meridian_parallel_angle, :double,        # theta-prime 
+             :meridian_convergence, :double,           # alpha 
+        
+             :tissot_semimajor, :double,               # a 
+             :tissot_semiminor, :double,               # b 
+         
+             :dx_dlam, :double,
+             :dx_dphi, :double,
+             :dy_dlam, :double,
+             :dy_dphi, :double
+    end
+
+    # Data types for list of operations, ellipsoids, datums and units used in PROJ.4 */
+    class PJ_LIST < FFI::Struct
+      layout :id,    :string,   # projection keyword
+             :PJ,    :pointer,  # projection entry point
+             :descr, :pointer   # description text
+    end
+    PJ_OPERATIONS = PJ_LIST
+
+    class PJ_ELLPS < FFI::Struct
+      layout :id, :string, # ellipse keyword name
+             :major, :string, # a= value
+             :ell, :string, # elliptical parameter
+             :name, :string # comments
+    end
+
+    class PJ_UNITS < FFI::Struct
+      layout :id, :string, # units keyword
+             :to_meter, :string, # multiply by value to get meters
+             :name, :string, # comments
+             :factor, :double # to_meter factor in actual numbers
+    end
+
+    class PJ_PRIME_MERIDIANS < FFI::Struct
+      layout :id, :string, # prime meridian keyword
+             :defn, :string # offset from greenwich in DMS format.
+    end
+
+    # Geodetic, mostly spatiotemporal coordinate types
+    class PJ_XYZT < FFI::Struct
+      layout :x, :double,
+             :y, :double,
+             :z, :double,
+             :t, :double
+    end
+
+    class PJ_UVWT < FFI::Struct
+      layout :u, :double,
+             :v, :double,
+             :w, :double,
+             :t, :double
+    end
+
+    class PJ_LPZT < FFI::Struct
+      layout :lam, :double,
+             :phi, :double,
+             :z, :double,
+             :t, :double
+    end
+
+    # Rotations: omega, phi, kappa
+    class PJ_OPK < FFI::Struct
+      layout :o, :double,
+             :p, :double,
+             :k, :double
+    end
+
+    # East, North, Up
+    class PJ_ENU < FFI::Struct
+      layout :e, :double,
+             :n, :double,
+             :u, :double
+    end
+
+    # Geodesic length, fwd azi, rev azi
+    class PJ_GEOD < FFI::Struct
+      layout :s, :double,
+             :a1, :double,
+             :a2, :double
+    end
+
+    # Classic proj.4 pair/triplet types - moved into the PJ_ name space.
+    class PJ_UV < FFI::Struct
+      layout :u, :double,
+             :v, :double
+    end
+
+    class PJ_XY < FFI::Struct
+      layout :x, :double,
+             :y, :double
+    end
+
+    class PJ_LP < FFI::Struct
+      layout :lam, :double,
+             :phi, :double
+    end
+
+    class PJ_XYZ < FFI::Struct
+      layout :x, :double,
+             :y, :double,
+             :z, :double
+    end
+
+    class PJ_UVW < FFI::Struct
+      layout :u, :double,
+             :v, :double,
+             :w, :double
+    end
+
+    class PJ_LPZ < FFI::Struct
+      layout :lam, :double,
+             :phi, :double,
+             :z, :double
+    end
+
+    class PJ_COORD < FFI::Union
+      layout :v, [:double, 4],
+             :xyzt, PJ_XYZT,
+             :uvwt, PJ_UVWT,
+             :lpzt, PJ_LPZT,
+             :geod, PJ_GEOD,
+             :opk, PJ_OPK,
+             :enu, PJ_ENU,
+             :xyz, PJ_XYZ,
+             :uvw, PJ_UVW,
+             :lpz, PJ_LPZ,
+             :xy,  PJ_XY,
+             :uv, PJ_UV,
+             :lp, PJ_LP
+    end
+
+    class PJ_INFO < FFI::Struct
+      layout :major, :int, # Major release number
+             :minor, :int,  # Minor release number
+             :patch, :int,  # Patch level
+             :release, :string,  # Release info. Version + date
+             :version, :string,   # Full version number
+             :searchpath, :string,  # Paths where init and grid files are looked for. Paths are separated by
+                                    # semi-colons on Windows, and colons on non-Windows platforms.
+             :paths, :pointer,
+             :path_count, :size_t
+    end
+
+    class PJ_PROJ_INFO < FFI::Struct
+      layout :id, :string, # Name of the projection in question
+             :description, :string, # Description of the projection
+             :definition, :string, # Projection definition
+             :has_inverse, :int, # 1 if an inverse mapping exists, 0 otherwise
+             :accuracy, :double # Expected accuracy of the transformation. -1 if unknown.
+
+      def to_s
+        "<#{self.class.name} id: #{self[:id]},  description: #{self[:description]}, definition: #{self[:definition]}, has_inverse: #{self[:has_inverse]} accuracy: #{self[:accuracy]}"
+      end
+    end
+
+    class PJ_GRID_INFO < FFI::Struct
+      layout :gridname, [:string, 32],  # name of grid
+             :filename, [:string, 260], # full path to grid
+             :format, [:string, 8],     # file format of grid
+             :lowerleft, PJ_LP,         # Coordinates of lower left corner
+             :upperright, PJ_LP,        # Coordinates of upper right corner
+             :n_lon, :int,              # Grid size
+             :n_lat, :int,              # Grid size
+             :cs_lon, :double,          # Cell size of grid
+             :cs_lat, :double           # Cell size of grid
+    end
+
+    class PJ_INIT_INFO < FFI::Struct
+      layout :name, [:string, 32],       # name init file
+             :filename, [:string, 260],  # full path to the init file
+             :version, [:string, 32],    # version of the init file
+             :origin, [:string, 32],     # origin of the file, e.g. EPSG
+             :lastupdate, [:string, 16] # Date of last update in YYYY-MM-DD format
+    end
+
+    enum :PJ_LOG_LEVEL, [:PJ_LOG_NONE , 0,
+                         :PJ_LOG_ERROR, 1,
+                         :PJ_LOG_DEBUG, 2,
+                         :PJ_LOG_TRACE, 3,
+                         :PJ_LOG_TELL , 4,
+                         :PJ_LOG_DEBUG_MAJOR, 2, # for proj_api.h compatibility
+                         :PJ_LOG_DEBUG_MINOR, 3] # for proj_api.h compatibility
+
+    # Apply transformation to observation - in forward or inverse direction
+    enum :PJ_DIRECTION, [:PJ_FWD, 1,   # Forward
+                         :PJ_IDENT, 0, # Do nothing
+                         :PJ_INV, -1]   # Inverse
+
+    enum :PJ_CATEGORY, [:PJ_CATEGORY_ELLIPSOID,
+                        :PJ_CATEGORY_PRIME_MERIDIAN,
+                        :PJ_CATEGORY_DATUM,
+                        :PJ_CATEGORY_CRS,
+                        :PJ_CATEGORY_COORDINATE_OPERATION]
+
+    enum :PJ_TYPE, [:PJ_TYPE_UNKNOWN,
+                    :PJ_TYPE_ELLIPSOID,
+                    :PJ_TYPE_PRIME_MERIDIAN,
+                    :PJ_TYPE_GEODETIC_REFERENCE_FRAME,
+                    :PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME,
+                    :PJ_TYPE_VERTICAL_REFERENCE_FRAME,
+                    :PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME,
+                    :PJ_TYPE_DATUM_ENSEMBLE,
+
+                    # Abstract type, not returned by proj_get_type()
+                    :PJ_TYPE_CRS,
+
+                    :PJ_TYPE_GEODETIC_CRS,
+                    :PJ_TYPE_GEOCENTRIC_CRS,
+
+                    # proj_get_type() will never return that type, but
+                    # :PJ_TYPE_GEOGRAPHIC_2D_CRS or :PJ_TYPE_GEOGRAPHIC_3D_CRS.
+                    :PJ_TYPE_GEOGRAPHIC_CRS,
+
+                    :PJ_TYPE_GEOGRAPHIC_2D_CRS,
+                    :PJ_TYPE_GEOGRAPHIC_3D_CRS,
+                    :PJ_TYPE_VERTICAL_CRS,
+                    :PJ_TYPE_PROJECTED_CRS,
+                    :PJ_TYPE_COMPOUND_CRS,
+                    :PJ_TYPE_TEMPORAL_CRS,
+                    :PJ_TYPE_ENGINEERING_CRS,
+                    :PJ_TYPE_BOUND_CRS,
+                    :PJ_TYPE_OTHER_CRS,
+
+                    :PJ_TYPE_CONVERSION,
+                    :PJ_TYPE_TRANSFORMATION,
+                    :PJ_TYPE_CONCATENATED_OPERATION,
+                    :PJ_TYPE_OTHER_COORDINATE_OPERATION]
+
+    enum :PJ_PROJ_STRING_TYPE, [:PJ_PROJ_5,
+                                :PJ_PROJ_4]
+
+    enum :PJ_COORDINATE_SYSTEM_TYPE, [:PJ_CS_TYPE_UNKNOWN,
+                                      :PJ_CS_TYPE_CARTESIAN,
+                                      :PJ_CS_TYPE_ELLIPSOIDAL,
+                                      :PJ_CS_TYPE_VERTICAL,
+                                      :PJ_CS_TYPE_SPHERICAL,
+                                      :PJ_CS_TYPE_ORDINAL,
+                                      :PJ_CS_TYPE_PARAMETRIC,
+                                      :PJ_CS_TYPE_DATETIMETEMPORAL,
+                                      :PJ_CS_TYPE_TEMPORALCOUNT,
+                                      :PJ_CS_TYPE_TEMPORALMEASURE]
+
+    enum :PJ_WKT_TYPE, [:PJ_WKT2_2015,
+                        :PJ_WKT2_2015_SIMPLIFIED,
+                        :PJ_WKT2_2018,
+                        :PJ_WKT2_2018_SIMPLIFIED,
+                        :PJ_WKT1_GDAL,
+                        :PJ_WKT1_ESRI]
+
+    attach_function :proj_info, [], PJ_INFO.by_value
+    attach_function :proj_pj_info, [:PJ], PJ_PROJ_INFO.by_value
+    attach_function :proj_grid_info, [:string], PJ_GRID_INFO.by_value
+    attach_function :proj_init_info, [:string], PJ_INIT_INFO.by_value
+
+    # Contexts
+    attach_function :proj_context_create, [], :PJ_CONTEXT
+    attach_function :proj_context_destroy, [:PJ_CONTEXT], :PJ_CONTEXT
+
+    # Error handling
+    attach_function :proj_context_errno, [:PJ_CONTEXT], :int
+    attach_function :proj_errno, [:PJ], :int
+    attach_function :proj_errno_set, [:PJ, :int], :int
+    attach_function :proj_errno_reset, [:PJ], :int
+    attach_function :proj_errno_restore, [:PJ, :int], :int
+
+    # Manage the transformation definition object PJ
+    attach_function :proj_create, [:PJ_CONTEXT, :string], :PJ
+    attach_function :proj_create_argv, [:PJ_CONTEXT, :int, :pointer], :PJ
+    attach_function :proj_create_crs_to_crs, [:PJ_CONTEXT, :string, :string, :PJ_AREA], :PJ
+    attach_function :proj_destroy, [:PJ], :PJ
+
+    attach_function :proj_trans, [:PJ, :PJ_DIRECTION, PJ_COORD.by_value], PJ_COORD.by_value
+
+    # Get lists of operations, ellipsoids, units and prime meridians
+    attach_function :proj_list_operations, [], :pointer #PJ_LIST
+    attach_function :proj_list_ellps, [], :pointer #PJ_ELLPS
+    attach_function :proj_list_units, [], :pointer #PJ_UNITS
+    attach_function :proj_list_prime_meridians, [], :pointer #PJ_PRIME_MERIDIANS
+
+    # Degrees/radians
+    attach_function :proj_torad, [:double], :double
+    attach_function :proj_todeg, [:double], :double
+    attach_function :proj_dmstor, [:string, :pointer], :double
+    attach_function :proj_rtodms, [:string, :double, :int, :int], :string
+    attach_function :proj_angular_input, [:PJ, :PJ_DIRECTION], :bool
+    attach_function :proj_angular_output, [:PJ, :PJ_DIRECTION], :bool
+  end
+end

data/lib/api/api_5_1.rb

@@ -0,0 +1,7 @@
+module Proj
+  module Api
+    attach_function :proj_log_level, [:PJ_CONTEXT, :PJ_LOG_LEVEL], :PJ_LOG_LEVEL
+    callback :pj_log_function, [:pointer, :int, :string], :void
+    attach_function :proj_log_func, [:PJ_CONTEXT, :pointer, :pj_log_function], :void
+  end
+end

data/lib/api/api_5_2.rb

@@ -0,0 +1,5 @@
+module Proj
+  module Api
+    attach_function :proj_errno_string, [:int], :string
+  end
+end

data/lib/api/api_6_0.rb

@@ -0,0 +1,44 @@
+module Proj
+  module Api
+    callback :proj_file_finder, [:PJ_CONTEXT, :string, :pointer], :string
+    attach_function :proj_context_set_file_finder, [:PJ_CONTEXT, :proj_file_finder, :pointer], :void
+    attach_function :proj_context_set_search_paths, [:PJ_CONTEXT, :int, :pointer], :void
+
+    attach_function :proj_context_use_proj4_init_rules, [:PJ_CONTEXT, :int], :void
+    attach_function :proj_context_get_use_proj4_init_rules, [:PJ_CONTEXT, :int], :bool
+    attach_function :proj_list_angular_units, [], :pointer #PJ_UNITS
+
+    # Base methods
+    attach_function :proj_get_name, [:PJ], :string
+    attach_function :proj_get_id_auth_name, [:PJ, :int], :string
+    attach_function :proj_get_id_code, [:PJ, :int], :string
+    attach_function :proj_get_type, [:PJ], :PJ_TYPE
+    attach_function :proj_is_deprecated, [:PJ], :bool
+    attach_function :proj_is_crs, [:PJ], :bool
+    attach_function :proj_get_area_of_use, [:PJ_CONTEXT, :PJ, :pointer, :pointer, :pointer, :pointer, :pointer], :bool
+
+    # Export to various formats
+    attach_function :proj_as_wkt, [:PJ_CONTEXT, :PJ, :PJ_WKT_TYPE, :pointer], :string
+    attach_function :proj_as_proj_string, [:PJ_CONTEXT, :PJ, :PJ_PROJ_STRING_TYPE, :pointer], :string
+    attach_function :proj_as_projjson, [:PJ_CONTEXT, :PJ, :pointer], :string
+
+    # Projection database functions
+    attach_function :proj_context_set_autoclose_database, [:PJ_CONTEXT, :int], :void
+    attach_function :proj_context_set_database_path, [:PJ_CONTEXT, :string, :pointer, :pointer], :int
+    attach_function :proj_context_get_database_path, [:PJ_CONTEXT], :string
+    attach_function :proj_context_get_database_metadata, [:PJ_CONTEXT, :string], :string
+
+    # CRS methods
+    attach_function :proj_crs_get_geodetic_crs, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_crs_get_horizontal_datum, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_crs_get_sub_crs, [:PJ_CONTEXT, :PJ, :int], :PJ
+    attach_function :proj_crs_get_datum, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_crs_get_coordinate_system, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_cs_get_type, [:PJ_CONTEXT, :PJ], :PJ_COORDINATE_SYSTEM_TYPE
+    attach_function :proj_cs_get_axis_count, [:PJ_CONTEXT, :PJ], :int
+    attach_function :proj_cs_get_axis_info, [:PJ_CONTEXT, :PJ, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :bool
+    attach_function :proj_get_prime_meridian, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_get_ellipsoid, [:PJ_CONTEXT, :PJ], :PJ
+    attach_function :proj_crs_get_coordoperation, [:PJ_CONTEXT, :PJ], :PJ
+  end
+end

data/lib/api/api_6_1.rb

@@ -0,0 +1,5 @@
+module Proj
+  module Api
+    attach_function :proj_normalize_for_visualization, [:PJ_CONTEXT, :PJ], :PJ
+  end
+end

data/lib/api/api_6_2.rb

@@ -0,0 +1,5 @@
+module Proj
+  module Api
+    attach_function :proj_create_crs_to_crs_from_pj, [:PJ_CONTEXT, :PJ, :PJ, :PJ_AREA, :string], :PJ
+  end
+end

data/lib/crs.rb

@@ -89,7 +89,6 @@ module Proj
     #
     # @return [Integer]
     def axis_count
-      foo = Api.proj_crs_get_coordinate_system(self.context, self)
       result = Api.proj_cs_get_axis_count(self.context, self.coordinate_system)
       if result == -1
         Error.check
@@ -131,7 +130,6 @@ module Proj
     #
     # @return [:PJ_COORDINATE_SYSTEM_TYPE]
     def crs_type
-      foo = Api.proj_crs_get_coordinate_system(self.context, self)
       result = Api.proj_cs_get_type(self.context, self.coordinate_system)
       if result == :PJ_CS_TYPE_UNKNOWN
         Error.check

data/lib/pj_object.rb

@@ -1,8 +1,6 @@
 # encoding: UTF-8
 module Proj
   class PjObject
-    attr_reader :context
-
     def self.finalize(pointer)
       proc do
         Api.proj_destroy(pointer)

data/lib/projection.rb

@@ -5,23 +5,23 @@ module Proj
   #   underlying API's this class uses. Code should be ported to use Crs and Transformation objects.
   class Projection
     def self.parse(value)
-      values = 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
+      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)
@@ -185,7 +185,7 @@ module Proj
       p_z = FFI::MemoryPointer.new(:double, 1)
       p_z.write_double(0)
 
-      a = Api.pj_transform(self, other, 1, 1, p_x, p_y, p_z)
+      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)

data/lib/transformation.rb

@@ -21,12 +21,12 @@ module Proj
     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(self.context, source, target, nil, nil)
+                    Api.proj_create_crs_to_crs_from_pj(context, source, target, nil, nil)
                   else
-                    Api.proj_create_crs_to_crs(self.context, source.definition, target.definition, nil)
+                    Api.proj_create_crs_to_crs(context, source.definition, target.definition, nil)
                   end
                 else
-                  Api.proj_create_crs_to_crs(self.context, source, target, nil)
+                  Api.proj_create_crs_to_crs(context, source, target, nil)
                 end
 
       if pointer.null?

data/proj4rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'proj4rb'
-  spec.version = '2.0.0'
+  spec.version = '2.2.0'
   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.
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   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.9'
+  spec.required_ruby_version = '>= 2.4.1'
   spec.license = 'MIT'
 
   spec.requirements << 'Proj (Proj4) Library'
@@ -19,13 +19,15 @@ Gem::Specification.new do |spec|
                    'proj4rb.gemspec',
                    'Rakefile',
                    'README.rdoc',
-                   'lib/*.rb',
+                   '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/transformation_test.rb

@@ -37,7 +37,7 @@ class TransformationTest < AbstractTest
     from = Proj::Coordinate.new(lam: 48.9906726079, phi: 8.4302123334)
     to = transform.inverse(from)
 
-    assert_in_delta(5428307, to.x, PRECISION)
+    assert_in_delta(5428306.39, to.x, PRECISION)
     assert_in_delta(3458375, to.y, PRECISION)
     assert_in_delta(0, to.z, PRECISION)
     assert_in_delta(0, to.t, PRECISION)
@@ -49,7 +49,7 @@ class TransformationTest < AbstractTest
     from = Proj::Coordinate.new(lam: 48.9906726079, phi: 8.4302123334)
     to = transform.forward(from)
 
-    assert_in_delta(5428307, to.x, PRECISION)
+    assert_in_delta(5428306.39, to.x, PRECISION)
     assert_in_delta(3458375, to.y, PRECISION)
     assert_in_delta(0, to.z, PRECISION)
     assert_in_delta(0, to.t, PRECISION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proj4rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Guilhem Vellut
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,6 +26,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +95,14 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- lib/api/api.rb
+- lib/api/api_4_9.rb
+- lib/api/api_5_0.rb
+- lib/api/api_5_1.rb
+- lib/api/api_5_2.rb
+- lib/api/api_6_0.rb
+- lib/api/api_6_1.rb
+- lib/api/api_6_2.rb
 - lib/area.rb
 - lib/config.rb
 - lib/context.rb
@@ -107,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.9
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="