georuby 1.9.9 → 2.0.0

data/spec/geo_ruby/simple_features/ewkt_parser_spec.rb

@@ -1,26 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe EWKTParser do
+describe GeoRuby::SimpleFeatures::EWKTParser do
 
   before(:each) do
-    @factory = GeometryFactory::new
-    @ewkt_parser = EWKTParser::new(@factory)
+    @factory = GeoRuby::SimpleFeatures::GeometryFactory::new
+    @ewkt_parser = GeoRuby::SimpleFeatures::EWKTParser::new(@factory)
   end
 
   it "test_point" do
     ewkt="POINT( 3.456 0.123)"
     @ewkt_parser.parse(ewkt)
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y(3.456,0.123)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y(3.456,0.123)
   end
 
   it "test_point_with_srid" do
     ewkt="SRID=245;POINT(0.0 2.0)"
     @ewkt_parser.parse(ewkt)
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y(0,2,245)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y(0,2,245)
     point.srid.should eql(245)
     ewkt.should == point.as_ewkt(true,false)
   end
@@ -29,8 +29,8 @@ describe EWKTParser do
     ewkt="POINT(3.456 0.123 123.667)"
     @ewkt_parser.parse(ewkt)
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y_z(3.456,0.123,123.667)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y_z(3.456,0.123,123.667)
     ewkt.should == point.as_ewkt(false)
   end
 
@@ -38,8 +38,8 @@ describe EWKTParser do
     ewkt="POINTM(3.456 0.123 123.667)"
     @ewkt_parser.parse(ewkt)
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y_m(3.456,0.123,123.667)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y_m(3.456,0.123,123.667)
     ewkt.should == point.as_ewkt(false)
   end
 
@@ -47,8 +47,8 @@ describe EWKTParser do
     ewkt="POINT(3.456 0.123 123.667 15.0)"
     @ewkt_parser.parse(ewkt)
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y_z_m(3.456,0.123,123.667,15.0)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y_z_m(3.456,0.123,123.667,15.0)
     ewkt.should == point.as_ewkt(false)
   end
 
@@ -56,73 +56,73 @@ describe EWKTParser do
   it "test_linestring" do
     @ewkt_parser.parse("LINESTRING(3.456 0.123,123.44 123.56,54555.22 123.3)")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[3.456,0.123],[123.44,123.56],[54555.22,123.3]])
+    line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+    line_string.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[3.456,0.123],[123.44,123.56],[54555.22,123.3]])
 
     @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3,45.4 41.6)")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
+    line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+    line_string.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
 
     @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3 35.3,45.4 41.6 12.3)")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
+    line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+    line_string.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
 
     @ewkt_parser.parse("SRID=256;LINESTRINGM(12.4 -45.3 35.3,45.4 41.6 12.3)")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true)
+    line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+    line_string.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true)
 
     @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3 35.3 25.2,45.4 41.6 12.3 13.75)")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true)
+    line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+    line_string.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true)
   end
 
   it "test_polygon" do
     @ewkt_parser.parse("POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1))")
     polygon = @factory.geometry
-    polygon.should be_instance_of Polygon
-    polygon.should == Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)
+    polygon.should be_instance_of GeoRuby::SimpleFeatures::Polygon
+    polygon.should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)
 
     @ewkt_parser.parse("SRID=256;POLYGON( ( 0 0  2,4 0 2,4 4 2,0 4 2,0 0 2),(1 1 2,3 1 2,3 3 2,1 3 2,1 1 2))")
     polygon = @factory.geometry
-    polygon.should be_instance_of Polygon
-    polygon.should == Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,true)
+    polygon.should be_instance_of GeoRuby::SimpleFeatures::Polygon
+    polygon.should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,true)
 
     @ewkt_parser.parse("SRID=256;POLYGONM((0 0 2,4 0 2,4 4 2,0 4 2,0 0 2),(1 1 2,3 1 2,3 3 2,1 3 2,1 1 2))")
     polygon = @factory.geometry
-    polygon.should be_instance_of Polygon
-    polygon.should == Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,false,true)
+    polygon.should be_instance_of GeoRuby::SimpleFeatures::Polygon
+    polygon.should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,false,true)
 
     @ewkt_parser.parse("SRID=256;POLYGON((0 0 2 -45.1,4 0 2 5,4 4 2 4.67,0 4 2 1.34,0 0 2 -45.1),(1 1 2 12.3,3 1 2 123,3 3 2 12.2,1 3 2 12,1 1 2 12.3))")
     polygon = @factory.geometry
