rgeo 0.1.12 → 0.1.13

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

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical MultiPoint implementation
+# Tests for the simple spherical 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 SimpleSpherical  # :nodoc:
       
-      
-      class MultiPointImpl
+      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include Common::GeometryMethods
-        include GeometryMethods
-        include Common::GeometryCollectionMethods
-        include Common::MultiPointMethods
+        def create_factory
+          @factory = ::RGeo::Geography.simple_spherical
+        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/tests/simple_spherical/tc_multi_polygon.rb

@@ -0,0 +1,70 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple spherical multi polygon 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/multi_polygon_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleSpherical  # :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)
+        end
+        
+        
+        include ::RGeo::Tests::Common::MultiPolygonTests
+        
+        
+        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

data/tests/simple_spherical/tc_point.rb

@@ -37,6 +37,8 @@
 require 'test/unit'
 require 'rgeo'
 
+require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
+
 
 module RGeo
   module Tests  # :nodoc:
@@ -50,121 +52,7 @@ module RGeo
         end
         
         
-        def test_creation
-          point_ = @factory.point(21, -22)
-          assert(!point_.respond_to?(:projection))
-          assert_equal(21, point_.x)
-          assert_equal(-22, point_.y)
-          assert_equal(21, point_.longitude)
-          assert_equal(-22, point_.latitude)
-        end
-        
-        
-        def test_wkt_creation
-          point1_ = @factory.parse_wkt('POINT(21 -22)')
-          assert_equal(21, point1_.x)
-          assert_equal(-22, point1_.y)
-          assert_equal(21, point1_.longitude)
-          assert_equal(-22, point1_.latitude)
-        end
-        
-        
-        def test_clone
-          point1_ = @factory.point(11, 12)
-          point2_ = point1_.clone
-          assert_equal(point1_, point2_)
-          point3_ = @factory.point(13, 12)
-          point4_ = point3_.dup
-          assert_equal(point3_, point4_)
-          assert_not_equal(point2_, point4_)
-        end
-        
-        
-        def test_type_check
-          point_ = @factory.point(21, 22)
-          assert(::RGeo::Features::Geometry.check_type(point_))
-          assert(::RGeo::Features::Point.check_type(point_))
-          assert(!::RGeo::Features::GeometryCollection.check_type(point_))
-          assert(!::RGeo::Features::Curve.check_type(point_))
-        end
-        
-        
-        def test_geometry_type
-          point_ = @factory.point(11, 12)
-          assert_equal(::RGeo::Features::Point, point_.geometry_type)
-        end
-        
-        
-        def test_dimension
-          point_ = @factory.point(11, 12)
-          assert_equal(0, point_.dimension)
-        end
-        
-        
-        def test_srid
-          point_ = @factory.point(11, 12)
-          assert_equal(4326, point_.srid)
-        end
-        
-        
-        def test_envelope
-          point_ = @factory.point(11, 12)
-          assert_equal(point_, point_.envelope)
-        end
-        
-        
-        def test_as_text_wkt_round_trip
-          point1_ = @factory.point(11, 12)
-          text_ = point1_.as_text
-          point2_ = @factory.parse_wkt(text_)
-          assert_equal(point2_, point1_)
-        end
-        
-        
-        def test_as_binary_wkb_round_trip
-          point1_ = @factory.point(211, 12)
-          binary_ = point1_.as_binary
-          point2_ = @factory.parse_wkb(binary_)
-          assert_equal(point2_, point1_)
-        end
-        
-        
-        def test_is_empty
-          point1_ = @factory.point(0, 0)
-          assert(!point1_.is_empty?)
-        end
-        
-        
-        def test_is_simple
-          point1_ = @factory.point(0, 0)
-          assert(point1_.is_simple?)
-        end
-        
-        
-        def test_boundary
-          point_ = @factory.point(11, 12)
-          boundary_ = point_.boundary
-          assert(boundary_.is_empty?)
-        end
-        
-        
-        def test_equals
-          point1_ = @factory.point(11, 12)
-          point2_ = @factory.point(11, 12)
-          point3_ = @factory.point(13, 12)
-          assert(point1_.equals?(point2_))
-          assert(point1_ == point2_)
-          assert(point1_.eql?(point2_))
-          assert(!point1_.equals?(point3_))
-          assert(point1_ != point3_)
-          assert(!point1_.eql?(point3_))
-        end
-        
-        
-        def test_convex_hull
-          point_ = @factory.point(11, 12)
-          assert_equal(point_, point_.convex_hull)
-        end
+        include ::RGeo::Tests::Common::PointTests
         
         
         def test_latlon
