rgeo 0.1.19 → 0.1.20

data/lib/rgeo/geography/projected_window.rb

@@ -200,7 +200,7 @@ module RGeo
       
       
       # Returns the southwest corner of the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def sw_point
         @sw ||= @factory.unproject(@factory.projection_factory.point(@x_min, @y_min))
@@ -208,7 +208,7 @@ module RGeo
       
       
       # Returns the southeast corner of the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def se_point
         @se ||= @factory.unproject(@factory.projection_factory.point(@x_max, @y_min))
@@ -216,7 +216,7 @@ module RGeo
       
       
       # Returns the northwest corner of the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def nw_point
         @nw ||= @factory.unproject(@factory.projection_factory.point(@x_min, @y_max))
@@ -224,7 +224,7 @@ module RGeo
       
       
       # Returns the northeast corner of the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def ne_point
         @ne ||= @factory.unproject(@factory.projection_factory.point(@x_max, @y_max))
@@ -232,7 +232,7 @@ module RGeo
       
       
       # Returns the center of the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def center_point
         @center ||= @factory.unproject(@factory.projection_factory.point(*center_xy))
@@ -240,7 +240,7 @@ module RGeo
       
       
       # Returns a random point the rectangle in _unprojected_
-      # (lat/lng) space, as a Features::Point object.
+      # (lat/lng) space, as a Feature::Point object.
       
       def random_point
         y_ = @y_min + (@y_max - @y_min) * rand
@@ -256,7 +256,7 @@ module RGeo
       
       
       # Returns true if the rectangle contains the given point, which
-      # must be a Features::Point in _unprojected_ (lat/lng) space.
+      # must be a Feature::Point in _unprojected_ (lat/lng) space.
       
       def contains_point?(point_)
         projection_ = @factory.project(point_)

data/lib/rgeo/geography/simple_mercator_projector.rb

@@ -0,0 +1,133 @@
+# -----------------------------------------------------------------------------
+# 
+# Simple mercator projection
+# 
+# -----------------------------------------------------------------------------
+# 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
+    
+    
+    class SimpleMercatorProjector  # :nodoc:
+      
+      EQUATORIAL_RADIUS = 6378137.0
+      
+      
+      def initialize(geography_factory_, opts_={})
+        @geography_factory = geography_factory_
+        @projection_factory = Cartesian.preferred_factory(:srid => 3857, :proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+      end
+      
+      
+      def projection_factory
+        @projection_factory
+      end
+      
+      
+      def project(geometry_)
+        case geometry_
+        when Feature::Point
+          rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
+          radius_ = EQUATORIAL_RADIUS
+          @projection_factory.point(geometry_.x * rpd_ * radius_,
+            ::Math.log(::Math.tan(::Math::PI / 4.0 + geometry_.y * rpd_ / 2.0)) * radius_)
+        when Feature::Line
+          @projection_factory.line(project(geometry_.start_point), project(geometry_.end_point))
+        when Feature::LinearRing
+          @projection_factory.linear_ring(geometry_.points.map{ |p_| project(p_) })
+        when Feature::LineString
+          @projection_factory.line_string(geometry_.points.map{ |p_| project(p_) })
+        when Feature::Polygon
+          @projection_factory.polygon(project(geometry_.exterior_ring),
+                                      geometry_.interior_rings.map{ |p_| project(p_) })
+        when Feature::MultiPoint
+          @projection_factory.multi_point(geometry_.map{ |p_| project(p_) })
+        when Feature::MultiLineString
+          @projection_factory.multi_line_string(geometry_.map{ |p_| project(p_) })
+        when Feature::MultiPolygon
+          @projection_factory.multi_polygon(geometry_.map{ |p_| project(p_) })
+        when Feature::GeometryCollection
+          @projection_factory.collection(geometry_.map{ |p_| project(p_) })
+        else
+          nil
+        end
+      end
+      
+      
+      def unproject(geometry_)
+        case geometry_
+        when Feature::Point
+          dpr_ = ImplHelper::Math::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_)
+        when Feature::Line
+          @geography_factory.line(unproject(geometry_.start_point), unproject(geometry_.end_point))
+        when Feature::LinearRing
+          @geography_factory.linear_ring(geometry_.points.map{ |p_| unproject(p_) })
+        when Feature::LineString
+          @geography_factory.line_string(geometry_.points.map{ |p_| unproject(p_) })
+        when Feature::Polygon
+          @geography_factory.polygon(unproject(geometry_.exterior_ring),
+                                    geometry_.interior_rings.map{ |p_| unproject(p_) })
+        when Feature::MultiPoint
+          @geography_factory.multi_point(geometry_.map{ |p_| unproject(p_) })
+        when Feature::MultiLineString
+          @geography_factory.multi_line_string(geometry_.map{ |p_| unproject(p_) })
+        when Feature::MultiPolygon
+          @geography_factory.multi_polygon(geometry_.map{ |p_| unproject(p_) })
+        when Feature::GeometryCollection
+          @geography_factory.collection(geometry_.map{ |p_| unproject(p_) })
+        else
+          nil
+        end
+      end
+      
+      
+      def wraps?
+        true
+      end
+      
+      
+      def limits_window
+        @limits_window ||= ProjectedWindow.new(@geography_factory, -20037508.342789, -20037508.342789, 20037508.342789, 20037508.342789, :is_limits => true)
+      end
+      
+      
+    end
+    
+    
+  end
+  
+end

data/lib/rgeo/geography/spherical_feature_classes.rb