-    polygon.should be_instance_of Polygon
-    polygon.should == Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],256,true,true)
+    polygon.should be_instance_of GeoRuby::SimpleFeatures::Polygon
+    polygon.should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],256,true,true)
   end
 
   it "test_multi_point" do
     #Form output by the current version of PostGIS. Future versions will output the one in the specification
     @ewkt_parser.parse("SRID=444;MULTIPOINT(12.4 -123.3,-65.1 123.4,123.55555555 123)")
     multi_point = @factory.geometry
-    multi_point.should be_instance_of MultiPoint
-    multi_point.should == MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
+    multi_point.should be_instance_of GeoRuby::SimpleFeatures::MultiPoint
+    multi_point.should == GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
     multi_point.srid.should eql(444)
     multi_point[0].srid.should eql(444)
 
     @ewkt_parser.parse("SRID=444;MULTIPOINT(12.4 -123.3 4.5,-65.1 123.4 6.7,123.55555555 123 7.8)")
     multi_point = @factory.geometry
-    multi_point.should be_instance_of MultiPoint
-    multi_point.should == MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
+    multi_point.should be_instance_of GeoRuby::SimpleFeatures::MultiPoint
+    multi_point.should == GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
     multi_point.srid.should eql(444)
     multi_point[0].srid.should eql(444)
 
     #Form in the EWKT specification (from the OGC)
     @ewkt_parser.parse("SRID=444;MULTIPOINT( ( 12.4   -123.3 4.5 ) , (-65.1 123.4 6.7),(123.55555555 123 7.8))")
     multi_point = @factory.geometry
-    multi_point.should be_instance_of MultiPoint
-    multi_point.should == MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
+    multi_point.should be_instance_of GeoRuby::SimpleFeatures::MultiPoint
+    multi_point.should == GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
     multi_point.srid.should eql(444)
     multi_point[0].srid.should eql(444)
   end
@@ -130,15 +130,15 @@ describe EWKTParser do
   it "test_multi_line_string" do
     @ewkt_parser.parse("SRID=256;MULTILINESTRING((1.5 45.2,-54.12312 -0.012),(1.5 45.2,-54.12312 -0.012,45.123 123.3))")
     multi_line_string = @factory.geometry
-    multi_line_string.should be_instance_of MultiLineString
-    multi_line_string.should == MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256),LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256)
+    multi_line_string.should be_instance_of GeoRuby::SimpleFeatures::MultiLineString
+    multi_line_string.should == GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256)
     multi_line_string.srid.should eql(256)
     multi_line_string[0].srid.should eql(256)
 
     @ewkt_parser.parse("SRID=256;MULTILINESTRING((1.5 45.2 1.3 1.2,-54.12312 -0.012 1.2 4.5),(1.5 45.2 5.1 -4.5,-54.12312 -0.012 -6.8 3.4,45.123 123.3 4.5 -5.3))")
     multi_line_string = @factory.geometry
-    multi_line_string.should be_instance_of MultiLineString
-    multi_line_string.should == MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true)
+    multi_line_string.should be_instance_of GeoRuby::SimpleFeatures::MultiLineString
+    multi_line_string.should == GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true)
     multi_line_string.srid.should eql(256)
     multi_line_string[0].srid.should eql(256)
   end
@@ -147,8 +147,8 @@ describe EWKTParser do
     ewkt="SRID=256;MULTIPOLYGON(((12.4 -45.3,45.4 41.6,4.456 1.0698,12.4 -45.3),(2.4 5.3,5.4 1.4263,14.46 1.06,2.4 5.3)),((0.0 0.0,4.0 0.0,4.0 4.0,0.0 4.0,0.0 0.0),(1.0 1.0,3.0 1.0,3.0 3.0,1.0 3.0,1.0 1.0)))"
     @ewkt_parser.parse(ewkt)
     multi_polygon = @factory.geometry
-    multi_polygon.should be_instance_of MultiPolygon
-    multi_polygon.should == MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256),Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
+    multi_polygon.should be_instance_of GeoRuby::SimpleFeatures::MultiPolygon
+    multi_polygon.should == GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
     multi_polygon.srid.should eql(256)
     multi_polygon[0].srid.should eql(256)
     ewkt.should == multi_polygon.as_ewkt
