georuby 1.9.9 → 2.0.0

data/spec/geo_ruby/simple_features/linear_ring_spec.rb

@@ -1,22 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe LinearRing do
+describe GeoRuby::SimpleFeatures::LinearRing do
 
   it "should instantiate" do
-    lr = LinearRing.new(4326)
-    lr.should be_instance_of(LinearRing)
+    lr = GeoRuby::SimpleFeatures::LinearRing.new(4326)
+    lr.should be_instance_of(GeoRuby::SimpleFeatures::LinearRing)
   end
 
   describe "Instance" do
 
-    let(:lr) { LinearRing.from_coordinates([[10,10],[20,45],[45,10],[10, 10]],256) }
+    let(:lr) { GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[10,10],[20,45],[45,10],[10, 10]],256) }
 
     it "should test if contains a point" do
-      lr.contains_point?(Point.from_x_y(21,21)).should be_true
+      lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,21)).should be_true
     end
 
     it "should test if not contains a point" do
-      lr.contains_point?(Point.from_x_y(21,51)).should be_false
+      lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,51)).should be_false
     end
 
   end

data/spec/geo_ruby/simple_features/multi_line_string_spec.rb

@@ -1,40 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe MultiLineString do
+describe GeoRuby::SimpleFeatures::MultiLineString do
 
  it "test_multi_line_string_creation" do
-    multi_line_string1 = 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_string1.should be_instance_of(MultiLineString)
+    multi_line_string1 = 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_string1.should be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
     multi_line_string1.length.should eql(2)
-    multi_line_string1[0].should == LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
+    multi_line_string1[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
 
-    multi_line_string2= MultiLineString.from_coordinates([[[1.5,45.2],[-54.12312,-0.012]],[[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]]],256);
-    multi_line_string1.should be_instance_of(MultiLineString)
+    multi_line_string2= GeoRuby::SimpleFeatures::MultiLineString.from_coordinates([[[1.5,45.2],[-54.12312,-0.012]],[[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]]],256);
+    multi_line_string1.should be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
     multi_line_string1.length.should eql(2)
-    multi_line_string2[0].should == LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
+    multi_line_string2[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
 
     multi_line_string2.should == multi_line_string2
   end
 
   it "test_multi_line_string_binary" do
-    multi_line_string = 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 = 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.as_hex_ewkb.should eql("01050000200001000002000000010200000002000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF010200000003000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF39B4C876BE8F46403333333333D35E40")
 
-    multi_line_string = 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 = 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.as_hex_ewkb.should eql("0105000020000100000200000001020000C002000000000000000000F83F9A99999999994640CDCCCCCCCCCCF43F333333333333F33FE4BD6A65C20F4BC0FA7E6ABC749388BF333333333333F33F000000000000124001020000C003000000000000000000F83F9A99999999994640666666666666144000000000000012C0E4BD6A65C20F4BC0FA7E6ABC749388BF3333333333331BC03333333333330B4039B4C876BE8F46403333333333D35E40000000000000124033333333333315C0")
   end
 
   it "test_multi_line_string_text" do
-    multi_line_string = 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 = 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.as_ewkt.should eql("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 = 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 = 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.as_ewkt.should eql("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))")
   end
 
   describe "Some More" do
     before do
-      @mls = 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)
+      @mls = 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)
     end
 
     it "should have a accessor to all points" do
@@ -47,7 +47,7 @@ describe MultiLineString do
 
     it "should simplify to linestring" do
       ls = @mls.to_line_string
-      ls.should be_instance_of(LineString)
+      ls.should be_instance_of(GeoRuby::SimpleFeatures::LineString)
       ls.should have(5).points
     end
   end

data/spec/geo_ruby/simple_features/multi_point_spec.rb

@@ -1,33 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe MultiPoint do
+describe GeoRuby::SimpleFeatures::MultiPoint do
 
   it "test_multi_point_creation" do
-    multi_point = MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
-    multi_point.should be_instance_of(MultiPoint)
+    multi_point = GeoRuby::SimpleFeatures::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.length.should eql(3)
-    multi_point[0].should == Point.from_x_y(12.4,-123.3,444)
-    multi_point[2].should == Point.from_x_y(123.55555555,123,444)
+    multi_point[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-123.3,444)
+    multi_point[2].should == GeoRuby::SimpleFeatures::Point.from_x_y(123.55555555,123,444)
   end
 
   it "test_multi_point_binary" do
-    multi_point = MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
+    multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
     multi_point.as_hex_ewkb.should eql("0104000020BC010000030000000101000000CDCCCCCCCCCC28403333333333D35EC0010100000066666666664650C09A99999999D95E4001010000001F97DD388EE35E400000000000C05E40")
 
