georuby 2.3.0 → 2.5.1

data/spec/geo_ruby/simple_features/polygon_spec.rb

@@ -2,119 +2,118 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe GeoRuby::SimpleFeatures::Polygon do
 
-  describe "Instance Methods" do
+  describe 'Instance Methods' do
 
-    let(:poly) { 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) }
+    let(:poly) { 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) }
 
-    it "should check if contains point" do
+    it 'should check if contains point' do
       expect(poly.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(3, 3))).to be_truthy
     end
 
-    it "should check if not contains point" do
+    it 'should check if not contains point' do
       expect(poly.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(5, 5))).to be_falsey
     end
 
   end
 
-  describe "tu converted" do
-    #no test of the binary representation for linear_rings : always with polygons and like line_string
-    it "should test_polygon_creation" do
-      linear_ring1 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],256)
-      linear_ring2 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]],256)
-      point1 = GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3,256)
-      point2 = GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6,256)
-      point3 = GeoRuby::SimpleFeatures::Point.from_x_y(4.456,1.0698,256)
-      point4 = GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3,256)
-      point5 = GeoRuby::SimpleFeatures::Point.from_x_y(2.4,5.3,256)
-      point6 = GeoRuby::SimpleFeatures::Point.from_x_y(5.4,1.4263,256)
-      point7 = GeoRuby::SimpleFeatures::Point.from_x_y(14.46,1.06,256)
-      point8 = GeoRuby::SimpleFeatures::Point.from_x_y(2.4,5.3,256)
-
-      polygon = GeoRuby::SimpleFeatures::Polygon::new(256)
+  describe 'tu converted' do
+    # no test of the binary representation for linear_rings : always with polygons and like line_string
+    it 'should test_polygon_creation' do
+      linear_ring1 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4, -45.3], [45.4, 41.6], [4.456, 1.0698], [12.4, -45.3]], 256)
+      linear_ring2 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[2.4, 5.3], [5.4, 1.4263], [14.46, 1.06], [2.4, 5.3]], 256)
+      point1 = GeoRuby::SimpleFeatures::Point.from_x_y(12.4, -45.3, 256)
+      point2 = GeoRuby::SimpleFeatures::Point.from_x_y(45.4, 41.6, 256)
+      point3 = GeoRuby::SimpleFeatures::Point.from_x_y(4.456, 1.0698, 256)
+      point4 = GeoRuby::SimpleFeatures::Point.from_x_y(12.4, -45.3, 256)
+      point5 = GeoRuby::SimpleFeatures::Point.from_x_y(2.4, 5.3, 256)
+      point6 = GeoRuby::SimpleFeatures::Point.from_x_y(5.4, 1.4263, 256)
+      point7 = GeoRuby::SimpleFeatures::Point.from_x_y(14.46, 1.06, 256)
+      point8 = GeoRuby::SimpleFeatures::Point.from_x_y(2.4, 5.3, 256)
+
+      polygon = GeoRuby::SimpleFeatures::Polygon.new(256)
       expect(polygon.length).to be_zero
 
       polygon << linear_ring1
       expect(polygon.length).to eql(1)
       expect(polygon[0]).to eq(linear_ring1)
 
-      #the validity of the hole is not checked : just for the sake of example
+      # the validity of the hole is not checked : just for the sake of example
       polygon << linear_ring2
       expect(polygon.length).to eql(2)
       expect(polygon[1]).to eq(linear_ring2)
 
-      polygon = GeoRuby::SimpleFeatures::Polygon.from_linear_rings([linear_ring1,linear_ring2],256)
+      polygon = GeoRuby::SimpleFeatures::Polygon.from_linear_rings([linear_ring1, linear_ring2], 256)
       expect(polygon.class).to eql(GeoRuby::SimpleFeatures::Polygon)
       expect(polygon.length).to eql(2)
       expect(polygon[0]).to eq(linear_ring1)
       expect(polygon[1]).to eq(linear_ring2)
 
-      polygon = 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)
+      polygon = 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)
       expect(polygon.class).to eql(GeoRuby::SimpleFeatures::Polygon)
       expect(polygon.length).to eql(2)
       expect(polygon[0]).to eq(linear_ring1)
       expect(polygon[1]).to eq(linear_ring2)
 
