rgeo 0.3.3 → 0.3.4

data/lib/rgeo/coord_sys/proj4.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Proj4 wrapper 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,67 +35,67 @@
 
 
 module RGeo
-  
+
   module CoordSys
-    
-    
+
+
     # This is a Ruby wrapper around a Proj4 coordinate system.
     # It represents a single geographic coordinate system, which may be
     # a flat projection, a geocentric (3-dimensional) coordinate system,
     # or a geographic (latitude-longitude) coordinate system.
-    # 
+    #
     # Generally, these are used to define the projection for a
     # Feature::Factory. You can then convert between coordinate systems
     # by casting geometries between such factories using the :project
     # option. You may also use this object directly to perform low-level
     # coordinate transformations.
-    
+
     class Proj4
-      
-      
+
+
       def inspect  # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)} #{canonical_str.inspect}>"
       end
-      
-      
+
+
       def to_s  # :nodoc:
         canonical_str
       end
-      
-      
+
+
       def hash  # :nodoc:
         canonical_hash.hash
       end
-      
-      
+
+
       # Returns true if this Proj4 is equivalent to the given Proj4.
-      # 
+      #
       # Note: this tests for equivalence by comparing only the hash
       # definitions of the Proj4 objects, and returning true if those
       # definitions are equivalent. In some cases, this may still return
       # false even if the actual coordinate systems are identical, since
       # there are sometimes multiple ways to express a given coordinate
       # system.
-      
+
       def eql?(rhs_)
         rhs_.class == self.class && rhs_.canonical_hash == canonical_hash && rhs_._radians? == _radians?
       end
       alias_method :==, :eql?
-      
-      
+
+
       # Marshal support
-      
+
       def marshal_dump  # :nodoc:
         {'rad' => radians?, 'str' => original_str || canonical_str}
       end
-      
+
       def marshal_load(data_)  # :nodoc:
         _set_value(data_['str'], data_['rad'])
       end
-      
-      
+
+
       # Psych support
-      
+
       def init_with(coder_)  # :nodoc:
         if coder_.type == :scalar
           _set_value(coder_.scalar, false)
@@ -103,29 +103,29 @@ module RGeo
           _set_value(coder_['proj4'], coder_['radians'])
         end
       end
-      
+
       def encode_with(coder_)  # :nodoc:
         coder_['proj4'] = original_str || canonical_str
         coder_['radians'] = radians?
       end
-      
-      
+
+
       # Returns the "canonical" string definition for this coordinate
       # system, as reported by Proj4. This may be slightly different
       # from the definition used to construct this object.
-      
+
       def canonical_str
         unless defined?(@canonical_str)
           @canonical_str = _canonical_str
         end
         @canonical_str
       end
-      
-      
+
+
       # Returns the "canonical" hash definition for this coordinate
       # system, as reported by Proj4. This may be slightly different
       # from the definition used to construct this object.
-      
+
       def canonical_hash
         unless defined?(@canonical_hash)
           @canonical_hash = {}
@@ -137,68 +137,68 @@ module RGeo
         end
         @canonical_hash
       end
-      
-      
+
+
       # Returns the string definition originally used to construct this
       # object. Returns nil if this object wasn't created by a string
       # definition; i.e. if it was created using get_geographic.
-      
+
       def original_str
         _original_str
       end
-      
-      
+
+
       # Returns true if this Proj4 object is a geographic (lat-long)
       # coordinate system.
-      
+
       def geographic?
         _geographic?
       end
-      
-      
+
+
       # Returns true if this Proj4 object is a geocentric (3dz)
       # coordinate system.
-      
+
       def geocentric?
         _geocentric?
       end
-      
-      
+
+
       # Returns true if this Proj4 object uses radians rather than degrees
       # if it is a geographic coordinate system.
-      
+
       def radians?
         _radians?
       end
-      
-      
+
+
       # Get the geographic (unprojected lat-long) coordinate system
       # corresponding to this coordinate system; i.e. the one that uses
       # the same ellipsoid and datum.
-      
+
       def get_geographic
         _get_geographic
       end
-      
-      
+
+
       class << self
-        
-        
+
+
         # Returns true if Proj4 is supported in this installation.
         # If this returns false, the other methods such as create
         # will not work.
-        
+
         def supported?
           respond_to?(:_create)
         end
-        
-        
+
+
         # Create a new Proj4 object, given a definition, which may be
         # either a string or a hash. Returns nil if the given definition
         # is invalid or Proj4 is not supported.
-        # 
+        #
         # Recognized options include:
-        # 
+        #
         # [<tt>:radians</tt>]
         #   If set to true, then this proj4 will represent geographic
         #   (latitude/longitude) coordinates in radians rather than
@@ -209,7 +209,7 @@ module RGeo
         #   radians as its units. If this is a geocentric or other type of
         #   coordinate system, this has no effect. Default is false.
         #   (That is all coordinates are in degrees by default.)
-        
+
         def create(defn_, opts_={})
           result_ = nil
           if supported?
