rgeo 0.2.8 → 0.2.9

data/test/wkrep/tc_wkt_generator.rb

@@ -56,119 +56,119 @@ module RGeo
         def test_point_2d
           generator_ = ::RGeo::WKRep::WKTGenerator.new
           obj_ = @factory.point(1, 2)
-          assert_equal('Point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_z
           generator_ = ::RGeo::WKRep::WKTGenerator.new
           obj_ = @factoryz.point(1, 2, 3)
-          assert_equal('Point(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_z_wkt11strict
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :wkt11_strict)
           obj_ = @factoryz.point(1, 2, 3)
-          assert_equal('Point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_m
           generator_ = ::RGeo::WKRep::WKTGenerator.new
           obj_ = @factorym.point(1, 2, 3)
-          assert_equal('Point(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_zm
           generator_ = ::RGeo::WKRep::WKTGenerator.new
           obj_ = @factoryzm.point(1, 2, 3, 4)
-          assert_equal('Point(1.0 2.0 3.0 4.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0 3.0 4.0)', generator_.generate(obj_))
         end
         
         
         def test_point_squarebrackets
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:square_brackets => true)
           obj_ = @factory.point(1, 2)
-          assert_equal('Point[1.0 2.0]', generator_.generate(obj_))
+          assert_equal('Point [1.0 2.0]', generator_.generate(obj_))
         end
         
         
         def test_point_uppercase
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:convert_case => :upper)
           obj_ = @factory.point(1, 2)
-          assert_equal('POINT(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('POINT (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_lowercase
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:convert_case => :lower)
           obj_ = @factory.point(1, 2)
-          assert_equal('point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_wkt12
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :wkt12)
           obj_ = @factory.point(1, 2)
-          assert_equal('Point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_wkt12_z
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :wkt12)
           obj_ = @factoryz.point(1, 2, 3)
-          assert_equal('Point Z(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('Point Z (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_wkt12_m
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :wkt12)
           obj_ = @factorym.point(1, 2, 3)
-          assert_equal('Point M(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('Point M (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_wkt12_zm
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :wkt12)
           obj_ = @factoryzm.point(1, 2, 3, 4)
-          assert_equal('Point ZM(1.0 2.0 3.0 4.0)', generator_.generate(obj_))
+          assert_equal('Point ZM (1.0 2.0 3.0 4.0)', generator_.generate(obj_))
         end
         
         
         def test_point_ewkt
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :ewkt)
           obj_ = @factory.point(1, 2)
-          assert_equal('Point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
         def test_point_ewkt_z
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :ewkt)
           obj_ = @factoryz.point(1, 2, 3)
-          assert_equal('Point(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_ewkt_m
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :ewkt)
           obj_ = @factorym.point(1, 2, 3)
-          assert_equal('PointM(1.0 2.0 3.0)', generator_.generate(obj_))
+          assert_equal('PointM (1.0 2.0 3.0)', generator_.generate(obj_))
         end
         
         
         def test_point_ewkt_zm
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :ewkt)
           obj_ = @factoryzm.point(1, 2, 3, 4)
-          assert_equal('Point(1.0 2.0 3.0 4.0)', generator_.generate(obj_))
+          assert_equal('Point (1.0 2.0 3.0 4.0)', generator_.generate(obj_))
         end
         
         
         def test_point_ewkt_with_srid
           generator_ = ::RGeo::WKRep::WKTGenerator.new(:tag_format => :ewkt, :emit_ewkt_srid => true)
           obj_ = @factory.point(1, 2)
-          assert_equal('SRID=1000;Point(1.0 2.0)', generator_.generate(obj_))
+          assert_equal('SRID=1000;Point (1.0 2.0)', generator_.generate(obj_))
         end
         
         
@@ -178,7 +178,7 @@ module RGeo
           p2_ = @factory.point(2, 2)
           p3_ = @factory.point(1, 1)
           obj_ = @factory.line_string([p1_, p2_, p3_])
-          assert_equal('LineString(1.0 2.0,2.0 2.0,1.0 1.0)', generator_.generate(obj_))
+          assert_equal('LineString (1.0 2.0, 2.0 2.0, 1.0 1.0)', generator_.generate(obj_))
         end
         
         
@@ -197,7 +197,7 @@ module RGeo
           p4_ = @factory.point(0, 10)
           ext_ = @factory.line_string([p1_, p2_, p3_, p4_, p1_])
           obj_ = @factory.polygon(ext_)
-          assert_equal('Polygon((0.0 0.0,10.0 0.0,10.0 10.0,0.0 10.0,0.0 0.0))', generator_.generate(obj_))
+          assert_equal('Polygon ((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0))', generator_.generate(obj_))
         end
         
         
@@ -213,7 +213,7 @@ module RGeo
           ext_ = @factory.line_string([p1_, p2_, p3_, p4_, p1_])
           int_ = @factory.line_string([p5_, p6_, p7_, p5_])
           obj_ = @factory.polygon(ext_, [int_])
-          assert_equal('Polygon((0.0 0.0,10.0 0.0,10.0 10.0,0.0 10.0,0.0 0.0),(1.0 1.0,2.0 2.0,3.0 1.0,1.0 1.0))', generator_.generate(obj_))
+          assert_equal('Polygon ((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0), (1.0 1.0, 2.0 2.0, 3.0 1.0, 1.0 1.0))', generator_.generate(obj_))
         end
         
         
@@ -230,7 +230,7 @@ module RGeo
           p2_ = @factory.point(2, 2)
           p3_ = @factory.point(1, 1)
           obj_ = @factory.multi_point([p1_, p2_, p3_])
-          assert_equal('MultiPoint((1.0 2.0),(2.0 2.0),(1.0 1.0))', generator_.generate(obj_))
+          assert_equal('MultiPoint ((1.0 2.0), (2.0 2.0), (1.0 1.0))', generator_.generate(obj_))
         end
         
         
@@ -254,7 +254,7 @@ module RGeo
           ls2_ = @factory.line_string([p5_, p6_, p7_])
           ls3_ = @factory.line_string([])
           obj_ = @factory.multi_line_string([ls1_, ls2_, ls3_])
-          assert_equal('MultiLineString((0.0 0.0,10.0 0.0,10.0 10.0,0.0 10.0,0.0 0.0),(1.0 1.0,2.0 2.0,3.0 1.0),EMPTY)', generator_.generate(obj_))
+          assert_equal('MultiLineString ((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0), (1.0 1.0, 2.0 2.0, 3.0 1.0), EMPTY)', generator_.generate(obj_))
         end
         
         
@@ -285,7 +285,7 @@ module RGeo
           poly2_ = @factory.polygon(@factory.line_string([]))
           poly3_ = @factory.polygon(ext3_)
           obj_ = @factory.multi_polygon([poly1_, poly2_, poly3_])
-          assert_equal('MultiPolygon(((0.0 0.0,10.0 0.0,10.0 10.0,0.0 10.0,0.0 0.0),(1.0 1.0,2.0 2.0,3.0 1.0,1.0 1.0)),EMPTY,((20.0 20.0,30.0 20.0,30.0 30.0,20.0 30.0,20.0 20.0)))', generator_.generate(obj_))
+          assert_equal('MultiPolygon (((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0), (1.0 1.0, 2.0 2.0, 3.0 1.0, 1.0 1.0)), EMPTY, ((20.0 20.0, 30.0 20.0, 30.0 30.0, 20.0 30.0, 20.0 20.0)))', generator_.generate(obj_))
         end
         
         
@@ -318,7 +318,7 @@ module RGeo
           obj1_ = @factory.multi_polygon([poly1_, poly2_, poly3_])
           obj2_ = @factory.point(1, 2)
           obj_ = @factory.collection([obj1_, obj2_])
-          assert_equal('GeometryCollection(MultiPolygon(((0.0 0.0,10.0 0.0,10.0 10.0,0.0 10.0,0.0 0.0),(1.0 1.0,2.0 2.0,3.0 1.0,1.0 1.0)),EMPTY,((20.0 20.0,30.0 20.0,30.0 30.0,20.0 30.0,20.0 20.0))),Point(1.0 2.0))', generator_.generate(obj_))
+          assert_equal('GeometryCollection (MultiPolygon (((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0), (1.0 1.0, 2.0 2.0, 3.0 1.0, 1.0 1.0)), EMPTY, ((20.0 20.0, 30.0 20.0, 30.0 30.0, 20.0 30.0, 20.0 20.0))), Point (1.0 2.0))', generator_.generate(obj_))
         end
         
         
@@ -344,7 +344,7 @@ module RGeo
           obj1_ = @factoryz.multi_polygon([poly1_, poly2_, poly3_])
           obj2_ = @factoryz.point(1, 2, 3)
           obj_ = @factoryz.collection([obj1_, obj2_])
-          assert_equal('GeometryCollection Z(MultiPolygon Z(((0.0 0.0 0.0,10.0 0.0 0.0,10.0 10.0 0.0,0.0 10.0 0.0,0.0 0.0 0.0),(1.0 1.0 0.0,2.0 2.0 0.0,3.0 1.0 0.0,1.0 1.0 0.0)),EMPTY,((20.0 20.0 0.0,30.0 20.0 0.0,30.0 30.0 0.0,20.0 30.0 0.0,20.0 20.0 0.0))),Point Z(1.0 2.0 3.0))', generator_.generate(obj_))
+          assert_equal('GeometryCollection Z (MultiPolygon Z (((0.0 0.0 0.0, 10.0 0.0 0.0, 10.0 10.0 0.0, 0.0 10.0 0.0, 0.0 0.0 0.0), (1.0 1.0 0.0, 2.0 2.0 0.0, 3.0 1.0 0.0, 1.0 1.0 0.0)), EMPTY, ((20.0 20.0 0.0, 30.0 20.0 0.0, 30.0 30.0 0.0, 20.0 30.0 0.0, 20.0 20.0 0.0))), Point Z (1.0 2.0 3.0))', generator_.generate(obj_))
         end
         
         

data/test/wkrep/tc_wkt_parser.rb

@@ -245,9 +245,7 @@ module RGeo
         
         
         def test_point_non_ewkt_with_srid
-          factory_ = ::RGeo::Cartesian.preferred_factory
-          parser_ = ::RGeo::WKRep::WKTParser.new(factory_)
-          parser_.factory_generator = ::RGeo::Cartesian.method(:preferred_factory)
+          parser_ = ::RGeo::WKRep::WKTParser.new(::RGeo::Cartesian.method(:preferred_factory))
           assert_raise(::RGeo::Error::ParseError) do
             obj_ = parser_.parse('SRID=1000;POINT(1 2)')
           end

metadata

@@ -2,7 +2,7 @@
 name: rgeo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 Z
+date: 2011-04-25 00:00:00 Z
 dependencies: []
 
 description: RGeo is a geospatial data library for Ruby. It provides an implementation of the Open Geospatial Consortium's Simple Features Specification, used by most standard spatial/geographic data storage systems such as PostGIS. A number of add-on modules are also available to help with writing location-based applications using Ruby-based frameworks such as Ruby On Rails.
@@ -130,6 +130,7 @@ files:
 - test/geos/tc_multi_line_string.rb
 - test/geos/tc_multi_point.rb
 - test/geos/tc_multi_polygon.rb
+- test/geos/tc_parsing_unparsing.rb
 - test/geos/tc_point.rb
 - test/geos/tc_polygon.rb
 - test/geos/tc_zmfactory.rb
@@ -215,6 +216,7 @@ test_files:
 - test/geos/tc_multi_line_string.rb
 - test/geos/tc_multi_point.rb
 - test/geos/tc_multi_polygon.rb
+- test/geos/tc_parsing_unparsing.rb
 - test/geos/tc_point.rb
 - test/geos/tc_polygon.rb
 - test/geos/tc_zmfactory.rb