RubyGems - proj4rb - Versions diffs - 3.0.0 → 4.0.0 - Mend

proj4rb 3.0.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (82) hide show

checksums.yaml +4 -4
data/ChangeLog +26 -15
data/README.rdoc +82 -44
data/Rakefile +27 -27
data/lib/api/api.rb +96 -118
data/lib/api/api_5_0.rb +331 -300
data/lib/api/api_5_1.rb +6 -6
data/lib/api/api_5_2.rb +4 -4
data/lib/api/api_6_0.rb +116 -14
data/lib/api/api_6_1.rb +4 -4
data/lib/api/api_6_2.rb +9 -6
data/lib/api/api_6_3.rb +6 -0
data/lib/api/api_7_0.rb +68 -0
data/lib/api/api_7_1.rb +73 -0
data/lib/api/api_7_2.rb +14 -0
data/lib/api/api_8_0.rb +6 -0
data/lib/api/api_8_1.rb +24 -0
data/lib/api/api_8_2.rb +6 -0
data/lib/api/api_9_1.rb +7 -0
data/lib/api/api_9_2.rb +9 -0
data/lib/api/api_experimental.rb +196 -0
data/lib/proj/area.rb +73 -32
data/lib/proj/axis_info.rb +44 -0
data/lib/proj/bounds.rb +13 -0
data/lib/proj/context.rb +174 -28
data/lib/proj/conversion.rb +92 -0
data/lib/proj/coordinate.rb +281 -197
data/lib/proj/coordinate_operation_mixin.rb +381 -0
data/lib/proj/coordinate_system.rb +137 -0
data/lib/proj/crs.rb +672 -204
data/lib/proj/crs_info.rb +47 -0
data/lib/proj/database.rb +305 -0
data/lib/proj/datum.rb +32 -0
data/lib/proj/datum_ensemble.rb +34 -0
data/lib/proj/ellipsoid.rb +77 -41
data/lib/proj/error.rb +62 -9
data/lib/proj/file_api.rb +166 -0
data/lib/proj/grid.rb +121 -0
data/lib/proj/grid_cache.rb +64 -0
data/lib/proj/grid_info.rb +19 -0
data/lib/proj/network_api.rb +92 -0
data/lib/proj/operation.rb +42 -42
data/lib/proj/operation_factory_context.rb +136 -0
data/lib/proj/parameter.rb +38 -0
data/lib/proj/parameters.rb +106 -0
data/lib/proj/pj_object.rb +670 -80
data/lib/proj/pj_objects.rb +44 -0
data/lib/proj/prime_meridian.rb +65 -39
data/lib/proj/projection.rb +698 -207
data/lib/proj/session.rb +46 -0
data/lib/proj/strings.rb +32 -0
data/lib/proj/transformation.rb +101 -60
data/lib/proj/unit.rb +108 -53
data/lib/proj.rb +110 -9
data/proj4rb.gemspec +5 -5
data/test/abstract_test.rb +23 -1
data/test/context_test.rb +172 -82
data/test/conversion_test.rb +368 -0
data/test/coordinate_system_test.rb +144 -0
data/test/crs_test.rb +770 -71
data/test/database_test.rb +360 -0
data/test/datum_ensemble_test.rb +65 -0
data/test/datum_test.rb +55 -0
data/test/ellipsoid_test.rb +64 -18
data/test/file_api_test.rb +66 -0
data/test/grid_cache_test.rb +72 -0
data/test/grid_test.rb +141 -0
data/test/network_api_test.rb +45 -0
data/test/operation_factory_context_test.rb +201 -0
data/test/parameters_test.rb +40 -0
data/test/pj_object_test.rb +179 -0
data/test/prime_meridian_test.rb +76 -0
data/test/proj_test.rb +46 -4
data/test/projection_test.rb +646 -222
data/test/session_test.rb +78 -0
data/test/transformation_test.rb +149 -7
data/test/unit_test.rb +57 -28
metadata +51 -13
data/lib/api/api_4_9.rb +0 -31
data/lib/proj/config.rb +0 -70
data/lib/proj/point.rb +0 -72
data/test/prime_meridians_test.rb +0 -33

data/lib/proj/coordinate.rb CHANGED Viewed

