proj4rb 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d9e88b214716f78e690e7265c6a9edc9e2c9c77cbb6e40c32883eec61320cc5
-  data.tar.gz: 4102575947ce82e7fdc40d6feeb37bb4b34f024dbfeda66fe20a1909b4a93ccd
+  metadata.gz: dee29581eba9124621bcf04204e9d224e39bba0482caa174fc57014c49a37be7
+  data.tar.gz: 46529fe96f62f6a94cc26baf8f1a695e38ff9099b16c52c58b503380d8773594
 SHA512:
-  metadata.gz: 87926009a11eb4a4d71cedcd79a4d72b8196e57df4ac7b59cb28c6b75da5635b89291fa564a1153fb4d2cd5cd910e5ff2c489695177aac54d5a6302a90d1cb26
-  data.tar.gz: 412e2777701a836b9b7d76f00e0e8526a5488711adf10051ea34f9603999a25d290d74b073d2e0f7940e68efc210c416f5a14b6f74e01e4572883caafe620738
+  metadata.gz: 145525e768e261cc293be7ec9851c6e19590f40572de114262da5b4c94eb9baec8296131071eee3438de0df7a18e7ace0981f14c2b6b0079b37739d852879833
+  data.tar.gz: f79972d062f3ce4f3f03e8ba2d67b908a928407b5cec336cfc79c83dca745e310c06d339d78d506bf419eeec3a8bd6c3e543aba950c37f5537edfba625f9da84

data/ChangeLog

@@ -1,3 +1,9 @@
+4.1.0 - March 12, 2023
+======================
+* Fix YARD warnings
+* Fix YARD types to match RBS types
+* Don't use type as attribute or method name to avoid conflicts with RBS
+
 4.0.0 - March 12, 2023
 ======================
 * Support Proj 9

data/README.rdoc

@@ -5,7 +5,7 @@ between a number of different coordinate systems and projections.
 == Documentation
 Reference documentation is available at https://rubydoc.info/github/cfis/proj4rb.
 
-Examples can be found in this README file as well as in the {file:Examples.rdoc Examples} file. In addition, the test suite has exapmles of calling almost every API so when in doubt take a look at them!
+Examples can be found in this README file as well as in the Examples file. In addition, the test suite has exapmles of calling almost every API so when in doubt take a look at them!
 
 == Installation
 First install the gem in the usual manner:
@@ -138,7 +138,7 @@ If you prefer to work with a uniform axis order, regardless of the axis orders m
 
 The normalized transformation will return output coordinates in longitude, latitude order for geographic CRSes and easting, northing for most projected CRSes.
 
