georuby 1.9.9 → 2.0.0

data/spec/geo_ruby/gpx4r/gpx_spec.rb

@@ -1,23 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-include GeoRuby::Gpx4r
-include GeoRuby::SimpleFeatures
-
-describe Gpx4r do
+describe GeoRuby::Gpx4r do
 
   it "should add gpx extension and raise if doesn't exists" do
     lambda do
       File.should_receive(:exists?).with("short.gpx").and_return(false)
-      GpxFile.open('short').should be_true
-    end.should raise_error MalformedGpxException
+      GeoRuby::Gpx4r::GpxFile.open('short').should be_true
+    end.should raise_error GeoRuby::Gpx4r::MalformedGpxException
   end
 
   describe "Waypoints" do
 
     before(:all) do
-      @gpxfile = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/short.gpx', :with_z => true, :with_m => true)
-      @gpxfile2 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/fells_loop', :with_z => true, :with_m => true)
-      @gpxfile3 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/tracktreks.gpx', :with_z => true)
+      @gpxfile = GeoRuby::Gpx4r::GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/short.gpx', :with_z => true, :with_m => true)
+      @gpxfile2 = GeoRuby::Gpx4r::GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/fells_loop', :with_z => true, :with_m => true)
+      @gpxfile3 = GeoRuby::Gpx4r::GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/tracktreks.gpx', :with_z => true)
     end
 
     it "should open and parse" do
@@ -63,43 +60,43 @@ describe Gpx4r do
     end
 
     it "should return it as a linestring" do
-      @gpxfile.as_line_string.should be_instance_of LineString
-      @gpxfile.as_polyline.should be_instance_of LineString
+      @gpxfile.as_line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+      @gpxfile.as_polyline.should be_instance_of GeoRuby::SimpleFeatures::LineString
     end
 
     it "should return it as a linestring 3" do
-      @gpxfile3.as_line_string.should be_instance_of LineString
-      @gpxfile3.as_polyline.should be_instance_of LineString
+      @gpxfile3.as_line_string.should be_instance_of GeoRuby::SimpleFeatures::LineString
+      @gpxfile3.as_polyline.should be_instance_of GeoRuby::SimpleFeatures::LineString
     end
 
     it "should return a envelope" do
-      @gpxfile.envelope.should be_instance_of Envelope
+      @gpxfile.envelope.should be_instance_of GeoRuby::SimpleFeatures::Envelope
       @gpxfile.envelope.lower_corner.x.should be_within(0.001).of(9.08128)
       @gpxfile.envelope.lower_corner.y.should be_within(0.001).of(48.7169)
     end
 
     it "should return a envelope 3" do
-      @gpxfile3.envelope.should be_instance_of Envelope
+      @gpxfile3.envelope.should be_instance_of GeoRuby::SimpleFeatures::Envelope
       @gpxfile3.envelope.lower_corner.x.should be_within(0.001).of(-149.8422613)
       @gpxfile3.envelope.lower_corner.y.should be_within(0.001).of(-17.547636)
     end
 
     it "should return it as a polygon" do
       [@gpxfile, @gpxfile2, @gpxfile3].each do |g|
-        g.as_polygon.should be_instance_of Polygon
-        g.as_polygon[0].should be_instance_of LinearRing
+        g.as_polygon.should be_instance_of GeoRuby::SimpleFeatures::Polygon
+        g.as_polygon[0].should be_instance_of GeoRuby::SimpleFeatures::LinearRing
         g.as_polygon[0].should be_closed
         g.as_polygon[1].should be_nil
       end
     end
 
     it "should close the polygon" do
-      se = Point.from_x_y(-44, -23)
-      sw = Point.from_x_y(-42, -22)
-      nw = Point.from_x_y(-42, -25)
-      ne = Point.from_x_y(-44, -21)
+      se = GeoRuby::SimpleFeatures::Point.from_x_y(-44, -23)
+      sw = GeoRuby::SimpleFeatures::Point.from_x_y(-42, -22)
+      nw = GeoRuby::SimpleFeatures::Point.from_x_y(-42, -25)
+      ne = GeoRuby::SimpleFeatures::Point.from_x_y(-44, -21)
       @gpxfile.instance_variable_set(:@points, [se,sw,nw,ne])
