rgeo 0.1.12 → 0.1.13

data/tests/geos/tc_multi_line_string.rb

@@ -37,7 +37,7 @@
 require 'test/unit'
 require 'rgeo'
 
-require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FILE__))
+require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirname(__FILE__))
 
 
 module RGeo
@@ -52,7 +52,7 @@ module RGeo
         end
         
         
-        include ::RGeo::Tests::Common::MultiPointTests
+        include ::RGeo::Tests::Common::MultiLineStringTests
         
         
       end

data/tests/simple_cartesian/tc_calculations.rb

@@ -0,0 +1,138 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the internal calculations for simple cartesian
+# 
+# -----------------------------------------------------------------------------
+# 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 SimpleCartesian  # :nodoc:
+      
+      class TestCalculations < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geos.factory
+          @point1 = @factory.point(3, 4)
+          @point2 = @factory.point(5, 5)
+          @point3 = @factory.point(6, 4)
+          @point4 = @factory.point(3, 5)
+          @point5 = @factory.point(-1, 2)
+          @point6 = @factory.point(-1, 1)
+          @point7 = @factory.point(5, 4)
+          @horiz_seg = Cartesian::Segment.new(@point1, @point3)
+          @vert_seg = Cartesian::Segment.new(@point4, @point1)
+          @short_rising_seg = Cartesian::Segment.new(@point1, @point2)
+          @long_rising_seg = Cartesian::Segment.new(@point5, @point2)
+          @parallel_rising_seg = Cartesian::Segment.new(@point6, @point7)
+          @steep_rising_seg = Cartesian::Segment.new(@point6, @point4)
+          @degenerate_seg = Cartesian::Segment.new(@point5, @point5)
+        end
+        
+        
+        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_segment_degenerate
+          assert(@degenerate_seg.degenerate?)
+          assert_equal(0, @degenerate_seg.dx)
+          assert_equal(0, @degenerate_seg.dy)
+          assert_equal(@point5, @degenerate_seg.s)
+          assert_equal(@point5, @degenerate_seg.e)
+        end
+        
+        
+        def test_segment_basic
+          assert(!@short_rising_seg.degenerate?)
+          assert_equal(2, @short_rising_seg.dx)
+          assert_equal(1, @short_rising_seg.dy)
+          assert_equal(@point1, @short_rising_seg.s)
+          assert_equal(@point2, @short_rising_seg.e)
+        end
+        
+        
+        def test_segment_side_basic
+          assert_equal(0.0, @short_rising_seg.side(@point5))
+          assert(@short_rising_seg.side(@point4) > 0.0)
+          assert(@short_rising_seg.side(@point6) < 0.0)
+        end
+        
+        
+        def test_segment_tproj_basic
+          assert_equal(-2, @short_rising_seg.tproj(@point5))
+          assert_close_enough(2.0/3.0, @long_rising_seg.tproj(@point1))
+        end
+        
+        
+        def test_segment_contains_point
+          assert(@long_rising_seg.contains_point?(@point1))
+          assert(@long_rising_seg.contains_point?(@point2))
+          assert(!@long_rising_seg.contains_point?(@point3))
+          assert(!@short_rising_seg.contains_point?(@point5))
+        end
+        
+        
+        def test_segment_intersects_parallel
+          assert(@long_rising_seg.intersects_segment?(@long_rising_seg))
+          assert(!@long_rising_seg.intersects_segment?(@parallel_rising_seg))
+        end
+        
+        
+        def test_segment_intersects_basic
+          assert(@long_rising_seg.intersects_segment?(@steep_rising_seg))
+          assert(@steep_rising_seg.intersects_segment?(@long_rising_seg))
+          assert(!@short_rising_seg.intersects_segment?(@steep_rising_seg))
+          assert(!@steep_rising_seg.intersects_segment?(@short_rising_seg))
+        end
+        
+        
+        def test_segment_intersects_endpoints
+          assert(@horiz_seg.intersects_segment?(@vert_seg))
+          assert(@vert_seg.intersects_segment?(@horiz_seg))
+        end
+        
+        
+      end
+      
+    end
+  end
+end

data/tests/simple_cartesian/tc_geometry_collection.rb

@@ -0,0 +1,68 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple cartesian geometry collection implementation
+# 
+# -----------------------------------------------------------------------------
+# 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'
+
+require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
+      
+      class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def create_factory
+          @factory = ::RGeo::Cartesian.simple_factory
+        end
+        
+        
+        include ::RGeo::Tests::Common::GeometryCollectionTests
+        
+        
+        undef_method :test_fully_equal
+        undef_method :test_geometrically_equal
+        undef_method :test_empty_equal
+        undef_method :test_not_equal
+        
+        
+      end
+      
+    end
+  end
+end

