nofxx-georuby 1.6.2 → 1.7.1

data/README.txt

@@ -35,36 +35,36 @@ Georuby has support for reading ESRI shapefiles (http://www.esri.com/library/whi
 
 Here is an example of Shapefile reading, that goes through all the geometries in a file and disaply the values of the attributes :
 
-        require 'geo_ruby/shp'
-
-        ShpFile.open(shpfile) do |shp|
-                shp.each do |shape|
-                        geom = shape.geometry #a GeoRuby SimpleFeature
-                        att_data = shape.data #a Hash
-                        shp.fields.each do |field|
-                                puts att_data[field.name]
-                        end
-                end
+      require 'geo_ruby/shp'
+																	 
+      ShpFile.open(shpfile) do |shp|
+        shp.each do |shape|
+          geom = shape.geometry #a GeoRuby SimpleFeature
+          att_data = shape.data #a Hash
+          shp.fields.each do |field|
+            puts att_data[field.name]
+          end
         end
+      end
 
 Support for ESRI shapefile creation and modification has been added as well. New shapefiles can be created given a geometry type and specifications for the DBF fields. Data can be added and removed from an existing shapefile. An update operation is also provided for convenience : it just performs a 'delete' and an 'add', which means the index of the modified record will change. Note that once a shapefile has been created, GeoRuby does not allow the modification of the schema (it will probably be done in a subsequent version).
 
 Here is an example of how to create a new Shapefile with 2 fields :
-
-        shpfile = ShpFile.create('hello.shp',ShpType::POINT,[Dbf::Field.new("Hoyoyo","C",10),Dbf::Field.new("Boyoul","N",10,0)])
+																	 
+      shpfile = ShpFile.create('hello.shp',ShpType::POINT,[Dbf::Field.new("Hoyoyo","C",10),Dbf::Field.new("Boyoul","N",10,0)])
 
 The file is then open for reading and writing.
 
 Here is an example of how to write to a shapefile (created or not with GeoRuby) :
 
-        shpfile = ShpFile.open('places.shp')
-        shpfile.transaction do |tr|
-                tr.add(ShpRecord.new(Point.from_x_y(123.4,123.4),'Hoyoyo' => "AEZ",'Bouyoul' => 45))
-                tr.update(4,ShpRecord.new(Point.from_x_y(-16.67,16.41),'Hoyoyo' => "EatMe",'Bouyoul' => 42))
-                tr.delete(1)
-        end
-        shpfile.close
-
+      shpfile = ShpFile.open('places.shp')
+      shpfile.transaction do |tr|
+        tr.add(ShpRecord.new(Point.from_x_y(123.4,123.4),'Hoyoyo' => "AEZ",'Bouyoul' => 45))
+        tr.update(4,ShpRecord.new(Point.from_x_y(-16.67,16.41),'Hoyoyo' => "EatMe",'Bouyoul' => 42))
+        tr.delete(1)
+      end
+      shpfile.close
+																	 
 Note the transaction is just there so the operations on the files can be buffered. Nothing happens on the original files until the block has finished executing. Calling <tt>tr.rollback</tt> at anytime during the execution will prevent the modifications.
 
 Also currently, error reporting is minimal and it has not been tested that thoroughly so caveat emptor and backup before performing any destructive operation.

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "georuby"
+    gem.name = "nofxx-georuby"
     gem.summary = "Ruby data holder for OGC Simple Features"
     gem.description = "GeoRuby provides geometric data types from the OGC 'Simple Features' specification."
     gem.email = "x@nofxx.com"

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.7.1

data/lib/geo_ruby/gpx4r/gpx.rb

@@ -75,7 +75,7 @@ module GeoRuby
       # If the GPX isn't closed, a line from the first
       # to the last point will be created to close it.
       def as_polygon
-        Polygon.from_points([@points[0] == @points[-1] ?  @points : @points << @points[0] ])
+        Polygon.from_points([@points[0] == @points[-1] ?  @points : @points.push(@points[0].clone)])
       end
 
       # Return GPX Envelope

data/lib/geo_ruby/shp4r/dbf.rb

@@ -1,7 +1,11 @@
 # Uses the dbf lib, Copyright 2006 Keith Morrison (http://infused.org)
 # Modified to work as external gem now
 require 'rubygems'
-require 'dbf'
+begin
+  require 'dbf'
+rescue LoadError
+  puts "Unable to find gem 'dbf'. Please install."
+end
 
 module GeoRuby
   module Shp4r

data/lib/geo_ruby/simple_features/envelope.rb

@@ -7,7 +7,7 @@ module GeoRuby
       attr_accessor :srid, :with_z, :zoom
 
       #Creates a enw Envelope with +lower_corner+ as the first element of the corners array and +upper_corner+ as the second element
-      def initialize(srid = @@default_srid, with_z = false)
+      def initialize(srid = DEFAULT_SRID, with_z = false)
         @srid = srid
         @with_z = with_z
       end
@@ -148,7 +148,7 @@ module GeoRuby
       end
 
       #Creates a new envelope. Accept an array of 2 points as argument
-      def self.from_points(points,srid=@@default_srid,with_z=false)
+      def self.from_points(points,srid=DEFAULT_SRID,with_z=false)
         raise "Not an array" unless points.class == Array
         e = Envelope.new(srid,with_z)
         e.lower_corner, e.upper_corner = points
@@ -156,7 +156,7 @@ module GeoRuby
       end
 
       #Creates a new envelope. Accept a sequence of point coordinates as argument : ((x,y),(x,y))
-      def self.from_coordinates(points,srid=@@default_srid,with_z=false)
+      def self.from_coordinates(points,srid=DEFAULT_SRID,with_z=false)
         e = Envelope.new(srid,with_z)
         e.lower_corner, e.upper_corner =  points.collect{|point_coords| Point.from_coordinates(point_coords,srid,with_z)}
         e

data/lib/geo_ruby/simple_features/ewkb_parser.rb

@@ -67,7 +67,7 @@ module GeoRuby
           @geometry_type = @geometry_type & ~SRID_MASK
         else
           #to manage multi geometries : the srid is not present in sub_geometries, therefore we take the srid of the parent ; if it is the root, we take the default srid
-          @srid= @srid || @@default_srid
+          @srid= @srid || DEFAULT_SRID
         end
 
         if @parse_options.has_key? @geometry_type

data/lib/geo_ruby/simple_features/ewkt_parser.rb

@@ -68,7 +68,7 @@ module GeoRuby
 
         else
           #to manage multi geometries : the srid is not present in sub_geometries, therefore we take the srid of the parent ; if it is the root, we take the default srid
-          @srid= @srid || @@default_srid
+          @srid= @srid || DEFAULT_SRID
           geom_type = token
         end
 

data/lib/geo_ruby/simple_features/geometry.rb

@@ -1,14 +1,8 @@
 module GeoRuby#:nodoc:
   module SimpleFeatures
     #arbitrary default SRID
-    @@default_srid = 4326
+    DEFAULT_SRID = 4326 unless defined? DEFAULT_SRID
 
-    def self.default_srid
-      @@default_srid
-    end
-    def self.srid=(srid)
-      @@default_srid = srid
-    end
 
     #Root of all geometric data classes.
     #Objects of class Geometry should not be instantiated.
@@ -22,7 +16,7 @@ module GeoRuby#:nodoc:
       attr_accessor :with_m
       alias :with_m? :with_m
 
-      def initialize(srid=@@default_srid,with_z=false,with_m=false)
+      def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)
         @srid=srid
         @with_z=with_z
         @with_m=with_m