-      polygon = GeoRuby::SimpleFeatures::Polygon.from_points([[point1,point2,point3,point4],[point5,point6,point7,point8]],256)
+      polygon = GeoRuby::SimpleFeatures::Polygon.from_points([[point1, point2, point3, point4], [point5, point6, point7, point8]], 256)
       expect(polygon.length).to eql(2)
       expect(polygon[0]).to eq(linear_ring1)
       expect(polygon[1]).to eq(linear_ring2)
 
-      polygon = GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,15.2],[45.4,41.6,2.4],[4.456,1.0698,5.6],[12.4,-45.3,6.1]],[[2.4,5.3,4.5],[5.4,1.4263,4.2],[14.46,1.06,123.1],[2.4,5.3,4.4]]],256,true)
+      polygon = GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4, -45.3, 15.2], [45.4, 41.6, 2.4], [4.456, 1.0698, 5.6], [12.4, -45.3, 6.1]], [[2.4, 5.3, 4.5], [5.4, 1.4263, 4.2], [14.46, 1.06, 123.1], [2.4, 5.3, 4.4]]], 256, true)
       expect(polygon.class).to eql(GeoRuby::SimpleFeatures::Polygon)
       expect(polygon.length).to eql(2)
 
-      linear_ring1 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4,-45.3,15.2],[45.4,41.6,2.4],[4.456,1.0698,5.6],[12.4,-45.3,6.1]],256,true)
-      linear_ring2 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[2.4,5.3,4.5],[5.4,1.4263,4.2],[14.46,1.06,123.1],[2.4,5.3,4.4]],256,true)
+      linear_ring1 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4, -45.3, 15.2], [45.4, 41.6, 2.4], [4.456, 1.0698, 5.6], [12.4, -45.3, 6.1]], 256, true)
+      linear_ring2 = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[2.4, 5.3, 4.5], [5.4, 1.4263, 4.2], [14.46, 1.06, 123.1], [2.4, 5.3, 4.4]], 256, true)
       expect(polygon[0]).to eq(linear_ring1)
       expect(polygon[1]).to eq(linear_ring2)
     end
 
-    it "bbox" do
-      bbox = GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,15.2],[45.4,41.6,2.4],[4.456,1.0698,5.6],[12.4,-45.3,6.1]],[[2.4,5.3,4.5],[5.4,1.4263,4.2],[14.46,1.06,123.1],[2.4,5.3,4.4]]],256,true).bounding_box
+    it 'bbox' do
+      bbox = GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4, -45.3, 15.2], [45.4, 41.6, 2.4], [4.456, 1.0698, 5.6], [12.4, -45.3, 6.1]], [[2.4, 5.3, 4.5], [5.4, 1.4263, 4.2], [14.46, 1.06, 123.1], [2.4, 5.3, 4.4]]], 256, true).bounding_box
       expect(bbox.length).to eql(2)
-      expect(bbox[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(4.456,-45.3,2.4))
-      expect(bbox[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(45.4,41.6,123.1))
+      expect(bbox[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(4.456, -45.3, 2.4))
+      expect(bbox[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(45.4, 41.6, 123.1))
     end
 
+    it 'test_polygon_equal' do
+      polygon1 = 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)
+      polygon2 = 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]]])
+      point = GeoRuby::SimpleFeatures::Point.from_x_y(12.4, -45.3, 123)
 
-    it "test_polygon_equal" do
-      polygon1 = 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)
-      polygon2 = 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]]])
-      point = GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3,123)
-
-      expect(polygon1).to  eq(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))
+      expect(polygon1).to eq(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))
       expect(polygon1).not_to eq(polygon2)
       expect(polygon1).not_to eq(point)
     end
 
-    it "test_polygon_binary" do
-      polygon = 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)
-      #taken from PostGIS answer
-      expect(polygon.as_hex_ewkb).to eql("0103000020000100000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
+    it 'test_polygon_binary' do
+      polygon = 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)
+      # taken from PostGIS answer
+      expect(polygon.as_hex_ewkb).to eql('0103000020000100000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F')
 
