rgeo 0.3.3 → 0.3.4

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # OGC CS factory for RGeo
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,89 +35,89 @@
 
 
 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,
     # and other related concepts, as well as a parser for the WKT format
     # for specifying coordinate systems.
-    # 
+    #
     # Generally, the easiest way to create coordinate system objects is
     # to use RGeo::CoordSys::CS.create_from_wkt, which parses the WKT
     # format. You can also use the create methods available for each
     # object class.
-    # 
+    #
     # Most but not all of the spec is implemented here.
     # Currently missing are:
-    # 
+    #
     # * XML format is not implemented. We're assuming that WKT is the
     #   preferred format.
     # * The PT and CT packages are not implemented.
     # * 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
       # objects or values.
-      # 
+      #
       # 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.
-        
+
         def create_compound_coordinate_system(name_, head_, tail_)
           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.
-        
+
         def create_ellipsoid(name_, semi_major_axis_, semi_minor_axis_, linear_unit_)
           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.
-        
+
         def create_flattened_sphere(name_, semi_major_axis_, inverse_flattening_, linear_unit_)
           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.
-        
+
         def create_from_wkt(str_)
           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
         # set to nil.
-        
+
         def create_geographic_coordinate_system(name_, angular_unit_, horizontal_datum_, prime_meridian_, axis0_, axis1_)
           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.
@@ -125,84 +125,84 @@ module RGeo
         def create_horizontal_datum(name_, horizontal_datum_type_, ellipsoid_, to_wgs84_)
           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.
-        
+
         def create_local_coordinate_system(name_, datum_, unit_, axes_)
           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_)
           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_)
           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
         # be set to nil.
-        
+
         def create_projected_coordinate_system(name_, gcs_, projection_, linear_unit_, axis0_, axis1_)
           ProjectedCoordinateSystem.create(name_, gcs_, projection_, linear_unit_, axis0_, axis1_)
         end
-        
-        
+
+
         # Create a Projection given a name, a projection class, and an
         # array of ProjectionParameter.
-        
+
         def create_projection(name_, wkt_projection_class_, parameters_)
           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.
-        
+
         def create_vertical_coordinate_system(name_, vertical_datum_, vertical_unit_, axis_)
           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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # OGC CS wkt parser for RGeo
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,21 +35,21 @@
 
 
 module RGeo
-  
+
   module CoordSys
-    
-    
+
+
     module CS
-      
-      
+
+
       class WKTParser  # :nodoc:
-        
+
         def initialize(str_)
           @scanner = ::StringScanner.new(str_)
           next_token
         end
-        
-        
+
+
         def parse(containing_type_=nil)
           if @cur_token.kind_of?(QuotedString) ||
               @cur_token.kind_of?(::Numeric) ||
@@ -167,21 +167,21 @@ module RGeo
           args_.assert_empty
           obj_
         end
-        
-        
+
+
         def consume_token_type(type_)  # :nodoc:
           expect_token_type(type_)
           tok_ = @cur_token
           next_token
           tok_
         end
-        
+
         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:
           @scanner.skip(/\s+/)
           case @scanner.peek(1)
@@ -213,43 +213,43 @@ module RGeo
           end
           @cur_token
         end
-        
+
         def cur_token  # :nodoc:
           @cur_token
         end
-        
-        
+
+
         class QuotedString < ::String  # :nodoc:
         end
-        
+
         class TypeString < ::String  # :nodoc:
         end
-        
-        
+
+
         class AuthorityClause  # :nodoc:
-          
+
           def initialize(name_, code_)
             @name = name_
             @code = code_
           end
-          
+
           def to_a
             [@name, @code]
           end
-          
+
         end
-        
-        
+
+
         class ArgumentList  # :nodoc:
-          
+
           def initialize
             @values = []
           end
-          
+
           def <<(value_)
             @values << value_
           end
-          
+
           def assert_empty
             if @values.size > 0
               names_ = @values.map do |val_|
@@ -258,7 +258,7 @@ module RGeo
               raise Error::ParseError, "#{@remaining} unexpected arguments: #{names_.join(', ')}"
             end
           end
-          
+
           def find_first(klass_)
             @values.each_with_index do |val_, index_|
               if val_.kind_of?(klass_)
@@ -268,7 +268,7 @@ module RGeo
             end
             nil
           end
-          
+
           def find_all(klass_)
             results_ = []
             nvalues_ = []
@@ -282,7 +282,7 @@ module RGeo
             @values = nvalues_
             results_
           end
-          
+
           def shift(klass_=nil)
             val_ = @values.shift
             unless val_
@@ -293,16 +293,16 @@ module RGeo
             end
             val_
           end
-          
+
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end