-    multi_point = MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,1.2],[123.55555555,123,2.3]],444,true)
+    multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,1.2],[123.55555555,123,2.3]],444,true)
     multi_point.as_hex_ewkb.should eql("01040000A0BC010000030000000101000080CDCCCCCCCCCC28403333333333D35EC00000000000001240010100008066666666664650C09A99999999D95E40333333333333F33F01010000801F97DD388EE35E400000000000C05E406666666666660240")
   end
 
   it "test_multi_point_text" do
-    multi_point = MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
+    multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
     multi_point.as_ewkt.should eql("SRID=444;MULTIPOINT((12.4 -123.3),(-65.1 123.4),(123.55555555 123))")
 
-    multi_point = MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
+    multi_point = 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.as_ewkt.should eql("SRID=444;MULTIPOINT((12.4 -123.3 4.5),(-65.1 123.4 6.7),(123.55555555 123 7.8))")
   end
 
   it "should respond to points" do
-    mp = MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
+    mp = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
     mp.should have(3).geometries
     mp.should have(3).points
   end

data/spec/geo_ruby/simple_features/multi_polygon_spec.rb

@@ -1,45 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe MultiPolygon do
+describe GeoRuby::SimpleFeatures::MultiPolygon do
 
    it "test_multi_polygon_creation" do
-    multi_polygon1 = 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_polygon1.should be_instance_of(MultiPolygon)
+    multi_polygon1 = 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_polygon1.should be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
     multi_polygon1.length.should eql(2)
-    multi_polygon1[0].should == 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)
+    multi_polygon1[0].should == 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)
 
-    multi_polygon2 = MultiPolygon.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]]],[[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]]],256)
-    multi_polygon1.should be_instance_of(MultiPolygon)
+    multi_polygon2 = GeoRuby::SimpleFeatures::MultiPolygon.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]]],[[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]]],256)
+    multi_polygon1.should be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
     multi_polygon1.length.should eql(2)
 
-    multi_polygon2[0].should == 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)
+    multi_polygon2[0].should == 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)
     multi_polygon1.should == multi_polygon2
   end
 
   it "test_multi_polygon_binary" do
-    multi_polygon = 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 = 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.as_hex_ewkb.should eql("0106000020000100000200000001030000000200000004000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC44406DE7FBA9F1D211403D2CD49AE61DF13FCDCCCCCCCCCC28406666666666A646C004000000333333333333034033333333333315409A999999999915408A8EE4F21FD2F63FEC51B81E85EB2C40F6285C8FC2F5F03F3333333333330340333333333333154001030000000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
 
-    multi_polygon = MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3,1.2],[45.4,41.6,1.2],[4.456,1.0698,1.2],[12.4,-45.3,1.2]],[[2.4,5.3,1.2],[5.4,1.4263,1.2],[14.46,1.06,1.2],[2.4,5.3,1.2]]],256,false,true),Polygon.from_coordinates([[[0,0,1.2],[4,0,1.2],[4,4,2.3],[0,4,1.2],[0,0,1.2]],[[1,1,2.2],[3,1,3.3],[3,3,1.1],[1,3,2.4],[1,1,2.2]]],256,false,true)],256,false,true)
+    multi_polygon = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,1.2],[45.4,41.6,1.2],[4.456,1.0698,1.2],[12.4,-45.3,1.2]],[[2.4,5.3,1.2],[5.4,1.4263,1.2],[14.46,1.06,1.2],[2.4,5.3,1.2]]],256,false,true),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,1.2],[4,0,1.2],[4,4,2.3],[0,4,1.2],[0,0,1.2]],[[1,1,2.2],[3,1,3.3],[3,3,1.1],[1,3,2.4],[1,1,2.2]]],256,false,true)],256,false,true)
     multi_polygon.as_hex_ewkb.should eql("0106000020000100000200000001030000400200000004000000CDCCCCCCCCCC28406666666666A646C0333333333333F33F3333333333B34640CDCCCCCCCCCC4440333333333333F33F6DE7FBA9F1D211403D2CD49AE61DF13F333333333333F33FCDCCCCCCCCCC28406666666666A646C0333333333333F33F0400000033333333333303403333333333331540333333333333F33F9A999999999915408A8EE4F21FD2F63F333333333333F33FEC51B81E85EB2C40F6285C8FC2F5F03F333333333333F33F33333333333303403333333333331540333333333333F33F0103000040020000000500000000000000000000000000000000000000333333333333F33F00000000000010400000000000000000333333333333F33F00000000000010400000000000001040666666666666024000000000000000000000000000001040333333333333F33F00000000000000000000000000000000333333333333F33F05000000000000000000F03F000000000000F03F9A999999999901400000000000000840000000000000F03F6666666666660A40000000000000084000000000000008409A9999999999F13F000000000000F03F00000000000008403333333333330340000000000000F03F000000000000F03F9A99999999990140")
   end
 
   it "test_multi_polygon_text" do
