rgeo 0.1.21 → 0.1.22

data/test/simple_mercator/tc_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator_factory
+          @factory = ::RGeo::Geographic.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator_factory
+          ::RGeo::Geographic.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_point.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator_factory
+          ::RGeo::Geographic.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_polygon.rb

@@ -48,8 +48,8 @@ module RGeo
         
         
         def create_factories
-          @factory = ::RGeo::Geography.simple_mercator_factory
-          @lenient_factory = ::RGeo::Geography.simple_mercator_factory(:lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geographic.simple_mercator_factory
+          @lenient_factory = ::RGeo::Geographic.simple_mercator_factory(:lenient_multi_polygon_assertions => true)
         end
         
         

data/test/simple_mercator/tc_point.rb

@@ -48,10 +48,10 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator_factory
-          @zfactory = ::RGeo::Geography.simple_mercator_factory(:support_z_coordinate => true)
-          @mfactory = ::RGeo::Geography.simple_mercator_factory(:support_m_coordinate => true)
-          @zmfactory = ::RGeo::Geography.simple_mercator_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          @factory = ::RGeo::Geographic.simple_mercator_factory
+          @zfactory = ::RGeo::Geographic.simple_mercator_factory(:has_z_coordinate => true)
+          @mfactory = ::RGeo::Geographic.simple_mercator_factory(:has_m_coordinate => true)
+          @zmfactory = ::RGeo::Geographic.simple_mercator_factory(:has_z_coordinate => true, :has_m_coordinate => true)
         end
         
         

data/test/simple_mercator/tc_polygon.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator_factory
+          @factory = ::RGeo::Geographic.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_window.rb

@@ -46,7 +46,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator_factory
+          @factory = ::RGeo::Geographic.simple_mercator_factory
         end
         
         
@@ -80,34 +80,34 @@ module RGeo
         
         
         def test_center_point
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(-160, -30), @factory.point(170, 30))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-160, -30), @factory.point(170, 30))
           assert_close_enough(@factory.point(5, 0), window1_.center_point)
-          window2_ = Geography::ProjectedWindow.for_corners(@factory.point(160, -30), @factory.point(-170, 30))
+          window2_ = Geographic::ProjectedWindow.for_corners(@factory.point(160, -30), @factory.point(-170, 30))
           assert_close_enough(@factory.point(175, 0), window2_.center_point)
         end
         
         
         def test_crosses_seam
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(-170, 30), @factory.point(170, 40))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-170, 30), @factory.point(170, 40))
           assert(!window1_.crosses_seam?)
-          window2_ = Geography::ProjectedWindow.for_corners(@factory.point(170, 30), @factory.point(-170, 40))
+          window2_ = Geographic::ProjectedWindow.for_corners(@factory.point(170, 30), @factory.point(-170, 40))
           assert(window2_.crosses_seam?)
         end
         
         
         def test_degenerate
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 40))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 40))
           assert(!window1_.degenerate?)
-          window2_ = Geography::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-20, 40))
+          window2_ = Geographic::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-20, 40))
           assert(window2_.degenerate?)
-          window3_ = Geography::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 30))
+          window3_ = Geographic::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 30))
           assert(window3_.degenerate?)
         end
         
         
         def test_contains_point
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(-170, 30), @factory.point(-160, 40))
-          window2_ = Geography::ProjectedWindow.for_corners(@factory.point(170, 30), @factory.point(-170, 40))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-170, 30), @factory.point(-160, 40))
+          window2_ = Geographic::ProjectedWindow.for_corners(@factory.point(170, 30), @factory.point(-170, 40))
           point1_ = @factory.point(-169, 32)
           point2_ = @factory.point(-171, 32)
           point3_ = @factory.point(-169, 29)