@@ -189,6 +77,20 @@ module RGeo
         end
         
         
+        undef_method :test_disjoint
+        undef_method :test_intersects
+        undef_method :test_touches
+        undef_method :test_crosses
+        undef_method :test_within
+        undef_method :test_contains
+        undef_method :test_overlaps
+        undef_method :test_convex_hull
+        undef_method :test_intersection
+        undef_method :test_union
+        undef_method :test_difference
+        undef_method :test_sym_difference
+        
+        
       end
       
     end

data/tests/simple_spherical/tc_polygon.rb

@@ -0,0 +1,67 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple spherical polygon 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/polygon_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleSpherical  # :nodoc:
+      
+      class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geography.simple_spherical
+        end
+        
+        
+        include ::RGeo::Tests::Common::PolygonTests
+        
+        
+        undef_method :test_fully_equal
+        undef_method :test_geometrically_equal_but_ordered_different
+        undef_method :test_geometrically_equal_but_different_directions
+        
+        
+      end
+      
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -07:00
+date: 2010-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,12 @@ extra_rdoc_files:
 - History.rdoc
 - README.rdoc
 files: 
+- lib/rgeo/cartesian/calculations.rb
+- lib/rgeo/cartesian/interface.rb
+- lib/rgeo/cartesian/simple_factory.rb
+- lib/rgeo/cartesian/simple_feature_classes.rb
+- lib/rgeo/cartesian/simple_feature_methods.rb
+- lib/rgeo/cartesian.rb
 - lib/rgeo/errors.rb
 - lib/rgeo/features/curve.rb
 - lib/rgeo/features/factory.rb
@@ -58,37 +64,34 @@ files:
 - lib/rgeo/features/point.rb
 - lib/rgeo/features/polygon.rb
 - lib/rgeo/features/surface.rb
+- lib/rgeo/features/types.rb
 - lib/rgeo/features.rb
 - lib/rgeo/geo_json/coder.rb
 - lib/rgeo/geo_json/entities.rb
 - lib/rgeo/geo_json/interface.rb
 - lib/rgeo/geo_json.rb
-- lib/rgeo/geography/common/geometry_collection_methods.rb
-- lib/rgeo/geography/common/geometry_methods.rb
-- lib/rgeo/geography/common/helper.rb
-- lib/rgeo/geography/common/line_string_methods.rb
-- lib/rgeo/geography/common/point_methods.rb
-- lib/rgeo/geography/common/polygon_methods.rb
 - lib/rgeo/geography/factories.rb
 - lib/rgeo/geography/factory.rb
+- lib/rgeo/geography/helper.rb
 - lib/rgeo/geography/projected_window.rb
 - lib/rgeo/geography/simple_mercator/feature_classes.rb
 - lib/rgeo/geography/simple_mercator/feature_methods.rb
 - lib/rgeo/geography/simple_mercator/projector.rb
 - lib/rgeo/geography/simple_spherical/calculations.rb
-- lib/rgeo/geography/simple_spherical/geometry_collection_impl.rb
-- lib/rgeo/geography/simple_spherical/geometry_methods.rb
-- lib/rgeo/geography/simple_spherical/line_string_impl.rb
-- lib/rgeo/geography/simple_spherical/multi_line_string_impl.rb
-- lib/rgeo/geography/simple_spherical/multi_point_impl.rb
-- lib/rgeo/geography/simple_spherical/multi_polygon_impl.rb
-- lib/rgeo/geography/simple_spherical/point_impl.rb
-- lib/rgeo/geography/simple_spherical/polygon_impl.rb
+- lib/rgeo/geography/simple_spherical/feature_classes.rb
+- lib/rgeo/geography/simple_spherical/feature_methods.rb
 - lib/rgeo/geography.rb
 - lib/rgeo/geos/factory.rb
 - lib/rgeo/geos/impl_additions.rb
 - lib/rgeo/geos/interface.rb
 - lib/rgeo/geos.rb
