proj4rb 4.0.0 → 4.1.0

data/lib/proj/crs.rb

@@ -6,13 +6,13 @@ module Proj
   class Crs < PjObject
     # Create a ProjectedCRS.
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
-    # @param geodetic_crs [CRS] Base GeodeticCRS
+    # @param geodetic_crs [Crs] Base GeodeticCRS
     # @param conversion [Conversion] Conversion
     # @param coordinate_system [CoordinateSystem] Cartesian coordinate system
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_projected(context, name: nil, geodetic_crs:, conversion:, coordinate_system:)
       pointer = Api.proj_create_projected_crs(context, name, geodetic_crs, conversion, coordinate_system)
 
@@ -25,12 +25,12 @@ module Proj
 
     # Returns a BoundCRS
     #
-    # @param ctx [Context] Context
-    # @param base_crs [CRS] Base CRS
-    # @param hub_crs [CRS] HUB CRS
+    # @param context [Context] Context
+    # @param base_crs [Crs] Base CRS
+    # @param hub_crs [Crs] HUB CRS
     # @param transformation [Transformation]
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_bound(context, base_crs:, hub_crs:, transformation:)
       pointer = Api.proj_crs_create_bound_crs(context, base_crs, hub_crs, transformation)
 
@@ -43,8 +43,8 @@ module Proj
 
     # Returns a BoundCRS with a transformation to EPSG:4326 wrapping it
     #
-    # @param ctx [Context] Context
-    # @param crs [CRS] CRS to wrap
+    # @param context [Context] Context
+    # @param crs [Crs] CRS to wrap
     # @param allow_intermediate_crs [String] Specifies if an intermediate CRS may be considered when
     #        computing the possible transformations. Allowed values are:
     #  * ALWAYS
@@ -53,7 +53,7 @@ module Proj
     #
     #  Default is NEVER
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_bound_to_wgs84(context, crs:, allow_intermediate_crs: "NEVER")
       options = {"ALLOW_INTERMEDIATE_CRS": allow_intermediate_crs}
       options_ptr = create_options_pointer(options)
@@ -69,10 +69,10 @@ module Proj
 
     # Create a a EngineeringCRS
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the CRS. Default is nil.
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_engineering(context, name:)
       pointer = Api.proj_create_engineering_crs(context, name)
 
@@ -85,13 +85,13 @@ module Proj
 
     # Create a VerticalCRS. For additional functionality see Crs#create_vertical_ex
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
     # @param datum_name [String] Name of the GeodeticReferenceFrame. Default is nil.
     # @param linear_units [String] Name of the angular units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_vertical(context, name:, datum_name:, linear_units:, linear_units_conv:)
       pointer = Api.proj_create_vertical_crs(context, name, datum_name, linear_units, linear_units_conv)
 
@@ -105,12 +105,12 @@ module Proj
     # Create a Bound Vertical CRS, with a transformation to a hub geographic 3D crs, such as
     # EPSG:4979 or WGS84, using a grid
     #
-    # @param ctx [Context] Context
-    # @param vertical_crs [CRS] A VerticalCRS
-    # @param hub_geographic_3d_crs [CRS] A Geographic 3D CRS
+    # @param context [Context] Context
+    # @param vertical_crs [Crs] A VerticalCRS
+    # @param hub_crs [Crs] A Geographic 3D CRS
     # @param grid_name [String] Grid name (typically a .gtx file)
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_bound_vertical(context, vertical_crs:, hub_crs:, grid_name:)
       pointer = Api.proj_crs_create_bound_vertical_crs(context, vertical_crs, hub_crs, grid_name)
 
@@ -124,20 +124,20 @@ module Proj
     # Create a VerticalCRS. This is an extended version of Crs#create_vertical that adds
     # the capability of defining a geoid model.
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
     # @param datum_name [String] Name of the GeodeticReferenceFrame. Default is nil.
     # @param datum_auth_name [String] Authority name of the VerticalReferenceFrame. Default is nil.
     # @param datum_code [String] Code of the VerticalReferenceFrame. Default is nil.
     # @param linear_units [String] Name of the angular units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
     # @param geoid_model_name [String] Geoid model name. Can be a name from the geoid_model name or a string "PROJ foo.gtx". Default is nil.
     # @param geoid_model_auth_name [String] Authority name of the transformation for the geoid model. Default is nil.
     # @param geoid_model_code [String] Code of the transformation for the geoid model. Default is nil.
     # @param geoid_geog_crs [Crs] Geographic CRS for the geoid transformation. Default is nil.