@@ -156,8 +156,8 @@ describe EWKTParser do
     ewkt="MULTIPOLYGON(((12.4 -45.3 2,45.4 41.6 3,4.456 1.0698 4,12.4 -45.3 2),(2.4 5.3 1,5.4 1.4263 3.44,14.46 1.06 4.5,2.4 5.3 1)),((0 0 5.6,4 0 5.4,4 4 1,0 4 23,0 0 5.6),(1 1 2.3,3 1 4,3 3 5,1 3 6,1 1 2.3)))"
     @ewkt_parser.parse(ewkt)
     multi_polygon = @factory.geometry
-    multi_polygon.should be_instance_of MultiPolygon
-    multi_polygon.should == MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3,2],[45.4,41.6,3],[4.456,1.0698,4],[12.4,-45.3,2]],[[2.4,5.3,1],[5.4,1.4263,3.44],[14.46,1.06,4.5],[2.4,5.3,1]]],4326,true),Polygon.from_coordinates([[[0,0,5.6],[4,0,5.4],[4,4,1],[0,4,23],[0,0,5.6]],[[1,1,2.3],[3,1,4],[3,3,5],[1,3,6],[1,1,2.3]]],4326,true)],4326,true)
+    multi_polygon.should be_instance_of GeoRuby::SimpleFeatures::MultiPolygon
+    multi_polygon.should == GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,2],[45.4,41.6,3],[4.456,1.0698,4],[12.4,-45.3,2]],[[2.4,5.3,1],[5.4,1.4263,3.44],[14.46,1.06,4.5],[2.4,5.3,1]]],4326,true),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,5.6],[4,0,5.4],[4,4,1],[0,4,23],[0,0,5.6]],[[1,1,2.3],[3,1,4],[3,3,5],[1,3,6],[1,1,2.3]]],4326,true)],4326,true)
     multi_polygon.srid.should eql(4326)
     multi_polygon[0].srid.should eql(4326)
   end
@@ -165,14 +165,14 @@ describe EWKTParser do
   it "test_geometry_collection" do
     @ewkt_parser.parse("SRID=256;GEOMETRYCOLLECTION(POINT(4.67 45.4),LINESTRING(5.7 12.45,67.55 54),POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))")
     geometry_collection = @factory.geometry
-    geometry_collection.should be_instance_of GeometryCollection
-    geometry_collection.should == GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256),Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
+    geometry_collection.should be_instance_of GeoRuby::SimpleFeatures::GeometryCollection
+    geometry_collection.should == GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
     geometry_collection[0].srid.should eql(256)
 
     @ewkt_parser.parse("SRID=256;GEOMETRYCOLLECTIONM(POINTM(4.67 45.4 45.6),LINESTRINGM(5.7 12.45 5.6,67.55 54 6.7))")
     geometry_collection = @factory.geometry
-    geometry_collection.should be_instance_of GeometryCollection
-    geometry_collection.should == GeometryCollection.from_geometries([Point.from_x_y_m(4.67,45.4,45.6,256),LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true)
+    geometry_collection.should be_instance_of GeoRuby::SimpleFeatures::GeometryCollection
+    geometry_collection.should == GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y_m(4.67,45.4,45.6,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true)
     geometry_collection[0].srid.should eql(256)
   end
 

data/spec/geo_ruby/simple_features/geometry_collection_spec.rb

@@ -1,54 +1,54 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe GeometryCollection do
+describe GeoRuby::SimpleFeatures::GeometryCollection do
 
   it "should test_geometry_collection_creation" do
-    geometry_collection = GeometryCollection::new(256)
-    geometry_collection << Point.from_x_y(4.67,45.4,256)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection::new(256)
+    geometry_collection << GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256)
 
     geometry_collection.length.should eql(1)
-    geometry_collection[0].should == Point.from_x_y(4.67,45.4,256)
+    geometry_collection[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256)
 
-    geometry_collection[0]=LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
-    geometry_collection << Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)
+    geometry_collection[0]=GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    geometry_collection << GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)
     geometry_collection.length.should eql(2)
-    geometry_collection[0].should == LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    geometry_collection[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
 
-    geometry_collection = GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection.class.should eql(GeometryCollection)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
+    geometry_collection.class.should eql(GeoRuby::SimpleFeatures::GeometryCollection)
     geometry_collection.srid.should eql(256)
     geometry_collection.length.should eql(2)
-    geometry_collection[1].should == LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    geometry_collection[1].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
 
     bbox = geometry_collection.bounding_box
     bbox.length.should eql(2)
-    bbox[0].should == Point.from_x_y(4.67,12.45)
-    bbox[1].should == Point.from_x_y(67.55,54)
+    bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(4.67,12.45)
+    bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(67.55,54)
   end
 
   it "test_geometry_collection_equal" do
-    geometry_collection1 = GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection2 = GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256),Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256)],256,true)
-    line_string=LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    geometry_collection1 = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
+    geometry_collection2 = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256)],256,true)
+    line_string=GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
 