-    multi_polygon = 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 = 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.as_ewkt.should eql("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,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))")
 
-    multi_polygon = 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 = 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.as_ewkt.should eql("SRID=4326;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)))")
   end
 
   describe "Counting" do
 
     before do
-      @mp = 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)
+      @mp = 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)
     end
 
     it "should have a points method" do
-      @mp.points[0].should be_instance_of(Point)
+      @mp.points[0].should be_instance_of(GeoRuby::SimpleFeatures::Point)
     end
 
     it "should flatten it right" do

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Point do
-  let(:point) { Point.new(4326) }
+describe GeoRuby::SimpleFeatures::Point do
+  let(:point) { GeoRuby::SimpleFeatures::Point.new(4326) }
 
   it "should instantiatember" do
     violated unless point
-    point.should be_instance_of(Point)
+    point.should be_instance_of(GeoRuby::SimpleFeatures::Point)
   end
 
   it "should have a nice matcher" do
@@ -18,15 +18,15 @@ describe Point do
   end
 
   it "should have a very nice matcher" do
-    Point.from_x_y_z_m(1,2,3.33,"t").should be_a_point(1, 2, 3.33, "t")
+    GeoRuby::SimpleFeatures::Point.from_x_y_z_m(1,2,3.33,"t").should be_a_point(1, 2, 3.33, "t")
   end
 
   it "should have a dumb matcher" do
-    Point.should be_geometric
+    GeoRuby::SimpleFeatures::Point.should be_geometric
   end
 
   it "should be subclassable" do
-    place = Class.new(Point)
+    place = Class.new(GeoRuby::SimpleFeatures::Point)
     p = place.from_x_y(1,2)
     p.should be_a place
   end
@@ -54,18 +54,18 @@ describe Point do
   end
 
   it "should compare ok" do
-    point1= Point::new
+    point1= GeoRuby::SimpleFeatures::Point::new
     point1.set_x_y(1.5,45.4)
-    point2= Point::new
+    point2= GeoRuby::SimpleFeatures::Point::new
     point2.set_x_y(1.5,45.4)
-    point3= Point::new
+    point3= GeoRuby::SimpleFeatures::Point::new
     point3.set_x_y(4.5,12.3)
-    point4= Point::new
+    point4= GeoRuby::SimpleFeatures::Point::new
     point4.set_x_y_z(1.5,45.4,423)
-    point5= Point::new
+    point5= GeoRuby::SimpleFeatures::Point::new
     point5.set_x_y(1.5,45.4)
     point5.m=15
-    geometry= Geometry::new
+    geometry= GeoRuby::SimpleFeatures::Geometry::new
 
     point1.should == point2
     point1.should_not == point3
@@ -77,7 +77,7 @@ describe Point do
   describe "> Instantiation" do
 
     it "should instantiate a 2d point" do
-      point = Point.from_x_y(10,20,123)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y(10,20,123)
       point.x.should eql(10)
       point.y.should eql(20)
       point.srid.should eql(123)
@@ -85,21 +85,21 @@ describe Point do
     end
 
     it "should instantiate a 2d easily" do
-      point = Point.xy(10,20,123)
+      point = GeoRuby::SimpleFeatures::Point.xy(10,20,123)
       point.x.should eql(10)
       point.y.should eql(20)
       point.srid.should eql(123)
     end
 
     it "should instantiate a 3d point" do
-      point = Point.from_x_y_z(-10,-20,-30)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z(-10,-20,-30)
       point.x.should eql(-10)
       point.y.should eql(-20)
       point.z.should eql(-30)
     end
 
     it "should instantiate a 3d(m) point" do
-      point = Point.from_x_y_m(10,20,30)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_m(10,20,30)
       point.x.should eql(10)
       point.y.should eql(20)
       point.m.should eql(30)
@@ -107,7 +107,7 @@ describe Point do
     end
 
     it "should instantiate a 4d point" do
-      point = Point.from_x_y_z_m(10,20,30,40,123)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(10,20,30,40,123)
       point.x.should eql(10)
       point.y.should eql(20)
       point.z.should eql(30)
@@ -116,13 +116,13 @@ describe Point do
     end
 
     it "should instantiate a point from polar coordinates" do