@@ -124,43 +124,43 @@ module RGeo
         
         
         def test_noseam_contains_window
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(10, 10), @factory.point(30, 30))
-          assert(window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(25, 25))))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(10, 10), @factory.point(30, 30))
+          assert(window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(25, 25))))
           
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(5, 15), @factory.point(25, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(35, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(0, 15), @factory.point(5, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(35, 15), @factory.point(40, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(5, 15), @factory.point(35, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(5, 15), @factory.point(25, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(35, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(0, 15), @factory.point(5, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(35, 15), @factory.point(40, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(5, 15), @factory.point(35, 25))))
           
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 5), @factory.point(25, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(25, 35))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 0), @factory.point(25, 5))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 35), @factory.point(25, 40))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(15, 5), @factory.point(25, 35))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 5), @factory.point(25, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 15), @factory.point(25, 35))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 0), @factory.point(25, 5))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 35), @factory.point(25, 40))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(15, 5), @factory.point(25, 35))))
           
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(170, 35), @factory.point(-170, 40))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(170, 35), @factory.point(-170, 40))))
         end
         
         
         def test_seam_contains_window
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(160, 10), @factory.point(-160, 30))
-          assert(window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(175, 15), @factory.point(-175, 25))))
-          assert(window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(170, 15), @factory.point(175, 25))))
-          assert(window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(-175, 15), @factory.point(-170, 25))))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(160, 10), @factory.point(-160, 30))
+          assert(window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(175, 15), @factory.point(-175, 25))))
+          assert(window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(170, 15), @factory.point(175, 25))))
+          assert(window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(-175, 15), @factory.point(-170, 25))))
           
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(170, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(-170, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(-170, 15), @factory.point(-150, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(170, 15), @factory.point(-150, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(170, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(-170, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(-170, 15), @factory.point(-150, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(170, 15), @factory.point(-150, 25))))
           
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(-150, 15), @factory.point(150, 25))))
-          assert(!window1_.contains_window?(Geography::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(-150, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(-150, 15), @factory.point(150, 25))))
+          assert(!window1_.contains_window?(Geographic::ProjectedWindow.for_corners(@factory.point(150, 15), @factory.point(-150, 25))))
         end
         
         
         def test_scaled_by
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(20, -20), @factory.point(50, 40))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(20, -20), @factory.point(50, 40))
           window1s_ = window1_.scaled_by(2, 1.5)
           assert(window1s_.contains_point?(@factory.point(10, -25)))
           assert(window1s_.contains_point?(@factory.point(60, 45)))
@@ -170,7 +170,7 @@ module RGeo
         
         
         def test_scaled_by_across_seam
-          window1_ = Geography::ProjectedWindow.for_corners(@factory.point(170, -20), @factory.point(-160, 40))
+          window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(170, -20), @factory.point(-160, 40))
           window1s_ = window1_.scaled_by(2, 1.5)
           assert(window1s_.contains_point?(@factory.point(160, -25)))
           assert(window1s_.contains_point?(@factory.point(-150, 45)))
@@ -180,7 +180,7 @@ module RGeo
         
         
         def test_surrounding_point
-          window1_ = Geography::ProjectedWindow.surrounding_point(@factory.point(20, -20), 1)
+          window1_ = Geographic::ProjectedWindow.surrounding_point(@factory.point(20, -20), 1)
           assert(window1_.contains_point?(@factory.point(20, -20)))
           assert(!window1_.contains_point?(@factory.point(20, -21)))
           assert(!window1_.contains_point?(@factory.point(19, -20)))
@@ -188,7 +188,7 @@ module RGeo
         
         
         def test_bounding_1_point
-          window1_ = Geography::ProjectedWindow.bounding_points([@factory.point(20, -20)]).with_margin(1)
+          window1_ = Geographic::ProjectedWindow.bounding_points([@factory.point(20, -20)]).with_margin(1)
           assert(window1_.contains_point?(@factory.point(20, -20)))
           assert(!window1_.contains_point?(@factory.point(20, -21)))
           assert(!window1_.contains_point?(@factory.point(19, -20)))
@@ -196,7 +196,7 @@ module RGeo
         
         
         def test_bounding_2_points
