proj4rb 2.0.0 → 3.0.0

data/lib/api/api_6_2.rb

@@ -0,0 +1,7 @@
+module Proj
+  module Api
+    attach_function :proj_as_projjson, [:PJ_CONTEXT, :PJ, :pointer], :string
+    attach_function :proj_create_crs_to_crs_from_pj, [:PJ_CONTEXT, :PJ, :PJ, :PJ_AREA, :string], :PJ
+    attach_function :proj_context_set_autoclose_database, [:PJ_CONTEXT, :int], :void
+  end
+end

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

@@ -1,32 +1,32 @@
-module Proj
-  class Area
-    attr_reader :name, :west_lon_degree, :south_lat_degree, :east_lon_degree, :north_lat_degree
-
-    def self.for_object(pj_object)
-      p_name = FFI::MemoryPointer.new(:pointer)
-      p_west_lon_degree = FFI::MemoryPointer.new(:double)
-      p_south_lat_degree = FFI::MemoryPointer.new(:double)
-      p_east_lon_degree = FFI::MemoryPointer.new(:double)
-      p_north_lat_degree = FFI::MemoryPointer.new(:double)
-
-      result = Api.proj_get_area_of_use(Context.current, pj_object,
-                                        p_west_lon_degree, p_south_lat_degree, p_east_lon_degree, p_north_lat_degree,
-                                        p_name)
-      unless result
-        Error.check
-      end
-
-      name = p_name.read_pointer.read_string_to_null.force_encoding('utf-8')
-      self.new(name,
-               p_west_lon_degree.read_double, p_south_lat_degree.read_double, p_east_lon_degree.read_double, p_north_lat_degree.read_double)
-    end
-
-    def initialize(name, west_lon_degree, south_lat_degree, east_lon_degree, north_lat_degree)
-      @name = name
-      @west_lon_degree = west_lon_degree
-      @south_lat_degree = south_lat_degree
-      @east_lon_degree = east_lon_degree
-      @north_lat_degree = north_lat_degree
-    end
-  end
-end
+module Proj
+  class Area
+    attr_reader :name, :west_lon_degree, :south_lat_degree, :east_lon_degree, :north_lat_degree
+
+    def self.for_object(pj_object)
+      p_name = FFI::MemoryPointer.new(:pointer)
+      p_west_lon_degree = FFI::MemoryPointer.new(:double)
+      p_south_lat_degree = FFI::MemoryPointer.new(:double)
+      p_east_lon_degree = FFI::MemoryPointer.new(:double)
+      p_north_lat_degree = FFI::MemoryPointer.new(:double)
+
+      result = Api.proj_get_area_of_use(Context.current, pj_object,
+                                        p_west_lon_degree, p_south_lat_degree, p_east_lon_degree, p_north_lat_degree,
+                                        p_name)
+      unless result
+        Error.check
+      end
+
+      name = p_name.read_pointer.read_string_to_null.force_encoding('utf-8')
+      self.new(name,
+               p_west_lon_degree.read_double, p_south_lat_degree.read_double, p_east_lon_degree.read_double, p_north_lat_degree.read_double)
+    end
+
+    def initialize(name, west_lon_degree, south_lat_degree, east_lon_degree, north_lat_degree)
+      @name = name
+      @west_lon_degree = west_lon_degree
+      @south_lat_degree = south_lat_degree
+      @east_lon_degree = east_lon_degree
+      @north_lat_degree = north_lat_degree
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-require 'singleton'
-
-module Proj
-  class Config
-    include Singleton
-
-    def set_search_paths
-      p_paths = self.search_paths_pointer
-      items = p_paths.type_size/p_paths.size
-
-      # Set search paths on default context - any new contexts will inherit from this
-      if Api.method_defined?(:proj_context_set_search_paths)
-        Api.proj_context_set_search_paths(nil, items, p_paths)
-      end
-
-      if Api.method_defined?(:pj_set_searchpath)
-        Api.pj_set_searchpath(items, p_paths)
-      end
-    end
-
-    def search_paths
-      ['/usr/share/proj',
-       '/usr/local/share/proj',
-       '/opt/share/proj',
-       '/opt/local/share/proj',
-       'c:/msys64/mingw64/share/proj',
-       'c:/mingw64/share/proj',
-       '/opt/local/lib/proj6/share/proj',
-       '/opt/local/lib/proj5/share/proj',
-       '/opt/local/lib/proj49/share/proj']
-    end
-
-    def data_path
-      if ENV['PROJ_LIB'] && File.directory?(ENV['PROJ_LIB'])
-        ENV['PROJ_LIB']
-      else
-        result = self.search_paths.detect do |path|
-          File.directory?(path)
-        end
-
-        unless result
-          raise(Error, "Could not find Proj data directory. Please set the PROJ_LIB environmental variable to correct directory")
-        end
-
-        result
-      end
-    end
-
-    def search_paths_pointer
-      p_path = FFI::MemoryPointer.from_string(self.data_path)
-      p_paths = FFI::MemoryPointer.new(:pointer, 1)
-      p_paths[0].write_pointer(p_path)
-      p_paths
-    end
-
-    def db_path
-      result = self.search_paths.map do |path|
-        File.join(path, 'proj.db')
-      end.detect do |path|
-        File.exists?(path)
-      end
-
-      unless result
-        raise(Error, "Could not find Proj database (proj.db). Please set the PROJ_LIB environmental variable to directory that contains it")
-      end
-
-      result
-    end
-  end
+require 'singleton'
+
+module Proj
+  class Config
+    include Singleton
+
+    def set_search_paths
+      p_paths = self.search_paths_pointer
+      items = p_paths.type_size/p_paths.size
+
+      # Set search paths on default context - any new contexts will inherit from this
+      if Api.method_defined?(:proj_context_set_search_paths)
+        Api.proj_context_set_search_paths(nil, items, p_paths)
+      end
+
+      if Api.method_defined?(:pj_set_searchpath)
+        Api.pj_set_searchpath(items, p_paths)
+      end
+    end
+
+    def search_paths
+      ['/usr/share/proj',
+       '/usr/local/share/proj',
+       '/opt/share/proj',
+       '/opt/local/share/proj',
+       'c:/msys64/mingw64/share/proj',
+       'c:/mingw64/share/proj',
+       '/opt/local/lib/proj6/share/proj',
+       '/opt/local/lib/proj5/share/proj',
+       '/opt/local/lib/proj49/share/proj']
+    end
+
+    def data_path
+      if ENV['PROJ_LIB'] && File.directory?(ENV['PROJ_LIB'])
+        ENV['PROJ_LIB']
+      else
+        result = self.search_paths.detect do |path|
+          File.directory?(path)
+        end
+
+        unless result
+          raise(Error, "Could not find Proj data directory. Please set the PROJ_LIB environmental variable to correct directory")
+        end
+
+        result
+      end
+    end
+
+    def search_paths_pointer
+      p_path = FFI::MemoryPointer.from_string(self.data_path)
+      p_paths = FFI::MemoryPointer.new(:pointer, 1)
+      p_paths[0].write_pointer(p_path)
+      p_paths
+    end
+
+    def db_path
+      result = self.search_paths.map do |path|
+        File.join(path, 'proj.db')
+      end.detect do |path|
+        File.exists?(path)
+      end
+
+      unless result
+        raise(Error, "Could not find Proj database (proj.db). Please set the PROJ_LIB environmental variable to directory that contains it")
+      end
+
+      result
+    end
+  end
 end

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