-      point = Point.from_r_t(1.4142,45)
+      point = GeoRuby::SimpleFeatures::Point.from_r_t(1.4142,45)
       point.y.should be_within(0.1).of(1)
       point.x.should be_within(0.1).of(1)
     end
 
     it "should instantiate from coordinates x,y" do
-      point = Point.from_coordinates([1.6,2.8],123)
+      point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8],123)
       point.x.should eql(1.6)
       point.y.should eql(2.8)
       point.should_not be_with_z
@@ -131,7 +131,7 @@ describe Point do
     end
 
     it "should instantiate from coordinates x,y,z" do
-      point = Point.from_coordinates([1.6,2.8,3.4],123, true)
+      point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8,3.4],123, true)
       point.x.should eql(1.6)
       point.y.should eql(2.8)
       point.z.should eql(3.4)
@@ -140,7 +140,7 @@ describe Point do
     end
 
     it "should instantiate from coordinates x,y,z,m" do
-      point = Point.from_coordinates([1.6,2.8,3.4,15],123, true, true)
+      point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8,3.4,15],123, true, true)
       point.x.should eql(1.6)
       point.y.should eql(2.8)
       point.z.should eql(3.4)
@@ -151,65 +151,65 @@ describe Point do
     end
 
     it "should have a bbox" do
-      bbox = Point.from_x_y_z_m(-1.6,2.8,-3.4,15,123).bounding_box
+      bbox = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(-1.6,2.8,-3.4,15,123).bounding_box
       bbox.length.should eql(2)
-      bbox[0].should == Point.from_x_y_z(-1.6,2.8,-3.4)
-      bbox[1].should == Point.from_x_y_z(-1.6,2.8,-3.4)
+      bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4)
+      bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4)
     end
 
     it "should parse lat long" do
-      Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x.should be_within(0.00001).of(-20.790658)
-      Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y.should be_within(0.00001).of(20.790658)
+      GeoRuby::SimpleFeatures::Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x.should be_within(0.00001).of(-20.790658)
+      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y.should be_within(0.00001).of(20.790658)
     end
 
     it "should parse lat long w/o sec" do
-      Point.from_latlong("-20°47′26″","-20°47′26″").x.should be_within(0.00001).of(-20.790555)
-      Point.from_latlong("20°47′26″","20°47′26″").y.should be_within(0.00001).of(20.790555)
+      GeoRuby::SimpleFeatures::Point.from_latlong("-20°47′26″","-20°47′26″").x.should be_within(0.00001).of(-20.790555)
+      GeoRuby::SimpleFeatures::Point.from_latlong("20°47′26″","20°47′26″").y.should be_within(0.00001).of(20.790555)
     end
 
     it "should accept with W or S notation" do
-      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x.should be_within(0.00001).of(-20.790658)
-      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y.should be_within(0.00001).of(-20.790658)
+      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x.should be_within(0.00001).of(-20.790658)
+      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y.should be_within(0.00001).of(-20.790658)
     end
 
     it "should instantiate a point from positive degrees" do
-      point = Point.from_latlong('47`20 06.09E','22`50 77.35N')
+      point = GeoRuby::SimpleFeatures::Point.from_latlong('47`20 06.09E','22`50 77.35N')
       point.y.should be_within(0.000001).of(22.8548194)
       point.x.should be_within(0.000001).of(47.335025)
     end
 
     it "should instantiate a point from negative degrees" do
-      point = Point.from_latlong('47`20 06.09W','22`50 77.35S')
+      point = GeoRuby::SimpleFeatures::Point.from_latlong('47`20 06.09W','22`50 77.35S')
       point.y.should be_within(0.000001).of(-22.8548194)
       point.x.should be_within(0.000001).of(-47.335025)
     end
 
     it "should print out nicely" do
-      Point.from_x_y(47.88, -20.1).as_latlong.should eql("47°52′48″, -20°06′00″")
+      GeoRuby::SimpleFeatures::Point.from_x_y(47.88, -20.1).as_latlong.should eql("47°52′48″, -20°06′00″")
     end
 
     it "should print out nicely" do
-      Point.from_x_y(-20.78, 20.78).as_latlong(:full => true).should eql("-20°46′48.00″, 20°46′48.00″")
+      GeoRuby::SimpleFeatures::Point.from_x_y(-20.78, 20.78).as_latlong(:full => true).should eql("-20°46′48.00″, 20°46′48.00″")
     end
 
     it "should print out nicely" do
-      Point.from_x_y(47.11, -20.2).as_latlong(:full => true).should eql("47°06′36.00″, -20°11′60.00″")
+      GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:full => true).should eql("47°06′36.00″, -20°11′60.00″")
     end
 
     it "should print out nicely" do