-      @gpxfile.as_polygon.should == Polygon.from_points([[se,sw,nw,ne,se]])
+      @gpxfile.as_polygon.should == GeoRuby::SimpleFeatures::Polygon.from_points([[se,sw,nw,ne,se]])
     end
   end
 

data/spec/geo_ruby/kml_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe KmlParser do
+describe GeoRuby::KmlParser do
   before(:all) do
     POINT = "<Point><coordinates>-82.4898187291883,34.2473206042649</coordinates></Point>"
     LINESTRING = "<LineString><coordinates>-122.365662,37.826988 -122.365202,37.826302 -122.364581,37.82655 -122.365038,37.827237</coordinates></LineString>"
@@ -14,11 +14,11 @@ describe KmlParser do
   end
   
   before(:each) do
-    @factory = GeometryFactory.new
-    @kml_parser = KmlParser.new(@factory)
+    @factory = GeoRuby::SimpleFeatures::GeometryFactory.new
+    @kml_parser = described_class.new(@factory)
   end
   
-  it "should parse a Point correctly" do
+  it "should parse a GeoRuby::SimpleFeatures::Point correctly" do
     @kml_parser.parse(POINT)
     g = @factory.geometry
     g.should_not eql(nil)
@@ -26,7 +26,7 @@ describe KmlParser do
     g.as_kml.gsub(/\n/,'').should eql(POINT) 
   end
   
-  it "should parse a LineString correctly" do
+  it "should parse a GeoRuby::SimpleFeatures::LineString correctly" do
     @kml_parser.parse(LINESTRING)
     g = @factory.geometry
     g.should_not eql(nil)
@@ -40,7 +40,7 @@ describe KmlParser do
     g.as_kml.gsub(/\n/,'').should eql(LINEARRING)
   end
   
-  it "should parse a Polygon correctly" do
+  it "should parse a GeoRuby::SimpleFeatures::Polygon correctly" do
     @kml_parser.parse(POLYGON)
     g = @factory.geometry
     g.should_not eql(nil)

data/spec/geo_ruby/shp4r/shp_spec.rb

@@ -1,18 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-include GeoRuby::Shp4r
-
-describe Shp4r do
+describe GeoRuby::Shp4r do
 
   describe "Point" do
     before(:each) do
-      @shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/point.shp')
+      @shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/point.shp')
     end
 
     it "should parse ok" do
       @shpfile.record_count.should eql(2)
       @shpfile.should have(1).fields
-      @shpfile.shp_type.should eql(ShpType::POINT)
+      @shpfile.shp_type.should eql(GeoRuby::Shp4r::ShpType::POINT)
     end
 
     it "should parse fields" do
@@ -23,7 +21,7 @@ describe Shp4r do
 
     it "should parse record 1" do
       rec = @shpfile[0]
-      rec.geometry.should be_kind_of Point
+      rec.geometry.should be_kind_of GeoRuby::SimpleFeatures::Point
       rec.geometry.x.should be_within(0.00001).of(-90.08375)
       rec.geometry.y.should be_within(0.00001).of(34.39996)
       rec.data["Hoyoyo"].should eql(6)
@@ -31,7 +29,7 @@ describe Shp4r do
 
     it "should parse record 2" do
       rec = @shpfile[1]
-      rec.geometry.should be_kind_of Point
+      rec.geometry.should be_kind_of GeoRuby::SimpleFeatures::Point
       rec.geometry.x.should be_within(0.00001).of(-87.82580)
       rec.geometry.y.should be_within(0.00001).of(33.36416)
       rec.data["Hoyoyo"].should eql(9)
