rgeo 0.1.12 → 0.1.13

data/lib/rgeo/geography/simple_mercator/feature_methods.rb

@@ -38,19 +38,10 @@ module RGeo
   
   module Geography
     
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       
-      module GeometryMethods
-        
-        
-        def eql?(rhs_)
-          if rhs_.respond_to?(:factory) && rhs_.factory.eql?(@factory)
-            projection.eql?(rhs_.projection)
-          else
-            false
-          end
-        end
+      module GeometryMethods  # :nodoc:
         
         
         def srid
@@ -103,52 +94,52 @@ module RGeo
         
         
         def equals?(rhs_)
-          projection.equals?(factory.cast(rhs_).projection)
+          projection.equals?(Features.cast(rhs_, factory).projection)
         end
         
         
         def disjoint?(rhs_)
-          projection.disjoint?(factory.cast(rhs_).projection)
+          projection.disjoint?(Features.cast(rhs_, factory).projection)
         end
         
         
         def intersects?(rhs_)
-          projection.intersects?(factory.cast(rhs_).projection)
+          projection.intersects?(Features.cast(rhs_, factory).projection)
         end
         
         
         def touches?(rhs_)
-          projection.touches?(factory.cast(rhs_).projection)
+          projection.touches?(Features.cast(rhs_, factory).projection)
         end
         
         
         def crosses?(rhs_)
-          projection.crosses?(factory.cast(rhs_).projection)
+          projection.crosses?(Features.cast(rhs_, factory).projection)
         end
         
         
         def within?(rhs_)
-          projection.within?(factory.cast(rhs_).projection)
+          projection.within?(Features.cast(rhs_, factory).projection)
         end
         
         
         def contains?(rhs_)
-          projection.contains?(factory.cast(rhs_).projection)
+          projection.contains?(Features.cast(rhs_, factory).projection)
         end
         
         
         def overlaps?(rhs_)
-          projection.overlaps?(factory.cast(rhs_).projection)
+          projection.overlaps?(Features.cast(rhs_, factory).projection)
         end
         
         
         def relate(rhs_, pattern_)
-          projection.relate(factory.cast(rhs_).projection, pattern_)
+          projection.relate(Features.cast(rhs_, factory).projection, pattern_)
         end
         
         
         def distance(rhs_)
-          projection.distance(factory.cast(rhs_).projection) / scaling_factor
+          projection.distance(Features.cast(rhs_, factory).projection) / scaling_factor
         end
         
         
@@ -163,29 +154,29 @@ module RGeo
         
         
         def intersection(rhs_)
-          factory.unproject(projection.intersection(factory.cast(rhs_).projection))
+          factory.unproject(projection.intersection(Features.cast(rhs_, factory).projection))
         end
         
         
         def union(rhs_)
-          factory.unproject(projection.union(factory.cast(rhs_).projection))
+          factory.unproject(projection.union(Features.cast(rhs_, factory).projection))
         end
         
         
         def difference(rhs_)
-          factory.unproject(projection.difference(factory.cast(rhs_).projection))
+          factory.unproject(projection.difference(Features.cast(rhs_, factory).projection))
         end
         
         
         def sym_difference(rhs_)
-          factory.unproject(projection.sym_difference(factory.cast(rhs_).projection))
+          factory.unproject(projection.sym_difference(Features.cast(rhs_, factory).projection))
         end
         
         
       end
       
       
-      module GeometryCollectionMethods
+      module GeometryCollectionMethods  # :nodoc:
         
         
         def scaling_factor
@@ -196,7 +187,7 @@ module RGeo
       end
       
       
-      module NCurveMethods
+      module NCurveMethods  # :nodoc:
         
         
         def length
@@ -207,7 +198,7 @@ module RGeo
       end
       
       
-      module CurveMethods
+      module CurveMethods  # :nodoc:
         
         
         def scaling_factor
@@ -218,7 +209,7 @@ module RGeo
       end
       
       
-      module LineStringMethods
+      module LineStringMethods  # :nodoc:
         
         
         def _validate_geometry
@@ -251,7 +242,7 @@ module RGeo
       end
       
       
-      module NSurfaceMethods
+      module NSurfaceMethods  # :nodoc:
         
         
         def area
@@ -273,7 +264,7 @@ module RGeo
       end
       
       
-      module SurfaceMethods
+      module SurfaceMethods  # :nodoc:
         
         
         def scaling_factor

data/lib/rgeo/geography/simple_mercator/projector.rb

@@ -38,21 +38,17 @@ module RGeo
   
   module Geography
     
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       
       EQUATORIAL_RADIUS = 6378137.0
       
       
-      class Projector
+      class Projector  # :nodoc:
         
         def initialize(geography_factory_, opts_={})
           @geography_factory = geography_factory_
-          if ::RGeo.const_defined?(:Geos) && Geos.supported?
-            @projection_factory = Geos.factory(:srid => 3857, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions])
-          else
-            @projection_factory = nil
-          end
+          @projection_factory = Cartesian.preferred_factory(:srid => 3857, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions])
         end
         
         
@@ -69,7 +65,7 @@ module RGeo
         def unproject(geometry_)
           case geometry_
           when Features::Point