-    geometry_collection1.should == GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
+    geometry_collection1.should == GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
     geometry_collection2.should_not == geometry_collection1
     line_string.should_not == geometry_collection1
   end
 
   it "test_geometry_collection_binary" do
-    geometry_collection = GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
     geometry_collection.as_hex_ewkb.should eql("010700002000010000020000000101000000AE47E17A14AE12403333333333B34640010200000002000000CDCCCCCCCCCC16406666666666E628403333333333E350400000000000004B40")
 
-    geometry_collection = GeometryCollection.from_geometries([Point.from_x_y_z_m(4.67,45.4,45.67,2.3,256),LineString.from_coordinates([[5.7,12.45,4.56,98.3],[67.55,54,12.2,3.4]],256,true, true)],256,true, true)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y_z_m(4.67,45.4,45.67,2.3,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45,4.56,98.3],[67.55,54,12.2,3.4]],256,true, true)],256,true, true)
     geometry_collection.as_hex_ewkb.should eql("01070000E0000100000200000001010000C0AE47E17A14AE12403333333333B34640F6285C8FC2D54640666666666666024001020000C002000000CDCCCCCCCCCC16406666666666E628403D0AD7A3703D124033333333339358403333333333E350400000000000004B4066666666666628403333333333330B40")
   end
 
   it "should test_geometry_collection_text" do
-    geometry_collection = GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
     geometry_collection.as_ewkt.should eql("SRID=256;GEOMETRYCOLLECTION(POINT(4.67 45.4),LINESTRING(5.7 12.45,67.55 54))")
 
-    geometry_collection = GeometryCollection.from_geometries([Point.from_x_y_m(4.67,45.4,45.6,256),LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true)
+    geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y_m(4.67,45.4,45.6,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true)
     geometry_collection.as_ewkt.should eql("SRID=256;GEOMETRYCOLLECTIONM(POINTM(4.67 45.4 45.6),LINESTRINGM(5.7 12.45 5.6,67.55 54 6.7))")
   end
 

data/spec/geo_ruby/simple_features/geometry_factory_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe GeometryFactory do
+describe GeoRuby::SimpleFeatures::GeometryFactory do
 #  before(:each) do
-#    @po = MultiPolygon.new
+#    @po = GeoRuby::SimpleFeatures::MultiPolygon.new
 #  end
 
   #it "should f" do

data/spec/geo_ruby/simple_features/geometry_spec.rb

@@ -1,32 +1,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Geometry do
-  before(:each) do
-    @geo = Geometry.new
-  end
+describe GeoRuby::SimpleFeatures::Geometry do
 
   it "should instantiate" do
-    violated unless @geo
+    violated unless subject
   end
 
   it "should have a default srid" do
-    @geo.srid.should eql(4326) #Geometry.default_srid)
+    subject.srid.should eql(4326) #Geometry.default_srid)
   end
 
   it "should change srid" do
-    geo = Geometry.new(225)
+    geo = GeoRuby::SimpleFeatures::Geometry.new(225)
     geo.srid.should eql(225)
   end
 
   it "should instantiate from hex ewkb" do
-    point = Geometry.from_hex_ewkb("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
-    point.class.should == Point
+    point = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
+    point.class.should == GeoRuby::SimpleFeatures::Point
     point.x.should be_within(0.1).of(12.4)
   end
 
   it "should output as_ewkb" do
-    @geo.stub!(:binary_geometry_type).and_return(1)
-    @geo.stub!(:binary_representation).and_return(1)
-    @geo.as_ewkb.should eql("\001\001\000\000 \346\020\000\000\001")
+    subject.stub!(:binary_geometry_type).and_return(1)
+    subject.stub!(:binary_representation).and_return(1)
+    subject.as_ewkb.should eql("\001\001\000\000 \346\020\000\000\001")
   end
 end

data/spec/geo_ruby/simple_features/line_string_spec.rb

@@ -2,22 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module LineSpecHelper
   def mock_points(num)
-#    @point = mock(Point, :x => 1.0, :y => 2.0)
+#    @point = mock(GeoRuby::SimpleFeatures::Point, :x => 1.0, :y => 2.0)
     Array.new(num) { |i| mock_point(i,i) }
   end
 
   def mock_point(x=1,y=2)
-    mock(Point, :x => x, :y => y, :text_representation => "#{x} #{y}")
+    mock(GeoRuby::SimpleFeatures::Point, :x => x, :y => y, :text_representation => "#{x} #{y}")
   end
 end
 
-describe LineString do
+describe GeoRuby::SimpleFeatures::LineString do
 
   include LineSpecHelper
 
   describe "Instance Methods" do
 
-    let(:line) { LineString.from_points([mock(Point)]) }
+    let(:line) { GeoRuby::SimpleFeatures::LineString.from_points([mock(GeoRuby::SimpleFeatures::Point)]) }
 
     it "should instantiate" do
       violated unless line
@@ -37,16 +37,16 @@ describe LineString do
 
   end
 
-  describe "Valid LineString" do
+  describe "Valid GeoRuby::SimpleFeatures::LineString" do
 
-    let(:line) { LineString.from_points([Point.xy(1,1), Point.xy(2,2), Point.xy(3,3)]) }
+    let(:line) { GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.xy(1,1), GeoRuby::SimpleFeatures::Point.xy(2,2), GeoRuby::SimpleFeatures::Point.xy(3,3)]) }
 
     it "should check orientation" do
       line.should_not be_clockwise
     end
 
     it "should check orientation" do