@@ -41,26 +39,26 @@ describe Shp4r do
 
   describe "Polyline" do
     before(:each) do
-      @shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polyline.shp')
+      @shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polyline.shp')
     end
 
     it "should parse ok" do
       @shpfile.record_count.should eql(1)
       @shpfile.should have(1).fields
-      @shpfile.shp_type.should eql(ShpType::POLYLINE)
+      @shpfile.shp_type.should eql(GeoRuby::Shp4r::ShpType::POLYLINE)
     end
 
     it "should parse fields" do
       field = @shpfile.fields.first
       field.name.should eql("Chipoto")
-      # Dbf now uses the decimal to choose between int and float
+      # GeoRuby::Shp4r::Dbf now uses the decimal to choose between int and float
       # So here is N instead of F
       field.type.should eql("N")
     end
 
     it "should parse record 1" do
       rec = @shpfile[0]
-      rec.geometry.should be_kind_of MultiLineString
+      rec.geometry.should be_kind_of GeoRuby::SimpleFeatures::MultiLineString
       rec.geometry.length.should eql(1)
       rec.geometry[0].length.should eql(6)
       rec.data["Chipoto"].should eql(5.678)
@@ -70,13 +68,13 @@ describe Shp4r do
 
   describe "Polygon" do
     before(:each) do
-      @shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon.shp')
+      @shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon.shp')
     end
 
     it "should parse ok" do
       @shpfile.record_count.should eql(1)
       @shpfile.should have(1).fields
-      @shpfile.shp_type.should eql(ShpType::POLYGON)
+      @shpfile.shp_type.should eql(GeoRuby::Shp4r::ShpType::POLYGON)
     end
 
     it "should parse fields" do
@@ -87,7 +85,7 @@ describe Shp4r do
 
     it "should parse record 1" do
       rec = @shpfile[0]
-      rec.geometry.should be_kind_of MultiPolygon
+      rec.geometry.should be_kind_of GeoRuby::SimpleFeatures::MultiPolygon
       rec.geometry.length.should eql(1)
       rec.geometry[0].length.should eql(1)
       rec.geometry[0][0].length.should eql(7)
@@ -111,12 +109,12 @@ describe Shp4r do
     it "test_point" do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/point',
                  File.dirname(__FILE__) + '/../../data/point2')
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/point2.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/point2.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
-        tr.add(ShpRecord.new(Point.from_x_y(123.4,123.4),'Hoyoyo' => 5))
-        tr.add(ShpRecord.new(Point.from_x_y(-16.67,16.41),'Hoyoyo' => -7))
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::Point.from_x_y(123.4,123.4),'Hoyoyo' => 5))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::Point.from_x_y(-16.67,16.41),'Hoyoyo' => -7))
         tr.delete(1)
       end
 
@@ -130,12 +128,12 @@ describe Shp4r do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/polyline',
                  File.dirname(__FILE__) + '/../../data/polyline2')
 
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polyline2.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polyline2.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
-        tr.add(ShpRecord.new(LineString.from_coordinates([[123.4,123.4],[45.6,12.3]]),'Chipoto' => 5.6778))
-        tr.add(ShpRecord.new(LineString.from_coordinates([[23.4,13.4],[45.6,12.3],[12,-67]]),'Chipoto' => -7.1))
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::LineString.from_coordinates([[123.4,123.4],[45.6,12.3]]),'Chipoto' => 5.6778))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::LineString.from_coordinates([[23.4,13.4],[45.6,12.3],[12,-67]]),'Chipoto' => -7.1))
         tr.delete(0)
       end
 
@@ -147,12 +145,12 @@ describe Shp4r do
     it "test_polygon" do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/polygon',
                  File.dirname(__FILE__) + '/../../data/polygon2')
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon2.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon2.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
         tr.delete(0)
-        tr.add(ShpRecord.new(Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]]),'Hello' => "oook"))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]]),'Hello' => "oook"))
       end
 
       shpfile.record_count.should eql(1)