data/lib/geo_ruby/simple_features/geometry_collection.rb

@@ -6,7 +6,7 @@ module GeoRuby
     class GeometryCollection < Geometry
       attr_reader :geometries
 
-      def initialize(srid = @@default_srid,with_z=false,with_m=false)
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
         @geometries = []
       end
@@ -126,7 +126,7 @@ module GeoRuby
       end
 
       #creates a new GeometryCollection from an array of geometries
-      def self.from_geometries(geometries,srid=@@default_srid,with_z=false,with_m=false)
+      def self.from_geometries(geometries,srid=DEFAULT_SRID,with_z=false,with_m=false)
         geometry_collection = new(srid,with_z,with_m)
         geometry_collection.concat(geometries)
         geometry_collection

data/lib/geo_ruby/simple_features/geometry_factory.rb

@@ -59,7 +59,7 @@ module GeoRuby
         xyzm.each_slice(4) {|slice| add_point_x_y_z_m(*slice)}
       end
       #begin a geometry of type +geometry_type+
-      def begin_geometry(geometry_type,srid=@@default_srid)
+      def begin_geometry(geometry_type,srid=DEFAULT_SRID)
         geometry= geometry_type::new(srid)
         @geometry= geometry if @geometry.nil?
         @geometry_stack << geometry

data/lib/geo_ruby/simple_features/line_string.rb

