proj4rb 2.0.0 → 3.0.0

data/lib/{pj_object.rb → proj/pj_object.rb}

@@ -1,82 +1,80 @@
-# encoding: UTF-8
-module Proj
-  class PjObject
-    attr_reader :context
-
-    def self.finalize(pointer)
-      proc do
-        Api.proj_destroy(pointer)
-      end
-    end
-
-    def initialize(pointer, context=nil)
-      @pointer = pointer
-      @context = context
-      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
-    end
-
-    def to_ptr
-      @pointer
-    end
-
-    def context
-      @context || Context.current
-    end
-
-    def proj_type
-      Api.proj_get_type(self)
-    end
-
-    def info
-      Api.proj_pj_info(self)
-    end
-
-    def id
-      self.info[:id]
-    end
-
-    def name
-      Api.proj_get_name(self).force_encoding('UTF-8')
-    end
-
-    def auth_name(index=0)
-      Api.proj_get_id_auth_name(self, index).force_encoding('UTF-8')
-    end
-
-    def auth_code(index=0)
-      Api.proj_get_id_code(self, index)
-    end
-
-    def auth(index=0)
-      "#{self.auth_name(index)}:#{self.auth_code(index)}"
-    end
-
-    def description
-      self.info[:description] ? self.info[:description].force_encoding('UTF-8') : nil
-    end
-
-    def definition
-      self.info[:definition] ? self.info[:definition].force_encoding('UTF-8') : nil
-    end
-
-    def has_inverse?
-      self.info[:has_inverse] == 1 ? true : false
-    end
-
-    def accuracy
-      self.info[:accuracy]
-    end
-
-    def to_proj_string(string_type=:PJ_PROJ_4)
-      Api.proj_as_proj_string(self.context, self, string_type, nil).force_encoding('UTF-8')
-    end
-
-    def to_json
-      Api.proj_as_projjson(self.context, self, nil).force_encoding('UTF-8')
-    end
-
-    def to_wkt(wkt_type=:PJ_WKT2_2018)
-      Api.proj_as_wkt(self.context, self, wkt_type, nil).force_encoding('UTF-8')
-    end
-  end
-end
+# encoding: UTF-8
+module Proj
+  class PjObject
+    def self.finalize(pointer)
+      proc do
+        Api.proj_destroy(pointer)
+      end
+    end
+
+    def initialize(pointer, context=nil)
+      @pointer = pointer
+      @context = context
+      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
+    end
+
+    def to_ptr
+      @pointer
+    end
+
+    def context
+      @context || Context.current
+    end
+
+    def proj_type
+      Api.proj_get_type(self)
+    end
+
+    def info
+      Api.proj_pj_info(self)
+    end
+
+    def id
+      self.info[:id]
+    end
+
+    def name
+      Api.proj_get_name(self).force_encoding('UTF-8')
+    end
+
+    def auth_name(index=0)
+      Api.proj_get_id_auth_name(self, index).force_encoding('UTF-8')
+    end
+
+    def auth_code(index=0)
+      Api.proj_get_id_code(self, index)
+    end
+
+    def auth(index=0)
+      "#{self.auth_name(index)}:#{self.auth_code(index)}"
+    end
+
+    def description
+      self.info[:description] ? self.info[:description].force_encoding('UTF-8') : nil
+    end
+
+    def definition
+      self.info[:definition] ? self.info[:definition].force_encoding('UTF-8') : nil
+    end
+
+    def has_inverse?
+      self.info[:has_inverse] == 1 ? true : false
+    end
+
+    def accuracy
+      self.info[:accuracy]
+    end
+
+    def to_proj_string(string_type=:PJ_PROJ_4)
+      Api.proj_as_proj_string(self.context, self, string_type, nil).force_encoding('UTF-8')
+    end
+
+    def to_json
+      Api.proj_as_projjson(self.context, self, nil).force_encoding('UTF-8')
+    end
+
+    def to_wkt(wkt_type=:PJ_WKT2_2018)
+      Api.proj_as_wkt(self.context, self, wkt_type, nil).force_encoding('UTF-8')
+    end
+  end
+end

data/lib/{point.rb → proj/point.rb}

@@ -1,72 +1,72 @@
-# 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 Coordinate objects.
-  class Point
-    def self.from_pointer(pointer)
-      result = self.allocate
-      result.instance_variable_set(:@struct, pointer)
-      result
-    end
-
-    # Create new Point object from coordinates.
-    def initialize(x, y)
-      @struct = Api::ProjUV.new
-      @struct[:u] = x
-      @struct[:v] = y
-    end
-
-    def to_ptr
-      @struct.to_ptr
-    end
-
-    def to_radians
-      self.class.new(Api.proj_torad(self.x), Api.proj_torad(self.y))
-    end
-
-    def to_degrees
-      self.class.new(Api.proj_todeg(self.x), Api.proj_todeg(self.y))
-    end
-
-    # Get x coordinate.
-    def x
-      @struct[:u]
-    end
-
-    # Set x coordinate.
-    def x=(value)
-      @struct[:u] = value
-    end
-
-    # Get y coordinate.
-    def y
-      @struct[:v]
-    end
-
-    # Set y coordinate.
-    def y=(value)
-      @struct[:v] = value
-    end
-
-    # Get longitude/x coordinate.
-    def lon
-      @struct[:u]
-    end
-
-    # Set longitude/x coordinate.
-    def lon=(value)
-      @struct[:u] = value
-    end
-
-    # Get latitude/y coordinate.
-    def lat
-      @struct[:v]
-    end
-
-    # Set latitude/y coordinate.
-    def lat=(value)
-      @struct[:v] = value
-    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 Coordinate objects.
+  class Point
+    def self.from_pointer(pointer)
+      result = self.allocate
+      result.instance_variable_set(:@struct, pointer)
+      result
+    end
+
+    # Create new Point object from coordinates.
+    def initialize(x, y)
+      @struct = Api::ProjUV.new
+      @struct[:u] = x
+      @struct[:v] = y
+    end
+
+    def to_ptr
+      @struct.to_ptr
+    end
+
+    def to_radians
+      self.class.new(Api.proj_torad(self.x), Api.proj_torad(self.y))
+    end
+
+    def to_degrees
+      self.class.new(Api.proj_todeg(self.x), Api.proj_todeg(self.y))
+    end
+
+    # Get x coordinate.
+    def x
+      @struct[:u]
+    end
+
+    # Set x coordinate.
+    def x=(value)
+      @struct[:u] = value
+    end
+
+    # Get y coordinate.
+    def y
+      @struct[:v]
+    end
+
+    # Set y coordinate.
+    def y=(value)
+      @struct[:v] = value
+    end
+
+    # Get longitude/x coordinate.
+    def lon
+      @struct[:u]
+    end
+
+    # Set longitude/x coordinate.
+    def lon=(value)
+      @struct[:u] = value
+    end
+
+    # Get latitude/y coordinate.
+    def lat
+      @struct[:v]
+    end
+
+    # Set latitude/y coordinate.
+    def lat=(value)
+      @struct[:v] = value
+    end
+  end
+end

data/lib/{prime_meridian.rb → proj/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