GeoRuby 1.2.0 → 1.2.1

data/README

@@ -1,5 +1,5 @@
 =GeoRuby
-This is GeoRuby 1.2.0. It is intended as a holder for data returned from PostGIS and the Spatial Extensions of MySql. The data model roughly follows the OGC "Simple Features for SQL" specification (see http://www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections). 
+This is GeoRuby 1.2.1. It is intended as a holder for data returned from PostGIS and the Spatial Extensions of MySql. The data model roughly follows the OGC "Simple Features for SQL" specification (see http://www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections). 
 
 ===Available data types
 The following geometric data types are provided :

data/lib/geo_ruby/shp4r/shp.rb

@@ -281,7 +281,7 @@ module GeoRuby
     
     #A SHP record : contains both the geometry and the data fields (from the DBF)
     class ShpRecord
-      attr_accessor :geometry , :data
+      attr_reader :geometry , :data
       
       def initialize(geometry, data)
         @geometry = geometry

data/lib/geo_ruby/simple_features/geometry_collection.rb

@@ -113,7 +113,7 @@ module GeoRuby
       
       #creates a new GeometryCollection from an array of geometries
       def self.from_geometries(geometries,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        geometry_collection = GeometryCollection::new(srid,with_z,with_m)
+        geometry_collection = new(srid,with_z,with_m)
         geometry_collection.concat(geometries)
         geometry_collection
       end

data/lib/geo_ruby/simple_features/line_string.rb

@@ -131,14 +131,14 @@ module GeoRuby
       
       #Creates a new line string. Accept an array of points as argument
       def self.from_points(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        line_string = LineString::new(srid,with_z,with_m)
+        line_string = new(srid,with_z,with_m)
         line_string.concat(points)
         line_string
       end
 
       #Creates a new line string. Accept a sequence of points as argument : ((x,y)...(x,y))
       def self.from_coordinates(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        line_string = LineString::new(srid,with_z,with_m)
+        line_string = new(srid,with_z,with_m)
         line_string.concat( points.collect{|point_coords| Point.from_coordinates(point_coords,srid,with_z,with_m)  } )
         line_string
       end

data/lib/geo_ruby/simple_features/linear_ring.rb

@@ -2,26 +2,11 @@ require 'geo_ruby/simple_features/line_string'
 
 module GeoRuby
   module SimpleFeatures
-    #Represents a linear ring, which is a closed line string (see LineString). No check is performed to verify if the linear ring is really closed.
+    #Represents a linear ring, which is a closed line string (see LineString). Currently, no check is performed to verify if the linear ring is really closed.
     class LinearRing < LineString
       def initialize(srid= DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
       end
-
-      #creates a new linear ring from an array of points. The first and last points should be equal, although no check is performed here.
-      def self.from_points(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        linear_ring = LinearRing::new(srid,with_z,with_m)
-        linear_ring.concat(points)
-        linear_ring
-      end
-
-      #creates a new linear ring from a sequence of points : ((x,y)...(x,y)).
-      def self.from_coordinates(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        linear_ring = LinearRing::new(srid,with_z,with_m)
-        linear_ring.concat( points.collect{|point_coords| Point.from_coordinates(point_coords,srid,with_z,with_m) } )
-        linear_ring
-      end
-      
     end
   end
 end

data/lib/geo_ruby/simple_features/multi_line_string.rb

@@ -23,14 +23,14 @@ module GeoRuby
       
       #Creates a new multi line string from an array of line strings
       def self.from_line_strings(line_strings,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        multi_line_string = MultiLineString::new(srid,with_z,with_m)
+        multi_line_string = new(srid,with_z,with_m)
         multi_line_string.concat(line_strings)
         multi_line_string
       end
       
       #Creates a new multi line string from sequences of points : (((x,y)...(x,y)),((x,y)...(x,y)))
       def self.from_coordinates(point_sequences,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        multi_line_string = MultiLineString::new(srid,with_z,with_m)
+        multi_line_string = new(srid,with_z,with_m)
         multi_line_string.concat(point_sequences.collect {|points| LineString.from_coordinates(points,srid,with_z,with_m) })
         multi_line_string
       end

data/lib/geo_ruby/simple_features/multi_point.rb

@@ -24,14 +24,14 @@ module GeoRuby
 
       #Creates a new multi point from an array of points
       def self.from_points(points,srid= DEFAULT_SRID,with_z=false,with_m=false)
-        multi_point= MultiPoint::new(srid,with_z,with_m)
+        multi_point= new(srid,with_z,with_m)
         multi_point.concat(points)
         multi_point
       end
 
       #Creates a new multi point from a list of point coordinates : ((x,y)...(x,y))
       def self.from_coordinates(points,srid= DEFAULT_SRID,with_z=false,with_m=false)
-        multi_point= MultiPoint::new(srid,with_z,with_m)
+        multi_point= new(srid,with_z,with_m)
         multi_point.concat(points.collect {|point| Point.from_coordinates(point,srid,with_z,with_m)})
         multi_point
       end

data/lib/geo_ruby/simple_features/multi_polygon.rb

@@ -23,13 +23,13 @@ module GeoRuby
       
       #Creates a multi polygon from an array of polygons
       def self.from_polygons(polygons,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        multi_polygon = MultiPolygon::new(srid,with_z,with_m)
+        multi_polygon = new(srid,with_z,with_m)
         multi_polygon.concat(polygons)
         multi_polygon
       end
       #Creates a multi polygon from sequences of points : ((((x,y)...(x,y)),((x,y)...(x,y)),((x,y)...(x,y))) 
       def self.from_coordinates(point_sequence_sequences,srid= DEFAULT_SRID,with_z=false,with_m=false)
-        multi_polygon = MultiPolygon::new(srid,with_z,with_m)
+        multi_polygon = new(srid,with_z,with_m)
         multi_polygon.concat( point_sequence_sequences.collect {|point_sequences| Polygon.from_coordinates(point_sequences,srid,with_z,with_m) } )
         multi_polygon
       end

data/lib/geo_ruby/simple_features/point.rb

@@ -23,6 +23,7 @@ module GeoRuby
         @x=x
         @y=y
         @z=z
+        self
       end
       alias :set_lon_lat_z :set_x_y_z
       
@@ -30,6 +31,7 @@ module GeoRuby
       def set_x_y(x,y)
         @x=x
         @y=y
+        self
       end
       alias :set_lon_lat :set_x_y
       
@@ -193,33 +195,29 @@ module GeoRuby
 
       #creates a point from the X and Y coordinates
       def self.from_x_y(x,y,srid=DEFAULT_SRID)
-        point= Point::new(srid)
+        point= new(srid)
         point.set_x_y(x,y)
-        point
       end
       
       #creates a point from the X, Y and Z coordinates
       def self.from_x_y_z(x,y,z,srid=DEFAULT_SRID)
-        point= Point::new(srid,true)
+        point= new(srid,true)
         point.set_x_y_z(x,y,z)
-        point
       end
       
 
       #creates a point from the X, Y and M coordinates
       def self.from_x_y_m(x,y,m,srid=DEFAULT_SRID)
-        point= Point::new(srid,false,true)
-        point.set_x_y(x,y)
+        point= new(srid,false,true)
         point.m=m
-        point
+        point.set_x_y(x,y)
       end
       
       #creates a point from the X, Y, Z and M coordinates
       def self.from_x_y_z_m(x,y,z,m,srid=DEFAULT_SRID)
-        point= Point::new(srid,true,true)
-        point.set_x_y_z(x,y,z)
+        point= new(srid,true,true)
         point.m=m
-        point
+        point.set_x_y_z(x,y,z)
       end
       
       #aliasing the constructors in case you want to use lat/lon instead of y/x

data/lib/geo_ruby/simple_features/polygon.rb

@@ -111,18 +111,26 @@ module GeoRuby
     
       #creates a new polygon. Accepts an array of linear strings as argument
       def self.from_linear_rings(linear_rings,srid = DEFAULT_SRID,with_z=false,with_m=false)
-        polygon = Polygon::new(srid,with_z,with_m)
+        polygon = new(srid,with_z,with_m)
         polygon.concat(linear_rings)
         polygon
       end
       
       #creates a new polygon. Accepts a sequence of points as argument : ((x,y)....(x,y)),((x,y).....(x,y))
       def self.from_coordinates(point_sequences,srid=DEFAULT_SRID,with_z=false,with_m=false)
-        polygon = Polygon::new(srid,with_z,with_m)
+        polygon = new(srid,with_z,with_m)
         polygon.concat( point_sequences.collect {|points| LinearRing.from_coordinates(points,srid,with_z,with_m) } )
         polygon
       end
 
+      #creates a new polygon from a list of Points (pt1....ptn),(pti....ptj)
+      def self.from_points(point_sequences, srid=DEFAULT_SRID,with_z=false,with_m=false)
+        polygon = new(srid,with_z,with_m)
+        polygon.concat( point_sequences.collect {|points| LinearRing.from_points(points,srid,with_z,with_m) } )
+        polygon
+
+      end
+
     end
   end
 end

data/rakefile.rb

@@ -24,7 +24,7 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'GeoRuby'
-  s.version = "1.2.0"
+  s.version = "1.2.1"
   s.summary = "Ruby data holder for OGC Simple Features"
   s.description = <<EOF
 GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)

data/test/test_simple_features.rb

@@ -145,8 +145,12 @@ class TestSimpleFeatures < Test::Unit::TestCase
     assert_in_delta(554058.924,point1.ellipsoidal_distance(point2),0.001)
          
     assert_in_delta(555811.68,point1.spherical_distance(point2),0.01)
-    
-    
+  end
+
+  def point_subclassable
+    place = Class.new(Point)
+    p = place.from_x_y(0.0,0.0)
+    assert p.is_a?(place)
   end
 
   def test_line_string_creation
@@ -245,7 +249,15 @@ class TestSimpleFeatures < Test::Unit::TestCase
   #no test of the binary representation for linear_rings : always with polygons and like line_string
   def test_polygon_creation
     linear_ring1 = LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],256) 
-    linear_ring2 = LinearRing.from_coordinates([[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]],256) 
+    linear_ring2 = LinearRing.from_coordinates([[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]],256)
+    point1 = Point.from_x_y(12.4,-45.3,256)
+    point2 = Point.from_x_y(45.4,41.6,256)
+    point3 = Point.from_x_y(4.456,1.0698,256)
+    point4 = Point.from_x_y(12.4,-45.3,256)
+    point5 = Point.from_x_y(2.4,5.3,256)
+    point6 = Point.from_x_y(5.4,1.4263,256)
+    point7 = Point.from_x_y(14.46,1.06,256)
+    point8 = Point.from_x_y(2.4,5.3,256)
     
     polygon = Polygon::new(256)
     assert_equal(0,polygon.length)
@@ -271,7 +283,11 @@ class TestSimpleFeatures < Test::Unit::TestCase
     assert_equal(linear_ring1,polygon[0])
     assert_equal(linear_ring2,polygon[1])
 
-    
+    polygon = Polygon.from_points([[point1,point2,point3,point4],[point5,point6,point7,point8]],256)
+    assert_equal(2,polygon.length)
+    assert_equal(linear_ring1,polygon[0])
+    assert_equal(linear_ring2,polygon[1])
+
     polygon = 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)
     assert_equal(Polygon,polygon.class)
     assert_equal(2,polygon.length)
@@ -286,6 +302,8 @@ class TestSimpleFeatures < Test::Unit::TestCase
     assert_equal(2,bbox.length)
     assert_equal(Point.from_x_y_z(4.456,-45.3,2.4),bbox[0])
     assert_equal(Point.from_x_y_z(45.4,41.6,123.1),bbox[1])
+
+    
     
   end
   def test_polygon_equal

data/tools/shp2sql.rb

@@ -1,5 +1,6 @@
 $:.unshift("lib/spatial_adapter/","lib/spatial_adapter/lib")
 
+require 'rubygems'
 require 'geo_ruby'
 include GeoRuby::Shp4r
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-01-20 00:00:00 +01:00
+  version: 1.2.1
+date: 2007-02-20 00:00:00 +01:00
 summary: Ruby data holder for OGC Simple Features
 require_paths: 
 - lib