@@ -7,7 +7,7 @@ module GeoRuby
       #the list of points forming the line string
       attr_reader :points
 
-      def initialize(srid= @@default_srid,with_z=false,with_m=false)
+      def initialize(srid= DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
         @points=[]
       end
@@ -167,14 +167,14 @@ module GeoRuby
       end
 
       #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)
+      def self.from_points(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
         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)
+      def self.from_coordinates(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
         line_string = new(srid,with_z,with_m)
         line_string.concat( points.map {|p| Point.from_coordinates(p,srid,with_z,with_m) } )
         line_string

data/lib/geo_ruby/simple_features/linear_ring.rb

@@ -4,7 +4,7 @@ module GeoRuby
   module SimpleFeatures
     #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)
+      def initialize(srid= DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
       end
     end

data/lib/geo_ruby/simple_features/multi_line_string.rb

@@ -1,10 +1,13 @@
 require 'geo_ruby/simple_features/geometry_collection'
 
 module GeoRuby
+
   module SimpleFeatures
+
     #Represents a group of line strings (see LineString).
     class MultiLineString < GeometryCollection
-      def initialize(srid = @@default_srid,with_z=false,with_m=false)
+
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid)
       end
 
@@ -12,24 +15,33 @@ module GeoRuby
         5
       end
 
+      def points
+        geometries.map(&:points).flatten
+      end
+
       #Text representation of a multi line string
       def text_representation(allow_z=true,allow_m=true) #:nodoc:
         @geometries.collect{|line_string| "(" + line_string.text_representation(allow_z,allow_m) + ")" }.join(",")
       end
+
       #WKT geometry type
       def text_geometry_type #:nodoc:
         "MULTILINESTRING"
       end
 
+      def to_line_string(join = true)
+        LineString.from_points(points)
+      end
+
       #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)
+      def self.from_line_strings(line_strings,srid=DEFAULT_SRID,with_z=false,with_m=false)
         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)
+      def self.from_coordinates(point_sequences,srid=DEFAULT_SRID,with_z=false,with_m=false)
         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

data/lib/geo_ruby/simple_features/multi_point.rb

@@ -5,7 +5,7 @@ module GeoRuby
     #Represents a group of points (see Point).
     class MultiPoint < GeometryCollection
 
-      def initialize(srid= @@default_srid,with_z=false,with_m=false)
+      def initialize(srid= DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
       end
 
@@ -13,24 +13,29 @@ module GeoRuby
         4
       end
 
+      def points
+        @geometries
+      end
+
       #Text representation of a MultiPoint
       def text_representation(allow_z=true,allow_m=true) #:nodoc:
         "(" + @geometries.collect{|point| point.text_representation(allow_z,allow_m)}.join("),(") + ")"
       end
+
       #WKT geoemtry type
       def text_geometry_type #:nodoc:
         "MULTIPOINT"
       end
 
       #Creates a new multi point from an array of points
-      def self.from_points(points,srid= @@default_srid,with_z=false,with_m=false)
+      def self.from_points(points,srid= DEFAULT_SRID,with_z=false,with_m=false)
         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)
+      def self.from_coordinates(points,srid= DEFAULT_SRID,with_z=false,with_m=false)
         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

data/lib/geo_ruby/simple_features/multi_polygon.rb

@@ -1,37 +1,52 @@
 require 'geo_ruby/simple_features/geometry_collection'
 
 module GeoRuby
+
   module SimpleFeatures
+
     #Represents a group of polygons (see Polygon).
-   class MultiPolygon < GeometryCollection
-      def initialize(srid = @@default_srid,with_z=false,with_m=false)
+    class MultiPolygon < GeometryCollection
+
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid)
       end
 
       def binary_geometry_type #:nodoc:
         6
       end
+
+      def points
+        @points ||= geometries.inject([]) do |arr, r|
+          arr.concat(r.rings.map(&:points).flatten)
+        end
+      end
+
       #Text representation of a MultiPolygon
       def text_representation(allow_z=true,allow_m=true) #:nodoc:
-        @geometries.collect{|polygon| "(" + polygon.text_representation(allow_z,allow_m) + ")"}.join(",")
+        @geometries.map {|polygon| "(" + polygon.text_representation(allow_z,allow_m) + ")"}.join(",")
       end
+
       #WKT geometry type
       def text_geometry_type #:nodoc:
         "MULTIPOLYGON"
       end
 
       #Creates a multi polygon from an array of polygons