@@ -164,11 +162,11 @@ describe Shp4r do
     it "test_multipoint" do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/multipoint',
                  File.dirname(__FILE__) + '/../../data/multipoint2')
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/multipoint2.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/multipoint2.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
-        tr.add(ShpRecord.new(MultiPoint.from_coordinates([[45.6,-45.1],[12.4,98.2],[51.2,-0.12],[156.12345,56.109]]),'Hello' => 5,"Hoyoyo" => "AEZAE"))
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[45.6,-45.1],[12.4,98.2],[51.2,-0.12],[156.12345,56.109]]),'Hello' => 5,"Hoyoyo" => "AEZAE"))
       end
 
       shpfile.record_count.should eql(2)
@@ -181,11 +179,11 @@ describe Shp4r do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/polygon',
                  File.dirname(__FILE__) + '/../../data/polygon4')
 
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon4.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon4.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
-        tr.add(ShpRecord.new(MultiPolygon.from_polygons([Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]])]),'Hello' => "oook"))
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]])]),'Hello' => "oook"))
       end
 
       shpfile.record_count.should eql(2)
@@ -199,11 +197,11 @@ describe Shp4r do
       cp_all_shp(File.dirname(__FILE__) + '/../../data/polygon',
                  File.dirname(__FILE__) + '/../../data/polygon5')
 
-      shpfile = ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon5.shp')
+      shpfile = GeoRuby::Shp4r::ShpFile.open(File.dirname(__FILE__) + '/../../data/polygon5.shp')
 
       shpfile.transaction do |tr|
-        tr.should be_instance_of ShpTransaction
-        tr.add(ShpRecord.new(MultiPolygon.from_polygons([Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]])]),'Hello' => "oook"))
+        tr.should be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[40,0],[40,40],[0,40],[0,0]],[[10,10],[10,20],[20,20],[10,10]]])]),'Hello' => "oook"))
         tr.rollback
       end
       shpfile.record_count.should eql(1)
@@ -215,9 +213,9 @@ describe Shp4r do
     end
 
     it "test_creation" do
-      shpfile = ShpFile.create(File.dirname(__FILE__) + '/../../data/point3.shp',ShpType::POINT,[Dbf::Field.new("Hoyoyo","C",10,0)])
+      shpfile = GeoRuby::Shp4r::ShpFile.create(File.dirname(__FILE__) + '/../../data/point3.shp',GeoRuby::Shp4r::ShpType::POINT,[GeoRuby::Shp4r::Dbf::Field.new("Hoyoyo","C",10,0)])
       shpfile.transaction do |tr|
-        tr.add(ShpRecord.new(Point.from_x_y(123,123.4),'Hoyoyo' => "HJHJJ"))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::Point.from_x_y(123,123.4),'Hoyoyo' => "HJHJJ"))
       end
       shpfile.record_count.should eql(1)
       shpfile.close
@@ -225,9 +223,9 @@ describe Shp4r do
     end
 
     it "test_creation_multipoint" do
-      shpfile = ShpFile.create(File.dirname(__FILE__) + '/../../data/multipoint3.shp',ShpType::MULTIPOINT,[Dbf::Field.new("Hoyoyo","C",10),Dbf::Field.new("Hello","N",10)])
+      shpfile = GeoRuby::Shp4r::ShpFile.create(File.dirname(__FILE__) + '/../../data/multipoint3.shp',GeoRuby::Shp4r::ShpType::MULTIPOINT,[GeoRuby::Shp4r::Dbf::Field.new("Hoyoyo","C",10),GeoRuby::Shp4r::Dbf::Field.new("Hello","N",10)])
       shpfile.transaction do |tr|
-        tr.add(ShpRecord.new(MultiPoint.from_coordinates([[123,123.4],[345,12.2]]),'Hoyoyo' => "HJHJJ","Hello" => 5))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[123,123.4],[345,12.2]]),'Hoyoyo' => "HJHJJ","Hello" => 5))
       end
       shpfile.record_count.should eql(1)
       shpfile.close

