rgeo 0.3.3 → 0.3.4

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Spherical 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,19 +35,19 @@
 
 
 module RGeo
-  
+
   module Geographic
-    
-    
+
+
     class SphericalPointImpl  # :nodoc:
-      
-      
+
+
       include Feature::Point
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include SphericalGeometryMethods
-      
-      
+
+
       def _validate_geometry
         @x = @x % 360.0
         @x -= 360.0 if @x >= 180.0
@@ -55,13 +55,13 @@ module RGeo
         @y = -90.0 if @y < -90.0
         super
       end
-      
-      
+
+
       def _xyz
         @xyz ||= SphericalMath::PointXYZ.from_latlon(@y, @x)
       end
-      
-      
+
+
       def distance(rhs_)
         rhs_ = Feature.cast(rhs_, @factory)
         case rhs_
@@ -71,8 +71,8 @@ module RGeo
           super
         end
       end
-      
-      
+
+
       def equals?(rhs_)
         return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
         case rhs_
@@ -92,148 +92,148 @@ module RGeo
           false
         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 SphericalLineStringImpl  # :nodoc:
-      
-      
+
+
       include Feature::LineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include SphericalGeometryMethods
       include SphericalLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::LineString).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalLineImpl  # :nodoc:
-      
-      
+
+
       include Feature::Line
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ImplHelper::BasicLineMethods
       include SphericalGeometryMethods
       include SphericalLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::Line).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalLinearRingImpl  # :nodoc:
-      
-      
+
+
       include Feature::LinearRing
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ImplHelper::BasicLinearRingMethods
       include SphericalGeometryMethods
       include SphericalLineStringMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::LinearRing).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalPolygonImpl  # :nodoc:
-      
-      
+
+
       include Feature::Polygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPolygonMethods
       include SphericalGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::Polygon).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalGeometryCollectionImpl  # :nodoc:
-      
-      
+
+
       include Feature::GeometryCollection
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include SphericalGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::GeometryCollection).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalMultiPointImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiPoint
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPointMethods
       include SphericalGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPoint).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalMultiLineStringImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiLineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiLineStringMethods
       include SphericalGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiLineString).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
     class SphericalMultiPolygonImpl  # :nodoc:
-      
-      
+
+
       include Feature::MultiPolygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPolygonMethods
       include SphericalGeometryMethods
-      
-      
+
+
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPolygon).include_in_class(self, true)
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Spherical geographic common methods
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,24 +35,24 @@
 
 
 module RGeo
-  
+
   module Geographic
-    
-    
+
+
     module SphericalGeometryMethods  # :nodoc:
-      
-      
+
+
       def srid
         factory.srid
       end
-      
-      
+
+
     end
-    
-    
+
+
     module SphericalLineStringMethods  # :nodoc:
-      
-      
+
+
       def _arcs
         unless @arcs
           @arcs = (0..num_points-2).map do |i_|
@@ -61,8 +61,8 @@ module RGeo
         end
         @arcs
       end
-      
-      
+
+
       def is_simple?
         arcs_ = _arcs
         len_ = arcs_.length
@@ -87,11 +87,11 @@ module RGeo
         end
         true
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/rgeo/geographic/spherical_math.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Core calculations on the sphere
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,28 +35,28 @@
 
 
 module RGeo
-  
+
   module Geographic
-    
+
     module SphericalMath  # :nodoc:
-      
-      
+
+
       RADIUS = 6378137.0
-      
-      
+
+
       # Represents a point on the unit sphere in (x,y,z) coordinates
       # instead of lat-lon. This form is often faster, more convenient,
       # and more numerically stable for certain computations.
-      # 
+      #
       # The coordinate system is a right-handed system where the z-axis
       # goes through the north pole, the x-axis goes through the prime
       # meridian, and the y-axis goes through +90 degrees longitude.
-      # 
+      #
       # This object is also used to represent a great circle, as its axis
       # of rotation.
-      
+
       class PointXYZ  # :nodoc:
-        
+
         def initialize(x_, y_, z_)
           r_ = ::Math.sqrt(x_ * x_ + y_ * y_ + z_ * z_)
           @x = x_ / r_
@@ -64,48 +64,48 @@ module RGeo
           @z = z_ / r_
           raise "Not a number" if @x.nan? || @y.nan? || @z.nan?
         end
-        
-        
+
+
         def to_s
           "(#{@x}, #{@y}, #{@z})"
         end
-        
-        
+
+
         attr_reader :x
         attr_reader :y
         attr_reader :z
-        
-        
+
+
         def eql?(rhs_)
           rhs_.kind_of?(PointXYZ) && @x == rhs_.x && @y == rhs_.y && @z == rhs_.z
         end
         alias_method :==, :eql?
-        
-        
+
+
         def latlon
           lat_rad_ = ::Math.asin(@z)
           lon_rad_ = ::Math.atan2(@y, @x) rescue 0.0
           rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
           [lat_rad_ / rpd_, lon_rad_ / rpd_]
         end
-        
-        
+
+
         def *(rhs_)
           val_ = @x * rhs_.x + @y * rhs_.y + @z * rhs_.z
           val_ = 1.0 if val_ > 1.0
           val_ = -1.0 if val_ < -1.0
           val_
         end
-        
-        
+
+
         def %(rhs_)
           rx_ = rhs_.x
           ry_ = rhs_.y
           rz_ = rhs_.z
           PointXYZ.new(@y*rz_-@z*ry_, @z*rx_-@x*rz_, @x*ry_-@y*rx_) rescue nil
         end
-        
-        
+
+
         def dist_to_point(rhs_)
           rx_ = rhs_.x
           ry_ = rhs_.y
@@ -117,8 +117,8 @@ module RGeo
           r_ = 1.0 if r_ > 1.0
           ::Math.asin(r_)
         end
-        
-        
+
+
         def self.from_latlon(lat_, lon_)
           rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
           lat_rad_ = rpd_ * lat_
@@ -129,58 +129,58 @@ module RGeo
           y_ = ::Math.sin(lon_rad_) * r_
           new(x_, y_, z_)
         end
-        
+
       end
-      
-      
+
+
       # Represents a finite arc on the sphere.
-      
+
       class ArcXYZ  # :nodoc:
-        
+
         def initialize(start_, end_)
           @s = start_
           @e = end_
           @axis = false
         end
-        
-        
+
+
         attr_reader :s
         attr_reader :e
-        
-        
+
+
         def to_s
           "#{@s} - #{@e}"
         end
-        
-        
+
+
         def eql?(rhs_)
           rhs_.kind_of?(ArcXYZ) && @s == rhs_.s && @e == rhs_.e
         end
         alias_method :==, :eql?
-        
-        
+
+
         def degenerate?
           axis_ = axis
           axis_.x == 0 && axis_.y == 0 && axis_.z == 0
         end
-        
-        
+
+
         def axis
           if @axis == false
             @axis = @s % @e
           end
           @axis
         end
-        
-        
+
+
         def contains_point?(obj_)
           axis_ = axis
           saxis_ = ArcXYZ.new(@s, obj_).axis
           eaxis_ = ArcXYZ.new(obj_, @e).axis
           !saxis_ || !eaxis_ || obj_ * axis_ == 0.0 && saxis_ * axis_ > 0 && eaxis_ * axis_ > 0
         end
-        
-        
+
+
         def intersects_arc?(obj_)
           my_axis_ = axis
           dot1_ = my_axis_ * obj_.s
@@ -194,13 +194,13 @@ module RGeo
             false
           end
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end