-      l = LineString.from_points([Point.from_x_y(20,20), Point.from_x_y(10,10), Point.from_x_y(-10,10)])
+      l = GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.from_x_y(20,20), GeoRuby::SimpleFeatures::Point.from_x_y(10,10), GeoRuby::SimpleFeatures::Point.from_x_y(-10,10)])
       l.should be_clockwise
     end
 
@@ -55,107 +55,107 @@ describe LineString do
   describe "tu converted" do
 
     it "should concat points" do
-      line_string = LineString::new
-      line_string.concat([Point.from_x_y(12.4,45.3),Point.from_x_y(45.4,41.6)])
+      line_string = GeoRuby::SimpleFeatures::LineString::new
+      line_string.concat([GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)])
 
       line_string.length.should eql(2)
-      line_string[0].should == Point.from_x_y(12.4,45.3)
+      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3)
 
-      point=Point.from_x_y(123,45.8777)
+      point=GeoRuby::SimpleFeatures::Point.from_x_y(123,45.8777)
       line_string[0]=point
       line_string[0].should == point
 
-      points=[Point.from_x_y(123,45.8777),Point.from_x_y(45.4,41.6)]
+      points=[GeoRuby::SimpleFeatures::Point.from_x_y(123,45.8777),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)]
       line_string.each_index {|i| line_string[i].should == points[i] }
 
-      point=Point.from_x_y(22.4,13.56)
+      point=GeoRuby::SimpleFeatures::Point.from_x_y(22.4,13.56)
       line_string << point
       line_string.length.should eql(3)
       line_string[2].should eql(point)
     end
 
     it "should create" do
-      line_string = LineString.from_points([Point.from_x_y(12.4,-45.3),Point.from_x_y(45.4,41.6)],123)
-      line_string.class.should eql(LineString)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)],123)
+      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
       line_string.length.should eql(2)
-      line_string[0].should == Point.from_x_y(12.4,-45.3)
-      line_string[1].should == Point.from_x_y(45.4,41.6)
+      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3)
+      line_string[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)
 
-      line_string = LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
-      line_string.class.should eql(LineString)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
+      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
       line_string.length.should eql(3)
-      line_string[0].should == Point.from_x_y(12.4,-45.3)
-      line_string[1].should == Point.from_x_y(45.4,41.6)
+      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3)
+      line_string[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
-      line_string.class.should eql(LineString)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
+      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
       line_string.length.should eql(3)
-      line_string[0].should == Point.from_x_y_z(12.4,-45.3,123,123)
+      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123)
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
-      line_string.class.should eql(LineString)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
+      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
       line_string.length.should eql(3)
-      line_string[0].should == Point.from_x_y_z(12.4,-45.3,123,123)
+      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123)
     end
 
     it "should bbox it" do
-      bbox = LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true).bounding_box
+      bbox = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true).bounding_box
       bbox.length.should eql(2)