data/spec/geo_ruby/simple_features/circle_spec.rb

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Circle do
+describe GeoRuby::SimpleFeatures::Circle do
 
   it "should instantiate" do
-    Circle.new.should be_kind_of Geometry
+    subject.should be_kind_of GeoRuby::SimpleFeatures::Geometry
   end
 
-
   describe "Instance" do
-    let(:circle) { Circle.new(4326) }
+    let(:circle) { GeoRuby::SimpleFeatures::Circle.new(4326) }
   end
 
-
 end

data/spec/geo_ruby/simple_features/envelope_spec.rb

@@ -1,29 +1,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Envelope do
+describe GeoRuby::SimpleFeatures::Envelope do
   before(:each) do
     @srid = 4269
-    @env = Envelope.from_points([Point.from_x_y(10,20, @srid),Point.from_x_y(20,30, @srid)], @srid)
+    @env = GeoRuby::SimpleFeatures::Envelope.from_points([GeoRuby::SimpleFeatures::Point.from_x_y(10,20, @srid),GeoRuby::SimpleFeatures::Point.from_x_y(20,30, @srid)], @srid)
   end
 
   it "should initialize" do
-    @env.should be_instance_of(Envelope)
+    @env.should be_instance_of(GeoRuby::SimpleFeatures::Envelope)
   end
 
   it "converted tu" do
-    linear_ring = LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],256)
-    polygon = Polygon.from_linear_rings([linear_ring],256)
+    linear_ring = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],256)
+    polygon = GeoRuby::SimpleFeatures::Polygon.from_linear_rings([linear_ring],256)
     e = polygon.envelope
 
-    e.lower_corner.class.should eql(Point)
-    e.upper_corner.class.should eql(Point)
+    e.lower_corner.class.should eql(GeoRuby::SimpleFeatures::Point)
+    e.upper_corner.class.should eql(GeoRuby::SimpleFeatures::Point)
 
     e.lower_corner.x.should eql(4.456)
     e.lower_corner.y.should eql(-45.3)
     e.upper_corner.x.should eql(45.4)
     e.upper_corner.y.should eql(41.6)
 
-    line_string = LineString.from_coordinates([[13.6,-49.3],[45.4,44.6],[14.2,1.09],[13.6,-49.3]],256)
+    line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[13.6,-49.3],[45.4,44.6],[14.2,1.09],[13.6,-49.3]],256)
     e2 = line_string.envelope
 
     e3 = e.extend(e2)

data/spec/geo_ruby/simple_features/ewkb_parser_spec.rb

@@ -1,106 +1,106 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe EWKBParser do
+describe GeoRuby::SimpleFeatures::EWKBParser do
 
   before(:each) do
-    @factory = GeometryFactory::new
-    @hex_ewkb_parser = HexEWKBParser::new(@factory)
+    @factory = GeoRuby::SimpleFeatures::GeometryFactory::new
+    @hex_ewkb_parser = GeoRuby::SimpleFeatures::HexEWKBParser::new(@factory)
   end
 
   it "test_point2d" do
     @hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y(12.4,45.3,123)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123)
   end
 
   it "test_point2d_BigEndian" do
     @hex_ewkb_parser.parse("00000000014013A035BD512EC7404A3060C38F3669")
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y(4.906455,52.377953)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y(4.906455,52.377953)
   end
 
   it "test_point3dz" do
     @hex_ewkb_parser.parse("01010000A07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC0")
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y_z(12.4,45.3,-3.5,123)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,45.3,-3.5,123)
   end
 
   it "test_point4d" do
     @hex_ewkb_parser.parse("01010000E07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC00000000000002E40")
     point = @factory.geometry