@@ -1,197 +1,281 @@
-# encoding: UTF-8
-module Proj
-  # A four dimensional coordinate of double values.
-  #
-  # For most geographic Crses, the units will be in degrees.
-  class Coordinate
-    def self.from_coord(pj_coord)
-      result = self.allocate
-      result.instance_variable_set(:@coord, pj_coord)
-      result
-    end
-    # Creates a new coordinate.
-    #
-    # @example
-    #
-    #    coord = Proj::Coordinate.new(:x => 1, :y => 2, :z => 3, :t => 4)
-    #    coord = Proj::Coordinate.new(:u => 5, :v => 6, :w => 7, :t => 8)
-    #    coord = Proj::Coordinate.new(:lam => 9, :phi => 10, :z => 11, :t => 12)
-    #    coord = Proj::Coordinate.new(:s => 13, :a1 => 14, :a2 => 15)
-    #    coord = Proj::Coordinate.new(:o => 16, :p => 17, :k => 18)
-    #    coord = Proj::Coordinate.new(:e => 19, :n => 20, :u => 21)
-    def initialize(x: nil, y: nil, z: nil, t: nil,
-                   u: nil, v: nil, w: nil, # t: nil
-                   lam: nil, phi: nil, # z: nil, t: nil,
-                   s: nil, a1: nil, a2: nil,
-                   o: nil, p: nil, k: nil,
-                   e: nil, n: nil) #u: nil
-      @coord = Api::PJ_COORD.new
-      keys = if x && y && z && t
-               [:x, :y, :z, :t]
-             elsif x && y && z
-               [:x, :y, :z]
-             elsif x && y
-               [:x, :y]
-             elsif u && v && w && t
-               [:u, :v, :w, :t]
-             elsif u && v && w
-               [:u, :v, :w]
-             elsif u && v
-               [:u, :v]
-             elsif lam && phi && z && t
-               [:lam, :phi, :z, :t]
-             elsif lam && phi && z
-               [:lam, :phi, :z]
-             elsif lam && phi
-               [:lam, :phi]
-             elsif s && a1 && a2
-               [:s, :a1, :a2]
-             elsif e && n && u
-               [:e, :n, :u]
-             elsif o && p && k
-               [:o, :p, :k]
-             end
-      coord_struct = @coord[:v]
-      keys.each_with_index do |key, index|
-        coord_struct[index] = binding.local_variable_get(key)
-      end
-    end
-    def to_ptr
-      @coord.to_ptr
-    end
-    # Returns x coordinate
-    #
-    # @return [Float]
-    def x
-      @coord[:v][0]
-    end
-    # Returns y coordinate
-    #
-    # @return [Float]
-    def y
-      @coord[:v][1]
-    end
-    # Returns z coordinate
-    #
-    # @return [Float]
-    def z
-      @coord[:v][2]
-    end
-    # Returns t coordinate
-    #
-    # @return [Float]
-    def t
-      @coord[:v][3]
-    end
-    # Returns u coordinate
-    #
-    # @return [Float]
-    # TODO - This could be u in uvw or enu. Going to ignore that
-    def u
-      @coord[:v][0]
-    end
-    # Returns v coordinate
-    #
-    # @return [Float]
-    def v
-      @coord[:v][1]
-    end
-    # Returns w coordinate
-    #
-    # @return [Float]
-    def w
-      @coord[:v][2]
-    end
-    # Returns lam coordinate
-    #
-    # @return [Float]
-    def lam
-      @coord[:v][0]
-    end
-    # Returns phi coordinate
-    #
-    # @return [Float]
-    def phi
-      @coord[:v][1]
-    end
-    # Returns o coordinate
-    #
-    # @return [Float]
-    def o
-      @coord[:v][0]
-    end
-    # Returns p coordinate
-    #
-    # @return [Float]
-    def p
-      @coord[:v][1]
-    end
-    # Returns k coordinate
-    #
-    # @return [Float]
-    def k
-      @coord[:v][3]
-    end
-    # Returns e coordinate
-    #
-    # @return [Float]
-    def e
-      @coord[:v][0]
-    end
-    # Returns n coordinate
-    #
-    # @return [Float]
-    def n
-      @coord[:v][1]
-    end
-    # Returns s coordinate
-    #
-    # @return [Float]
-    def s
-      @coord[:v][0]
-    end
-    # Returns a1 coordinate
-    #
-    # @return [Float]
-    def a1
-      @coord[:v][1]
-    end
-    # Returns a2 coordinate
-    #
-    # @return [Float]
-    def a2
-      @coord[:v][2]
-    end
-    # Returns nice printout of coordinate contents
-    #
-    # @return [String]
-    def to_s
-      "v0: #{self.x}, v1: #{self.y}, v2: #{self.z}, v3: #{self.t}"
-    end
-  end
-end
+# encoding: UTF-8
+module Proj
+  # A four dimensional coordinate of double values.
+  #
+  # For most geographic CRSes, the units will be in degrees.
+  class Coordinate
+    def self.from_coord(pj_coord)
+      result = self.allocate
+      result.instance_variable_set(:@coord, pj_coord)
+      result
+    end
+    # Creates a new coordinate.
+    #
+    # @example
+    #
+    #    coord = Proj::Coordinate.new(:x => 1, :y => 2, :z => 3, :t => 4)
+    #    coord = Proj::Coordinate.new(:u => 5, :v => 6, :w => 7, :t => 8)
+    #    coord = Proj::Coordinate.new(:lam => 9, :phi => 10, :z => 11, :t => 12)
+    #    coord = Proj::Coordinate.new(:lon => 9, :lat => 10, :z => 11, :t => 12)
+    #    coord = Proj::Coordinate.new(:s => 13, :a1 => 14, :a2 => 15)
+    #    coord = Proj::Coordinate.new(:o => 16, :p => 17, :k => 18)
+    #    coord = Proj::Coordinate.new(:e => 19, :n => 20, :u => 21)
+    def initialize(x: nil, y: nil, z: nil, t: nil,
+                   u: nil, v: nil, w: nil, # t: nil
+                   lam: nil, phi: nil, # z: nil, t: nil,
+                   lat: nil, lon: nil, # z: nil, t: nil,
+                   s: nil, a1: nil, a2: nil,
+                   o: nil, p: nil, k: nil,
+                   e: nil, n: nil) #u: nil
+      @coord = Api::PJ_COORD.new
+      keys = if x && y && z && t
+               [:x, :y, :z, :t]
+             elsif x && y && z
+               [:x, :y, :z]
+             elsif x && y
+               [:x, :y]
+             elsif u && v && w && t
+               [:u, :v, :w, :t]
+             elsif u && v && w
+               [:u, :v, :w]
+             elsif u && v
+               [:u, :v]
+             elsif lam && phi && z && t
+               [:lam, :phi, :z, :t]
+             elsif lam && phi && z
+               [:lam, :phi, :z]
+             elsif lam && phi
+               [:lam, :phi]
+             elsif lon && lat && z && t
+               [:lon, :lat, :z, :t]
+             elsif lon && lat && z
+               [:lon, :lat, :z]
+             elsif lon && lat
+               [:lon, :lat]
+             elsif s && a1 && a2
+               [:s, :a1, :a2]
+             elsif e && n && u
+               [:e, :n, :u]
+             elsif o && p && k
+               [:o, :p, :k]
+             else
+               []
+             end
+      coord_struct = @coord[:v]
+      keys.each_with_index do |key, index|
+        coord_struct[index] = binding.local_variable_get(key)
+      end
+    end
+    def to_ptr
+      @coord.to_ptr
+    end
+    def pj_coord
+      @coord
+    end
+    def eql?(other)
+      @coord == other.instance_variable_get(:@coord)
+    end
+    def ==(other)
+      @coord.eql?(other.instance_variable_get(:@coord))
+    end
+    def enu
+      @coord[:enu]
+    end
+    def geod
+      @coord[:geod]
+    end
+    def lp
+      @coord[:lp]
+    end
+    def lpz
+      @coord[:lpz]
+    end
+    def lpzt
+      @coord[:lpzt]
+    end
+    def opk
+      @coord[:opk]
+    end
+    def uv
+      @coord[:uv]
+    end
+    def uvw
+      @coord[:uvw]
+    end
+    def uvwt
+      @coord[:uvwt]
+    end
+    def xy
+      @coord[:xy]
+    end
+    def xyz
+      @coord[:xyz]
+    end
+    def xyzt
+      @coord[:xyzt]
+    end
+    # Returns x coordinate
+    #
+    # @return [Float]
+    def x
+      @coord[:v][0]
+    end
+    # Returns y coordinate
+    #
+    # @return [Float]
+    def y
+      @coord[:v][1]
+    end
+    # Returns z coordinate
+    #
+    # @return [Float]
+    def z
+      @coord[:v][2]
+    end
+    # Returns t coordinate
+    #
+    # @return [Float]
+    def t
+      @coord[:v][3]
+    end
+    # Returns u coordinate
+    #
+    # @return [Float]
+    # TODO - This could be u in uvw or enu. Going to ignore that
+    def u
+      @coord[:v][0]
+    end
+    # Returns v coordinate
+    #
+    # @return [Float]
+    def v
+      @coord[:v][1]
+    end
+    # Returns w coordinate
+    #
+    # @return [Float]
+    def w
+      @coord[:v][2]
+    end
+    # Returns longitude coordinate
+    #
+    # @return [Float]
+    def lon
+      @coord[:v][0]
+    end
+    # Returns latitude coordinate
+    #
+    # @return [Float]
+    def lat
+      @coord[:v][1]
+    end
+    # Returns lam coordinate
+    #
+    # @return [Float]
+    def lam
+      @coord[:v][0]
+    end
+    # Returns phi coordinate
+    #
+    # @return [Float]
+    def phi
+      @coord[:v][1]
+    end
+    # Returns o coordinate
+    #
+    # @return [Float]
+    def o
+      @coord[:v][0]
+    end
+    # Returns p coordinate
+    #
+    # @return [Float]
+    def p
+      @coord[:v][1]
+    end
+    # Returns k coordinate
+    #
+    # @return [Float]
+    def k
+      @coord[:v][3]
+    end
+    # Returns e coordinate
+    #
+    # @return [Float]
+    def e
+      @coord[:v][0]
+    end
+    # Returns n coordinate
+    #
+    # @return [Float]
+    def n
+      @coord[:v][1]
+    end
+    # Returns s coordinate
+    #
+    # @return [Float]
+    def s
+      @coord[:v][0]
+    end
+    # Returns a1 coordinate
+    #
+    # @return [Float]
+    def a1
+      @coord[:v][1]
+    end
+    # Returns a2 coordinate
+    #
+    # @return [Float]
+    def a2
+      @coord[:v][2]
+    end
+    # Returns nice printout of coordinate contents
+    #
+    # @return [String]
+    def to_s
+      "v0: #{self.x}, v1: #{self.y}, v2: #{self.z}, v3: #{self.t}"
+    end
+  end
+end