@@ -224,14 +224,14 @@ module RGeo
           end
           result_
         end
-        
-        
+
+
         # Create a new Proj4 object, given a definition, which may be
         # either a string or a hash. Raises Error::UnsupportedOperation
         # if the given definition is invalid or Proj4 is not supported.
-        # 
+        #
         # Recognized options include:
-        # 
+        #
         # [<tt>:radians</tt>]
         #   If set to true, then this proj4 will represent geographic
         #   (latitude/longitude) coordinates in radians rather than
@@ -242,7 +242,7 @@ module RGeo
         #   radians as its units. If this is a geocentric or other type of
         #   coordinate system, this has no effect. Default is false.
         #   (That is all coordinates are in degrees by default.)
-        
+
         def new(defn_, opts_={})
           result_ = create(defn_, opts_)
           unless result_
@@ -250,13 +250,13 @@ module RGeo
           end
           result_
         end
-        
-        
+
+
         # Low-level coordinate transform method.
         # Transforms the given coordinate (x, y, [z]) from one proj4
         # coordinate system to another. Returns an array with either two
         # or three elements.
-        
+
         def transform_coords(from_proj_, to_proj_, x_, y_, z_=nil)
           if !from_proj_._radians? && from_proj_._geographic?
             x_ *= ImplHelper::Math::RADIANS_PER_DEGREE
@@ -269,14 +269,14 @@ module RGeo
           end
           result_
         end
-        
-        
+
+
         # Low-level geometry transform method.
         # Transforms the given geometry between the given two projections.
         # The resulting geometry is constructed using the to_factory.
         # Any projections associated with the factories themselves are
         # ignored.
-        
+
         def transform(from_proj_, from_geometry_, to_proj_, to_factory_)
           case from_geometry_
           when Feature::Point
@@ -299,8 +299,8 @@ module RGeo
             to_factory_.collection(from_geometry_.map{ |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
           end
         end
-        
-        
+
+
         def _transform_point(from_proj_, from_point_, to_proj_, to_factory_)  # :nodoc:
           from_factory_ = from_point_.factory
           from_has_z_ = from_factory_.property(:has_z_coordinate)
@@ -327,26 +327,26 @@ module RGeo
             nil
           end
         end
-        
-        
+
+
         def _transform_linear_ring(from_proj_, from_ring_, to_proj_, to_factory_)  # :nodoc:
           to_factory_.linear_ring(from_ring_.points[0..-2].map{ |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
         end
-        
-        
+
+
         def _transform_polygon(from_proj_, from_polygon_, to_proj_, to_factory_)  # :nodoc:
           ext_ = _transform_linear_ring(from_proj_, from_polygon_.exterior_ring, to_proj_, to_factory_)
           int_ = from_polygon_.interior_rings.map{ |r_| _transform_linear_ring(from_proj_, r_, to_proj_, to_factory_) }
           to_factory_.polygon(ext_, int_)
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/coord_sys/srs_database/active_record_table.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # SRS database interface
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,26 +35,26 @@
 
 
 module RGeo
-  
+
   module CoordSys
-    
+
     module SRSDatabase
-      
-      
+
+
       # A spatial reference database implementation that uses ActiveRecord
       # to access a spatial reference table provided by a spatial database
       # implementation. You can use this class to obtain coordinate system
       # information from your installation of, e.g. PostGIS.
-      
+
       class ActiveRecordTable
-        
+
         @@class_counter = 0
-        
-        
+
+
         # Create a new ActiveRecord-backed database connection.
-        # 
+        #
         # Options include:
-        # 
+        #
         # [<tt>:ar_class</tt>]
         #   An ActiveRecord class to use. You may provide this if you
         #   already have an ActiveRecord class that accesses the table.
@@ -109,7 +109,7 @@ module RGeo
         #   If set to true, entries are cached when first retrieved, so
         #   subsequent requests do not have to make a database round trip.
         #   Default is false.
-        # 
+        #
         # Some option settings may be provided by the ActiveRecord
         # connection adapter, if the ActiveRecord class's connection uses
         # an adapter that is RGeo-savvy. The "postgis" and "spatialite"
@@ -118,7 +118,7 @@ module RGeo
         # the database-provided spatial reference table as defaults.
         # However, you can still override those settings if you want to
         # use a custom table.
-        
+
         def initialize(opts_={})
           @cache = opts_[:cache] ? {} : nil
           @ar_class = opts_[:ar_class]
@@ -148,10 +148,10 @@ module RGeo
           @srtext_column = opts_[:srtext_column]
           @proj4text_column = opts_[:proj4text_column]
         end
-        
-        
+
+
         # Retrieve an Entry given an integer SRID.
-        
+
         def get(ident_)
           ident_ = ident_.to_i
           return @cache[ident_] if @cache && @cache.include?(ident_)
@@ -175,20 +175,20 @@ module RGeo
           @cache[ident_] = result_ if @cache
           result_
         end
-        
-        
+
+
         # Clears the cache if a cache is active.
-        
+
         def clear_cache
           @cache.clear if @cache
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end