rgeo 3.0.0.pre.rc.3 → 3.0.1

data/lib/rgeo/coord_sys/cs/entities.rb

@@ -147,7 +147,6 @@ module RGeo
       # Coordinate Transformation spec.
       #
       # This is a non-instantiable abstract class.
-
       class Base
         # Standard object inspection output
 
@@ -158,8 +157,8 @@ module RGeo
         # Tests for equality. Two objects are defined as equal if they
         # have the same type (class) and the same WKT representation.
 
-        def eql?(rhs)
-          rhs.class == self.class && rhs.to_wkt == to_wkt
+        def eql?(other)
+          other.class == self.class && other.to_wkt == to_wkt
         end
         alias == eql?
 
@@ -180,19 +179,21 @@ module RGeo
         # <tt>:standard_brackets</tt>
         #   If true, outputs parentheses rather than square
         #   brackets. Default is false.
-        def to_wkt(standard_brackets = false)
+        def to_wkt(standard_brackets: false)
           open, close = brackets(standard_brackets)
           content = wkt_content(standard_brackets).map { |obj| ",#{obj}" }.join
-          if defined?(@authority) && @authority
-            authority = ",AUTHORITY#{open}#{@authority.inspect},#{@authority_code.inspect}#{close}"
-          else
-            authority = ""
-          end
-          if defined?(@extensions) && @extensions
-            extensions = @extensions.map { |k, v| ",EXTENSION#{open}#{k.inspect},#{v.inspect}#{close}" }.join
-          else
-            extensions = ""
-          end
+          authority =
+            if defined?(@authority) && @authority
+              ",AUTHORITY#{open}#{@authority.inspect},#{@authority_code.inspect}#{close}"
+            else
+              ""
+            end
+          extensions =
+            if defined?(@extensions) && @extensions
+              @extensions.map { |k, v| ",EXTENSION#{open}#{k.inspect},#{v.inspect}#{close}" }.join
+            else
+              ""
+            end
           "#{wkt_typename}#{open}#{@name.inspect}#{content}#{extensions}#{authority}#{close}"
         end
 
@@ -205,12 +206,11 @@ module RGeo
         def marshal_load(data) # :nodoc:
           data = data["wkt"] if data.is_a?(Hash)
           temp = CS.create_from_wkt(data)
-          if temp.class == self.class
-            temp.instance_variables.each do |iv|
-              instance_variable_set(iv, temp.instance_variable_get(iv))
-            end
-          else
-            raise TypeError, "Bad Marshal data"
+
+          raise TypeError, "Bad Marshal data" unless temp.instance_of?(self.class)
+
+          temp.instance_variables.each do |iv|
+            instance_variable_set(iv, temp.instance_variable_get(iv))
           end
         end
 
@@ -222,12 +222,11 @@ module RGeo
 
         def init_with(coder) # :nodoc:
           temp = CS.create_from_wkt(coder.type == :scalar ? coder.scalar : coder["wkt"])
-          if temp.class == self.class
-            temp.instance_variables.each do |iv|
-              instance_variable_set(iv, temp.instance_variable_get(iv))
-            end
-          else
-            raise TypeError, "Bad YAML data"
+
+          raise TypeError, "Bad YAML data" unless temp.instance_of?(self.class)
+
+          temp.instance_variables.each do |iv|
+            instance_variable_set(iv, temp.instance_variable_get(iv))
           end
         end
 
@@ -246,20 +245,21 @@ module RGeo
       #
       # Details of axis. This is used to label axes, and indicate the
       # orientation.
-
       class AxisInfo < Base
         # :stopdoc:
         NAMES_BY_VALUE = %w[OTHER NORTH SOUTH EAST WEST UP DOWN].freeze
         # :startdoc:
 
         def initialize(name, orientation) # :nodoc:
+          super()
           @name = name
-          case orientation
-          when String, Symbol
-            @orientation = NAMES_BY_VALUE.index(orientation.to_s.upcase).to_i
-          else
-            @orientation = orientation.to_i
-          end
+          @orientation =
+            case orientation
+            when String, Symbol
+              NAMES_BY_VALUE.index(orientation.to_s.upcase).to_i
+            else
+              orientation.to_i
+            end
         end
 
         # Human readable name for axis. Possible values are "X", "Y",