-            dpr_ = Common::Helper::DEGREES_PER_RADIAN
+            dpr_ = Helper::DEGREES_PER_RADIAN
             radius_ = EQUATORIAL_RADIUS
             @geography_factory.point(geometry_.x / radius_ * dpr_,
               (2.0 * ::Math.atan(::Math.exp(geometry_.y / radius_)) - ::Math::PI / 2.0) * dpr_)

data/lib/rgeo/geography/simple_spherical/calculations.rb

@@ -38,7 +38,7 @@ module RGeo
   
   module Geography
     
-    module SimpleSpherical
+    module SimpleSpherical  # :nodoc:
       
       
       RADIUS = 6371007.2
@@ -55,7 +55,7 @@ module RGeo
       # This object is also used to represent a great circle, as its axis
       # of rotation.
       
-      class PointXYZ
+      class PointXYZ  # :nodoc:
         
         def initialize(x_, y_, z_)
           r_ = ::Math.sqrt(x_ * x_ + y_ * y_ + z_ * z_)
@@ -85,7 +85,7 @@ module RGeo
         def latlon
           lat_rad_ = ::Math.asin(@z)
           lon_rad_ = ::Math.atan2(@y, @x) rescue 0.0
-          rpd_ = Common::Helper::RADIANS_PER_DEGREE
+          rpd_ = Helper::RADIANS_PER_DEGREE
           [lat_rad_ / rpd_, lon_rad_ / rpd_]
         end
         
@@ -120,7 +120,7 @@ module RGeo
         
         
         def self.from_latlon(lat_, lon_)
-          rpd_ = Common::Helper::RADIANS_PER_DEGREE
+          rpd_ = Helper::RADIANS_PER_DEGREE
           lat_rad_ = rpd_ * lat_
           lon_rad_ = rpd_ * lon_
           z_ = ::Math.sin(lat_rad_)
@@ -135,7 +135,7 @@ module RGeo
       
       # Represents a finite arc on the sphere.
       
-      class ArcXYZ
+      class ArcXYZ  # :nodoc:
         
         def initialize(start_, end_)
           @s = start_
@@ -159,6 +159,12 @@ module RGeo
         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
@@ -193,10 +199,6 @@ module RGeo
       end
       
       
-      module Calculations
-      end
-      
-      
     end
     
   end

data/lib/rgeo/geography/simple_spherical/feature_classes.rb

@@ -0,0 +1,189 @@
+# -----------------------------------------------------------------------------
+# 
+# Spherical geography feature classes
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * 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
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module Geography
+    
+    module SimpleSpherical  # :nodoc:
+      
+      
+      class PointImpl  # :nodoc:
+        
+        
+        include Features::Point
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicPointMethods
+        
+        
+        def _validate_geometry
+          @x = @x % 360.0
+          @x -= 360.0 if @x >= 180.0
+          @y = 90.0 if @y > 90.0
+          @y = -90.0 if @y < -90.0
+          super
+        end
+        
+        
+        def _xyz
+          @xyz ||= PointXYZ.from_latlon(@y, @x)
+        end
+        
+        
+        def distance(rhs_)
+          rhs_ = Features.cast(rhs_, @factory)
+          case rhs_
+          when PointImpl
+            _xyz.dist_to_point(rhs_._xyz) * SimpleSpherical::RADIUS
+          else
+            super
+          end
+        end
+        
+        
+      end
+      
+      
+      class LineStringImpl  # :nodoc:
+        
+        
+        include Features::LineString
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicLineStringMethods
+        include SimpleSpherical::LineStringMethods
+        
+        
+      end
+      
+      
+      class LineImpl  # :nodoc:
+        
+        
+        include Features::Line
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicLineStringMethods
+        include SimpleSpherical::LineStringMethods
+        include ImplHelpers::BasicLineMethods
+        
+        
+      end
+      
+      
+      class LinearRingImpl  # :nodoc:
+        
+        
+        include Features::Line
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicLineStringMethods
+        include SimpleSpherical::LineStringMethods
+        include ImplHelpers::BasicLinearRingMethods
+        
+        
+      end
+      
+      
+      class PolygonImpl  # :nodoc:
+        
+        
+        include Features::Polygon
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicPolygonMethods
+        
+        
+      end
+      
+      
+      class GeometryCollectionImpl  # :nodoc:
+        
+        
+        include Features::GeometryCollection
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
+        
+        
+      end
+      
+      
+      class MultiPointImpl  # :nodoc:
+        
+        
+        include Features::GeometryCollection
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
+        include ImplHelpers::BasicMultiPointMethods
+        
+        
+      end
+      
+      
+      class MultiLineStringImpl  # :nodoc:
+        
+        
+        include Features::GeometryCollection
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
+        include ImplHelpers::BasicMultiLineStringMethods
+        
+        
+      end
+      
+      
+      class MultiPolygonImpl  # :nodoc:
+        
+        
+        include Features::GeometryCollection
+        include ImplHelpers::BasicGeometryMethods
+        include SimpleSpherical::GeometryMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
+        include ImplHelpers::BasicMultiPolygonMethods
+        
+        
+      end
+      
+      
+    end
+    
+  end
+  
+end