rgeo-proj4 3.1.1 → 4.0.0

data/ext/proj4_c_impl/preface.h

@@ -0,0 +1,27 @@
+#ifdef HAVE_PROJ_H
+#ifdef HAVE_PROJ_CREATE
+#ifdef HAVE_PROJ_CREATE_CRS_TO_CRS_FROM_PJ
+#ifdef HAVE_PROJ_NORMALIZE_FOR_VISUALIZATION
+#define RGEO_PROJ4_SUPPORTED
+#endif
+#endif
+#endif
+#endif
+
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+#define mark rb_gc_mark_movable
+#else
+#define mark rb_gc_mark
+#endif
+
+// When using ruby ALLOC* macros, we are using ruby_xmalloc, which counterpart
+// is ruby_xfree. This macro helps enforcing that by showing us the way.
+#define FREE ruby_xfree
+
+#ifdef __cplusplus
+#define RGEO_BEGIN_C extern "C" {
+#define RGEO_END_C }
+#else
+#define RGEO_BEGIN_C
+#define RGEO_END_C
+#endif

data/lib/rgeo/coord_sys/crs_to_crs.rb

@@ -6,25 +6,49 @@ module RGeo
     # This is a Ruby wrapper around a proj crs_to_crs
     # A crs_to_crs transformation object is a pipeline between two known coordinate reference systems.
     # https://proj.org/development/reference/functions.html#c.proj_create_crs_to_crs
-    class CRSToCRS
-      attr_writer :from, :to
+    #
+    # It also inherits from the RGeo::CoordSys::CoordinateTransform abstract class.
+    class CRSToCRS < CS::CoordinateTransform
+      attr_accessor :source_cs, :target_cs
 
       class << self
         def create(from, to)
           crs_to_crs = _create(from, to)
-          crs_to_crs.from = from
-          crs_to_crs.to = to
+          crs_to_crs.source_cs = from
+          crs_to_crs.target_cs = to
           crs_to_crs
         end
       end
+
+      alias from source_cs
+      alias to target_cs
+      alias to_wkt _as_text
+
+      def wkt_typename
+        wkt_str = to_wkt
+        wkt_str[0, wkt_str.index("[")]
+      end
+
+      def transform_type
+        PROJ_TYPES[_proj_type]
+      end
+
+      def area_of_use
+        _area_of_use
+      end
+
+      def identity?
+        _identity?(source_cs, target_cs)
+      end
+
       # transform the coordinates from the initial CRS to the destination CRS
       def transform_coords(x, y, z)
-        if @from._radians? && @from._geographic?
+        if from._radians? && from._geographic?
           x *= ImplHelper::Math::DEGREES_PER_RADIAN
           y *= ImplHelper::Math::DEGREES_PER_RADIAN
         end
         result = _transform_coords(x, y, z)
-        if result && @to._radians? && @to._geographic?
+        if result && to._radians? && to._geographic?
           result[0] *= ImplHelper::Math::RADIANS_PER_DEGREE
           result[1] *= ImplHelper::Math::RADIANS_PER_DEGREE
         end
@@ -79,6 +103,10 @@ module RGeo
         int_ = from_polygon_.interior_rings.map { |r_| transform_linear_ring(r_, to_factory_) }
         to_factory_.polygon(ext_, int_)
       end
+
+      def inspect
+        "#<#{self.class}:0x#{object_id.to_s(16)} @source_cs=#{source_cs.original_str} @target_cs=#{target_cs.original_str}>"
+      end
     end
 
     # Store of all the created CRSToCRS

data/lib/rgeo/coord_sys/proj4.rb

@@ -19,7 +19,9 @@ module RGeo
     # option. You may also use this object directly to perform low-level
     # coordinate transformations.
 
-    class Proj4
+    class Proj4 < CS::CoordinateSystem
+      attr_accessor :dimension
+
       def inspect # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)} #{canonical_str.inspect}>"
       end
@@ -110,6 +112,7 @@ module RGeo
       def as_text
         _as_text
       end
+      alias to_wkt as_text
 
       # Returns the string representing the authority and code of the
       # CRS if it exists, nil otherwise.