-      Point.from_x_y(47.11, -20.2).as_latlong(:coord => true).should eql("47°06′36″N, 20°11′60″W")
+      GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:coord => true).should eql("47°06′36″N, 20°11′60″W")
     end
 
     it "should print out nicely" do
-      Point.from_x_y(-47.11, 20.2).as_latlong(:full => true,:coord => true).should eql("47°06′36.00″S, 20°11′60.00″E")
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_latlong(:full => true,:coord => true).should eql("47°06′36.00″S, 20°11′60.00″E")
     end
 
   end
 
   describe " > Distance & Bearing" do
 
-    let(:p1) { Point.from_x_y(1,1) }
-    let(:p2) { Point.from_x_y(2,2) }
+    let(:p1) { GeoRuby::SimpleFeatures::Point.from_x_y(1,1) }
+    let(:p2) { GeoRuby::SimpleFeatures::Point.from_x_y(2,2) }
 
     it "and a 3th grade child should calculate euclidian distance" do
       p1.euclidian_distance(p2).
@@ -227,8 +227,8 @@ describe Point do
     end
 
     describe "Orthogonal Distance" do
-      let(:line) { LineString.from_coordinates([[0,0],[1,3]], 4326) }
-      let(:line2) { LineString.from_coordinates([[1,1],[1,2]], 4326) }
+      let(:line) { GeoRuby::SimpleFeatures::LineString.from_coordinates([[0,0],[1,3]], 4326) }
+      let(:line2) { GeoRuby::SimpleFeatures::LineString.from_coordinates([[1,1],[1,2]], 4326) }
 
       it "should calcula orthogonal distance from a line (90 deg)" do
         p1.orthogonal_distance(line).should be_within(0.001).of(1.414)
@@ -257,22 +257,22 @@ describe Point do
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p3 = Point.from_x_y(1,-1)
+      p3 = GeoRuby::SimpleFeatures::Point.from_x_y(1,-1)
       p1.bearing_to(p3).should be_within(0.01).of(180.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p3 = Point.from_x_y(-1,-1)
+      p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,-1)
       p1.bearing_to(p3).should be_within(0.01).of(225.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p3 = Point.from_x_y(-1,1)
+      p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,1)
       p1.bearing_to(p3).should be_within(0.01).of(270.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p3 = Point.from_x_y(2,-1)
+      p3 = GeoRuby::SimpleFeatures::Point.from_x_y(2,-1)
       p1.bearing_to(p3).should be_within(0.0001).of(153.4349488)
     end
 
@@ -285,7 +285,7 @@ describe Point do
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p3 = Point.from_x_y(-1,1)
+      p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,1)
       p1.bearing_text(p3).should eql(:w)
     end
 
@@ -293,7 +293,7 @@ describe Point do
 
   describe "> Export Formats" do
 
-    let(:point) { Point.from_x_y( -11.2431, 32.3141 ) }
+    let(:point) { GeoRuby::SimpleFeatures::Point.from_x_y( -11.2431, 32.3141 ) }
 
     it "should print out as array" do
 
@@ -304,19 +304,19 @@ describe Point do
     end
 
     it "should printoout as binary" do
-      Point.from_x_y(12.4,45.3,123).as_hex_ewkb.should eql("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
-      point = Point.from_x_y_z_m(12.4,45.3,-3.5,15,123)
+      GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_hex_ewkb.should eql("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(12.4,45.3,-3.5,15,123)
       point.as_hex_ewkb.should eql("01010000E07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC00000000000002E40")
       point.as_hex_wkb.should eql("0101000000CDCCCCCCCCCC28406666666666A64640")
     end
 
     it "should printoout as text" do
-      Point.from_x_y(12.4,45.3,123).as_ewkt.should eql("SRID=123;POINT(12.4 45.3)")
-      point = Point.from_x_y_z(12.4,45.3,-3.5,123)
+      GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_ewkt.should eql("SRID=123;POINT(12.4 45.3)")
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,45.3,-3.5,123)
       point.as_ewkt.should eql("SRID=123;POINT(12.4 45.3 -3.5)")
       point.as_wkt.should eql("POINT(12.4 45.3)")
       point.as_ewkt(false,true).should eql("POINT(12.4 45.3 -3.5)")
-      point = Point.from_x_y_m(12.4,45.3,-3.5,123)
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_m(12.4,45.3,-3.5,123)
       point.as_ewkt.should eql("SRID=123;POINTM(12.4 45.3 -3.5)")
       point.as_ewkt(true,true,false).should eql("SRID=123;POINT(12.4 45.3)")
     end