@@ -301,9 +301,9 @@ module RGeo
       # projected coordinate system. The angular units of parameter
       # values match the angular units of the geographic coordinate
       # system that the projected coordinate system is based on.
-
       class ProjectionParameter < Base
         def initialize(name, value) # :nodoc:
+          super()
           @name = name
           @value = value.to_f
         end
@@ -339,15 +339,15 @@ module RGeo
       # Wolf parameters should be applied to geocentric coordinates, where
       # the X axis points towards the Greenwich Prime Meridian, the Y axis
       # points East, and the Z axis points North.
-
       class WGS84ConversionInfo < Base
-        def initialize(dx, dy, dz, ex, ey, ez, ppm) # :nodoc:
-          @dx = dx.to_f
-          @dy = dy.to_f
-          @dz = dz.to_f
-          @ex = ex.to_f
-          @ey = ey.to_f
-          @ez = ez.to_f
+        def initialize(dx_meters, dy_meters, dz_meters, ex_arc_seconds, ey_arc_seconds, ez_arc_seconds, ppm) # :nodoc:
+          super()
+          @dx = dx_meters.to_f
+          @dy = dy_meters.to_f
+          @dz = dz_meters.to_f
+          @ex = ex_arc_seconds.to_f
+          @ey = ey_arc_seconds.to_f
+          @ez = ez_arc_seconds.to_f
           @ppm = ppm.to_f
         end
 
@@ -372,7 +372,7 @@ module RGeo
         # Bursa Wolf scaling in in parts per million.
         attr_reader :ppm
 
-        def to_wkt(standard_brackets = false)
+        def to_wkt(standard_brackets: false)
           open, close = brackets(standard_brackets)
           "TOWGS84#{open}#{@dx},#{@dy},#{@dz},#{@ex},#{@ey},#{@ez},#{@ppm}#{close}"
         end
@@ -383,8 +383,8 @@ module RGeo
           # The Bursa Wolf shift should be in meters, the rotation in arc
           # seconds, and the scaling in parts per million.
 
-          def create(dx, dy, dz, ex, ey, ez, ppm)
-            new(dx, dy, dz, ex, ey, ez, ppm)
+          def create(dx_meters, dy_meters, dz_meters, ex_arc_seconds, ey_arc_seconds, ez_arc_seconds, ppm)
+            new(dx_meters, dy_meters, dz_meters, ex_arc_seconds, ey_arc_seconds, ez_arc_seconds, ppm)
           end
         end
       end
@@ -427,9 +427,10 @@ module RGeo
       # * <b>alias</b>: an alias
       # * <b>remarks</b>: provider-supplied remarks.
       # * <b>extensions</b>: a hash of extension keys and values
-
       class Info < Base
-        def initialize(name, authority = nil, authority_code = nil, abbreviation = nil, init_alias = nil, remarks = nil, extensions = nil) # :nodoc:
+        def initialize(name, authority = nil, authority_code = nil, abbreviation = nil, init_alias = nil,
+                       remarks = nil, extensions = nil) # :nodoc:
+          super()
           @name = name
           @authority = authority ? authority.to_s : nil
           @authority_code = authority_code ? authority_code.to_s : nil
@@ -488,7 +489,6 @@ module RGeo
       # Normally, you will instantiate one of the subclasses LinearUnit or
       # AngularUnit. However, it is possible to instantiate Unit if it is
       # not clear whether the data refers to a LinearUnit or AngularUnit.
-
       class Unit < Info
         def initialize(name, conversion_factor, *optional) # :nodoc:
           super(name, *optional)
@@ -525,7 +525,6 @@ module RGeo
       # == OGC spec description
       #
       # Definition of linear units.
-
       class LinearUnit < Unit
         # Returns the number of meters per LinearUnit.
         # Also available as Unit#conversion_factor.
@@ -548,7 +547,6 @@ module RGeo
       # == OGC spec description
       #
       # Definition of angular units.
-
       class AngularUnit < Unit
         # Returns the number of radians per AngularUnit.
         # Also available as Unit#conversion_factor.
@@ -571,7 +569,6 @@ module RGeo
       # == OGC spec description
       #
       # A meridian used to take longitude measurements from.
-
       class PrimeMeridian < Info
         def initialize(name, angular_unit, longitude, *optional) # :nodoc:
           super(name, *optional)
@@ -611,9 +608,9 @@ module RGeo
       # == OGC spec description
       #
       # An approximation of the Earth's surface as a squashed sphere.