+- lib/rgeo/impl_helpers/basic_geometry_collection_methods.rb
+- lib/rgeo/impl_helpers/basic_geometry_methods.rb
+- lib/rgeo/impl_helpers/basic_line_string_methods.rb
+- lib/rgeo/impl_helpers/basic_point_methods.rb
+- lib/rgeo/impl_helpers/basic_polygon_methods.rb
+- lib/rgeo/impl_helpers/serialization.rb
+- lib/rgeo/impl_helpers.rb
 - lib/rgeo/version.rb
 - lib/rgeo.rb
 - History.rdoc
@@ -109,6 +112,14 @@ files:
 - tests/geos/tc_multi_polygon.rb
 - tests/geos/tc_point.rb
 - tests/geos/tc_polygon.rb
+- tests/simple_cartesian/tc_calculations.rb
+- tests/simple_cartesian/tc_geometry_collection.rb
+- tests/simple_cartesian/tc_line_string.rb
+- tests/simple_cartesian/tc_multi_line_string.rb
+- tests/simple_cartesian/tc_multi_point.rb
+- tests/simple_cartesian/tc_multi_polygon.rb
+- tests/simple_cartesian/tc_point.rb
+- tests/simple_cartesian/tc_polygon.rb
 - tests/simple_mercator/tc_geometry_collection.rb
 - tests/simple_mercator/tc_line_string.rb
 - tests/simple_mercator/tc_multi_line_string.rb
@@ -118,8 +129,13 @@ files:
 - tests/simple_mercator/tc_polygon.rb
 - tests/simple_mercator/tc_window.rb
 - tests/simple_spherical/tc_calculations.rb
+- tests/simple_spherical/tc_geometry_collection.rb
 - tests/simple_spherical/tc_line_string.rb
+- tests/simple_spherical/tc_multi_line_string.rb
+- tests/simple_spherical/tc_multi_point.rb
+- tests/simple_spherical/tc_multi_polygon.rb
 - tests/simple_spherical/tc_point.rb
+- tests/simple_spherical/tc_polygon.rb
 - tests/tc_geojson.rb
 - tests/tc_oneoff.rb
 - ext/geos_c_impl/extconf.rb
@@ -133,7 +149,6 @@ files:
 - ext/geos_c_impl/factory.h
 - ext/geos_c_impl/geometry.h
 - ext/geos_c_impl/geometry_collection.h
-- ext/geos_c_impl/globals.h
 - ext/geos_c_impl/line_string.h
 - ext/geos_c_impl/point.h
 - ext/geos_c_impl/polygon.h
@@ -190,6 +205,14 @@ test_files:
 - tests/geos/tc_multi_polygon.rb
 - tests/geos/tc_point.rb
 - tests/geos/tc_polygon.rb
+- tests/simple_cartesian/tc_calculations.rb
+- tests/simple_cartesian/tc_geometry_collection.rb
+- tests/simple_cartesian/tc_line_string.rb
+- tests/simple_cartesian/tc_multi_line_string.rb
+- tests/simple_cartesian/tc_multi_point.rb
+- tests/simple_cartesian/tc_multi_polygon.rb
+- tests/simple_cartesian/tc_point.rb
+- tests/simple_cartesian/tc_polygon.rb
 - tests/simple_mercator/tc_geometry_collection.rb
 - tests/simple_mercator/tc_line_string.rb
 - tests/simple_mercator/tc_multi_line_string.rb
@@ -199,7 +222,12 @@ test_files:
 - tests/simple_mercator/tc_polygon.rb
 - tests/simple_mercator/tc_window.rb
 - tests/simple_spherical/tc_calculations.rb
+- tests/simple_spherical/tc_geometry_collection.rb
 - tests/simple_spherical/tc_line_string.rb
+- tests/simple_spherical/tc_multi_line_string.rb
+- tests/simple_spherical/tc_multi_point.rb
+- tests/simple_spherical/tc_multi_polygon.rb
 - tests/simple_spherical/tc_point.rb
+- tests/simple_spherical/tc_polygon.rb
 - tests/tc_geojson.rb
 - tests/tc_oneoff.rb