-      def self.from_polygons(polygons,srid=@@default_srid,with_z=false,with_m=false)
+      def self.from_polygons(polygons,srid=DEFAULT_SRID,with_z=false,with_m=false)
         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)
+      def self.from_coordinates(point_sequence_sequences,srid= DEFAULT_SRID,with_z=false,with_m=false)
         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
+
     end
+
   end
+
 end

data/lib/geo_ruby/simple_features/point.rb

@@ -17,7 +17,7 @@ module GeoRuby
       alias :tet :t
       alias :tetha :t
 
-      def initialize(srid=@@default_srid,with_z=false,with_m=false)
+      def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
         @x = @y = 0.0
         @z=0.0 #default value : meaningful if with_z
@@ -261,7 +261,7 @@ module GeoRuby
       end
 
       #creates a point from an array of coordinates
-      def self.from_coordinates(coords,srid=@@default_srid,with_z=false,with_m=false)
+      def self.from_coordinates(coords,srid=DEFAULT_SRID,with_z=false,with_m=false)
         if ! (with_z or with_m)
           from_x_y(coords[0],coords[1],srid)
         elsif with_z and with_m
@@ -274,26 +274,26 @@ module GeoRuby
       end
 
       #creates a point from the X and Y coordinates
-      def self.from_x_y(x,y,srid=@@default_srid)
+      def self.from_x_y(x,y,srid=DEFAULT_SRID)
         point= new(srid)
         point.set_x_y(x,y)
       end
 
       #creates a point from the X, Y and Z coordinates
-      def self.from_x_y_z(x,y,z,srid=@@default_srid)
+      def self.from_x_y_z(x,y,z,srid=DEFAULT_SRID)
         point= new(srid,true)
         point.set_x_y_z(x,y,z)
       end
 
       #creates a point from the X, Y and M coordinates
-      def self.from_x_y_m(x,y,m,srid=@@default_srid)
+      def self.from_x_y_m(x,y,m,srid=DEFAULT_SRID)
         point= new(srid,false,true)
         point.m=m
         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)
+      def self.from_x_y_z_m(x,y,z,m,srid=DEFAULT_SRID)
         point= new(srid,true,true)
         point.m=m
         point.set_x_y_z(x,y,z)
@@ -301,7 +301,7 @@ module GeoRuby
 
       #creates a point using polar coordinates
       #r and theta(degrees)
-      def self.from_r_t(r,t,srid=@@default_srid)
+      def self.from_r_t(r,t,srid=DEFAULT_SRID)
         t *= DEG2RAD
         x = r * Math.cos(t)
         y = r * Math.sin(t)
@@ -310,7 +310,7 @@ module GeoRuby
       end
 
       #creates a point using coordinates like 22`34 23.45N
-      def self.from_latlong(lat,lon,srid=@@default_srid)
+      def self.from_latlong(lat,lon,srid=DEFAULT_SRID)
         p = [lat,lon].map do |l|
           sig, deg, min, sec, cen = l.scan(/(-)?(\d{1,2})\D*(\d{2})\D*(\d{2})(\D*(\d{1,3}))?/).flatten
           sig = true if l =~ /W|S/

data/lib/geo_ruby/simple_features/polygon.rb

@@ -1,13 +1,15 @@
 require 'geo_ruby/simple_features/geometry'
 
 module GeoRuby
+
   module SimpleFeatures
+
     #Represents a polygon as an array of linear rings (see LinearRing). No check is performed regarding the validity of the geometries forming the polygon.
     class Polygon < Geometry
       #the list of rings forming the polygon
       attr_reader :rings
 
-      def initialize(srid = @@default_srid,with_z=false,with_m=false)
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid,with_z,with_m)
         @rings = []
       end
@@ -64,12 +66,14 @@ module GeoRuby
           true
         end
       end
+
       #binary representation of a polygon, without the headers neccessary for a valid WKB string
       def binary_representation(allow_z=true,allow_m=true)
         rep = [length].pack("V")
         each {|linear_ring| rep << linear_ring.binary_representation(allow_z,allow_m)}
         rep
       end
+
       #WKB geometry type
       def binary_geometry_type
         3
@@ -79,6 +83,7 @@ module GeoRuby
       def text_representation(allow_z=true,allow_m=true)
         @rings.collect{|line_string| "(" + line_string.text_representation(allow_z,allow_m) + ")" }.join(",")
       end
+
       #WKT geometry type
       def text_geometry_type
         "POLYGON"
