rgeo 0.4.0 → 0.5.0

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

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module CoordSys
-
-
     # This module contains an implementation of the CS (coordinate
     # systems) package of the OGC Coordinate Transform spec. It provides
     # classes for representing ellipsoids, datums, coordinate systems,
@@ -31,8 +28,6 @@ module RGeo
     #   implemented.
 
     module CS
-
-
       # A class implementing the CS_CoordinateSystemFactory interface.
       # It provides methods for building up complex objects from simpler
       # objects or values.
@@ -42,8 +37,6 @@ module RGeo
       # values, use the create methods for the object classes themselves.
 
       class CoordinateSystemFactory
-
-
         # Create a CompoundCoordinateSystem from a name, and two
         # constituent coordinate systems.
 
@@ -51,7 +44,6 @@ module RGeo
           CompoundCoordinateSystem.create(name_, head_, tail_)
         end
 
-
         # Create an Ellipsoid from a name, semi-major axis, and semi-minor
         # axis. You can also provide a LinearUnit, but this is optional
         # and may be set to nil.
@@ -60,7 +52,6 @@ module RGeo
           Ellipsoid.create_ellipsoid(name_, semi_major_axis_, semi_minor_axis_, linear_unit_)
         end
 
-
         # Create an Ellipsoid from a name, semi-major axis, and an inverse
         # flattening factor. You can also provide a LinearUnit, but this
         # is optional and may be set to nil.
@@ -69,7 +60,6 @@ module RGeo
           Ellipsoid.create_flattened_sphere(name_, semi_major_axis_, inverse_flattening_, linear_unit_)
         end
 
-
         # Create any object given the OGC WKT format. Raises
         # Error::ParseError if a syntax error is encounterred.
 
@@ -77,7 +67,6 @@ module RGeo
           WKTParser.new(str_).parse
         end
 
-
         # Create a GeographicCoordinateSystem, given a name, an
         # AngularUnit, a HorizontalDatum, a PrimeMeridian, and two
         # AxisInfo objects. The AxisInfo objects are optional and may be
@@ -87,7 +76,6 @@ module RGeo
           GeographicCoordinateSystem.create(name_, angular_unit_, horizontal_datum_, prime_meridian_, axis0_, axis1_)
         end
 
-
         # Create a HorizontalDatum given a name, a horizontal datum type
         # code, an Ellipsoid, and a WGS84ConversionInfo. The
         # WGS84ConversionInfo is optional and may be set to nil.
@@ -96,7 +84,6 @@ module RGeo
           HorizontalDatum.create(name_, horizontal_datum_type_, ellipsoid_, to_wgs84_)
         end
 
-
         # Create a LocalCoordinateSystem given a name, a LocalDatum, a
         # Unit, and an array of at least one AxisInfo.
 
@@ -104,22 +91,19 @@ module RGeo
           LocalCoordinateSystem.create(name_, datum_, unit_, axes_)
         end
 
-
         # Create a LocalDatum given a name and a local datum type code.
 
-        def create_local_datum(name_, local_datum_type_)
+        def create_local_datum(_name_, local_datum_type_)
           LocalDatum.create(name, local_datum_type_)
         end
 
-
         # Create a PrimeMeridian given a name, an AngularUnit, and a
         # longitude offset.
 
-        def create_prime_meridian(name_, angular_unit_, longitude_)
+        def create_prime_meridian(_name_, angular_unit_, longitude_)
           PrimeMeridian.create(name, angular_unit_, longitude_)
         end
 
-
         # Create a ProjectedCoordinateSystem given a name, a
         # GeographicCoordinateSystem, and Projection, a LinearUnit, and
         # two AxisInfo objects. The AxisInfo objects are optional and may
@@ -129,7 +113,6 @@ module RGeo
           ProjectedCoordinateSystem.create(name_, gcs_, projection_, linear_unit_, axis0_, axis1_)
         end
 
-
         # Create a Projection given a name, a projection class, and an
         # array of ProjectionParameter.
 
@@ -137,7 +120,6 @@ module RGeo
           Projection.create(name_, wkt_projection_class_, parameters_)
         end
 
