rgeo 0.1.19 → 0.1.20

data/{tests → test}/simple_mercator/tc_geometry_collection.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirn
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
         

data/{tests → test}/simple_mercator/tc_multi_line_string.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirnam
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
         

data/{tests → test}/simple_mercator/tc_multi_point.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         

data/{tests → test}/simple_mercator/tc_multi_polygon.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
         

data/{tests → test}/simple_mercator/tc_point.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestPoint < ::Test::Unit::TestCase  # :nodoc:
         
@@ -82,7 +82,7 @@ module RGeo
           point2_ = @factory.point(11, 12)
           point3_ = @factory.point(13, 12)
           assert_in_delta(0, point1_.distance(point2_), 0.0001)
-          assert_in_delta(217773, point1_.distance(point3_), 1)
+          assert_in_delta(222638, point1_.distance(point3_), 1)
         end
         
         

data/{tests → test}/simple_mercator/tc_window.rb

@@ -40,7 +40,7 @@ require 'rgeo'
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       class TestWindow < ::Test::Unit::TestCase  # :nodoc:
         

data/test/spherical_geography/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 SphericalGeography  # :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::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          assert_equal(point1_, point2_)
+        end
+        
+        
+        def test_point_from_latlng
+          point1_ = ::RGeo::Geography::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::Geography::SphericalMath::PointXYZ.new(1, 1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 1, 1)
+          assert_close_enough(1.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_dot_minusone
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(-1, -1, -1)
+          assert_close_enough(-1.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_dot_zero
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, -1, 0)
+          assert_close_enough(0.0, point1_ * point2_)
+        end
+        
+        
+        def test_point_cross
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, -1, 0)
+          assert_close_enough(-1.0, (point1_ % point2_).z)
+        end
+        
+        
+        def test_point_cross_coincident
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          assert_nil(point1_ % point2_)
+        end
+        
+        
+        def test_point_cross_opposite
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(-1, 0, 0)
+          assert_nil(point1_ % point2_)
+        end
+        
+        
+        def test_arc_axis
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 1, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, -1, 0)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_close_enough(-1.0, arc1_.axis.z)
+        end
+        
+        
+        def test_arc_axis2
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000001, 0)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_close_enough(1.0, arc1_.axis.z)
+        end
+        
+        
+        def test_arc_intersects_point_off
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000001, 0.1)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(false, arc1_.contains_point?(point3_))
+        end
+        
+        
+        def test_arc_intersects_point_between
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000001, 0)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(true, arc1_.contains_point?(point3_))
+        end
+        
+        
+        def test_arc_intersects_point_endpoint
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(1, 0.000002, 0)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          assert_equal(true, arc1_.contains_point?(point1_))
+        end
+        
+        
+        def test_arc_intersects_arc_true
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(-0.1, 0, 1)
+          point4_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(true, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_parallel
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.1, 0.1, 1)
+          point4_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.1, -0.1, 1)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(false, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_separated_tee
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          point4_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.2, 0, 1)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(false, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+        def test_arc_intersects_arc_connected_tee
+          point1_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, 0.1, 1)
+          point2_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, -0.1, 1)
+          point3_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0, 0, 1)
+          point4_ = ::RGeo::Geography::SphericalMath::PointXYZ.new(0.1, 0, 1)
+          arc1_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point1_, point2_)
+          arc2_ = ::RGeo::Geography::SphericalMath::ArcXYZ.new(point3_, point4_)
+          assert_equal(true, arc1_.intersects_arc?(arc2_))
+        end
+        
+        
+      end
+      
+    end
+  end
+end

data/{tests/simple_spherical → test/spherical_geography}/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 SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          @factory = ::RGeo::Geography.simple_spherical
+          @factory = ::RGeo::Geography.spherical
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_line_string.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestLineString < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_spherical
+          @factory = ::RGeo::Geography.spherical
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_multi_line_string.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirnam
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          @factory = ::RGeo::Geography.simple_spherical
+          @factory = ::RGeo::Geography.spherical
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_multi_point.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          @factory = ::RGeo::Geography.simple_spherical
+          @factory = ::RGeo::Geography.spherical
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_multi_polygon.rb

@@ -42,14 +42,14 @@ require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factories
-          @factory = ::RGeo::Geography.simple_spherical
-          @lenient_factory = ::RGeo::Geography.simple_spherical(:lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geography.spherical
+          @lenient_factory = ::RGeo::Geography.spherical(:lenient_multi_polygon_assertions => true)
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_point.rb

@@ -42,16 +42,16 @@ require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_spherical
-          @zfactory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true)
-          @mfactory = ::RGeo::Geography.simple_spherical(:support_m_coordinate => true)
-          @zmfactory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true, :support_m_coordinate => true)
+          @factory = ::RGeo::Geography.spherical
+          @zfactory = ::RGeo::Geography.spherical(:support_z_coordinate => true)
+          @mfactory = ::RGeo::Geography.spherical(:support_m_coordinate => true)
+          @zmfactory = ::RGeo::Geography.spherical(:support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         
@@ -67,7 +67,7 @@ module RGeo
         
         def test_srid
           point_ = @factory.point(11, 12)
-          assert_equal(4326, point_.srid)
+          assert_equal(4055, point_.srid)
         end
         
         
@@ -76,7 +76,7 @@ module RGeo
           point2_ = @factory.point(0, 10)
           point3_ = @factory.point(0, 40)
           assert_in_delta(0, point1_.distance(point2_), 0.0001)
-          assert_in_delta(::Math::PI / 6.0 * ::RGeo::Geography::SimpleSpherical::RADIUS, point1_.distance(point3_), 0.0001)
+          assert_in_delta(::Math::PI / 6.0 * ::RGeo::Geography::SphericalMath::RADIUS, point1_.distance(point3_), 0.0001)
         end
         
         

data/{tests/simple_spherical → test/spherical_geography}/tc_polygon.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/polygon_tests.rb', ::File.dirname(__FILE__
 
 module RGeo
   module Tests  # :nodoc:
-    module SimpleSpherical  # :nodoc:
+    module SphericalGeography  # :nodoc:
       
       class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_spherical
+          @factory = ::RGeo::Geography.spherical
         end