data/tests/simple_cartesian/tc_line_string.rb

@@ -0,0 +1,70 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple cartesian line string implementation
+# 
+# -----------------------------------------------------------------------------
+# 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'
+
+require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
+      
+      class TestLineString < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Cartesian.simple_factory
+        end
+        
+        
+        include ::RGeo::Tests::Common::LineStringTests
+        
+        
+        undef_method :test_fully_equal
+        undef_method :test_geometrically_equal_but_different_type
+        undef_method :test_geometrically_equal_but_different_type2
+        undef_method :test_geometrically_equal_but_different_overlap
+        undef_method :test_empty_equal
+        undef_method :test_not_equal
+        
+        
+      end
+      
+    end
+  end
+end

data/{lib/rgeo/geography/simple_spherical/multi_line_string_impl.rb → tests/simple_cartesian/tc_multi_line_string.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical MultiLineString implementation
+# Tests for the simple cartesian multi line string implementation
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -34,34 +34,34 @@
 ;
 
 
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirname(__FILE__))
+
+
 module RGeo
-  
-  module Geography
-    
-    module SimpleSpherical
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
       
-      
-      class MultiLineStringImpl
+      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include Common::GeometryMethods
-        include GeometryMethods
-        include Common::GeometryCollectionMethods
-        include Common::MultiLineStringMethods
+        def create_factory
+          @factory = ::RGeo::Cartesian.simple_factory
+        end
         
         
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
+        include ::RGeo::Tests::Common::MultiLineStringTests
+        
+        
+        undef_method :test_fully_equal
+        undef_method :test_geometrically_equal
+        undef_method :test_not_equal
         
         
       end
       
-      
     end
-    
   end
-  
 end

data/{lib/rgeo/geography/simple_spherical/multi_polygon_impl.rb → tests/simple_cartesian/tc_multi_point.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical MultiPolygon implementation
+# Tests for the simple cartesian multi point implementation
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -34,34 +34,34 @@
 ;
 
 
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FILE__))
+
+
 module RGeo
-  
-  module Geography
-    
-    module SimpleSpherical
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
       
-      
-      class MultiPolygonImpl
+      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include Common::GeometryMethods
-        include GeometryMethods
-        include Common::GeometryCollectionMethods
-        include Common::MultiPolygonMethods
+        def create_factory
+          @factory = ::RGeo::Cartesian.simple_factory
+        end
         
         
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
+        include ::RGeo::Tests::Common::MultiPointTests
+        
+        
+        undef_method :test_fully_equal
+        undef_method :test_geometrically_equal
+        undef_method :test_not_equal
         
         
       end
       
-      
     end
-    
   end
-  
 end

data/{lib/rgeo/geography/common/geometry_methods.rb → tests/simple_cartesian/tc_multi_polygon.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Basic methods used by all geography features
+# Tests for the simple cartesian multi polygon implementation
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -34,59 +34,37 @@
 ;
 
 
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__FILE__))
+
+
 module RGeo
-  
-  module Geography
-    
-    module Common
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
       
-      
-      module GeometryMethods
+      class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
         
         
-        def inspect  # :nodoc:
-          "#<#{self.class}:0x#{object_id.to_s(16)} #{as_text.inspect}>"
+        def create_factories
+          @factory = ::RGeo::Cartesian.simple_factory
+          @lenient_factory = ::RGeo::Cartesian.simple_factory(:lenient_multi_polygon_assertions => true)
         end
         
-        def to_s  # :nodoc:
-          as_text
-        end
         
+        include ::RGeo::Tests::Common::MultiPolygonTests
         
-        def _validate_geometry  # :nodoc:
-        end
         
-        
-        def _set_factory(factory_)  # :nodoc:
-          @factory = factory_
-        end
-        
-        
-        def factory
-          @factory
-        end
-        
-        
-        def cast(type_)
-          type_ == geometry_type ? self : nil
-        end
-        
-        
-        def as_text
-          Helper.unparse_wkt(self)
-        end
-        
-        
-        def as_binary
-          Helper.unparse_wkb(self)
-        end
+        undef_method :test_creation_wrong_type
+        undef_method :test_creation_overlapping
+        undef_method :test_creation_connected
+        undef_method :test_equal
+        undef_method :test_not_equal
         
         
       end
       
-      
     end
-    
   end
-  
 end