-    # @param accuracy [Double] Accuracy in meters. Default is nil
+    # @param accuracy [Float] Accuracy in meters. Default is nil
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_vertical_ex(context, name: nil, datum_name: nil, datum_auth_name: nil, datum_code: nil,
                                 linear_units: nil, linear_units_conv: 0,
                                 geoid_model_name: nil, geoid_model_auth_name: nil, geoid_model_code: nil,
@@ -157,12 +157,12 @@ module Proj
 
     # Create a CompoundCRS.
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
-    # @param horizontal_crs [CRS] A horizontal CRS
-    # @param vertical_crs [CRS] A vertical CRS
+    # @param horizontal_crs [Crs] A horizontal CRS
+    # @param vertical_crs [Crs] A vertical CRS
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_compound(context, name:, horizontal_crs:, vertical_crs:)
       pointer = Api.proj_create_compound_crs(context, name, horizontal_crs, vertical_crs)
 
@@ -175,21 +175,21 @@ module Proj
 
     # Create a GeographicCRS.
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
     # @param datum_name [String] Name of the GeodeticReferenceFrame. Default is nil.
     # @param ellipsoid_name [String] Name of the Ellipsoid. Default is nil.
-    # @param semi_major_meter [Double] Ellipsoid semi-major axis, in meters.
-    # @param inv_flattening [Double] Ellipsoid inverse flattening. Or 0 for a sphere.
+    # @param semi_major_meter [Float] Ellipsoid semi-major axis, in meters.
+    # @param inv_flattening [Float] Ellipsoid inverse flattening. Or 0 for a sphere.
     # @param prime_meridian_name [String] Name of the PrimeMeridian. Default is nil.
-    # @param prime_meridian_offset [Double] Offset of the prime meridian, expressed in the specified angular units.
+    # @param prime_meridian_offset [Float] Offset of the prime meridian, expressed in the specified angular units.
     # @param pm_angular_units [String] Name of the angular units. Or nil for degrees.
-    # @param pm_angular_units_conv [Double] Conversion factor from the angular unit to radians. Default is 0 if pm_angular_units is nil
+    # @param pm_angular_units_conv [Float] Conversion factor from the angular unit to radians. Default is 0 if pm_angular_units is nil
     # @param coordinate_system [CoordinateSystem] Ellipsoidal coordinate system
     #
-    # @return [CRS]
-    def self.create_geographic(context, name:, datum_name:, ellps_name:, semi_major_meter:, inv_flattening:, prime_meridian_name:, prime_meridian_offset:, pm_angular_units:, pm_units_conv:, coordinate_system:)
-      pointer = Api.proj_create_geographic_crs(context, name, datum_name, ellps_name, semi_major_meter, inv_flattening, prime_meridian_name, prime_meridian_offset, pm_angular_units, pm_units_conv, coordinate_system)
+    # @return [Crs]
+    def self.create_geographic(context, name:, datum_name:, ellipsoid_name:, semi_major_meter:, inv_flattening:, prime_meridian_name:, prime_meridian_offset:, pm_angular_units:, pm_angular_units_conv:, coordinate_system:)
+      pointer = Api.proj_create_geographic_crs(context, name, datum_name, ellipsoid_name, semi_major_meter, inv_flattening, prime_meridian_name, prime_meridian_offset, pm_angular_units, pm_angular_units_conv, coordinate_system)
 
       if pointer.null?
         Error.check_context(context)
@@ -200,12 +200,12 @@ module Proj
 
     # Create a GeographicCRS from a datum
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
-    # @param datum [Datum | DatumEnsemble] Datum or DatumEnsemble
+    # @param datum [Datum, DatumEnsemble] Datum or DatumEnsemble
     # @param coordinate_system [CoordinateSystem] Ellipsoidal coordinate system
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_geographic_from_datum(context, name:, datum:, coordinate_system:)
       pointer = Api.proj_create_geographic_crs_from_datum(context, name, datum, coordinate_system)
 
@@ -218,22 +218,22 @@ module Proj
 
     # Create a GeographicCRS.
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
     # @param datum_name [String] Name of the GeodeticReferenceFrame. Default is nil.
     # @param ellipsoid_name [String] Name of the Ellipsoid. Default is nil.
-    # @param semi_major_meter [Double] Ellipsoid semi-major axis, in meters.
-    # @param inv_flattening [Double] Ellipsoid inverse flattening. Or 0 for a sphere.
+    # @param semi_major_meter [Float] Ellipsoid semi-major axis, in meters.
+    # @param inv_flattening [Float] Ellipsoid inverse flattening. Or 0 for a sphere.
     # @param prime_meridian_name [String] Name of the PrimeMeridian. Default is nil.
-    # @param prime_meridian_offset [Double] Offset of the prime meridian, expressed in the specified angular units.
+    # @param prime_meridian_offset [Float] Offset of the prime meridian, expressed in the specified angular units.
     # @param angular_units [String] Name of the angular units. Or nil for degrees.
-    # @param angular_units_conv [Double] Conversion factor from the angular unit to radians. Default is 0 if angular_units is nil
+    # @param angular_units_conv [Float] Conversion factor from the angular unit to radians. Default is 0 if angular_units is nil
     # @param linear_units [String] Name of the angular units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
     #
-    # @return [CRS]
-    def self.create_geocentric(context, name:, datum_name:, ellps_name:, semi_major_meter:, inv_flattening:, prime_meridian_name:, prime_meridian_offset:, angular_units:, angular_units_conv:, linear_units:, linear_units_conv:)
-      pointer = Api.proj_create_geocentric_crs(context, name, datum_name, ellps_name, semi_major_meter, inv_flattening, prime_meridian_name, prime_meridian_offset, angular_units, angular_units_conv, linear_units, linear_units_conv)
+    # @return [Crs]
+    def self.create_geocentric(context, name:, datum_name:, ellipsoid_name:, semi_major_meter:, inv_flattening:, prime_meridian_name:, prime_meridian_offset:, angular_units:, angular_units_conv:, linear_units:, linear_units_conv:)
+      pointer = Api.proj_create_geocentric_crs(context, name, datum_name, ellipsoid_name, semi_major_meter, inv_flattening, prime_meridian_name, prime_meridian_offset, angular_units, angular_units_conv, linear_units, linear_units_conv)
 
       if pointer.null?
         Error.check_context(context)
@@ -244,13 +244,13 @@ module Proj
 
     # Create a GeodeticCRS of geocentric type
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
-    # @param datum [Datum | DatumEnsemble] Datum or DatumEnsemble
+    # @param datum [Datum, DatumEnsemble] Datum or DatumEnsemble
     # @param linear_units [String] Name of the angular units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from linear units to meters. Default is 0 if linear_units is nil
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_geocentric_from_datum(context, name:, datum:, linear_units:, linear_units_conv:)
       pointer = Api.proj_create_geocentric_crs_from_datum(context, name, datum, linear_units, linear_units_conv)
 
@@ -263,13 +263,13 @@ module Proj
 
     # Create a DerivedGeograhicCRS
     #
-    # @param ctx [Context] Context
+    # @param context [Context] Context
     # @param name [String] Name of the GeographicCRS. Default is nil.
-    # @param base_geographic_crs [CRS] Base Geographic CRS
+    # @param base_geographic_crs [Crs] Base Geographic CRS
     # @param conversion [Conversion] Conversion from the base Geographic to the DerivedGeograhicCRS
     # @param coordinate_system [CoordinateSystem] Ellipsoidal coordinate system
     #
-    # @return [CRS]
+    # @return [Crs]
     def self.create_derived_geographic(context, name: nil, base_geographic_crs:, conversion:, coordinate_system:)
       pointer = Api.proj_create_derived_geographic_crs(context, name, base_geographic_crs, conversion, coordinate_system)
 
@@ -282,8 +282,8 @@ module Proj
 
     # Find GeodeticCRSes that use the specified datum
     #
-    # @param ctx [Context] Context
-    # @param auth_name [string] - Authority name. Default is nil.
+    # @param context [Context] Context
+    # @param auth_name [String] - Authority name. Default is nil.
     # @param datum_auth_name [String] Datum authority name
     # @param datum_code [String] Datum code
     # @param crs_type [String] The CRS type. Default is nil. Allowed values are:
@@ -358,7 +358,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_crs_get_geodetic_crs
     #
-    # @return [CRS]
+    # @return [Crs]
     def geodetic_crs
       pointer = Api.proj_crs_get_geodetic_crs(self.context, self)
       self.class.create_object(pointer, self.context)
@@ -370,7 +370,7 @@ module Proj
     #
     # @param index [Integer] Index of the CRS component (typically 0 = horizontal, 1 = vertical)
     #
-    # @return [CRS]
+    # @return [Crs]
     def sub_crs(index)
       pointer = Api.proj_crs_get_sub_crs(self.context, self, index)
       self.class.create_object(pointer, self.context)
@@ -407,7 +407,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_crs_get_horizontal_datum
     #
-    # @return [CRS]
+    # @return [Crs]
     def horizontal_datum
       pointer = Api.proj_crs_get_horizontal_datum(self.context, self)
       self.class.create_object(pointer, self.context)
@@ -473,7 +473,7 @@ module Proj
 
     # Returns a list of matching reference CRS, and the percentage (0-100) of confidence in the match.
     #
-    # @param auth_name [string] - Authority name, or nil for all authorities
+    # @param auth_name [String] - Authority name, or nil for all authorities
     #
     # @return [Array] - Array of CRS objects sorted by decreasing confidence.
     def identify(auth_name)
@@ -501,7 +501,7 @@ module Proj
     #
     # @param name [String] The new name of the CRS
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_name(name)
       ptr = Api.proj_alter_name(self.context, self, name)
 
@@ -514,10 +514,10 @@ module Proj
 
     # Return a copy of the CRS with its identifier changed
     #
-    # @param name [String] The new authority name of the CRS
+    # @param auth_name [String] The new authority name of the CRS
     # @param code [String] The new code of the CRS
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_id(auth_name, code)
       ptr = Api.proj_alter_id(self.context, self, auth_name, code)
 
@@ -535,9 +535,9 @@ module Proj
     #      CRS with new_geod_crs.
     #  * In other cases, it returns a clone of obj.
     #
-    # @param new_geod_crs [CRS] A GeodeticCRS
+    # @param new_geod_crs [Crs] A GeodeticCRS
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_geodetic_crs(new_geod_crs)
       ptr = Api.proj_crs_alter_geodetic_crs(self.context, self, new_geod_crs)
 
@@ -551,11 +551,11 @@ module Proj
     # Return a copy of the CRS with its angular units changed
     #
     # @param angular_units [String] Name of the angular units. Or nil for degrees.
-    # @param angular_units_conv [Double] Conversion factor from the angular unit to radians. Default is 0 if angular_units is nil
+    # @param angular_units_conv [Float] Conversion factor from the angular unit to radians. Default is 0 if angular_units is nil
     # @param unit_auth_name [String]  Unit authority name. Defaults to nil.
     # @param unit_code [String] Unit code. Defaults to nil.
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_cs_angular_unit(angular_units: nil, angular_units_conv: 0, unit_auth_name: nil, unit_code: nil)
       ptr = Api.proj_crs_alter_cs_angular_unit(self.context, self, angular_units, angular_units_conv, unit_auth_name, unit_code)
 
@@ -570,11 +570,11 @@ module Proj
     # must be or contain a ProjectedCRS, VerticalCRS or a GeocentricCRS.
     #
     # @param linear_units [String] Name of the linear units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from the linear unit to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from the linear unit to meters. Default is 0 if linear_units is nil
     # @param unit_auth_name [String]  Unit authority name. Defaults to nil.
     # @param unit_code [String] Unit code. Defaults to nil.
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_cs_linear_unit(linear_units: nil, linear_units_conv: 0, unit_auth_name: nil, unit_code: nil)
       ptr = Api.proj_crs_alter_cs_linear_unit(self.context, self, linear_units, linear_units_conv, unit_auth_name, unit_code)
 
@@ -589,7 +589,7 @@ module Proj
     # must be or contain a ProjectedCRS, VerticalCRS or a GeocentricCRS.
     #
     # @param linear_units [String] Name of the linear units. Or nil for meters.
-    # @param linear_units_conv [Double] Conversion factor from the linear unit to meters. Default is 0 if linear_units is nil
+    # @param linear_units_conv [Float] Conversion factor from the linear unit to meters. Default is 0 if linear_units is nil
     # @param unit_auth_name [String]  Unit authority name. Defaults to nil.
     # @param unit_code [String] Unit code. Defaults to nil.
     # @param convert_to_new_unit [Boolean] If true then existing values will be converted from
@@ -597,7 +597,7 @@ module Proj
     #  and the unit overridden (so the resulting CRS will not be equivalent to the
     #  original one for reprojection purposes).
     #
-    # @return [CRS]
+    # @return [Crs]
     def alter_parameters_linear_unit(linear_units: nil, linear_units_conv: 0, unit_auth_name: nil, unit_code: nil, convert_to_new_unit:)
       ptr = Api.proj_crs_alter_parameters_linear_unit(self.context, self, linear_units, linear_units_conv,
                                                       unit_auth_name, unit_code,
@@ -615,7 +615,7 @@ module Proj
     #
     # @param name [String] CRS name. If nil then the name of this CRS will be used.
     #
-    # @return [CRS]
+    # @return [Crs]
     def promote_to_3d(name: nil)
       ptr = Api.proj_crs_promote_to_3D(self.context, name, self)
 
@@ -630,7 +630,7 @@ module Proj
     #
     # @param name [String] CRS name. If nil then the name of this CRS will be used.
     #
-    # @return [CRS]
+    # @return [Crs]
     def demote_to_2d(name: nil)
       ptr = Api.proj_crs_demote_to_2D(self.context, name, self)
 
@@ -656,9 +656,9 @@ module Proj
     # This is equivalent to using Crs#promote_to_3d
     #
     # @param name [String] CRS name. If nil then the name of this CRS will be used.
-    # @param geog_3D_crs [CRS] Base geographic 3D CRS for the new CRS. Defaults to nil.
+    # @param geog_3d_crs [Crs] Base geographic 3D CRS for the new CRS. Defaults to nil.
     #
-    # @return [CRS]
+    # @return [Crs]
     def projected_3d(name: nil, geog_3d_crs: nil)
       ptr = Api.proj_crs_create_projected_3D_crs_from_2D(self.context, name, self, geog_3d_crs)
 

data/lib/proj/crs_info.rb

@@ -1,23 +1,23 @@
 # encoding: UTF-8
 module Proj
   class CrsInfo
-    attr_reader :auth_name, :code, :name, :type, :deprecated, :bbox_valid,
+    attr_reader :auth_name, :code, :name, :crs_type, :deprecated, :bbox_valid,
                 :west_lon_degree, :south_lat_degree, :east_lon_degree, :north_lat_degree,
                 :area_name, :projection_method_name, :celestial_body_name
 
     def self.from_proj_crs_info(proj_crs_info)
-      data = {auth_name: proj_crs_info[:auth_name],
-              code: proj_crs_info[:code],
-              name: proj_crs_info[:name],
-              type: proj_crs_info[:type],
-              deprecated: proj_crs_info[:deprecated] == 1 ? true : false,
-              bbox_valid: proj_crs_info[:bbox_valid] == 1 ? true : false,
-              west_lon_degree: proj_crs_info[:west_lon_degree],
-              south_lat_degree: proj_crs_info[:south_lat_degree],
-              east_lon_degree: proj_crs_info[:east_lon_degree],
-              north_lat_degree: proj_crs_info[:north_lat_degree],
-              area_name: proj_crs_info[:area_name],
-              projection_method_name: proj_crs_info[:projection_method_name]}
+      data = { auth_name: proj_crs_info[:auth_name],
+               code: proj_crs_info[:code],
+               name: proj_crs_info[:name],
+               crs_type: proj_crs_info[:type],
+               deprecated: proj_crs_info[:deprecated] == 1 ? true : false,
+               bbox_valid: proj_crs_info[:bbox_valid] == 1 ? true : false,
+               west_lon_degree: proj_crs_info[:west_lon_degree],
+               south_lat_degree: proj_crs_info[:south_lat_degree],
+               east_lon_degree: proj_crs_info[:east_lon_degree],
+               north_lat_degree: proj_crs_info[:north_lat_degree],
+               area_name: proj_crs_info[:area_name],
+               projection_method_name: proj_crs_info[:projection_method_name]}
 
       if Api::PROJ_VERSION >= Gem::Version.new('8.1.0')
         data[:celestial_body_name] = proj_crs_info[:celestial_body_name]
@@ -26,13 +26,13 @@ module Proj
       new(**data)
     end
 
-    def initialize(auth_name:, code:, name:, type:, deprecated:, bbox_valid:,
+    def initialize(auth_name:, code:, name:, crs_type:, deprecated:, bbox_valid:,
                    west_lon_degree:, south_lat_degree:, east_lon_degree:, north_lat_degree:,
                    area_name:, projection_method_name:, celestial_body_name: nil)
       @auth_name = auth_name
       @code = code
       @name = name
-      @type = type
+      @crs_type = crs_type
       @deprecated = deprecated
       @bbox_valid = bbox_valid
       @west_lon_degree = west_lon_degree

data/lib/proj/database.rb

@@ -84,12 +84,12 @@ module Proj
     # @see https://proj.org/development/reference/functions.html#c.proj_get_codes_from_database
     #
     # @param auth_name [String] Authority name. Must not be nil.
-    # @param type [PJ_TYPE] Object type.
+    # @param pj_type [PJ_TYPE] Proj Object type.
     # @param allow_deprecated [Boolean] Specifies if deprecated objects should be returned. Default is false.
     #
     # @return [Strings] Returned authority codes
-    def codes(auth_name, type, allow_deprecated = false)
-      ptr = Api.proj_get_codes_from_database(self.context, auth_name, type, allow_deprecated ? 1 : 0)
+    def codes(auth_name, pj_type, allow_deprecated = false)
+      ptr = Api.proj_get_codes_from_database(self.context, auth_name, pj_type, allow_deprecated ? 1 : 0)
       Strings.new(ptr)
     end
 

data/lib/proj/datum.rb

@@ -4,7 +4,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_dynamic_datum_get_frame_reference_epoch
     #
-    # @return [Double] The frame reference epoch as decimal year, or -1 in case of error.
+    # @return [Float] The frame reference epoch as decimal year, or -1 in case of error.
     def frame_reference_epoch
       Api.proj_dynamic_datum_get_frame_reference_epoch(self.context, self)
     end

data/lib/proj/ellipsoid.rb

@@ -43,7 +43,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_ellipsoid_get_parameters
     #
-    # @return [Double]
+    # @return [Float]
     def semi_major_axis
       self.parameters[:semi_major_axis]
     end
@@ -52,7 +52,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_ellipsoid_get_parameters
     #
-    # @return [Double]
+    # @return [Float]
     def semi_minor_axis
       self.parameters[:semi_minor_axis]
     end
@@ -70,7 +70,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_ellipsoid_get_parameters
     #
-    # @return [Double]
+    # @return [Float]
     def inverse_flattening
       self.parameters[:inverse_flattening]
     end

data/lib/proj/grid.rb

@@ -85,7 +85,7 @@ module Proj
     # @see https://proj.org/development/reference/functions.html#c.proj_download_file
     #
     # @param ignore_ttl [Boolean] If set to FALSE, PROJ will only check the recentness of an already downloaded file, if the delay between the last time it has been verified and the current time exceeds the TTL setting. This can save network accesses. If set to TRUE, PROJ will unconditionally check from the server the recentness of the file.
-    # @yieldparam percent [Double] The progress downloading the file in the range of 0 to 1
+    # @yieldparam percent [Float] The progress downloading the file in the range of 0 to 1
     #
     # @return [Boolean] True if the download was successful or unneeded. Otherwise false
     def download(ignore_ttl = false)

data/lib/proj/operation.rb

@@ -3,10 +3,10 @@ module Proj
     attr_reader :id, :description
 
     def self.list
-      pointer_to_array = FFI::Pointer.new(Api::PJ_OPERATIONS, Api.proj_list_operations)
+      pointer_to_array = FFI::Pointer.new(Api::PJ_LIST, Api.proj_list_operations)
       result = Array.new
       0.step do |i|
-        operation_info = Api::PJ_OPERATIONS.new(pointer_to_array[i])
+        operation_info = Api::PJ_LIST.new(pointer_to_array[i])
         break result if operation_info[:id].nil?
         id = operation_info[:id]
         description = operation_info[:descr].read_pointer.read_string.force_encoding('UTF-8')

data/lib/proj/operation_factory_context.rb

@@ -3,6 +3,7 @@ module Proj
   class OperationFactoryContext
     attr_reader :context
 
+    # @!visibility private
     def self.finalize(pointer)
       proc do
         Api.proj_operation_factory_context_destroy(pointer)
@@ -44,7 +45,7 @@ module Proj
 
     # Set the desired accuracy of the resulting coordinate transformations.
     #
-    # @param value [double] - Accuracy in meters. Set to 0 to disable the filter.
+    # @param value [Float] - Accuracy in meters. Set to 0 to disable the filter.
     def desired_accuracy=(value)
       Api.proj_operation_factory_context_set_desired_accuracy(self.context, self, value)
     end

data/lib/proj/parameters.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 module Proj
   class Parameters
+    # @!visibility private
     def self.finalize(pointer)
       proc do
         Api.proj_get_crs_list_parameters_destroy(pointer)

data/lib/proj/pj_object.rb

@@ -205,7 +205,7 @@ module Proj
 
     # Assign a new context to this object
     #
-    # @param [Context] The context to assign to this object
+    # @param value [Context] The context to assign to this object
     def context=(value)
       Api.proj_assign_context(self, value)
     end
@@ -310,7 +310,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_pj_info
     #
-    # @return [Double]
+    # @return [Float]
     def accuracy
       self.info[:accuracy]
     end
@@ -468,7 +468,7 @@ module Proj
     # @param coord1 [Coordinate] Coordinate of first point. Must be lat/long in radians
     # @param coord2 [Coordinate] Coordinate of second point. Must be lat/long in radians
     #
-    # @return [Double] Distance between the coordinates in meters
+    # @return [Float] Distance between the coordinates in meters
     def lp_distance(coord1, coord2)
       Api.proj_lp_dist(self, coord1, coord2)
     end
@@ -485,7 +485,7 @@ module Proj
     # @param coord1 [Coordinate] Coordinate of first point. Must be lat/long in radians
     # @param coord2 [Coordinate] Coordinate of second point. Must be lat/long in radians
     #
-    # @return [Double] Distance between the coordinates in meters
+    # @return [Float] Distance between the coordinates in meters
     def lpz_distance(coord1, coord2)
       Api.proj_lpz_dist(self, coord1, coord2)
     end
@@ -497,7 +497,7 @@ module Proj
     # @param coord1 [Coordinate] Coordinate of first point
     # @param coord2 [Coordinate] Coordinate of second point
     #
-    # @return [Double] Distance between the coordinates in meters
+    # @return [Float] Distance between the coordinates in meters
     def xy_distance(coord1, coord2)
       Api.proj_xy_dist(coord1, coord2)
     end
@@ -510,7 +510,7 @@ module Proj
     # @param coord1 [Coordinate] Coordinate of first point
     # @param coord2 [Coordinate] Coordinate of second point
     #
-    # @return [Double] Distance between the coordinates in meters
+    # @return [Float] Distance between the coordinates in meters
     def xyz_distance(coord1, coord2)
       Api.proj_xyz_dist(coord1, coord2)
     end

data/lib/proj/pj_objects.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 module Proj
   class PjObjects
+    # @!visibility private
     def self.finalize(pointer)
       proc do
         Api.proj_list_destroy(pointer)

data/lib/proj/prime_meridian.rb

@@ -40,7 +40,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
     #
-    # @return [Double]
+    # @return [Float]
     def longitude
       self.parameters[:longitude]
     end
@@ -49,7 +49,7 @@ module Proj
     #
     # @see https://proj.org/development/reference/functions.html#c.proj_prime_meridian_get_parameters
     #
-    # @return [Double]
+    # @return [Float]
     def unit_conv_factor
       self.parameters[:unit_conv_factor]
     end