-
         # Create a VerticalCoordinateSystem given a name, a VerticalDatum,
         # a VerticalUnit, and an AxisInfo. The AxisInfo is optional and
         # may be nil.
@@ -146,33 +128,21 @@ module RGeo
           VerticalCoordinateSystem.create(name_, vertical_datum_, vertical_unit_, axis_)
         end
 
-
         # Create a VerticalDatum given a name ane a datum type code.
 
         def create_vertical_datum(name_, vertical_datum_type_)
           VerticalDatum.create(name_, vertical_datum_type_)
         end
-
-
       end
 
-
       class << self
-
-
         # Parsees OGC WKT format and returns the object created. Raises
         # Error::ParseError if a syntax error is encounterred.
 
         def create_from_wkt(str_)
           WKTParser.new(str_).parse
         end
-
-
       end
-
-
     end
-
   end
-
 end

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

@@ -5,31 +5,23 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module CoordSys
-
-
     module CS
-
-
-      class WKTParser  # :nodoc:
-
+      class WKTParser # :nodoc:
         def initialize(str_)
           @scanner = ::StringScanner.new(str_)
           next_token
         end
 
-
-        def parse(containing_type_=nil)  # :nodoc:
-          if @cur_token.kind_of?(QuotedString) ||
-            @cur_token.kind_of?(::Numeric) ||
-            (containing_type_ == 'AXIS' && @cur_token.kind_of?(TypeString))
-          then
+        def parse(containing_type_ = nil) # :nodoc:
+          if @cur_token.is_a?(QuotedString) ||
+            @cur_token.is_a?(::Numeric) ||
+            (containing_type_ == "AXIS" && @cur_token.is_a?(TypeString))
             value_ = @cur_token
             next_token
             return value_
           end
-          unless @cur_token.kind_of?(TypeString)
+          unless @cur_token.is_a?(TypeString)
             raise Error::ParseError("Found token #{@cur_token} when we expected a value")
           end
           type_ = @cur_token
@@ -45,49 +37,49 @@ module RGeo
           consume_token_type(:end)
           obj_ = nil
           case type_
-          when 'AUTHORITY'
+          when "AUTHORITY"
             obj_ = AuthorityClause.new(args_.shift(QuotedString), args_.shift(QuotedString))
-          when 'EXTENSION'
+          when "EXTENSION"
             obj_ = ExtensionClause.new(args_.shift(QuotedString), args_.shift(QuotedString))
-          when 'AXIS'
+          when "AXIS"
             obj_ = AxisInfo.create(args_.shift(QuotedString), args_.shift(TypeString))
-          when 'TOWGS84'
+          when "TOWGS84"
             bursa_wolf_params_ = args_.find_all(::Numeric)
             unless bursa_wolf_params_.size == 7
               raise Error::ParseError("Expected 7 Bursa Wolf parameters but found #{bursa_wolf_params_.size}")
             end
             obj_ = WGS84ConversionInfo.create(*bursa_wolf_params_)
-          when 'UNIT'
+          when "UNIT"
             case containing_type_
-            when 'GEOCCS', 'VERT_CS', 'PROJCS', 'SPHEROID'
+            when "GEOCCS", "VERT_CS", "PROJCS", "SPHEROID"
               klass_ = LinearUnit
-            when 'GEOGCS'
+            when "GEOGCS"
               klass_ = AngularUnit
             else
               klass_ = Unit
             end
             obj_ = klass_.create(args_.shift(QuotedString), args_.shift(::Numeric), *args_.create_optionals)
-          when 'PARAMETER'
+          when "PARAMETER"
             obj_ = ProjectionParameter.create(args_.shift(QuotedString), args_.shift(::Numeric))
-          when 'PRIMEM'
+          when "PRIMEM"
             obj_ = PrimeMeridian.create(args_.shift(QuotedString), nil, args_.shift(::Numeric), *args_.create_optionals)
-          when 'SPHEROID'
+          when "SPHEROID"
             obj_ = Ellipsoid.create_flattened_sphere(args_.shift(QuotedString), args_.shift(::Numeric), args_.shift(::Numeric), args_.find_first(LinearUnit), *args_.create_optionals)
