rgeo 0.3.3 → 0.3.4

data/lib/rgeo/geographic/proj4_projector.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Proj4 projection
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,52 +35,52 @@
 
 
 module RGeo
-  
+
   module Geographic
-    
-    
+
+
     class Proj4Projector  # :nodoc:
-      
-      
+
+
       def initialize(geography_factory_, projection_factory_)
         @geography_factory = geography_factory_
         @projection_factory = projection_factory_
       end
-      
-      
+
+
       def project(geometry_)
         Feature.cast(geometry_, @projection_factory, :project)
       end
-      
-      
+
+
       def unproject(geometry_)
         Feature.cast(geometry_, @geography_factory, :project)
       end
-      
-      
+
+
       def projection_factory
         @projection_factory
       end
-      
-      
+
+
       def wraps?
         false
       end
-      
-      
+
+
       def limits_window
         nil
       end
-      
-      
+
+
       class << self
-        
-        
+
+
         def create_from_existing_factory(geography_factory_, projection_factory_)
           new(geography_factory_, projection_factory_)
         end
-        
-        
+
+
         def create_from_proj4(geography_factory_, proj4_, opts_={})
           projection_factory_ = Cartesian.preferred_factory(:proj4 => proj4_,
             :coord_sys => opts_[:coord_sys], :srid => opts_[:srid],
@@ -92,14 +92,14 @@ module RGeo
             :wkb_parser => opts_[:wkb_parser], :wkb_generator => opts_[:wkb_generator])
           new(geography_factory_, projection_factory_)
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geographic/projected_feature_classes.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Projtected geographic feature classes
-# 
+#
 # -----------------------------------------------------------------------------
-# 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 Geographic
-    
-    
+
+
     class ProjectedPointImpl  # :nodoc:
-      
-      
+
+
       include Feature::Point
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include ProjectedGeometryMethods
-      
-      
+
+
       def _validate_geometry
         @y = 85.0511287 if @y > 85.0511287
         @y = -85.0511287 if @y < -85.0511287
         super
       end
-      
-      
+
+
       def canonical_x
         x_ = @x % 360.0
         x_ -= 360.0 if x_ >= 180.0
@@ -62,8 +62,8 @@ module RGeo
       end
       alias_method :canonical_longitude, :canonical_x
       alias_method :canonical_lon, :canonical_x
-      
-      
+
+
       def canonical_point
         if @x >= -180.0 && @x < 180.0
           self
@@ -71,40 +71,40 @@ module RGeo
           PointImpl.new(@factory, canonical_x, @y)
         end
       end
-      
-      
+
+
       alias_method :longitude, :x
       alias_method :lon, :x
       alias_method :latitude, :y
       alias_method :lat, :y
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::Point).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedLineStringImpl  # :nodoc:
-      
-      
+
+
       include Feature::LineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
       include ProjectedLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::LineString).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedLinearRingImpl  # :nodoc:
-      
-      
+
+
       include Feature::LinearRing
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
@@ -112,17 +112,17 @@ module RGeo
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
       include ProjectedLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::LinearRing).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedLineImpl  # :nodoc:
-      
-      
+
+
       include Feature::Line
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
@@ -130,111 +130,111 @@ module RGeo
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
       include ProjectedLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::Line).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedPolygonImpl  # :nodoc:
-      
-      
+
+
       include Feature::Polygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPolygonMethods
       include ProjectedGeometryMethods
       include ProjectedNSurfaceMethods
-      
-      
+
+
       def _validate_geometry
         super
         unless projection
           raise Error::InvalidGeometry, 'Polygon failed assertions'
         end
       end
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::Polygon).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedGeometryCollectionImpl  # :nodoc:
-      
-      
+
+
       include Feature::GeometryCollection
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ProjectedGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::GeometryCollection).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedMultiPointImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiPoint
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPointMethods
       include ProjectedGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPoint).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedMultiLineStringImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiLineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiLineStringMethods
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiLineString).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class ProjectedMultiPolygonImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiPolygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPolygonMethods
       include ProjectedGeometryMethods
       include ProjectedNSurfaceMethods
-      
-      
+
+
       def _validate_geometry
         super
         unless projection
           raise Error::InvalidGeometry, 'MultiPolygon failed assertions'
         end
       end
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPolygon).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Projected geographic common method definitions
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,144 +35,144 @@
 
 
 module RGeo
-  
+
   module Geographic
-    
-    
+
+
     module ProjectedGeometryMethods  # :nodoc:
-      
-      
+
+
       def srid
         factory.srid
       end
-      
-      
+
+
       def projection
         unless defined?(@projection)
           @projection = factory.project(self)
         end
         @projection
       end
-      
-      
+
+
       def envelope
         factory.unproject(projection.envelope)
       end
-      
-      
+
+
       def is_empty?
         projection.is_empty?
       end
-      
-      
+
+
       def is_simple?
         projection.is_simple?
       end
-      
-      
+
+
       def boundary
         boundary_ = projection.boundary
         boundary_ ? factory.unproject(boundary_) : nil
       end
-      
-      
+
+
       def equals?(rhs_)
         projection.equals?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def disjoint?(rhs_)
         projection.disjoint?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def intersects?(rhs_)
         projection.intersects?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def touches?(rhs_)
         projection.touches?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def crosses?(rhs_)
         projection.crosses?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def within?(rhs_)
         projection.within?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def contains?(rhs_)
         projection.contains?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def overlaps?(rhs_)
         projection.overlaps?(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def relate(rhs_, pattern_)
         projection.relate(Feature.cast(rhs_, factory).projection, pattern_)
       end
-      
-      
+
+
       def distance(rhs_)
         projection.distance(Feature.cast(rhs_, factory).projection)
       end
-      
-      
+
+
       def buffer(distance_)
         factory.unproject(projection.buffer(distance_))
       end
-      
-      
+
+
       def convex_hull
         factory.unproject(projection.convex_hull)
       end
-      
-      
+
+
       def intersection(rhs_)
         factory.unproject(projection.intersection(Feature.cast(rhs_, factory).projection))
       end
-      
-      
+
+
       def union(rhs_)
         factory.unproject(projection.union(Feature.cast(rhs_, factory).projection))
       end
-      
-      
+
+
       def difference(rhs_)
         factory.unproject(projection.difference(Feature.cast(rhs_, factory).projection))
       end
-      
-      
+
+
       def sym_difference(rhs_)
         factory.unproject(projection.sym_difference(Feature.cast(rhs_, factory).projection))
       end
-      
-      
+
+
     end
-    
-    
+
+
     module ProjectedNCurveMethods  # :nodoc:
-      
-      
+
+
       def length
         projection.length
       end
-      
-      
+
+
     end
-    
-    
+
+
     module ProjectedLineStringMethods  # :nodoc:
-      
-      
+
+
       def _validate_geometry
         size_ = @points.size
         if size_ > 1
@@ -198,32 +198,32 @@ module RGeo
         end
         super
       end
-      
-      
+
+
     end
-    
-    
+
+
     module ProjectedNSurfaceMethods  # :nodoc:
-      
-      
+
+
       def area
         projection.area
       end
-      
-      
+
+
       def centroid
         factory.unproject(projection.centroid)
       end
-      
-      
+
+
       def point_on_surface
         factory.unproject(projection.point_on_surface)
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end