-      polygon = 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)
-      #taken from PostGIS answer
-      expect(polygon.as_hex_ewkb).to eql("01030000A000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
+      polygon = 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)
+      # taken from PostGIS answer
+      expect(polygon.as_hex_ewkb).to eql('01030000A000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040')
 
-      polygon = 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)
-      expect(polygon.as_hex_ewkb).to eql("010300006000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
+      polygon = 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)
+      expect(polygon.as_hex_ewkb).to eql('010300006000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040')
 
-      polygon = 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)
-      expect(polygon.as_hex_ewkb).to eql("01030000E0000100000200000005000000000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C00000000000001040000000000000000000000000000000400000000000001440000000000000104000000000000010400000000000000040AE47E17A14AE1240000000000000000000000000000010400000000000000040713D0AD7A370F53F000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C005000000000000000000F03F000000000000F03F00000000000000409A999999999928400000000000000840000000000000F03F00000000000000400000000000C05E400000000000000840000000000000084000000000000000406666666666662840000000000000F03F000000000000084000000000000000400000000000002840000000000000F03F000000000000F03F00000000000000409A99999999992840")
+      polygon = 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)
+      expect(polygon.as_hex_ewkb).to eql('01030000E0000100000200000005000000000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C00000000000001040000000000000000000000000000000400000000000001440000000000000104000000000000010400000000000000040AE47E17A14AE1240000000000000000000000000000010400000000000000040713D0AD7A370F53F000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C005000000000000000000F03F000000000000F03F00000000000000409A999999999928400000000000000840000000000000F03F00000000000000400000000000C05E400000000000000840000000000000084000000000000000406666666666662840000000000000F03F000000000000084000000000000000400000000000002840000000000000F03F000000000000F03F00000000000000409A99999999992840')
     end
 
-    it "should test_polygon_text" do
-      polygon = 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)
-      expect(polygon.as_ewkt).to eql("SRID=256;POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1))")
+    it 'should test_polygon_text' do
+      polygon = 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)
+      expect(polygon.as_ewkt).to eql('SRID=256;POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1))')
 