@@ -1,103 +1,103 @@
-module Proj
-  # Proj 4.8 introduced the concept of a thread context object to support multi-threaded programs. The bindings
-  # automatically create on context per thread (its stored in local thread storage).
-  class Context
-    # The context for the current thread
-    #
-    # @return [Context]
-    def self.current
-      Thread.current[:proj_context] ||= Context.new
-    end
-
-    def self.finalize(pointer)
-      proc do
-        Api.proj_context_destroy(pointer)
-      end
-    end
-
-    def initialize
-      @pointer = Api.proj_context_create
-      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
-
-      set_database_path
-    end
-
-    # Helper method that tries to locate the Proj coordinate database (proj.db)
-    def set_database_path
-      return unless Api.method_defined?(:proj_context_get_database_path)
-      return if database_path
-
-      self.database_path = Config.instance.db_path
-    end
-
-    def to_ptr
-      @pointer
-    end
-
-    # Get the last error number
-    #
-    # return [Integer]
-    def errno
-      Api.proj_context_errno(self)
-    end
-
-    # Gets the path the Proj database
-    #
-    # return [String]
-    def database_path
-      Api.proj_context_get_database_path(self)
-    end
-
-    # Sets the path to the Proj database
-    def database_path=(value)
-      result = Api.proj_context_set_database_path(self, value, nil, nil)
-      unless result == 1
-        Error.check(self.errno)
-      end
-    end
-
-    # Sets a custom log function
-    #
-    # @example
-    #   context.set_log_function(data) do |pointer, int, message|
-    #     ... do stuff...
-    #   end
-    #
-    # @param pointer [FFI::MemoryPointer] Optional pointer to custom data
-    # @param proc [Proc] Custom logging procedure
-    # @return [nil]
-    def set_log_function(pointer = nil, &proc)
-      Api.proj_log_func(self, pointer, proc)
-    end
-
-    # Gets the current log level
-    #
-    # @return [:PJ_LOG_LEVEL]
-    def log_level
-      Api.proj_log_level(self, :PJ_LOG_TELL)
-    end
-
-    # Sets the current log level
-    #
-    # @param value [:PJ_LOG_LEVEL]
-    # @return [nil]
-    def log_level=(value)
-      Api.proj_log_level(self, value)
-    end
-
-    # Gets if proj4 init rules are being used (i.e., support +init parameters)
-    #
-    # @return [Boolean]
-    def use_proj4_init_rules
-      Api.proj_context_get_use_proj4_init_rules(self, 0)
-    end
-
-    # Sets if proj4 init rules should be used
-    #
-    # @param value [Boolean]
-    # @return [nil]
-    def use_proj4_init_rules=(value)
-      Api.proj_context_use_proj4_init_rules(self, value ? 1 : 0)
-    end
-  end
+module Proj
+  # Proj 4.8 introduced the concept of a thread context object to support multi-threaded programs. The bindings
+  # automatically create on context per thread (its stored in local thread storage).
+  class Context
+    # The context for the current thread
+    #
+    # @return [Context]
+    def self.current
+      Thread.current[:proj_context] ||= Context.new
+    end
+
+    def self.finalize(pointer)
+      proc do
+        Api.proj_context_destroy(pointer)
+      end
+    end
+
+    def initialize
+      @pointer = Api.proj_context_create
+      ObjectSpace.define_finalizer(self, self.class.finalize(@pointer))
+
+      set_database_path
+    end
+
+    # Helper method that tries to locate the Proj coordinate database (proj.db)
+    def set_database_path
+      return unless Api.method_defined?(:proj_context_get_database_path)
+      return if database_path
+
+      self.database_path = Config.instance.db_path
+    end
+
+    def to_ptr
+      @pointer
+    end
+
+    # Get the last error number
+    #
+    # return [Integer]
+    def errno
+      Api.proj_context_errno(self)
+    end
+
+    # Gets the path the Proj database
+    #
+    # return [String]
+    def database_path
+      Api.proj_context_get_database_path(self)
+    end
+
+    # Sets the path to the Proj database
+    def database_path=(value)
+      result = Api.proj_context_set_database_path(self, value, nil, nil)
+      unless result == 1
+        Error.check(self.errno)
+      end
+    end
+
+    # Sets a custom log function
+    #
+    # @example
+    #   context.set_log_function(data) do |pointer, int, message|
+    #     ... do stuff...
+    #   end
+    #
+    # @param pointer [FFI::MemoryPointer] Optional pointer to custom data
+    # @param proc [Proc] Custom logging procedure
+    # @return [nil]
+    def set_log_function(pointer = nil, &proc)
+      Api.proj_log_func(self, pointer, proc)
+    end
+
+    # Gets the current log level
+    #
+    # @return [:PJ_LOG_LEVEL]
+    def log_level
+      Api.proj_log_level(self, :PJ_LOG_TELL)
+    end
+
+    # Sets the current log level
+    #
+    # @param value [:PJ_LOG_LEVEL]
+    # @return [nil]
+    def log_level=(value)
+      Api.proj_log_level(self, value)
+    end
+
+    # Gets if proj4 init rules are being used (i.e., support +init parameters)
+    #
+    # @return [Boolean]
+    def use_proj4_init_rules
+      Api.proj_context_get_use_proj4_init_rules(self, 0)
+    end
+
+    # Sets if proj4 init rules should be used
+    #
+    # @param value [Boolean]
+    # @return [nil]
+    def use_proj4_init_rules=(value)
+      Api.proj_context_use_proj4_init_rules(self, value ? 1 : 0)
+    end
+  end
 end