@@ -0,0 +1,212 @@
+# -----------------------------------------------------------------------------
+# 
+# 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
+    
+    
+    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
+        @y = 90.0 if @y > 90.0
+        @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_
+        when SphericalPointImpl
+          _xyz.dist_to_point(rhs_._xyz) * SphericalMath::RADIUS
+        else
+          super
+        end
+      end
+      
+      
+      def equals?(rhs_)
+        return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
+        case rhs_
+        when Feature::Point
+          if @y == 90
+            rhs_.y == 90
+          elsif @y == -90
+            rhs_.y == -90
+          else
+            rhs_.x == @x && rhs_.y == @y
+          end
+        when Feature::LineString
+          rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
+        when Feature::GeometryCollection
+          rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
+        else
+          false
+        end
+      end
+      
+      
+      alias_method :longitude, :x
+      alias_method :lon, :x
+      alias_method :latitude, :y
+      alias_method :lat, :y
+      
+      
+    end
+    
+    
+    class SphericalLineStringImpl  # :nodoc:
+      
+      
+      include Feature::LineString
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include SphericalGeometryMethods
+      include SphericalLineStringMethods
+      
+      
+    end
+    
+    
+    class SphericalLineImpl  # :nodoc:
+      
+      
+      include Feature::Line
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include ImplHelper::BasicLineMethods
+      include SphericalGeometryMethods
+      include SphericalLineStringMethods
+      
+      
+    end
+    
+    
+    class SphericalLinearRingImpl  # :nodoc:
+      
+      
+      include Feature::LinearRing
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include ImplHelper::BasicLinearRingMethods
+      include SphericalGeometryMethods
+      include SphericalLineStringMethods
+      
+      
+    end
+    
+    
+    class SphericalPolygonImpl  # :nodoc:
+      
+      
+      include Feature::Polygon
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicPolygonMethods
+      include SphericalGeometryMethods
+      
+      
+    end
+    
+    
+    class SphericalGeometryCollectionImpl  # :nodoc:
+      
+      
+      include Feature::GeometryCollection
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include SphericalGeometryMethods
+      
+      
+    end
+    
+    
+    class SphericalMultiPointImpl  # :nodoc:
+      
+      
+      include Feature::GeometryCollection
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiPointMethods
+      include SphericalGeometryMethods
+      
+      
+    end
+    
+    
+    class SphericalMultiLineStringImpl  # :nodoc:
+      
+      
+      include Feature::GeometryCollection
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiLineStringMethods
+      include SphericalGeometryMethods
+      
+      
+    end
+    
+    
+    class SphericalMultiPolygonImpl  # :nodoc:
+      
+      
+      include Feature::GeometryCollection
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiPolygonMethods
+      include SphericalGeometryMethods
+      
+      
+    end
+    
+    
+  end
+  
+end

data/lib/rgeo/geography/{simple_spherical/feature_methods.rb → spherical_feature_methods.rb}

@@ -38,64 +38,60 @@ module RGeo
   
   module Geography
     
-    module SimpleSpherical  # :nodoc:
+    
+    module SphericalGeometryMethods  # :nodoc:
       
       
-      module GeometryMethods  # :nodoc:
-        
-        
-        def srid
-          4326
-        end
-        
-        
+      def srid
+        factory.srid
       end
       
       
-      module LineStringMethods  # :nodoc:
-        
-        
-        def _arcs
-          unless @arcs
-            @arcs = (0..num_points-2).map do |i_|
-              ArcXYZ.new(point_n(i_)._xyz, point_n(i_+1)._xyz)
-            end
+    end
+    
+    
+    module SphericalLineStringMethods  # :nodoc:
+      
+      
+      def _arcs
+        unless @arcs
+          @arcs = (0..num_points-2).map do |i_|
+            SphericalMath::ArcXYZ.new(point_n(i_)._xyz, point_n(i_+1)._xyz)
           end
-          @arcs
         end
-        
-        
-        def is_simple?
-          arcs_ = _arcs
-          len_ = arcs_.length
-          return false if arcs_.any?{ |a_| a_.degenerate? }
-          return true if len_ == 1
-          return arcs_[0].s != arcs_[1].e if len_ == 2
-          arcs_.each_with_index do |arc_, index_|
-            nindex_ = index_ + 1
-            nindex_ = nil if nindex_ == len_
-            return false if nindex_ && arc_.contains_point?(arcs_[nindex_].e)
-            pindex_ = index_ - 1
-            pindex_ = nil if pindex_ < 0
-            return false if pindex_ && arc_.contains_point?(arcs_[pindex_].s)
-            if nindex_
-              oindex_ = nindex_ + 1
-              while oindex_ < len_
-                oarc_ = arcs_[oindex_]
-                return false if !(index_ == 0 && oindex_ == len_-1 && arc_.s == oarc_.e) && arc_.intersects_arc?(oarc_)
-                oindex_ += 1
-              end
+        @arcs
+      end
+      
+      
+      def is_simple?
+        arcs_ = _arcs
+        len_ = arcs_.length
+        return false if arcs_.any?{ |a_| a_.degenerate? }
+        return true if len_ == 1
+        return arcs_[0].s != arcs_[1].e if len_ == 2
+        arcs_.each_with_index do |arc_, index_|
+          nindex_ = index_ + 1
+          nindex_ = nil if nindex_ == len_
+          return false if nindex_ && arc_.contains_point?(arcs_[nindex_].e)
+          pindex_ = index_ - 1
+          pindex_ = nil if pindex_ < 0
+          return false if pindex_ && arc_.contains_point?(arcs_[pindex_].s)
+          if nindex_
+            oindex_ = nindex_ + 1
+            while oindex_ < len_
+              oarc_ = arcs_[oindex_]
+              return false if !(index_ == 0 && oindex_ == len_-1 && arc_.s == oarc_.e) && arc_.intersects_arc?(oarc_)
+              oindex_ += 1
             end
           end
-          true
         end
-        
-        
+        true
       end
       
       
     end
     
+    
   end
   
 end