-      polygon = 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)
-      expect(polygon.as_ewkt).to eql("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 = 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)
+      expect(polygon.as_ewkt).to eql('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 = 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)
-      expect(polygon.as_ewkt).to eql("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 = 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)
+      expect(polygon.as_ewkt).to eql('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 = 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)
-      expect(polygon.as_ewkt).to eql("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 = 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)
+      expect(polygon.as_ewkt).to eql('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))')
     end
 
   end

data/spec/geo_ruby_spec.rb

@@ -3,18 +3,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 # Time to add your specs!
 # http://rspec.info/
 describe GeoRuby do
-  
-  it "should instantiate Geometry" do
+
+  it 'should instantiate Geometry' do
     @geo = GeoRuby::SimpleFeatures::Geometry.new
     expect(@geo.class).to eql(::GeoRuby::SimpleFeatures::Geometry)
   end
 
-  it "should instantiate Point" do
+  it 'should instantiate Point' do
     @point = GeoRuby::SimpleFeatures::Point.new
     expect(@point).to be_instance_of(::GeoRuby::SimpleFeatures::Point)
   end
 
-  it "should instantiate Line" do
+  it 'should instantiate Line' do
     @line = GeoRuby::SimpleFeatures::LineString.new
     expect(@line).to be_instance_of(::GeoRuby::SimpleFeatures::LineString)
   end

data/spec/spec_helper.rb

@@ -3,38 +3,39 @@ require 'rubygems'
 # Must require active_spport/core_ext/object and then json/pure
 # or the json module gets clobbered and geojson output
 # becomes invalid... ie. it never calls class specific to_json
-#require 'active_support/core_ext/object'
-#require 'json/pure'
+# require 'active_support/core_ext/object'
+# require 'json/pure'
 
 require 'rspec'
 
 require 'geo_ruby'
+require 'geo_ruby/ewk'
 require 'geo_ruby/shp'
 require 'geo_ruby/gpx'
-require 'geo_ruby/geojson'
-require 'geo_ruby/georss'
 require 'geo_ruby/kml'
+require 'geo_ruby/georss'
+require 'geo_ruby/geojson'
 
-if ENV["CI"]
+if ENV['CI']
   require 'coveralls'
   Coveralls.wear!
 end
 
 module GeorubyMatchers
-
   class BeGeometric
-
     def matches?(actual)
-      actual.ancestors.include?(actual) || actual.kind_of?("Geometry")
+      actual.ancestors.include?(actual) || actual.is_a?('Geometry')
     end
 
-    def failure_message;          "expected #{@actual.inspect} to be some geom";    end
+    def failure_message
+      "expected #{@actual.inspect} to be some geom"
+    end
   end
 
   class BeAPoint
     include RSpec::Matchers
 
-    def initialize(expect=nil)
+    def initialize(expect = nil)
       @expect = expect
     end
 
@@ -42,7 +43,7 @@ module GeorubyMatchers
       if @expect
         [:x, :y, :z, :m].each_with_index do |c, i|
           next unless val = @expect[i]
-          if val.kind_of? Numeric
+          if val.is_a? Numeric
             expect(actual.send(c)).to be_within(0.1).of(val)
           else
             expect(actual.send(c)).to eql(val)
@@ -52,8 +53,13 @@ module GeorubyMatchers
       expect(actual).to be_instance_of(GeoRuby::SimpleFeatures::Point)
     end
 
-    def failure_message;          "expected #{@expect} but received #{@actual.inspect}";    end
-    def failure_message_when_negated; "expected something else then '#{@expect}' but got '#{@actual}'";    end
+    def failure_message
+      "expected #{@expect} but received #{@actual.inspect}"
+    end
+
+    def failure_message_when_negated
+      "expected something else then '#{@expect}' but got '#{@actual}'"
+    end
   end
 
   def be_a_point(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georuby
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Guilhem Vellut
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies: []
 description: GeoRuby provides geometric data types from the OGC 'Simple Features'
   specification.
@@ -23,10 +23,12 @@ files:
 - README.md
 - Rakefile
 - lib/geo_ruby.rb
+- lib/geo_ruby/ewk.rb
+- lib/geo_ruby/ewk/ewkb_parser.rb
+- lib/geo_ruby/ewk/ewkt_parser.rb
 - lib/geo_ruby/geojson.rb
 - lib/geo_ruby/georss.rb
 - lib/geo_ruby/gpx.rb
-- lib/geo_ruby/gpx4r/gpx.rb
 - lib/geo_ruby/kml.rb
 - lib/geo_ruby/shp.rb
 - lib/geo_ruby/shp4r/dbf.rb
@@ -34,8 +36,6 @@ files:
 - lib/geo_ruby/simple_features.rb
 - lib/geo_ruby/simple_features/circle.rb
 - lib/geo_ruby/simple_features/envelope.rb
-- lib/geo_ruby/simple_features/ewkb_parser.rb
-- lib/geo_ruby/simple_features/ewkt_parser.rb
 - lib/geo_ruby/simple_features/geometry.rb
 - lib/geo_ruby/simple_features/geometry_collection.rb
 - lib/geo_ruby/simple_features/geometry_factory.rb
@@ -49,6 +49,7 @@ files:
 - lib/geo_ruby/simple_features/polygon.rb
 - lib/geo_ruby/version.rb
 - lib/georuby.rb
+- spec/data/geojson/feature.json
 - spec/data/geojson/feature_collection.json
 - spec/data/georss/atom.xml
 - spec/data/georss/gml.xml
@@ -72,15 +73,15 @@ files:
 - spec/data/polyline.dbf
 - spec/data/polyline.shp
 - spec/data/polyline.shx
+- spec/geo_ruby/ewk/ewkb_parser_spec.rb
+- spec/geo_ruby/ewk/ewkt_parser_spec.rb
 - spec/geo_ruby/geojson_spec.rb
 - spec/geo_ruby/georss_spec.rb
-- spec/geo_ruby/gpx4r/gpx_spec.rb
+- spec/geo_ruby/gpx_spec.rb
 - spec/geo_ruby/kml_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
 - spec/geo_ruby/simple_features/circle_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
-- spec/geo_ruby/simple_features/ewkb_parser_spec.rb
-- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
 - spec/geo_ruby/simple_features/geometry_collection_spec.rb
 - spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/geometry_spec.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby data holder for OGC Simple Features

data/lib/geo_ruby/gpx4r/gpx.rb

@@ -1,118 +0,0 @@
-require "rubygems"
-require "nokogiri"
-
-module GeoRuby
-  module Gpx4r
-
-    #An interface to GPX files
-    class GpxFile
-      attr_reader :record_count, :file_root #:xmin, :ymin, :xmax, :ymax, :zmin, :zmax, :mmin, :mmax, :file_length
-
-      include Enumerable
-
-      # Opens a GPX file. Both "abc.shp" and "abc" are accepted.
-      def initialize(file, *opts) #with_z = true, with_m = true)
-        @file_root = file.gsub(/\.gpx$/i,"")
-        raise MalformedGpxException.new("Missing GPX File") unless
-          File.exists? @file_root + ".gpx"
-        @points, @envelope = [], nil
-        @gpx = File.open(@file_root + ".gpx", "rb")
-        opt = opts.inject({}) { |o, h| h.merge(o) }
-        parse_file(opt[:with_z], opt[:with_m])
-      end
-
-      #force the reopening of the files compsing the shp. Close before calling this.
-      def reload!
-        initialize(@file_root)
-      end
-
-      #opens a GPX "file". If a block is given, the GpxFile object is yielded to it and is closed upon return. Else a call to <tt>open</tt> is equivalent to <tt>GpxFile.new(...)</tt>.
-      def self.open(file, *opts)
-        gpxfile = GpxFile.new(file, *opts)
-        if block_given?
-          yield gpxfile
-          # gpxfile.close
-        else
-          gpxfile
-        end
-      end
-
-      #Closes a gpxfile
-      def close
-        @gpx.close
-      end
-
-      #Tests if the file has no record
-      def empty?
-        record_count == 0
-      end
-
-      #Goes through each record
-      def each
-        (0...record_count).each do |i|
-          yield get_record(i)
-        end
-      end
-      alias :each_record :each
-
-      #Returns record +i+
-      def [](i)
-        get_record(i)
-      end
-
-      #Returns all the records
-      def records
-        @points
-      end
-
-      # Return the GPX file as LineString
-      def as_line_string
-        GeoRuby::SimpleFeatures::LineString.from_points(@points)
-      end
-      alias :as_polyline :as_line_string
-
-      # Return the GPX file as a Polygon
-      # If the GPX isn't closed, a line from the first
-      # to the last point will be created to close it.
-      def as_polygon
-        GeoRuby::SimpleFeatures::Polygon.from_points([@points[0] == @points[-1] ?  @points : @points.push(@points[0].clone)])
-      end
-
-      # Return GPX Envelope
-      def envelope
-        @envelope ||= as_polygon.envelope
-      end
-
-      private
-
-      def get_record(i)
-        @points[i]
-      end
-
-      # wpt => waypoint => TODO?
-      # rte(pt) => route
-      # trk(pt) => track /
-      def parse_file(with_z, with_m)
-        data = @gpx.read
-        @file_mode = data =~ /trkpt/ ? "//trkpt" : (data =~ /wpt/ ? "//wpt" : "//rtept")
-        Nokogiri.HTML(data).search(@file_mode).each do |tp|
-          z = z.inner_text.to_f if with_z && z = tp.at("ele")
-          m = m.inner_text if with_m && m = tp.at("time")
-          @points << GeoRuby::SimpleFeatures::Point.from_coordinates([tp["lon"].to_f, tp["lat"].to_f, z, m],4326,with_z, with_m)
-        end
-        close
-        @record_count = @points.length
-        self.envelope
-      rescue => e
-        raise MalformedGpxException.new("Bad GPX. Error: #{e}")
-        # trackpoint.at("gpxdata:hr").nil? # heartrate
-      end
-
-    end
-
-    class MalformedGpxException < StandardError
-    end
-
-  end
-
-end