-          when 'PROJECTION'
+          when "PROJECTION"
             name_ = args_.shift(QuotedString)
             obj_ = Projection.create(name_, name_, args_.find_all(ProjectionParameter), *args_.create_optionals)
-          when 'DATUM'
+          when "DATUM"
             name_ = args_.shift(QuotedString)
             ellipsoid_ = args_.find_first(Ellipsoid)
             to_wgs84_ = args_.find_first(WGS84ConversionInfo)
             obj_ = HorizontalDatum.create(name_, HD_GEOCENTRIC, ellipsoid_, to_wgs84_, *args_.create_optionals)
-          when 'VERT_DATUM'
+          when "VERT_DATUM"
             obj_ = VerticalDatum.create(args_.shift(QuotedString), args_.shift(::Numeric), *args_.create_optionals)
-          when 'LOCAL_DATUM'
+          when "LOCAL_DATUM"
             obj_ = LocalDatum.create(args_.shift(QuotedString), args_.shift(::Numeric), *args_.create_optionals)
-          when 'COMPD_CS'
+          when "COMPD_CS"
             obj_ = CompoundCoordinateSystem.create(args_.shift(QuotedString), args_.shift(CoordinateSystem), args_.shift(CoordinateSystem), *args_.create_optionals)
-          when 'LOCAL_CS'
+          when "LOCAL_CS"
             name_ = args_.shift(QuotedString)
             local_datum_ = args_.find_first(LocalDatum)
             unit_ = args_.find_first(Unit)
@@ -96,7 +88,7 @@ module RGeo
               raise Error::ParseError("Expected at least one AXIS in a LOCAL_CS")
             end
             obj_ = LocalCoordinateSystem.create(name_, local_datum_, unit_, axes_, *args_.create_optionals)
-          when 'GEOCCS'
+          when "GEOCCS"
             name_ = args_.shift(QuotedString)
             horizontal_datum_ = args_.find_first(HorizontalDatum)
             prime_meridian_ = args_.find_first(PrimeMeridian)
@@ -106,13 +98,13 @@ module RGeo
               raise Error::ParseError("GEOCCS must contain either 0 or 3 AXIS parameters")
             end
             obj_ = GeocentricCoordinateSystem.create(name_, horizontal_datum_, prime_meridian_, linear_unit_, axes_[0], axes_[1], axes_[2], *args_.create_optionals)
-          when 'VERT_CS'
+          when "VERT_CS"
             name_ = args_.shift(QuotedString)
             vertical_datum_ = args_.find_first(VerticalDatum)
             linear_unit_ = args_.find_first(LinearUnit)
             axis_ = args_.find_first(AxisInfo)
             obj_ = VerticalCoordinateSystem.create(name_, vertical_datum_, linear_unit_, axis_, *args_.create_optionals)
-          when 'GEOGCS'
+          when "GEOGCS"
             name_ = args_.shift(QuotedString)
             horizontal_datum_ = args_.find_first(HorizontalDatum)
             prime_meridian_ = args_.find_first(PrimeMeridian)
@@ -122,7 +114,7 @@ module RGeo
               raise Error::ParseError("GEOGCS must contain either 0 or 2 AXIS parameters")
             end
             obj_ = GeographicCoordinateSystem.create(name_, angular_unit_, horizontal_datum_, prime_meridian_, axes_[0], axes_[1], *args_.create_optionals)
-          when 'PROJCS'
+          when "PROJCS"
             name_ = args_.shift(QuotedString)
             geographic_coordinate_system_ = args_.find_first(GeographicCoordinateSystem)
             projection_ = args_.find_first(Projection)
@@ -141,39 +133,38 @@ module RGeo
           obj_
         end
 
-
-        def consume_token_type(type_)  # :nodoc:
+        def consume_token_type(type_) # :nodoc:
           expect_token_type(type_)
           tok_ = @cur_token
           next_token
           tok_
         end
 
-        def expect_token_type(type_)  # :nodoc:
+        def expect_token_type(type_) # :nodoc:
           unless type_ === @cur_token
             raise Error::ParseError, "#{type_.inspect} expected but #{@cur_token.inspect} found."
           end
         end
 