-          window1_ = Geography::ProjectedWindow.bounding_points([@factory.point(10, 10), @factory.point(30, 30)])
+          window1_ = Geographic::ProjectedWindow.bounding_points([@factory.point(10, 10), @factory.point(30, 30)])
           assert(window1_.contains_point?(@factory.point(20, 20)))
           assert(!window1_.contains_point?(@factory.point(5, 20)))
           assert(!window1_.contains_point?(@factory.point(20, 35)))
@@ -204,7 +204,7 @@ module RGeo
         
         
         def test_bounding_2_points_across_seam
-          window1_ = Geography::ProjectedWindow.bounding_points([@factory.point(-170, 10), @factory.point(170, 30)])
+          window1_ = Geographic::ProjectedWindow.bounding_points([@factory.point(-170, 10), @factory.point(170, 30)])
           assert(window1_.contains_point?(@factory.point(-174, 20)))
           assert(!window1_.contains_point?(@factory.point(-160, 20)))
           assert(!window1_.contains_point?(@factory.point(160, 20)))

data/test/spherical_geographic/tc_calculations.rb

@@ -0,0 +1,203 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the internal calculations for simple spherical
+# 
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SphericalGeographic  # :nodoc:
+      
+      class TestCalculations < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def assert_close_enough(v1_, v2_)
+          diff_ = (v1_ - v2_).abs
+          # denom_ = (v1_ + v2_).abs
+          # diff_ /= denom_ if denom_ > 0.01
+          assert(diff_ < 0.00000001, "#{v1_} is not close to #{v2_}")
+        end
+        
+        
+        def test_point_eql
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          assert_equal(point1_, point2_)
+        end
+        
+        
+        def test_point_from_latlng
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.from_latlon(45, -45)
+          assert_close_enough(0.5, point1_.x)
+          assert_close_enough(-0.5, point1_.y)
+          assert_close_enough(::Math.sqrt(2) * 0.5, point1_.z)
+        end
+        
+        
+        def test_point_dot_one
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 1)
+          assert_close_enough(1.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_dot_minusone
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(-1, -1, -1)
+          assert_close_enough(-1.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_dot_zero
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, -1, 0)
+          assert_close_enough(0.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_cross
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, -1, 0)
+          assert_close_enough(-1.0, (point1_ % point2_).z)
+        end
+        
+        
+        def test_point_cross_coincident
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          assert_nil(point1_ % point2_)
+        end
+        
+        
+        def test_point_cross_opposite
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(-1, 0, 0)
+          assert_nil(point1_ % point2_)
+        end
+        
+        
+        def test_arc_axis
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, -1, 0)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_close_enough(-1.0, arc1_.axis.z)
+        end
+        
+        
+        def test_arc_axis2
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000001, 0)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_close_enough(1.0, arc1_.axis.z)
+        end
+        
+        
+        def test_arc_intersects_point_off
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000001, 0.1)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(false, arc1_.contains_point?(point3_))
+        end
+        
+        
+        def test_arc_intersects_point_between
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000001, 0)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(true, arc1_.contains_point?(point3_))
+        end
+        
+        
+        def test_arc_intersects_point_endpoint
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(true, arc1_.contains_point?(point1_))
+        end
+        
+        
+        def test_arc_intersects_arc_true
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(-0.1, 0, 1)
+          point4_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(true, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_parallel
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.1, 0.1, 1)
+          point4_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.1, -0.1, 1)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(false, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_separated_tee
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          point4_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.2, 0, 1)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(false, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_connected_tee
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, 0, 1)
+          point4_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          arc1_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(true, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+      end
+      
+    end
+  end
+end

data/test/{spherical_geography → spherical_geographic}/tc_geometry_collection.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirn
 
 module RGeo
   module Tests  # :nodoc:
-    module SphericalGeography  # :nodoc:
+    module SphericalGeographic  # :nodoc:
       
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          @factory = ::RGeo::Geography.spherical_factory
+          @factory = ::RGeo::Geographic.spherical_factory
         end