@@ -90,6 +95,7 @@ module GeoRuby
         geom_attr = options[:geom_attr]
         "<#{georss_ns}:polygon#{geom_attr}>" + self[0].georss_poslist + "</#{georss_ns}:polygon>\n"
       end
+
       #georss w3c representation : outputs the first point of the outer ring
       def georss_w3cgeo_representation(options)
         w3cgeo_ns = options[:w3cgeo_ns] || "geo"
@@ -124,27 +130,28 @@ module GeoRuby
       end
 
       #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)
+      def self.from_linear_rings(linear_rings,srid = DEFAULT_SRID,with_z=false,with_m=false)
         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)
+      def self.from_coordinates(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_coordinates(points,srid,with_z,with_m) } )
+        polygon.concat( point_sequences.map {|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)
+      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.concat( point_sequences.map {|points| LinearRing.from_points(points,srid,with_z,with_m) } )
         polygon
-
       end
 
     end
+
   end
+
 end

data/{georuby.gemspec → nofxx-georuby.gemspec}

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{georuby}
-  s.version = "1.6.2"
+  s.name = %q{nofxx-georuby}
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilhem Vellut", "Marcos Augusto"]
-  s.date = %q{2009-08-16}
+  s.date = %q{2010-01-28}
   s.description = %q{GeoRuby provides geometric data types from the OGC 'Simple Features' specification.}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "README.txt",
      "Rakefile",
      "VERSION",
-     "georuby.gemspec",
      "lib/geo_ruby.rb",
      "lib/geo_ruby/gpx.rb",
      "lib/geo_ruby/gpx4r/gpx.rb",
@@ -45,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/geo_ruby/simple_features/multi_polygon.rb",
      "lib/geo_ruby/simple_features/point.rb",
      "lib/geo_ruby/simple_features/polygon.rb",
+     "nofxx-georuby.gemspec",
      "script/console",
      "script/destroy",
      "script/generate",
@@ -94,24 +94,24 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby data holder for OGC Simple Features}
   s.test_files = [
-    "spec/geo_ruby_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/geo_ruby/gpx4r/gpx_spec.rb",
+    "spec/geo_ruby/gpx4r/gpx_spec.rb",
      "spec/geo_ruby/shp4r/shp_spec.rb",
-     "spec/geo_ruby/simple_features/point_spec.rb",
-     "spec/geo_ruby/simple_features/geometry_factory_spec.rb",
      "spec/geo_ruby/simple_features/envelope_spec.rb",
-     "spec/geo_ruby/simple_features/polygon_spec.rb",
-     "spec/geo_ruby/simple_features/line_string_spec.rb",
-     "spec/geo_ruby/simple_features/multi_line_string_spec.rb",
-     "spec/geo_ruby/simple_features/ewkt_parser_spec.rb",
      "spec/geo_ruby/simple_features/ewkb_parser_spec.rb",
-     "spec/geo_ruby/simple_features/linear_ring_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/multi_polygon_spec.rb",
-     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_factory_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_spec.rb",
      "spec/geo_ruby/simple_features/georss_parser_spec.rb",
-     "spec/geo_ruby/simple_features/geometry_spec.rb"
+     "spec/geo_ruby/simple_features/line_string_spec.rb",
+     "spec/geo_ruby/simple_features/linear_ring_spec.rb",
+     "spec/geo_ruby/simple_features/multi_line_string_spec.rb",
+     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/multi_polygon_spec.rb",
+     "spec/geo_ruby/simple_features/point_spec.rb",
+     "spec/geo_ruby/simple_features/polygon_spec.rb",
+     "spec/geo_ruby_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -124,3 +124,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/spec/geo_ruby/gpx4r/gpx_spec.rb

@@ -72,14 +72,6 @@ describe Gpx4r do
       @gpxfile3.as_polyline.should be_instance_of LineString
     end
 
-    it "should return it as a polygon" do
-      @gpxfile.as_polygon.should be_instance_of Polygon
-    end
-
-    it "should return it as a polygon 3" do
-      @gpxfile3.as_polygon.should be_instance_of Polygon
-    end
-
     it "should return a envelope" do
       @gpxfile.envelope.should be_instance_of Envelope
       @gpxfile.envelope.lower_corner.x.should be_close(9.08128, 0.001)
@@ -92,6 +84,15 @@ describe Gpx4r do
       @gpxfile3.envelope.lower_corner.y.should be_close(-17.547636, 0.001)
     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[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)

data/spec/geo_ruby/shp4r/shp_spec.rb

@@ -23,7 +23,7 @@ describe Shp4r do
     end
 
     it "should parse record 1" do
-      rec = @shpfile.first
+      rec = @shpfile[0]
       rec.geometry.should be_kind_of Point
       rec.geometry.x.should be_close(-90.08375, 0.00001)
       rec.geometry.y.should be_close(34.39996, 0.00001)
@@ -60,7 +60,7 @@ describe Shp4r do
     end
 
     it "should parse record 1" do
-      rec = @shpfile.first
+      rec = @shpfile[0]
       rec.geometry.should be_kind_of MultiLineString
       rec.geometry.length.should eql(1)
       rec.geometry[0].length.should eql(6)
@@ -87,7 +87,7 @@ describe Shp4r do
     end
 
     it "should parse record 1" do
-      rec = @shpfile.first
+      rec = @shpfile[0]
       rec.geometry.should be_kind_of MultiPolygon
       rec.geometry.length.should eql(1)
       rec.geometry[0].length.should eql(1)

data/spec/geo_ruby/simple_features/multi_line_string_spec.rb

@@ -4,12 +4,12 @@ describe 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.should be_instance_of(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_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_string1.should be_instance_of(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)
 
@@ -32,4 +32,23 @@ describe MultiLineString do
     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)
+    end
+
+    it "should have a accessor to all points" do
+      @mls.points.should be_instance_of(Array)
+    end
+
+    it "should flatten the array" do
+      @mls.should have(5).points
+    end
+
+    it "should simplify to linestring" do
+      ls = @mls.to_line_string
+      ls.should be_instance_of(LineString)
+      ls.should have(5).points
+    end
+  end
 end

data/spec/geo_ruby/simple_features/multi_point_spec.rb

@@ -4,7 +4,7 @@ describe 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.should be_instance_of(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)
@@ -26,4 +26,10 @@ describe MultiPoint do
     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.should have(3).geometries
+    mp.should have(3).points
+  end
+
 end

data/spec/geo_ruby/simple_features/multi_polygon_spec.rb

@@ -4,12 +4,12 @@ describe 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.should be_instance_of(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_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_polygon1.should be_instance_of(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)
@@ -32,4 +32,19 @@ describe MultiPolygon do
     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)
+    end
+
+    it "should have a points method" do
+      @mp.points[0].should be_instance_of(Point)
+    end
+
+    it "should flatten it right" do
+      @mp.should have(18).points
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-georuby
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  version: 1.7.1
 platform: ruby
 authors: 
 - Guilhem Vellut
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2010-01-28 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - README.txt
 - Rakefile
 - VERSION
-- georuby.gemspec
 - lib/geo_ruby.rb
 - lib/geo_ruby/gpx.rb
 - lib/geo_ruby/gpx4r/gpx.rb
@@ -52,6 +51,7 @@ files:
 - lib/geo_ruby/simple_features/multi_polygon.rb
 - lib/geo_ruby/simple_features/point.rb
 - lib/geo_ruby/simple_features/polygon.rb
+- nofxx-georuby.gemspec
 - script/console
 - script/destroy
 - script/generate
@@ -94,9 +94,10 @@ files:
 - spec/geo_ruby_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/nofxx/georuby
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -122,21 +123,21 @@ signing_key:
 specification_version: 3
 summary: Ruby data holder for OGC Simple Features
 test_files: 
-- spec/geo_ruby_spec.rb
-- spec/spec_helper.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
-- spec/geo_ruby/simple_features/point_spec.rb
-- spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
-- spec/geo_ruby/simple_features/polygon_spec.rb
-- spec/geo_ruby/simple_features/line_string_spec.rb
-- spec/geo_ruby/simple_features/multi_line_string_spec.rb
-- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
 - spec/geo_ruby/simple_features/ewkb_parser_spec.rb
-- spec/geo_ruby/simple_features/linear_ring_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/multi_polygon_spec.rb
-- spec/geo_ruby/simple_features/multi_point_spec.rb
-- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/geometry_spec.rb
+- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/line_string_spec.rb
+- spec/geo_ruby/simple_features/linear_ring_spec.rb
+- spec/geo_ruby/simple_features/multi_line_string_spec.rb
+- spec/geo_ruby/simple_features/multi_point_spec.rb
+- spec/geo_ruby/simple_features/multi_polygon_spec.rb
+- spec/geo_ruby/simple_features/point_spec.rb
+- spec/geo_ruby/simple_features/polygon_spec.rb
+- spec/geo_ruby_spec.rb
+- spec/spec_helper.rb