rgeo 0.1.12 → 0.1.13

data/lib/rgeo/{geography/common/polygon_methods.rb → impl_helpers/serialization.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Common methods for Polygon geography features
+# Basic methods used by geometry objects
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,87 +36,95 @@
 
 module RGeo
   
-  module Geography
+  module ImplHelpers  # :nodoc:
     
-    module Common
+    
+    module Serialization  # :nodoc:
       
+      @helper_factory = false
       
-      module PolygonMethods
+      class << self
         
         
-        def _setup(exterior_ring_, interior_rings_)
-          @exterior_ring = factory.cast(exterior_ring_)
-          @interior_rings = (interior_rings_ || []).map{ |elem_| factory.cast(elem_) }
-          unless Features::LinearRing.check_type(@exterior_ring)
-            raise Errors::InvalidGeometry, 'Exterior ring must be a LinearRing'
-          end
-          @interior_rings.each do |ring_|
-            unless Features::LinearRing.check_type(ring_)
-              raise Errors::InvalidGeometry, 'Interior ring must be a LinearRing'
+        def _helper_factory
+          if @helper_factory == false
+            if Geos.supported?
+              @helper_factory = Geos.factory(:srid => 0)
+            else
+              @helper_factory = nil
             end
           end
-          _validate_geometry
+          @helper_factory
         end
         
         
-        def cast(type_)
-          case type_
-          when Features::Polygon
-            self
-          when Features::LinearRing
-            @exterior_ring
-          when Features::LineString
-            @exterior_ring.cast(type_)
-          when Features::GeometryCollection
-            factory.collection([self]) rescue nil
-          when Features::MultiPolygon
-            factory.multi_polygon([self]) rescue nil
+        def parse_wkt(str_, factory_)
+          helper_factory_ = _helper_factory
+          if helper_factory_
+            obj_ = helper_factory_.parse_wkt(str_)
+            obj_ ? Features.cast(obj_, factory_) : nil
           else
-            super
+            default_parse_wkt(str_, factory_)
           end
         end
         
         
-        def exterior_ring
-          @exterior_ring
+        def parse_wkb(str_, factory_)
+          helper_factory_ = _helper_factory
+          if helper_factory_
+            obj_ = helper_factory_.parse_wkb(str_)
+            obj_ ? Features.cast(obj_, factory_) : nil
+          else
+            default_parse_wkb(str_, factory_)
+          end
         end
         
         
-        def num_interior_rings
-          @interior_rings.size
+        def unparse_wkt(obj_)
+          helper_factory_ = _helper_factory
+          if helper_factory_
+            Features.cast(obj_, helper_factory_).as_text
+          else
+            default_unparse_wkt(obj_)
+          end
         end
         
         
-        def interior_ring_n(n_)
-          @interior_rings[n_]
+        def unparse_wkb(obj_)
+          helper_factory_ = _helper_factory
+          if helper_factory_
+            Features.cast(obj_, helper_factory_).as_binary
+          else
+            default_unparse_wkb(obj_)
+          end
         end
         
         
-        def interior_rings
-          @interior_rings.dup
+        def default_parse_wkt(str_, factory_)
+          nil  # TODO
         end
         
         
-        def dimension
-          2
+        def default_parse_wkb(str_, factory_)
+          nil  # TODO
         end
         
         
-        def geometry_type
-          Features::Polygon
+        def default_unparse_wkt(obj_)
+          nil  # TODO
         end
         
         
-        def is_empty?
-          @exterior_ring.is_empty?
+        def default_unparse_wkb(obj_)
+          nil  # TODO
         end
         
         
       end
       
-      
     end
     
+    
   end
   
 end

data/tests/common/geometry_collection_tests.rb

@@ -62,7 +62,8 @@ module RGeo
           assert(::RGeo::Features::GeometryCollection === geom_)
           assert_equal(::RGeo::Features::GeometryCollection, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
-          assert_equal([@point1, @line1], geom_.to_a)
+          assert(@point1.eql?(geom_[0]))
+          assert(@line1.eql?(geom_[1]))
         end
         
         
@@ -105,7 +106,7 @@ module RGeo
           assert(::RGeo::Features::GeometryCollection === geom2_)
           assert_equal(::RGeo::Features::GeometryCollection, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert(::RGeo::Features::Line === geom2_[1][1])
+          assert_equal(::RGeo::Features::Line, geom2_[1][1].geometry_type)
         end
         
         
@@ -144,7 +145,7 @@ module RGeo
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(-4 2, -5 3))')
           built_geom_ = @factory.collection([@point1, @line1])
-          assert_equal(built_geom_, parsed_geom_)
+          assert(built_geom_.eql?(parsed_geom_))
         end
         
         
@@ -158,10 +159,11 @@ module RGeo
         def test_clone
           geom1_ = @factory.collection([@point1, @line1])
           geom2_ = geom1_.clone
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
           assert_equal(::RGeo::Features::GeometryCollection, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert_equal([@point1, @line1], geom2_.to_a)
+          assert(@point1.eql?(geom2_[0]))
+          assert(@line1.eql?(geom2_[1]))
         end
         
         
@@ -183,7 +185,7 @@ module RGeo
           geom1_ = @factory.collection([@point1, @line1])
           text_ = geom1_.as_text
           geom2_ = @factory.parse_wkt(text_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         
@@ -191,7 +193,7 @@ module RGeo
           geom1_ = @factory.collection([@point1, @line1])
           binary_ = geom1_.as_binary
           geom2_ = @factory.parse_wkb(binary_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         

data/tests/common/multi_line_string_tests.rb

@@ -64,7 +64,8 @@ module RGeo
           assert(::RGeo::Features::MultiLineString === geom_)
           assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
-          assert_equal([@linestring1, @linestring2], geom_.to_a)
+          assert(@linestring1.eql?(geom_[0]))
+          assert(@linestring2.eql?(geom_[1]))
         end
         
         
@@ -89,16 +90,17 @@ module RGeo
         end
         
         
-        def test_creation_compound
-          mls1_ = @factory.multi_line_string([@linestring1, @linestring2])
-          mls2_ = @factory.collection([@line1])
-          mls3_ = @factory.collection([mls1_])
-          geom_ = @factory.multi_line_string([mls3_, mls2_, @linearring1])
+        def test_creation_casting
+          mls1_ = @factory.collection([@line1])
+          mls2_ = @factory.multi_line_string([@linearring1])
+          geom_ = @factory.multi_line_string([@linestring1, @linestring2, mls1_, mls2_])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiLineString === geom_)
           assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
           assert_equal(4, geom_.num_geometries)
-          assert(geom_.to_a.eql?([@linestring1, @linestring2, @line1, @linearring1]))
+          assert(@linestring1.eql?(geom_[0]))
+          assert(@linestring2.eql?(geom_[1]))
+          assert(@line1.eql?(geom_[2]))
+          assert(@linearring1.eql?(geom_[3]))
         end
         
         
@@ -129,7 +131,7 @@ module RGeo
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTILINESTRING((0 0, 1 0), (-4 2, -5 3, -3 5))')
           built_geom_ = @factory.multi_line_string([@linestring1, @linestring2])
-          assert_equal(built_geom_, parsed_geom_)
+          assert(built_geom_.eql?(parsed_geom_))
         end
         
         
@@ -144,10 +146,11 @@ module RGeo
         def test_clone
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = geom1_.clone
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
           assert_equal(::RGeo::Features::MultiLineString, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert_equal([@linestring1, @linestring2], geom2_.to_a)
+          assert(@linestring1.eql?(geom2_[0]))
+          assert(@linestring2.eql?(geom2_[1]))
         end
         
         
@@ -171,7 +174,7 @@ module RGeo
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           text_ = geom1_.as_text
           geom2_ = @factory.parse_wkt(text_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         
@@ -179,7 +182,7 @@ module RGeo
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           binary_ = geom1_.as_binary
           geom2_ = @factory.parse_wkb(binary_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         

data/tests/common/multi_point_tests.rb

@@ -60,7 +60,8 @@ module RGeo
           assert(::RGeo::Features::MultiPoint === geom_)
           assert_equal(::RGeo::Features::MultiPoint, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
-          assert_equal([@point1, @point2], geom_.to_a)
+          assert(@point1.eql?(geom_[0]))
+          assert(@point2.eql?(geom_[1]))
         end
         
         
@@ -74,16 +75,17 @@ module RGeo
         end
         
         
-        def test_creation_compound
-          mp1_ = @factory.multi_point([@point1, @point2])
-          mp2_ = @factory.collection([@point3])
-          mp3_ = @factory.collection([mp1_])
-          geom_ = @factory.multi_point([mp3_, mp2_, @point4])
+        def test_creation_casting
+          mp1_ = @factory.collection([@point3])
+          mp2_ = @factory.multi_point([@point4])
+          geom_ = @factory.multi_point([@point1, @point2, mp1_, mp2_])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiPoint === geom_)
           assert_equal(::RGeo::Features::MultiPoint, geom_.geometry_type)
           assert_equal(4, geom_.num_geometries)
-          assert_equal([@point1, @point2, @point3, @point4], geom_.to_a)
+          assert(@point1.eql?(geom_[0]))
+          assert(@point2.eql?(geom_[1]))
+          assert(@point3.eql?(geom_[2]))
+          assert(@point4.eql?(geom_[3]))
         end
         
         
@@ -121,7 +123,7 @@ module RGeo
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTIPOINT((0 0), (-4 2), (-5 3))')
           built_geom_ = @factory.multi_point([@point1, @point3, @point4])
-          assert_equal(built_geom_, parsed_geom_)
+          assert(built_geom_.eql?(parsed_geom_))
         end
         
         
@@ -136,10 +138,11 @@ module RGeo
         def test_clone
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = geom1_.clone
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
           assert_equal(::RGeo::Features::MultiPoint, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert_equal([@point1, @point2], geom2_.to_a)
+          assert(@point1.eql?(geom2_[0]))
+          assert(@point2.eql?(geom2_[1]))
         end
         
         
@@ -163,7 +166,7 @@ module RGeo
           geom1_ = @factory.multi_point([@point1, @point2])
           text_ = geom1_.as_text
           geom2_ = @factory.parse_wkt(text_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         
@@ -171,7 +174,7 @@ module RGeo
           geom1_ = @factory.multi_point([@point1, @point2])
           binary_ = geom1_.as_binary
           geom2_ = @factory.parse_wkb(binary_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         

data/tests/common/multi_polygon_tests.rb

@@ -74,7 +74,8 @@ module RGeo
           assert(::RGeo::Features::MultiPolygon === geom_)
           assert_equal(::RGeo::Features::MultiPolygon, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
-          assert_equal([@poly1, @poly2], geom_.to_a)
+          assert(@poly1.eql?(geom_[0]))
+          assert(@poly2.eql?(geom_[1]))
         end
         
         
@@ -129,7 +130,7 @@ module RGeo
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTIPOLYGON(((0 0, 0 -10, -10 0, 0 0)), ((0 0, 0 10, 10 10, 10 0, 0 0), (4 4, 5 6, 6 4, 4 4)))')
           built_geom_ = @factory.multi_polygon([@poly1, @poly2])
-          assert_equal(built_geom_, parsed_geom_)
+          assert(built_geom_.eql?(parsed_geom_))
         end
         
         
@@ -144,10 +145,11 @@ module RGeo
         def test_clone
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           geom2_ = geom1_.clone
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
           assert_equal(::RGeo::Features::MultiPolygon, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert_equal([@poly1, @poly2], geom2_.to_a)
+          assert(@poly1.eql?(geom2_[0]))
+          assert(@poly2.eql?(geom2_[1]))
         end
         
         
@@ -171,7 +173,7 @@ module RGeo
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           text_ = geom1_.as_text
           geom2_ = @factory.parse_wkt(text_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         
@@ -179,7 +181,7 @@ module RGeo
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           binary_ = geom1_.as_binary
           geom2_ = @factory.parse_wkb(binary_)
-          assert_equal(geom1_, geom2_)
+          assert(geom1_.eql?(geom2_))
         end
         
         

data/tests/common/point_tests.rb

@@ -219,8 +219,7 @@ module RGeo
         
         def test_convex_hull
           point_ = @factory.point(11, 12)
-          hull_ = point_.convex_hull
-          assert_close_enough(point_, hull_)
+          assert_close_enough(point_, point_.convex_hull)
         end
         
         

data/tests/common/polygon_tests.rb

@@ -53,7 +53,7 @@ module RGeo
           assert_not_nil(polygon_)
           assert(::RGeo::Features::Polygon === polygon_)
           assert_equal(::RGeo::Features::Polygon, polygon_.geometry_type)
-          assert_equal(exterior_, polygon_.exterior_ring)
+          assert(exterior_.eql?(polygon_.exterior_ring))
           assert_equal(0, polygon_.num_interior_rings)
         end
         
@@ -72,9 +72,9 @@ module RGeo
           assert_not_nil(polygon_)
           assert(::RGeo::Features::Polygon === polygon_)
           assert_equal(::RGeo::Features::Polygon, polygon_.geometry_type)
-          assert_equal(exterior_, polygon_.exterior_ring)
+          assert(exterior_.eql?(polygon_.exterior_ring))
           assert_equal(1, polygon_.num_interior_rings)
-          assert_equal([interior_], polygon_.interior_rings)
+          assert(interior_.eql?(polygon_.interior_ring_n(0)))
         end
         
         
@@ -127,7 +127,7 @@ module RGeo
           point3_ = @factory.point(1, 0)
           exterior_ = @factory.linear_ring([point1_, point2_, point3_, point1_])
           built_poly_ = @factory.polygon(exterior_)
-          assert_equal(built_poly_, parsed_poly_)
+          assert(built_poly_.eql?(parsed_poly_))
         end
         
         
@@ -143,7 +143,7 @@ module RGeo
           exterior_ = @factory.linear_ring([point1_, point2_, point3_, point4_, point1_])
           interior_ = @factory.linear_ring([point5_, point6_, point7_, point5_])
           built_poly_ = @factory.polygon(exterior_, [interior_])
-          assert_equal(built_poly_, parsed_poly_)
+          assert(built_poly_.eql?(parsed_poly_))
         end
         
         
@@ -154,8 +154,8 @@ module RGeo
           exterior_ = @factory.linear_ring([point1_, point2_, point3_, point1_])
           poly1_ = @factory.polygon(exterior_)
           poly2_ = poly1_.clone
-          assert_equal(poly1_, poly2_)
-          assert_equal(exterior_, poly2_.exterior_ring)
+          assert(poly1_.eql?(poly2_))
+          assert(exterior_.eql?(poly2_.exterior_ring))
           assert_equal(0, poly2_.num_interior_rings)
         end
         
@@ -182,7 +182,7 @@ module RGeo
           poly1_ = @factory.polygon(exterior_)
           text_ = poly1_.as_text
           poly2_ = @factory.parse_wkt(text_)
-          assert_equal(poly1_, poly2_)
+          assert(poly1_.eql?(poly2_))
         end
         
         
@@ -194,7 +194,7 @@ module RGeo
           poly1_ = @factory.polygon(exterior_)
           binary_ = poly1_.as_binary
           poly2_ = @factory.parse_wkb(binary_)
-          assert_equal(poly1_, poly2_)
+          assert(poly1_.eql?(poly2_))
         end