-    point.should be_instance_of Point
-    point.should == Point.from_x_y_z_m(12.4,45.3,-3.5,15,123)
+    point.should be_instance_of GeoRuby::SimpleFeatures::Point
+    point.should == GeoRuby::SimpleFeatures::Point.from_x_y_z_m(12.4,45.3,-3.5,15,123)
   end
 
   it "test_line_string" do
     @hex_ewkb_parser.parse("01020000200001000002000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC4440")
     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)
 
     @hex_ewkb_parser.parse("01020000A00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A641403333333333B34640CDCCCCCCCCCC44409A99999999992840")
     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)
 
     @hex_ewkb_parser.parse("01020000E00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A64140CDCCCCCCCC8C46403333333333B34640CDCCCCCCCCCC44409A999999999928403D0AD7A3701D4440")
     line_string = @factory.geometry
-    line_string.should be_instance_of LineString
-    line_string.should == LineString.from_coordinates([[12.4,-45.3,35.3,45.1],[45.4,41.6,12.3,40.23]],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,45.1],[45.4,41.6,12.3,40.23]],256,true,true)
   end
 
   it "test_polygon" do
     @hex_ewkb_parser.parse("0103000020000100000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
     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)
 
     @hex_ewkb_parser.parse("01030000A000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
     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)
 
     @hex_ewkb_parser.parse("010300006000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
     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)
 
     @hex_ewkb_parser.parse("01030000E0000100000200000005000000000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C00000000000001040000000000000000000000000000000400000000000001440000000000000104000000000000010400000000000000040AE47E17A14AE1240000000000000000000000000000010400000000000000040713D0AD7A370F53F000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C005000000000000000000F03F000000000000F03F00000000000000409A999999999928400000000000000840000000000000F03F00000000000000400000000000C05E400000000000000840000000000000084000000000000000406666666666662840000000000000F03F000000000000084000000000000000400000000000002840000000000000F03F000000000000F03F00000000000000409A99999999992840")
     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_geometry_collection" do
     @hex_ewkb_parser.parse("010700002000010000020000000101000000AE47E17A14AE12403333333333B34640010200000002000000CDCCCCCCCCCC16406666666666E628403333333333E350400000000000004B40")
     geometry_collection = @factory.geometry
-    geometry_collection.should be_instance_of GeometryCollection
+    geometry_collection.should be_instance_of GeoRuby::SimpleFeatures::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)],256)
+    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)],256)
     geometry_collection[0].srid.should eql(256)
 
     @hex_ewkb_parser.parse("01070000E0000100000200000001010000C0AE47E17A14AE12403333333333B34640F6285C8FC2D54640666666666666024001020000C002000000CDCCCCCCCCCC16406666666666E628403D0AD7A3703D124033333333339358403333333333E350400000000000004B4066666666666628403333333333330B40")
     geometry_collection = @factory.geometry
-    geometry_collection.should be_instance_of GeometryCollection
-    geometry_collection.should == 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.should be_instance_of GeoRuby::SimpleFeatures::GeometryCollection
+    geometry_collection.should == 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[0].srid.should eql(256)
   end
 
   it "test_multi_point" do
     @hex_ewkb_parser.parse("0104000020BC010000030000000101000000CDCCCCCCCCCC28403333333333D35EC0010100000066666666664650C09A99999999D95E4001010000001F97DD388EE35E400000000000C05E40")
     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)
 
     @hex_ewkb_parser.parse("01040000A0BC010000030000000101000080CDCCCCCCCCCC28403333333333D35EC00000000000001240010100008066666666664650C09A99999999D95E40333333333333F33F01010000801F97DD388EE35E400000000000C05E406666666666660240")
     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,1.2],[123.55555555,123,2.3]],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,1.2],[123.55555555,123,2.3]],444,true)
     multi_point.srid.should eql(444)
     multi_point[0].srid.should eql(444)
   end