@@ -120,6 +123,18 @@ module RGeo
         _auth_name
       end
 
+      # Gets axis details for dimension within coordinate system. Each
+      # dimension in the coordinate system has a corresponding axis.
+      def get_axis(dimension)
+        _axis_and_unit_info(dimension).split(":")[0]
+      end
+
+      # Gets units for dimension within coordinate system. Each
+      # dimension in the coordinate system has corresponding units.
+      def get_units(dimension)
+        _axis_and_unit_info(dimension).split(":")[1]
+      end
+
       # Returns true if this Proj4 object is a geographic (lat-long)
       # coordinate system.
 
@@ -134,6 +149,13 @@ module RGeo
         _geocentric?
       end
 
+      # Returns true if this Proj4 object is a projected
+      # coordinate system
+
+      def projected?
+        _projected?
+      end
+
       # Returns true if this Proj4 object uses radians rather than degrees
       # if it is a geographic coordinate system.
 
@@ -148,6 +170,39 @@ module RGeo
       def get_geographic
         _get_geographic
       end
+      alias geographic_coordinate_system get_geographic
+
+      # Returns true if this Proj4 object represents a CRS.
+
+      def crs?
+        _crs?
+      end
+
+      # Sometimes used to assign SRIDs in factory creation
+      # Also in the base CS::Info class that CS::CoordinateSystem
+      # inherits from
+      #
+      # @return [Integer|NilClass] authority code if available
+      def authority_code
+        auth_name.split(":")[1].to_i if auth_name
+      end
+
+      # Low-level coordinate transform method.
+      # Transforms the given coordinate (x, y, [z]) from one proj4
+      # coordinate system to another. Returns an array with either two
+      # or three elements.
+      def transform_coords(to_proj, x, y, z = nil)
+        self.class.transform_coords(self, to_proj, x, y, z)
+      end
+
+      # Low-level geometry transform method.
+      # Transforms the given geometry between the given two projections.
+      # The resulting geometry is constructed using the to_factory.
+      # Any projections associated with the factories themselves are
+      # ignored.
+      def transform(from_geometry, to_proj, to_factory)
+        self.class.transform(self, from_geometry, to_proj, to_factory)
+      end
 
       class << self
         # Returns true if Proj4 is supported in this installation.
@@ -165,8 +220,9 @@ module RGeo
         end
 
         # Create a new Proj4 object, given a definition, which may be
-        # either a string or a hash. Returns nil if the given definition
-        # is invalid or Proj4 is not supported.
+        # either a string, hash, or integer. If an integer is given, it
+        # assumes that you are using the EPSG SRID that matches that code.
+        # Returns nil if the given definition is invalid or Proj4 is not supported.
         #
         # Recognized options include:
         #
@@ -188,11 +244,16 @@ module RGeo
               defn_ = defn_.map { |k_, v_| v_ ? "+#{k_}=#{v_}" : "+#{k_}" }.join(" ")
             end
 
+            defn_ = "EPSG:#{defn_}" if defn_.is_a?(Integer)
+
             result_ = _create(defn_, opts_[:radians])
-            result_ = nil unless result_._valid?
+            raise RGeo::Error::InvalidProjection unless result_._valid?
+
+            result_.dimension = result_._axis_count
           end
           result_
         end
+        alias create_from_wkt create
 
         # Create a new Proj4 object, given a definition, which may be
         # either a string or a hash. Raises Error::UnsupportedOperation
@@ -221,9 +282,9 @@ module RGeo
         # Transforms the given coordinate (x, y, [z]) from one proj4
         # coordinate system to another. Returns an array with either two
         # or three elements.
-        def transform_coords(from_proj_, to_proj_, x_, y_, z_ = nil)
-          crs_to_crs = CRSStore.get(from_proj_, to_proj_)
-          crs_to_crs.transform_coords(x_, y_, z_)
+        def transform_coords(from_proj, to_proj, x, y, z = nil)
+          crs_to_crs = CRSStore.get(from_proj, to_proj)
+          crs_to_crs.transform_coords(x, y, z)
         end
 
         # Low-level geometry transform method.
@@ -231,9 +292,9 @@ module RGeo
         # The resulting geometry is constructed using the to_factory.
         # Any projections associated with the factories themselves are
         # ignored.