-        def next_token  # :nodoc:
+        def next_token # :nodoc:
           @scanner.skip(/\s+/)
           case @scanner.peek(1)
           when '"'
             @scanner.getch
             @cur_token = QuotedString.new(@scanner.scan(/[^"]*/))
             @scanner.getch
-          when ','
+          when ","
             @scanner.getch
             @cur_token = :comma
-          when '(','['
+          when "(", "["
             @scanner.getch
             @cur_token = :begin
-          when ']',')'
+          when "]", ")"
             @scanner.getch
             @cur_token = :end
           when /[a-zA-Z]/
             @cur_token = TypeString.new(@scanner.scan(/[a-zA-Z]\w*/))
-          when '', nil
+          when "", nil
             @cur_token = nil
           else
             @scanner.scan_until(/[^\s\(\)\[\],"]+/)
@@ -187,47 +178,36 @@ module RGeo
           @cur_token
         end
 
-        def cur_token  # :nodoc:
-          @cur_token
-        end
-
+        attr_reader :cur_token
 
-        class QuotedString < ::String  # :nodoc:
+        class QuotedString < ::String # :nodoc:
         end
 
-        class TypeString < ::String  # :nodoc:
+        class TypeString < ::String # :nodoc:
         end
 
-
-        class AuthorityClause  # :nodoc:
-
-          def initialize(name_, code_)  # :nodoc:
+        class AuthorityClause # :nodoc:
+          def initialize(name_, code_) # :nodoc:
             @name = name_
             @code = code_
           end
 
-          def to_a  # :nodoc:
+          def to_a # :nodoc:
             [@name, @code]
           end
-
         end
 
-
-        class ExtensionClause  # :nodoc:
-
-          def initialize(key_, value_)  # :nodoc:
+        class ExtensionClause # :nodoc:
+          def initialize(key_, value_) # :nodoc:
             @key = key_
             @value = value_
           end
 
-          attr_reader :key  # :nodoc:
-          attr_reader :value  # :nodoc:
-
+          attr_reader :key # :nodoc:
+          attr_reader :value # :nodoc:
         end
 
-
-        class ArgumentList  # :nodoc:
-
+        class ArgumentList # :nodoc:
           def initialize  # :nodoc:
             @values = []
           end
@@ -236,18 +216,18 @@ module RGeo
             @values << value_
           end
 
-          def assert_empty  # :nodoc:
+          def assert_empty # :nodoc:
             if @values.size > 0
               names_ = @values.map do |val_|
-                val_.kind_of?(Base) ? val_._wkt_typename : val_.inspect
+                val_.is_a?(Base) ? val_._wkt_typename : val_.inspect
               end
               raise Error::ParseError, "#{@values.size} unexpected arguments: #{names_.join(', ')}"
             end
           end
 
-          def find_first(klass_)  # :nodoc:
+          def find_first(klass_) # :nodoc:
             @values.each_with_index do |val_, index_|
-              if val_.kind_of?(klass_)
+              if val_.is_a?(klass_)
                 @values.slice!(index_)
                 return val_
               end
@@ -259,7 +239,7 @@ module RGeo
             results_ = []
             nvalues_ = []
             @values.each do |val_|
-              if val_.kind_of?(klass_)
+              if val_.is_a?(klass_)
                 results_ << val_
               else
                 nvalues_ << val_
@@ -271,30 +251,22 @@ module RGeo
 
           def create_optionals  # :nodoc:
             hash_ = {}
-            find_all(ExtensionClause).each{ |ec_| hash_[ec_.key] = ec_.value }
+            find_all(ExtensionClause).each { |ec_| hash_[ec_.key] = ec_.value }
             (find_first(AuthorityClause) || [nil, nil]).to_a + [nil, nil, nil, hash_]
           end
 
-          def shift(klass_=nil)  # :nodoc:
+          def shift(klass_ = nil) # :nodoc:
             val_ = @values.shift
             unless val_
               raise Error::ParseError, "No arguments left... expected #{klass_}"
             end
-            if klass_ && !val_.kind_of?(klass_)
+            if klass_ && !val_.is_a?(klass_)
               raise Error::ParseError, "Expected #{klass_} but got #{val_.class}"
             end
             val_
           end
-
         end
-
-
       end
-
-
     end
-
-
   end
-
 end