-
       class Ellipsoid < Info
-        def initialize(name, semi_major_axis, semi_minor_axis, inverse_flattening, ivf_definitive, linear_unit, *optional) # :nodoc:
+        def initialize(name, semi_major_axis, semi_minor_axis, inverse_flattening, ivf_definitive,
+                       linear_unit, *optional) # :nodoc:
           super(name, *optional)
           @semi_major_axis = semi_major_axis.to_f
           @semi_minor_axis = semi_minor_axis.to_f
@@ -718,7 +715,6 @@ module RGeo
       # This is a non-instantiable abstract class. You must instantiate
       # one of the subclasses HorizontalDatum, VerticalDatum, or
       # LocalDatum.
-
       class Datum < Info
         def initialize(name, datum_type, *optional) # :nodoc:
           super(name, *optional)
@@ -738,7 +734,6 @@ module RGeo
       # == OGC spec description
       #
       # Procedure used to measure vertical distances.
-
       class VerticalDatum < Datum
         def wkt_typename
           "VERT_DATUM"
@@ -768,7 +763,6 @@ module RGeo
       # coordinates can be transformed between two different local
       # coordinate systems, as long as they are based on the same local
       # datum.
-
       class LocalDatum < Datum
         def wkt_typename
           "LOCAL_DATUM"
@@ -794,7 +788,6 @@ module RGeo
       # == OGC spec description
       #
       # Procedure used to measure positions on the surface of the Earth.
-
       class HorizontalDatum < Datum
         def initialize(name, datum_type, ellipsoid, wgs84_parameters, *optional) # :nodoc:
           super(name, datum_type, *optional)
@@ -828,8 +821,8 @@ module RGeo
         private
 
         def wkt_content(standard_brackets)
-          array = [@ellipsoid.to_wkt(standard_brackets)]
-          array << @wgs84_parameters.to_wkt(standard_brackets) if @wgs84_parameters
+          array = [@ellipsoid.to_wkt(standard_brackets: standard_brackets)]
+          array << @wgs84_parameters.to_wkt(standard_brackets: standard_brackets) if @wgs84_parameters
           array
         end
       end
@@ -837,7 +830,6 @@ module RGeo
       # == OGC spec description
       #
       # A projection from geographic coordinates to projected coordinates.
-
       class Projection < Info
         def initialize(name, class_name, parameters, *optional) # :nodoc:
           super(name, *optional)
@@ -916,7 +908,6 @@ module RGeo
       # GeographicCoordinateSystem, ProjectedCoordinateSystem,
       # VerticalCoordinateSystem, LocalCoordinateSystem, or
       # CompoundCoordinateSystem.
-
       class CoordinateSystem < Info
         def initialize(name, dimension, *optional) # :nodoc:
           super(name, *optional)
@@ -929,14 +920,14 @@ module RGeo
         # Gets axis details for dimension within coordinate system. Each
         # dimension in the coordinate system has a corresponding axis.
 
-        def get_axis(dimension)
+        def get_axis(_dimension)
           nil
         end
 
         # Gets units for dimension within coordinate system. Each
         # dimension in the coordinate system has corresponding units.
 
-        def get_units(dimension)
+        def get_units(_dimension)
           nil
         end
 
@@ -993,7 +984,6 @@ module RGeo
       # as a geographic or a projected coordinate system with a horizontal
       # datum. The other is a vertical CRS which is a one-dimensional
       # coordinate system with a vertical datum.
-
       class CompoundCoordinateSystem < CoordinateSystem
         def initialize(name, head, tail, *optional) # :nodoc:
           super(name, head.dimension + tail.dimension, *optional)
@@ -1038,7 +1028,7 @@ module RGeo
         private
 
         def wkt_content(standard_brackets)
-          [@head.to_wkt(standard_brackets), @tail.to_wkt(standard_brackets)]
+          [@head.to_wkt(standard_brackets: standard_brackets), @tail.to_wkt(standard_brackets: standard_brackets)]
         end
       end
 
@@ -1060,7 +1050,6 @@ module RGeo
       #
       # RGeo's implementation does not provide the Coordinate
       # Transformation (CT) package.
-
       class LocalCoordinateSystem < CoordinateSystem
         def initialize(name, local_datum, unit, axes, *optional) # :nodoc:
           super(name, axes.size, *optional)