-        def transform(from_proj_, from_geometry_, to_proj_, to_factory_)
-          crs_to_crs = CRSStore.get(from_proj_, to_proj_)
-          crs_to_crs.transform(from_geometry_, to_factory_)
+        def transform(from_proj, from_geometry, to_proj, to_factory)
+          crs_to_crs = CRSStore.get(from_proj, to_proj)
+          crs_to_crs.transform(from_geometry, to_factory)
         end
       end
     end

data/lib/rgeo/errors.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RGeo
+  # All RGeo errors are members of this namespace.
+
+  module Error
+    # Base class for all RGeo-related exceptions
+    class RGeoError < RuntimeError
+    end
+
+    # RGeo error specific to the PROJ library
+    class InvalidProjection < RGeoError
+    end
+  end
+end

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "3.1.1"
+    VERSION = "4.0.0"
   end
 end

data/lib/rgeo/proj4.rb

@@ -2,7 +2,46 @@
 
 require "rgeo"
 require "rgeo/proj4/version"
+require "rgeo/coord_sys/proj4_c_impl"
 require "rgeo/coord_sys/crs_to_crs"
 require "rgeo/coord_sys/proj4"
-require "rgeo/coord_sys/srs_database/proj4_data"
-require "rgeo/coord_sys/proj4_c_impl"
+require_relative "./errors"
+
+module RGeo
+  module CoordSys
+    # PROJ uses enums for types, some methods require us to return
+    # the name of the type. We will use this as a lookup.
+    PROJ_TYPES = %w[
+      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
+      PJ_TYPE_CRS
+      PJ_TYPE_GEODETIC_CRS
+      PJ_TYPE_GEOCENTRIC_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
+      PJ_TYPE_TEMPORAL_DATUM
+      PJ_TYPE_ENGINEERING_DATUM
+      PJ_TYPE_PARAMETRIC_DATUM
+    ].freeze
+  end
+end
+
+RGeo::CoordSys::CONFIG.default_coord_sys_class = RGeo::CoordSys::Proj4 if RGeo::CoordSys::Proj4.supported?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
-- Tee Parham, Daniel Azuma
+- Tee Parham, Daniel Azuma, Keith Doggett, Ulysse Buonomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: ffi-geos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: ruby_memcheck
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Proj4 extension for rgeo.
 email:
-- parhameter@gmail.com, dazuma@gmail.com
+- parhameter@gmail.com, dazuma@gmail.com, kfdoggett@gmail.com
 executables: []
 extensions:
 - ext/proj4_c_impl/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- ext/proj4_c_impl/errors.c
+- ext/proj4_c_impl/errors.h
 - ext/proj4_c_impl/extconf.rb
 - ext/proj4_c_impl/main.c
+- ext/proj4_c_impl/preface.h
 - lib/rgeo/coord_sys/crs_to_crs.rb
 - lib/rgeo/coord_sys/proj4.rb
-- lib/rgeo/coord_sys/srs_database/proj4_data.rb
+- lib/rgeo/errors.rb
 - lib/rgeo/proj4.rb
 - lib/rgeo/proj4/version.rb
 homepage: https://github.com/rgeo/rgeo-proj4
