rgeo 0.3.3 → 0.3.4

data/test/simple_mercator/tc_window.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the simple mercator window implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# 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
@@ -41,25 +41,25 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module SimpleMercator  # :nodoc:
-      
+
       class TestWindow < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geographic.simple_mercator_factory
         end
-        
-        
+
+
         def assert_close_enough(p1_, p2_)
           assert((p1_.x - p2_.x).abs < 0.00001 && (p1_.y - p2_.y).abs < 0.00001)
         end
-        
-        
+
+
         def assert_contains_approx(p_, mp_)
           assert(mp_.any?{ |q_| (p_.x - q_.x).abs < 0.00001 && (p_.y - q_.y).abs < 0.00001 })
         end
-        
-        
+
+
         def test_limits
           limits_ = @factory.projection_limits_window
           assert_in_delta(-20037508, limits_.x_min, 1)
@@ -67,8 +67,8 @@ module RGeo
           assert_in_delta(20037508, limits_.x_max, 1)
           assert_in_delta(20037508, limits_.y_max, 1)
         end
-        
-        
+
+
         def test_limits_unprojected
           limits_ = @factory.projection_limits_window
           assert_close_enough(@factory.point(-180, -85.051129), limits_.sw_point)
@@ -77,24 +77,24 @@ module RGeo
           assert_close_enough(@factory.point(180, 85.051129), limits_.ne_point)
           assert_close_enough(@factory.point(0, 0), limits_.center_point)
         end
-        
-        
+
+
         def test_center_point
           window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-160, -30), @factory.point(170, 30))
           assert_close_enough(@factory.point(5, 0), window1_.center_point)
           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_ = Geographic::ProjectedWindow.for_corners(@factory.point(-170, 30), @factory.point(170, 40))
           assert(!window1_.crosses_seam?)
           window2_ = Geographic::ProjectedWindow.for_corners(@factory.point(170, 30), @factory.point(-170, 40))
           assert(window2_.crosses_seam?)
         end
-        
-        
+
+
         def test_degenerate
           window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 40))
           assert(!window1_.degenerate?)
@@ -103,8 +103,8 @@ module RGeo
           window3_ = Geographic::ProjectedWindow.for_corners(@factory.point(-20, 30), @factory.point(-10, 30))
           assert(window3_.degenerate?)
         end
-        
-        
+
+
         def test_contains_point
           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))
@@ -121,44 +121,44 @@ module RGeo
           assert(window2_.contains_point?(point4_))
           assert(!window2_.contains_point?(point5_))
         end
-        
-        
+
+
         def test_noseam_contains_window
           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?(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?(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?(Geographic::ProjectedWindow.for_corners(@factory.point(170, 35), @factory.point(-170, 40))))
         end
-        
-        
+
+
         def test_seam_contains_window
           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?(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?(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_ = Geographic::ProjectedWindow.for_corners(@factory.point(20, -20), @factory.point(50, 40))
           window1s_ = window1_.scaled_by(2, 1.5)
@@ -167,8 +167,8 @@ module RGeo
           assert(!window1s_.contains_point?(@factory.point(0, -25)))
           assert(!window1s_.contains_point?(@factory.point(10, -35)))
         end
-        
-        
+
+
         def test_scaled_by_across_seam
           window1_ = Geographic::ProjectedWindow.for_corners(@factory.point(170, -20), @factory.point(-160, 40))
           window1s_ = window1_.scaled_by(2, 1.5)
@@ -177,32 +177,32 @@ module RGeo
           assert(!window1s_.contains_point?(@factory.point(150, -25)))
           assert(!window1s_.contains_point?(@factory.point(-140, 45)))
         end
-        
-        
+
+
         def test_surrounding_point
           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)))
         end
-        
-        
+
+
         def test_bounding_1_point
           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)))
         end
-        
-        
+
+
         def test_bounding_2_points
           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)))
         end
-        
-        
+
+
         def test_bounding_2_points_across_seam
           window1_ = Geographic::ProjectedWindow.bounding_points([@factory.point(-170, 10), @factory.point(170, 30)])
           assert(window1_.contains_point?(@factory.point(-174, 20)))
@@ -210,10 +210,10 @@ module RGeo
           assert(!window1_.contains_point?(@factory.point(160, 20)))
           assert(!window1_.contains_point?(@factory.point(-174, 35)))
         end
-        
-        
+
+
       end
-      
+
     end
   end
 end

data/test/spherical_geographic/tc_calculations.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the internal calculations for simple spherical
-# 
+#
 # -----------------------------------------------------------------------------
-# 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
@@ -41,91 +41,91 @@ 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)
@@ -133,8 +133,8 @@ module RGeo
           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)
@@ -142,16 +142,16 @@ module RGeo
           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)
@@ -161,8 +161,8 @@ module RGeo
           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)
@@ -172,8 +172,8 @@ module RGeo
           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)
@@ -183,8 +183,8 @@ module RGeo
           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)
@@ -194,10 +194,10 @@ module RGeo
           arc2_ = ::RGeo::Geographic::SphericalMath::ArcXYZ.new(point3_, point4_)
           assert_equal(true, arc1_.intersects_arc?(arc2_))
         end
-        
-        
+
+
       end
-      
+
     end
   end
 end