@@ -1080,7 +1069,7 @@ module RGeo
 
         # Implements CoordinateSystem#get_units
 
-        def get_units(index)
+        def get_units(_index)
           @unit
         end
 
@@ -1103,9 +1092,9 @@ module RGeo
 
         def wkt_content(standard_brackets)
           [
-            @local_datum.to_wkt(standard_brackets),
-            @unit.to_wkt(standard_brackets)
-          ] + @axes.map { |ax| ax.to_wkt(standard_brackets) }
+            @local_datum.to_wkt(standard_brackets: standard_brackets),
+            @unit.to_wkt(standard_brackets: standard_brackets)
+          ] + @axes.map { |ax| ax.to_wkt(standard_brackets: standard_brackets) }
         end
       end
 
@@ -1117,7 +1106,6 @@ module RGeo
       # the Z axis will point North, and the Y axis will point East (e.g.
       # a right handed system), but you should check the axes for
       # non-default values.
-
       class GeocentricCoordinateSystem < CoordinateSystem
         def initialize(name, horizontal_datum, prime_meridian, linear_unit, axis0, axis1, axis2, *optional) # :nodoc:
           super(name, 3, *optional)
@@ -1143,7 +1131,7 @@ module RGeo
 
         # Implements CoordinateSystem#get_units
 
-        def get_units(index)
+        def get_units(_index)
           @linear_unit
         end
 
@@ -1177,13 +1165,13 @@ module RGeo
 
         def wkt_content(standard_brackets)
           arr = [
-            @horizontal_datum.to_wkt(standard_brackets),
-            @prime_meridian.to_wkt(standard_brackets),
-            @linear_unit.to_wkt(standard_brackets)
+            @horizontal_datum.to_wkt(standard_brackets: standard_brackets),
+            @prime_meridian.to_wkt(standard_brackets: standard_brackets),
+            @linear_unit.to_wkt(standard_brackets: standard_brackets)
           ]
-          arr << @axis0.to_wkt(standard_brackets) if @axis0
-          arr << @axis1.to_wkt(standard_brackets) if @axis1
-          arr << @axis2.to_wkt(standard_brackets) if @axis2
+          arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
+          arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
+          arr << @axis2.to_wkt(standard_brackets: standard_brackets) if @axis2
           arr
         end
       end
@@ -1192,7 +1180,6 @@ module RGeo
       #
       # A one-dimensional coordinate system suitable for vertical
       # measurements.
-
       class VerticalCoordinateSystem < CoordinateSystem
         def initialize(name, vertical_datum, vertical_unit, axis, *optional) # :nodoc:
           super(name, 1, *optional)
@@ -1210,13 +1197,13 @@ module RGeo
 
         # Implements CoordinateSystem#get_units
 
-        def get_units(index)
+        def get_units(_index)
           @vertical_unit
         end
 
         # Implements CoordinateSystem#get_axis
 
-        def get_axis(index)
+        def get_axis(_index)
           @axis
         end
 
@@ -1238,8 +1225,11 @@ module RGeo
         private
 
         def wkt_content(standard_brackets)
-          arr = [@vertical_datum.to_wkt(standard_brackets), @vertical_unit.to_wkt(standard_brackets)]
-          arr << @axis.to_wkt(standard_brackets) if @axis
+          arr = [
+            @vertical_datum.to_wkt(standard_brackets: standard_brackets),
+            @vertical_unit.to_wkt(standard_brackets: standard_brackets)
+          ]
+          arr << @axis.to_wkt(standard_brackets: standard_brackets) if @axis
           arr
         end
       end
@@ -1253,7 +1243,6 @@ module RGeo
       # This is a non-instantiable abstract class. You must instantiate
       # one of the subclasses GeographicCoordinateSystem or
       # ProjectedCoordinateSystem.
-
       class HorizontalCoordinateSystem < CoordinateSystem
         def initialize(name, horizontal_datum, *optional) # :nodoc:
           super(name, 2, *optional)
@@ -1271,7 +1260,6 @@ module RGeo
       # You can find out which this is by examining the axes. You should
       # also check the angular units, since not all geographic coordinate
       # systems use degrees.
-
       class GeographicCoordinateSystem < HorizontalCoordinateSystem
         def initialize(name, angular_unit, horizontal_datum, prime_meridian, axis0, axis1, *optional) # :nodoc:
           super(name, horizontal_datum, *optional)