@@ -122,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/rgeo/coord_sys/srs_database/proj4_data.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-# -----------------------------------------------------------------------------
-#
-# SRS database interface
-#
-# -----------------------------------------------------------------------------
-
-module RGeo
-  module CoordSys
-    module SRSDatabase
-      # A spatial reference database implementation backed by coordinate
-      # system files installed as part of the proj4 library. For a given
-      # Proj4Data object, you specify a single file (e.g. the epsg data
-      # file), and you can retrieve records by ID number.
-
-      class Proj4Data
-        # Connect to one of the proj4 data files. You should provide the
-        # file name, optionally the installation directory if it is not
-        # in a typical location, and several additional options.
-        #
-        # These options are recognized:
-        #
-        # [<tt>:dir</tt>]
-        #   The path for the share/proj directory that contains the
-        #   requested data file. By default, the Proj4Data class will
-        #   try a number of directories for you, including
-        #   /usr/local/share/proj, /opt/local/share/proj, /usr/share/proj,
-        #   and a few other variants. However, if you have proj4 installed
-        #   elsewhere, you can provide an explicit directory using this
-        #   option. You may also pass nil as the value, in which case all
-        #   the normal lookup paths will be disabled, and you will have to
-        #   provide the full path as the file name.
-        # [<tt>:cache</tt>]
-        #   If set to true, this class caches previously looked up entries
-        #   so subsequent lookups do not have to reread the file. If set
-        #   to <tt>:read_all</tt>, then ALL values in the file are read in
-        #   and cached the first time a lookup is done. If set to
-        #   <tt>:preload</tt>, then ALL values in the file are read in
-        #   immediately when the database is created. Default is false,
-        #   indicating that the file will be reread on every lookup.
-        # [<tt>:authority</tt>]
-        #   If set, its value is taken as the authority name for all
-        #   entries. The authority code will be set to the identifier. If
-        #   not set, then the authority fields of entries will be blank.
-
-        def initialize(filename_, opts_ = {})
-          dir_ = nil
-          if opts_.include?(:dir)
-            dir_ = opts_[:dir]
-          else
-            ["/usr/local/share/proj", "/usr/local/proj/share/proj", "/usr/local/proj4/share/proj", "/opt/local/share/proj", "/opt/proj/share/proj", "/opt/proj4/share/proj", "/opt/share/proj", "/usr/share/proj"].each do |d_|
-              if ::File.directory?(d_) && ::File.readable?(d_)
-                dir_ = d_
-                break
-              end
-            end
-          end
-          @path = dir_ ? "#{dir_}/#{filename_}" : filename_
-          @authority = opts_[:authority]
-          if opts_[:cache]
-            @cache = {}
-            case opts_[:cache]
-            when :read_all
-              @populate_state = 1
-            when :preload
-              search_file(nil)
-              @populate_state = 2
-            else
-              @populate_state = 0
-            end
-          else
-            @cache = nil
-            @populate_state = 0
-          end
-        end
-
-        # Retrieve the Entry for the given ID number.
-
-        def get(ident_)
-          ident_ = ident_.to_s
-          return @cache[ident_] if @cache&.include?(ident_)
-          result_ = nil
-          case @populate_state
-          when 0
-            data_ = search_file(ident_)
-            result_ = Entry.new(ident_, authority: @authority, authority_code: @authority ? ident_ : nil, name: data_[1], proj4: data_[2]) if data_
-            @cache[ident_] = result_ if @cache
-          when 1
-            search_file(nil)
-            result_ = @cache[ident_]
-            @populate_state = 2
-          end
-          result_
-        end
-
-        # Clear the cache if one exists.
-
-        def clear_cache
-          @cache&.clear
-          @populate_state = 1 if @populate_state == 2
-        end
-
-        private
-
-        def search_file(ident_)
-          ::File.open(@path) do |file_|
-            cur_name_ = nil
-            cur_ident_ = nil
-            cur_text_ = nil
-            file_.each do |line_|
-              line_.strip!
-              if (comment_delim_ = line_.index("#"))
-                cur_name_ = line_[comment_delim_ + 1..-1].strip
-                line_ = line_[0..comment_delim_ - 1].strip
-              end
-              if !cur_ident_ && (line_ =~ /^<(\w+)>(.*)/)
-                cur_ident_ = Regexp.last_match(1)
-                cur_text_ = []
-                line_ = Regexp.last_match(2).strip
-              end
-              next unless cur_ident_
-              if line_[-2..-1] == "<>"
-                cur_text_ << line_[0..-3].strip
-                cur_text_ = cur_text_.join(" ")
-                if ident_.nil?
-                  @cache[ident_] = Entry.new(ident_, authority: @authority, authority_code: @authority ? id_ : nil, name: cur_name_, proj4: cur_text_)
-                end
-                return [ident_, cur_name_, cur_text_] if cur_ident_ == ident_
-                cur_ident_ = nil
-                cur_name_ = nil
-                cur_text_ = nil
-              else
-                cur_text_ << line_
-              end
-            end
-          end
-          nil
-        end
-      end
-    end
-  end
-end