@@ -108,15 +108,15 @@ describe EWKBParser do
   it "test_multi_line_string" do
     @hex_ewkb_parser.parse("01050000200001000002000000010200000002000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF010200000003000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF39B4C876BE8F46403333333333D35E40")
     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)
 
     @hex_ewkb_parser.parse("0105000020000100000200000001020000C002000000000000000000F83F9A99999999994640CDCCCCCCCCCCF43F333333333333F33FE4BD6A65C20F4BC0FA7E6ABC749388BF333333333333F33F000000000000124001020000C003000000000000000000F83F9A99999999994640666666666666144000000000000012C0E4BD6A65C20F4BC0FA7E6ABC749388BF3333333333331BC03333333333330B4039B4C876BE8F46403333333333D35E40000000000000124033333333333315C0")
     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
@@ -124,15 +124,15 @@ describe EWKBParser do
   it "test_multi_polygon" do
     @hex_ewkb_parser.parse("0106000020000100000200000001030000000200000004000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC44406DE7FBA9F1D211403D2CD49AE61DF13FCDCCCCCCCCCC28406666666666A646C004000000333333333333034033333333333315409A999999999915408A8EE4F21FD2F63FEC51B81E85EB2C40F6285C8FC2F5F03F3333333333330340333333333333154001030000000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
     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)
 
     @hex_ewkb_parser.parse("0106000020000100000200000001030000400200000004000000CDCCCCCCCCCC28406666666666A646C0333333333333F33F3333333333B34640CDCCCCCCCCCC4440333333333333F33F6DE7FBA9F1D211403D2CD49AE61DF13F333333333333F33FCDCCCCCCCCCC28406666666666A646C0333333333333F33F0400000033333333333303403333333333331540333333333333F33F9A999999999915408A8EE4F21FD2F63F333333333333F33FEC51B81E85EB2C40F6285C8FC2F5F03F333333333333F33F33333333333303403333333333331540333333333333F33F0103000040020000000500000000000000000000000000000000000000333333333333F33F00000000000010400000000000000000333333333333F33F00000000000010400000000000001040666666666666024000000000000000000000000000001040333333333333F33F00000000000000000000000000000000333333333333F33F05000000000000000000F03F000000000000F03F9A999999999901400000000000000840000000000000F03F6666666666660A40000000000000084000000000000008409A9999999999F13F000000000000F03F00000000000008403333333333330340000000000000F03F000000000000F03F9A99999999990140")
     multi_polygon = @factory.geometry
-    multi_polygon.should be_instance_of MultiPolygon
-    multi_polygon.should == 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.should be_instance_of GeoRuby::SimpleFeatures::MultiPolygon
+    multi_polygon.should == 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.srid.should eql(256)
     multi_polygon[0].srid.should eql(256)
   end
@@ -140,19 +140,19 @@ describe EWKBParser do
 
   it "test_failure_trailing_data" do
     #added A345 at the end
-    lambda {@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC28406666666666A64640A345")}.should raise_error(EWKBFormatError)
+    lambda {@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC28406666666666A64640A345")}.should raise_error(GeoRuby::SimpleFeatures::EWKBFormatError)
   end
 
   it "test_failure_unknown_geometry_type" do
-    lambda {@hex_ewkb_parser.parse("01090000207B000000CDCCCCCCCCCC28406666666666A64640")}.should raise_error(EWKBFormatError)
+    lambda {@hex_ewkb_parser.parse("01090000207B000000CDCCCCCCCCCC28406666666666A64640")}.should raise_error(GeoRuby::SimpleFeatures::EWKBFormatError)
   end
 
   it "test_failure_m" do
-    lambda {@hex_ewkb_parser.parse("01010000607B000000CDCCCCCCCCCC28406666666666A64640")}.should raise_error(EWKBFormatError)
+    lambda {@hex_ewkb_parser.parse("01010000607B000000CDCCCCCCCCCC28406666666666A64640")}.should raise_error(GeoRuby::SimpleFeatures::EWKBFormatError)
   end
 
   it "test_failure_truncated_data" do
-    lambda {@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC2840666666")}.should raise_error(EWKBFormatError)
+    lambda {@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC2840666666")}.should raise_error(GeoRuby::SimpleFeatures::EWKBFormatError)
   end
 
 end