-For more information see {https://proj.org/faq.html#why-is-the-axis-ordering-in-proj-not-consistent Why Is The Axis Ordering In Proj Not Consistent?}
+For more information see https://proj.org/faq.html#why-is-the-axis-ordering-in-proj-not-consistent.
 
 === Context
 Contexts are used to support multi-threaded programs. The bindings expose this object via Context.current
@@ -149,9 +149,9 @@ Both Crs and Transformation objects take a context object in their constructors.
 to using Context.current
 
 == Network Access
-Proj supports downloading grid files on demand if network access is enabled (it is disabled by default). To enable network use the method {Context#network_enabled=}. To specify the url endpoint use {Context#url=}. Advanced users can replace Proj's networking code, which uses libcurl, with their own implementation. To do this see the NetworkApi class.
+Proj supports downloading grid files on demand if network access is enabled (it is disabled by default). To enable network use the method Context#network_enabled=. To specify the url endpoint use Context#url=. Advanced users can replace Proj's networking code, which uses libcurl, with their own implementation. To do this see the NetworkApi class.
 
-Downloaded grids are cached in a sqlite file named cache.db. To specify the location, size and other characteristics of the cache file refer to the {GridCache} class which is accessible via Context#cache. By default the cache size is 300MB. Caching is on by default but can be disabled via GridCache#enabled=.
+Downloaded grids are cached in a sqlite file named cache.db. To specify the location, size and other characteristics of the cache file refer to the GridCache class which is accessible via Context#cache. By default the cache size is 300MB. Caching is on by default but can be disabled via GridCache#enabled=.
 
 == Error handling
 When an error occurs, a Proj::Error instance will be thrown with the underlying message provided
@@ -172,7 +172,7 @@ The Ruby program itself cannot set this variable and have it work correctly (at
 For more information see https://proj.org/resource_files.html
 
 == Class Hierarchy
-The proj4rb class hierarchy is based on Proj's class hiearchy which, in turn, is derived from {http://docs.opengeospatial.org/as/18-005r5/18-005r5.html ISO 19111:2019}. It is:
+The proj4rb class hierarchy is based on Proj's class hiearchy which, in turn, is derived from http://docs.opengeospatial.org/as/18-005r5/18-005r5.html. It is:
 
    PjObject
      CoordinateOperationMixin

data/lib/api/api.rb

@@ -5,6 +5,9 @@ module Proj
   module Api
     extend FFI::Library
 
+    # List of knows PROJ library versions
+    #
+    # @return [Array<String>]
     def self.library_versions
       ["25", # 9.2
        "9_1", # 9.1
@@ -18,6 +21,9 @@ module Proj
        "11"] # 4.9
     end
 
+    # Search paths to use when looking for PROJ library
+    #
+    # @return [Array<String>]
     def self.search_paths
       result = case RbConfig::CONFIG['host_os']
                  when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
@@ -33,18 +39,27 @@ module Proj
       result
     end
 
+    # Windows search paths for PROJ library
+    #
+    # @return [Array<String>]
     def self.windows_search_paths
       self.library_versions.map do |version|
         ["libproj-#{version}", "libproj_#{version}"]
       end.flatten
     end
 
+    # Linux search paths for PROJ library
+    #
+    # @return [Array<String>]
     def self.linux_search_paths
       self.library_versions.map do |version|
         "libproj.so.#{version}"
       end
     end
 
+    # MacOS search paths for PROJ library
+    #
+    # @return [Array<String>]
     def self.macos_search_paths
       # On MacOS only support HomeBrew since the MacPort is unsupported and ancient (5.2).
       self.library_versions.map do |version|
@@ -52,6 +67,9 @@ module Proj
       end
     end
 
+    # Load PROJ library
+    #
+    # @return [FFI::DynamicLibrary]
     def self.load_library
       if ENV["PROJ_LIB_PATH"]
         ffi_lib ENV["PROJ_LIB_PATH"]
@@ -62,6 +80,9 @@ module Proj
       ffi_libraries.first
     end
 
+    # Load API files based on PROJ version
+    #
+    # @return [nil]
     def self.load_api
       # First load the base 5.0 api so we can determine the Proj Version
       require_relative './api_5_0'

data/lib/api/api_5_0.rb

@@ -28,7 +28,6 @@ module Proj
              :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
@@ -197,6 +196,7 @@ module Proj
              :lastupdate, [:string, 16] # Date of last update in YYYY-MM-DD format
     end
 
+    # @return [Symbol]
     PJ_LOG_LEVEL = enum(:PJ_LOG_NONE , 0,
                         :PJ_LOG_ERROR, 1,
                         :PJ_LOG_DEBUG, 2,
@@ -206,11 +206,13 @@ module Proj
                         :PJ_LOG_DEBUG_MINOR, 3) # for proj_api.h compatibility
 
     # Apply transformation to observation - in forward or inverse direction
+    # @return [Symbol]
     PJ_DIRECTION = enum(:PJ_FWD, 1,   # Forward
                         :PJ_IDENT, 0, # Do nothing
                         :PJ_INV, -1)  # Inverse
 
     # Object category
+    # @return [Symbol]
     PJ_CATEGORY = enum(:PJ_CATEGORY_ELLIPSOID,
                        :PJ_CATEGORY_PRIME_MERIDIAN,
                        :PJ_CATEGORY_DATUM,
@@ -218,6 +220,7 @@ module Proj
                        :PJ_CATEGORY_COORDINATE_OPERATION,
                        :PJ_CATEGORY_DATUM_ENSEMBLE)
 
+    # @return [Symbol]
     PJ_TYPE = enum(:PJ_TYPE_UNKNOWN,
                    :PJ_TYPE_ELLIPSOID,
                    :PJ_TYPE_PRIME_MERIDIAN,
@@ -256,9 +259,11 @@ module Proj
 
                    :PJ_TYPE_COORDINATE_METADATA)
 
+    # @return [Symbol]
     PJ_PROJ_STRING_TYPE = enum(:PJ_PROJ_5,
                                :PJ_PROJ_4)
 
+    # @return [Symbol]
     PJ_COORDINATE_SYSTEM_TYPE = enum(:PJ_CS_TYPE_UNKNOWN,
                                      :PJ_CS_TYPE_CARTESIAN,
                                      :PJ_CS_TYPE_ELLIPSOIDAL,
@@ -270,6 +275,7 @@ module Proj
                                      :PJ_CS_TYPE_TEMPORALCOUNT,
                                      :PJ_CS_TYPE_TEMPORALMEASURE)
 
+    # @return [Symbol]
     PJ_WKT_TYPE = enum(:PJ_WKT2_2015,
                        :PJ_WKT2_2015_SIMPLIFIED,
                        :PJ_WKT2_2019,

data/lib/api/api_6_0.rb

@@ -1,11 +1,13 @@
 module Proj
   module Api
     # Comparison criteria
+    # @return [Symbol]
     PJ_COMPARISON_CRITERION = enum(:PJ_COMP_STRICT, # All properties are identical
                                    :PJ_COMP_EQUIVALENT, # The objects are equivalent for the purpose of coordinate operations. They can differ by the name of their objects, identifiers, other metadata. Parameters may be expressed in different units, provided that the value is (with some tolerance) the same once expressed in a common unit.
                                    :PJ_COMP_EQUIVALENT_EXCEPT_AXIS_ORDER_GEOGCRS) # Same as EQUIVALENT, relaxed with an exception that the axis order of the base CRS of a DerivedCRS/ProjectedCRS or the axis order of a GeographicCRS is ignored. Only to be used with DerivedCRS/ProjectedCRS/GeographicCRS
 
     #Guessed WKT "dialect"
+    # @return [Symbol]
     PJ_GUESSED_WKT_DIALECT = enum(:PJ_GUESSED_WKT2_2019,
                                   :PJ_GUESSED_WKT2_2018,
                                   :PJ_GUESSED_WKT2_2015,
@@ -65,9 +67,9 @@ module Proj
                 :type, PJ_TYPE, # Object type
                 :deprecated, :int, # Whether the object is deprecated
                 :bbox_valid, :int, # Whether bbox values in degrees are valid
-                :west_lon_degree, :double,  # Western-most longitude of the area of use, in degrees.
+                :west_lon_degree, :double, # Western-most longitude of the area of use, in degrees.
                 :south_lat_degree, :double, # Southern-most latitude of the area of use, in degrees.
-                :east_lon_degree, :double,  # Eastern-most longitude of the area of use, in degrees.
+                :east_lon_degree, :double, # Eastern-most longitude of the area of use, in degrees.
                 :north_lat_degree, :double, # Northern-most latitude of the area of use, in degrees.
                 :area_name, :string, # Name of the area of use
                 :projection_method_name, :string] # Name of the projection method for a projected CRS. Might be NULL even for projected CRS in some cases.

data/lib/api/api_7_0.rb

@@ -4,6 +4,7 @@ module Proj
     typedef :pointer, :PROJ_FILE_HANDLE
     typedef :pointer, :USER_DATA
 
+    # @return [Symbol]
     PROJ_OPEN_ACCESS = enum(:PROJ_OPEN_ACCESS_READ_ONLY, # Read-only access. Equivalent to "rb"
                             :PROJ_OPEN_ACCESS_READ_UPDATE, # Read-update access. File should be created if not existing. Equivalent to "r+b
                             :PROJ_OPEN_ACCESS_CREATE) # Create access. File should be truncated to 0-byte if already existing. Equivalent to "w+b"

data/lib/api/api_experimental.rb

@@ -1,17 +1,21 @@
 module Proj
   module Api
     if Api::PROJ_VERSION >= Gem::Version.new('6.0.0')
+
+      # @return [Symbol]
       PJ_UNIT_TYPE = enum(:PJ_UT_ANGULAR,
                           :PJ_UT_LINEAR,
                           :PJ_UT_SCALE,
                           :PJ_UT_TIME)
 
+      # @return [Symbol]
       PJ_CARTESIAN_CS_2D_TYPE = enum(:PJ_CART2D_EASTING_NORTHING,
                                      :PJ_CART2D_NORTHING_EASTING,
                                      :PJ_CART2D_NORTH_POLE_EASTING_SOUTH_NORTHING_SOUTH,
                                      :PJ_CART2D_SOUTH_POLE_EASTING_NORTH_NORTHING_NORTH,
                                      :PJ_CART2D_WESTING_SOUTHING)
 
+      # @return [Symbol]
       PJ_ELLIPSOIDAL_CS_2D_TYPE = enum(:PJ_ELLPS2D_LONGITUDE_LATITUDE,
                                        :PJ_ELLPS2D_LATITUDE_LONGITUDE)
 
@@ -156,6 +160,7 @@ module Proj
     end
 
     if Api::PROJ_VERSION >= Gem::Version.new('6.3.0')
+      # @return [Symbol]
       PJ_ELLIPSOIDAL_CS_3D_TYPE = enum(:PJ_ELLPS3D_LONGITUDE_LATITUDE_HEIGHT,
                                        :PJ_ELLPS3D_LATITUDE_LONGITUDE_HEIGHT)
 

data/lib/proj/area.rb

@@ -6,6 +6,7 @@ module Proj
   class Area
     attr_reader :name, :west_lon_degree, :south_lat_degree, :east_lon_degree, :north_lat_degree
 
+    # @!visibility private
     def self.finalize(pointer)
       proc do
         Api.proj_area_destroy(pointer)

data/lib/proj/axis_info.rb

@@ -38,7 +38,7 @@ module Proj
     def unit_type
       database = Database.new(Context.default)
       unit = database.unit(self.unit_auth_name, self.unit_code)
-      unit.type
+      unit.unit_type
     end
   end
 end

data/lib/proj/context.rb

@@ -23,6 +23,7 @@ module Proj
       Thread.current[:proj_context] ||= Context.new
     end
 
+    # @!visibility private
     def self.finalize(pointer)
       proc do
         Api.proj_context_destroy(pointer)
@@ -177,7 +178,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_context_get_user_writable_directory
     #
-    # @param [Boolean] If set to TRUE, create the directory if it does not exist already. Defaults to false
+    # @param create [Boolean] If true create the directory if it does not exist already. Defaults to false.
     #
     # @return [String] Directory
     def user_directory(create = false)
@@ -206,7 +207,7 @@ module Proj
       end
     end
 
-    # Installs a new {FileApi FileApiImpl}
+    # Installs a new {FileApiImpl FileApi}
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_context_set_fileapi
     def set_file_api(file_api_klass)
@@ -219,7 +220,7 @@ module Proj
       @file_api = file_api_klass.new(self)
     end
 
-    # Installs a new {NetworkApi NetworkApiImpl}
+    # Installs a new {NetworkApiImpl NetworkApi}
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_context_set_network_callbacks
     def set_network_api(network_api_klass)

data/lib/proj/conversion.rb

@@ -2,7 +2,7 @@
 require 'stringio'
 
 module Proj
-  # Conversions are {CoordinateOperationMix coordinate operations} that convert a source
+  # Conversions are {CoordinateOperationMixin coordinate operations} that convert a source
   # {Coordinate coordinate} to a new value. In Proj they are defined as operations that
   # do not exert a change in reference frame while {Transformation transformations } do.
   class Conversion < PjObject
@@ -20,7 +20,6 @@ module Proj
     # @param method_auth_name [String] Method authority name. Default is nil.
     # @param method_code [String] Method code. Default is nil.
     # @param params [Array<Parameter>] Parameter descriptions
-    # @param accuracy [Double] Accuracy of the transformation in meters. A negative value means unknown.
     #
     # @return [Conversion]
     def self.create_conversion(context, name:, auth_name:, code:, method_name:, method_auth_name:, method_code:, params:)

data/lib/proj/coordinate_operation_mixin.rb

@@ -6,7 +6,7 @@ module Proj
                      :unit_conv_factor, :unit_name, :unit_auth_name, :unit_code, :unit_category,
                      keyword_init: true)
 
-  # Coordinate Operations convert {Coordinate coordintates} to a new value. In Proj they are
+  # Coordinate Operations convert {Coordinate coordinates} to a new value. In Proj they are
   # can either by {Conversion conversions} that do not exert a change in reference frame
   # or {Transformation transformations} which do.
   module CoordinateOperationMixin
@@ -168,8 +168,8 @@ module Proj
       self.transform(coord, :PJ_INV)
     end
 
-    # Transforms a {Coordinate} in the specified direction. See {CoordinateOperation#forward forward} and
-    # {CoordinateOperation#inverse inverse}
+    # Transforms a {Coordinate} in the specified direction. See {CoordinateOperationMixin#forward forward} and
+    # {CoordinateOperationMixin#inverse inverse}
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_trans
     #
@@ -212,7 +212,7 @@ module Proj
     # Transforms an array of {Coordinate coordinates}. Individual points that fail to transform
     # will have their components set to Infinity.
     #
-    # @param array [Array<Coordinate>] Coordinates to transform
+    # @param coordinates [Array<Coordinate>] Coordinates to transform
     # @param direction [PJ_DIRECTION] The direction of the transformation
     #
     # @return [Array<Coordinate>] Array of transformed coordinates
@@ -245,7 +245,7 @@ module Proj
     # @param iterations [Integer] The number of roundtrip transformations
     # @param coordinate [Coordinate] The input coordinate
     #
-    # @return [Double] The euclidean distance of the starting point coordinate and the last coordinate after n iterations back and forth.
+    # @return [Float] The euclidean distance of the starting point coordinate and the last coordinate after n iterations back and forth.
     def roundtrip(direction, iterations, coordinate)
       Api.proj_roundtrip(self, direction, iterations, coordinate.pj_coord)
     end
@@ -254,7 +254,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_normalize_for_visualization
     #
-    # @return [CoordinateOperation] A new CoordinateOperation or nil in case of error
+    # @return [CoordinateOperationMixin] A new CoordinateOperation or nil in case of error
     def normalize_for_visualization
       ptr = Api.proj_normalize_for_visualization(self.context, self)
       self.class.create_object(ptr, self.context)
@@ -264,7 +264,7 @@ module Proj
     #
     # @see }https://proj.org/development/reference/functions.html#c.proj_trans_get_last_used_operation proj_trans_get_last_used_operation
     #
-    # @return [CoordinateOperation] The last used operation
+    # @return [CoordinateOperationMixin] The last used operation
     def last_used_operation
       ptr = Api.proj_trans_get_last_used_operation(self)
       self.class.create_object(ptr, self.context)
@@ -284,7 +284,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_coordoperation_get_accuracy
     #
-    # @return [Double] The accuracy, or a negative value if unknown or in case of error.
+    # @return [Float] The accuracy, or a negative value if unknown or in case of error.
     def accuracy
       Api.proj_coordoperation_get_accuracy(self.context, self)
     end
@@ -348,7 +348,7 @@ module Proj
     #
     # @param error_if_incompatible [Boolean] If true an exception is thrown if the coordinate operation is not compatible with a WKT1 TOWGS84 representation
     #
-    # @return [Array<Double>] Array of 7 numbers that represent translation, rotation and scale parameters.
+    # @return [Array<Float>]] Array of 7 numbers that represent translation, rotation and scale parameters.
     #                          Rotation and scale difference terms might be zero if the transformation only includes translation parameters
     def to_wgs84(error_if_incompatible = false)
       parameter_count = 7

data/lib/proj/coordinate_system.rb

@@ -6,11 +6,11 @@ module Proj
     # Create a CoordinateSystem
     #
     # @param context [Context] The context associated with the CoordinateSystem
-    # @param type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
+    # @param cs_type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
     # @param axes [Array<PJ_AXIS_DESCRIPTION>] Array of Axes
     #
     # @return [CoordinateSystem]
-    def self.create(type, axes, context)
+    def self.create(cs_type, axes, context)
       axes_ptr = FFI::MemoryPointer.new(Api::PJ_AXIS_DESCRIPTION, axes.size)
       axes.each_with_index do |axis, i|
         axis_description_target = Api::PJ_AXIS_DESCRIPTION.new(axes_ptr[i])
@@ -18,7 +18,7 @@ module Proj
         axis_description_target.to_ptr.__copy_from__(axis_description_source.to_ptr, Api::PJ_AXIS_DESCRIPTION.size)
       end
 
-      pointer = Api.proj_create_cs(context, type, axes.count, axes_ptr)
+      pointer = Api.proj_create_cs(context, cs_type, axes.count, axes_ptr)
       Error.check_context(context)
       self.create_object(pointer, context)
     end
@@ -26,13 +26,13 @@ module Proj
     # Create an Ellipsoidal 2D CoordinateSystem
     #
     # @param context [Context] The context associated with the CoordinateSystem
-    # @param type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
+    # @param cs_type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
     # @param unit_name [String] Name of the angular units. Or nil for degree
-    # @param unit_conv_factor [Double] Conversion factor from the angular unit to radian. Set to 0 if unit name is degree
+    # @param unit_conv_factor [Float] Conversion factor from the angular unit to radian. Set to 0 if unit name is degree
     #
     # @return [CoordinateSystem]
-    def self.create_ellipsoidal_2d(type, context, unit_name: nil, unit_conv_factor: 0)
-      pointer = Api.proj_create_ellipsoidal_2D_cs(context, type, unit_name, unit_conv_factor)
+    def self.create_ellipsoidal_2d(cs_type, context, unit_name: nil, unit_conv_factor: 0)
+      pointer = Api.proj_create_ellipsoidal_2D_cs(context, cs_type, unit_name, unit_conv_factor)
       Error.check_context(context)
       self.create_object(pointer, context)
     end
@@ -40,15 +40,15 @@ module Proj
     # Create an Ellipsoidal 3D CoordinateSystem
     #
     # @param context [Context] The context associated with the CoordinateSystem
-    # @param type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
+    # @param cs_type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
     # @param horizontal_angular_unit_name [String] Name of the angular units. Or nil for degree
-    # @param horizontal_angular_unit_conv_factor [Double] Conversion factor from the angular unit to radian. Set to 0 if horizontal_angular_unit_name name is degree
+    # @param horizontal_angular_unit_conv_factor [Float] Conversion factor from the angular unit to radian. Set to 0 if horizontal_angular_unit_name name is degree
     # @param vertical_linear_unit_name [String] Name of the angular units. Or nil for meter
-    # @param vertical_linear_unit_conv_factor [Double] Conversion factor from the linear unit to meter. Set to 0 if vertical_linear_unit_name name is meter
+    # @param vertical_linear_unit_conv_factor [Float] Conversion factor from the linear unit to meter. Set to 0 if vertical_linear_unit_name name is meter
     #
     # @return [CoordinateSystem]
-    def self.create_ellipsoidal_3d(type, context, horizontal_angular_unit_name: nil, horizontal_angular_unit_conv_factor: 0, vertical_linear_unit_name: nil, vertical_linear_unit_conv_factor: 0)
-      pointer = Api.proj_create_ellipsoidal_3D_cs(context, type, horizontal_angular_unit_name, horizontal_angular_unit_conv_factor, vertical_linear_unit_name, vertical_linear_unit_conv_factor)
+    def self.create_ellipsoidal_3d(cs_type, context, horizontal_angular_unit_name: nil, horizontal_angular_unit_conv_factor: 0, vertical_linear_unit_name: nil, vertical_linear_unit_conv_factor: 0)
+      pointer = Api.proj_create_ellipsoidal_3D_cs(context, cs_type, horizontal_angular_unit_name, horizontal_angular_unit_conv_factor, vertical_linear_unit_name, vertical_linear_unit_conv_factor)
       Error.check_context(context)
       self.create_object(pointer, context)
     end
@@ -56,13 +56,13 @@ module Proj
     # Create a CartesiansCS 2D coordinate system
     #
     # @param context [Context] The context associated with the CoordinateSystem
-    # @param type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
+    # @param cs_type [PJ_COORDINATE_SYSTEM_TYPE] Coordinate system type
     # @param unit_name [String] Name of the unit. Default is nil.
-    # @param unit_conv_factor [Double] Unit conversion factor to SI. Default is 0.
+    # @param unit_conv_factor [Float] Unit conversion factor to SI. Default is 0.
     #
     # @return [CoordinateSystem]
-    def self.create_cartesian_2d(context, type, unit_name: nil, unit_conv_factor: 0)
-      pointer = Api.proj_create_cartesian_2D_cs(context, type, unit_name, unit_conv_factor)
+    def self.create_cartesian_2d(context, cs_type, unit_name: nil, unit_conv_factor: 0)
+      pointer = Api.proj_create_cartesian_2D_cs(context, cs_type, unit_name, unit_conv_factor)
       Error.check_context(context)
       self.create_object(pointer, context)
     end
@@ -72,7 +72,7 @@ module Proj
     # @see https://proj.org/development/reference/functions.html#c.proj_cs_get_type
     #
     # @return [PJ_COORDINATE_SYSTEM_TYPE]
-    def type
+    def cs_type
       result = Api.proj_cs_get_type(self.context, self)
       if result == :PJ_CS_TYPE_UNKNOWN
         Error.check_object(self)