-      bbox[0].should == Point.from_x_y_z(4.456,-45.3,123)
-      bbox[1].should == Point.from_x_y_z(45.4,41.6,987)
+      bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(4.456,-45.3,123)
+      bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(45.4,41.6,987)
     end
 
     it "should test_line_string_equal" do
-      line_string1 = LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
-      line_string2 = LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],123)
-      point = Point.from_x_y(12.4,-45.3,123)
+      line_string1 = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
+      line_string2 = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],123)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3,123)
 
-      line_string1.should == LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
+      line_string1.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
       line_string1.should_not == line_string2
       line_string1.should_not == point
     end
 
     it "should test_line_string_binary" do
-      line_string = LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
       line_string.as_hex_ewkb.should eql("01020000200001000002000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC4440")
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
       line_string.as_hex_ewkb.should eql("01020000A00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A641403333333333B34640CDCCCCCCCCCC44409A99999999992840")
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,35.3,45.1],[45.4,41.6,12.3,40.23]],256,true,true)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3,45.1],[45.4,41.6,12.3,40.23]],256,true,true)
       line_string.as_hex_ewkb.should eql("01020000E00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A64140CDCCCCCCCC8C46403333333333B34640CDCCCCCCCCCC44409A999999999928403D0AD7A3701D4440")
     end
 
     it "test_line_string_text" do
-      line_string = LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
       line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3,45.4 41.6)")
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
       line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3 35.3,45.4 41.6 12.3)")
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true)
       line_string.as_ewkt.should eql("SRID=256;LINESTRINGM(12.4 -45.3 35.3,45.4 41.6 12.3)")
 
-      line_string = LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true)
+      line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true)
       line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3 35.3 25.2,45.4 41.6 12.3 13.75)")
     end
 
     it "should test_linear_ring_creation" do
       #testing just the constructor helpers since the rest is the same as for line_string
-      linear_ring = LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],345)
-      linear_ring.class.should eql(LinearRing)
+      linear_ring = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],345)
+      linear_ring.class.should eql(GeoRuby::SimpleFeatures::LinearRing)
       linear_ring.length.should eql(4)
       linear_ring.should be_closed
-      linear_ring[1].should == Point.from_x_y(45.4,41.6,345)
+      linear_ring[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6,345)
     end
   end
 
   describe "> Coordinates" do
 
     before(:each) do
-      Point.should_receive(:from_coordinates).
+      GeoRuby::SimpleFeatures::Point.should_receive(:from_coordinates).
         exactly(4).with(anything, 4326, false, false).and_return(mock_point)
-      @line = LineString.from_coordinates([1.2,2.5,2.2,4.5])
+      @line = GeoRuby::SimpleFeatures::LineString.from_coordinates([1.2,2.5,2.2,4.5])
     end
 
     it "should instantiate from coordinates" do
@@ -166,7 +166,7 @@ describe LineString do
 
   describe "> Instantiated" do
 
-    let (:line) { LineString.from_points(mock_points(7)) }
+    let (:line) { GeoRuby::SimpleFeatures::LineString.from_points(mock_points(7)) }
 
     it "should be closed if the last point equals the first" do
       line.push(line.first)
@@ -203,10 +203,10 @@ describe LineString do
 
   describe "> Distances..." do
     before(:each) do
-      @p1 = mock(Point)
-      @p2 = mock(Point)
-      @p3 = mock(Point)
-      @line = LineString.from_points([@p1,@p2,@p3])
+      @p1 = mock(GeoRuby::SimpleFeatures::Point)
+      @p2 = mock(GeoRuby::SimpleFeatures::Point)
+      @p3 = mock(GeoRuby::SimpleFeatures::Point)
+      @line = GeoRuby::SimpleFeatures::LineString.from_points([@p1,@p2,@p3])
     end
 
     it "should print the length with haversine" do
@@ -224,10 +224,10 @@ describe LineString do
 
   describe "Simplify" do
 
-    let(:line) { LineString.from_coordinates([[6,0],[4,1],[3,4],[4,6],[5,8],[5,9],[4,10],[6,15]], 4326) }
+    let(:line) { GeoRuby::SimpleFeatures::LineString.from_coordinates([[6,0],[4,1],[3,4],[4,6],[5,8],[5,9],[4,10],[6,15]], 4326) }
 
     it "should simplify a simple linestring" do
-      line =  LineString.from_coordinates([[12,15],[14,17],[17, 20]], 4326)
+      line =  GeoRuby::SimpleFeatures::LineString.from_coordinates([[12,15],[14,17],[17, 20]], 4326)
       line.simplify.should have(2).points
     end