@@ -1290,7 +1278,7 @@ module RGeo
 
         # Implements CoordinateSystem#get_units
 
-        def get_units(index)
+        def get_units(_index)
           @angular_unit
         end
 
@@ -1312,7 +1300,7 @@ module RGeo
         # of interest. The first conversion (with index=0) should provide
         # acceptable accuracy over the largest possible area of interest.
 
-        def get_wgs84_conversion_info(index)
+        def get_wgs84_conversion_info(_index)
           @horizontal_datum.wgs84_parameters
         end
 
@@ -1340,12 +1328,12 @@ module RGeo
 
         def wkt_content(standard_brackets)
           arr = [
-            @horizontal_datum.to_wkt(standard_brackets),
-            @prime_meridian.to_wkt(standard_brackets),
-            @angular_unit.to_wkt(standard_brackets)
+            @horizontal_datum.to_wkt(standard_brackets: standard_brackets),
+            @prime_meridian.to_wkt(standard_brackets: standard_brackets),
+            @angular_unit.to_wkt(standard_brackets: standard_brackets)
           ]
-          arr << @axis0.to_wkt(standard_brackets) if @axis0
-          arr << @axis1.to_wkt(standard_brackets) if @axis1
+          arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
+          arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
           arr
         end
       end
@@ -1353,7 +1341,6 @@ module RGeo
       # == OGC spec description
       #
       # A 2D cartographic coordinate system.
-
       class ProjectedCoordinateSystem < HorizontalCoordinateSystem
         def initialize(name, geographic_coordinate_system, projection, linear_unit, axis0, axis1, *optional) # :nodoc:
           super(name, geographic_coordinate_system.horizontal_datum, *optional)
@@ -1376,7 +1363,7 @@ module RGeo
 
         # Implements CoordinateSystem#get_units
 
-        def get_units(index)
+        def get_units(_index)
           @linear_unit
         end
 
@@ -1409,11 +1396,14 @@ module RGeo
         private
 
         def wkt_content(standard_brackets)
-          arr = [@geographic_coordinate_system.to_wkt(standard_brackets), @projection.to_wkt(standard_brackets)]
-          @projection.each_parameter { |param| arr << param.to_wkt(standard_brackets) }
-          arr << @linear_unit.to_wkt(standard_brackets)
-          arr << @axis0.to_wkt(standard_brackets) if @axis0
-          arr << @axis1.to_wkt(standard_brackets) if @axis1
+          arr = [
+            @geographic_coordinate_system.to_wkt(standard_brackets: standard_brackets),
+            @projection.to_wkt(standard_brackets: standard_brackets)
+          ]
+          @projection.each_parameter { |param| arr << param.to_wkt(standard_brackets: standard_brackets) }
+          arr << @linear_unit.to_wkt(standard_brackets: standard_brackets)
+          arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
+          arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
           arr
         end
       end
@@ -1560,8 +1550,8 @@ module RGeo
         private
 
         def wkt_content(standard_brackets)
-          source_cs_wkt = "SOURCECS[#{source_cs.to_wkt(standard_brackets)}]"
-          target_cs_wkt = "TARGETCS[#{target_cs.to_wkt(standard_brackets)}]"
+          source_cs_wkt = "SOURCECS[#{source_cs.to_wkt(standard_brackets: standard_brackets)}]"
+          target_cs_wkt = "TARGETCS[#{target_cs.to_wkt(standard_brackets: standard_brackets)}]"
 
           [source_cs_wkt, target_cs_wkt]
         end

data/lib/rgeo/coord_sys/cs/factories.rb

@@ -28,7 +28,6 @@ module RGeo
     # * FittedCoordinateSystem is not implemented.
     # * The defaultEnvelope attribute of CS_CoordinateSystem is not
     #   implemented.
-
     module CS
       # A class implementing the CS_CoordinateSystemFactory interface.
       # It provides methods for building up complex objects from simpler
@@ -37,7 +36,6 @@ module RGeo
       # Note that the methods of CS_CoordinateSystemFactory do not provide
       # facilities for setting the authority. If you need to set authority
       # values, use the create methods for the object classes themselves.
-
       class CoordinateSystemFactory
         # Create a CompoundCoordinateSystem from a name, and two
         # constituent coordinate systems.