GeoRuby 1.1.0 → 1.1.1

data/README

@@ -19,7 +19,7 @@ On top of this an Envelope class is available, to contain the bounding box of a
 ===Input and output
 These geometries can be input and output in WKB/EWKB/WKT/EWKT format (as well as the related HexWKB and HexEWKB formats). HexEWKB and WKB are the default form under which geometric data is returned respectively from PostGIS and MySql.
 
-GeoRSS Simple, GeoRSS W3CGeo, GeoRSS GML can also be output. Note that they will not output valid RSS, but just the part strictly concerning the geometry as outlined in http://www.georss.org/1/ . Since the model does not allow multiple geometries, for geometry collections, only the first geometry will be output. Similarly, for polygons, the GeoRSS output will only contain the outer ring. As for W3CGeo output, only points can be output, so the first point of the geometry is chosen. By default the Simple format is output. Envelope can also be output in these formats: The box geometric type is chosen (except for W3CGeo, where the center of the envelope is chose). 
+GeoRSS Simple, GeoRSS W3CGeo, GeoRSS GML can also be input and output. Note that they will not output valid RSS, but just the part strictly concerning the geometry as outlined in http://www.georss.org/1/ . Since the model does not allow multiple geometries, for geometry collections, only the first geometry will be output. Similarly, for polygons, the GeoRSS output will only contain the outer ring. As for W3CGeo output, only points can be output, so the first point of the geometry is chosen. By default the Simple format is output. Envelope can also be output in these formats: The box geometric type is chosen (except for W3CGeo, where the center of the envelope is chose). 
 
 On top of that, there is now support for KML output. As for GeoRSS, a valid KML file will not be output, but only the geometric data. Options <tt>:id</tt>, <tt>:extrude</tt>, <tt>:tesselate</tt> and <tt>:altitude_mode</tt> can be given. Note that if the <tt>:altitude_mode</tt> option is not passed or set to <tt>clampedToGround</tt>, the altitude data will not be output even if present. Envelopes output a LatLonAltBox instead of a geometry.
 
@@ -28,6 +28,7 @@ To install the latest version, just type :
       gem install GeoRuby
 
 ===Changes since the last version
+- Input of GeoRSS geometries (1.1.1)
 - Addition of the Vincenty ellipsoidal distance calculation method
 - The spherical distance now assumes the x and y are in degrees not radians
 - Addition of aliases to the +x+ and +y+ accessors, as well as the <tt>from_x_y_...</tt> constructors so the +x+ can be replaced by +lon+ and +y+ by +lat+.
@@ -36,7 +37,7 @@ To install the latest version, just type :
 
 ===For version 1.2.0
 - Reading (and writing?) of SHP files
-- Parsing of GeoRSS data
+- Documentation
 - Update of the tutorials to show the GeoRSS and KML output, as well as the reading of SHP files
 
 ===License

data/lib/geo_ruby.rb

@@ -11,4 +11,5 @@ require 'geo_ruby/simple_features/envelope'
 require 'geo_ruby/simple_features/ewkb_parser'
 require 'geo_ruby/simple_features/ewkt_parser'
 require 'geo_ruby/simple_features/geometry_factory'
+require 'geo_ruby/simple_features/georss_parser'
 

data/lib/geo_ruby/simple_features/envelope.rb

@@ -1,13 +1,13 @@
 module GeoRuby
   module SimpleFeatures
     
+    #Contains the bounding box of a geometry
     class Envelope 
       attr_accessor :lower_corner, :upper_corner
       attr_accessor :srid, :with_z
       
       #Creates a enw Envelope with +lower_corner+ as the first element of the corners array and +upper_corner+ as the second element
-      def initialize(corners, srid = DEFAULT_SRID, with_z = false)
-        @lower_corner,@upper_corner = corners
+      def initialize(srid = DEFAULT_SRID, with_z = false)
         @srid = srid
         @with_z = with_z
       end
@@ -24,8 +24,8 @@ module GeoRuby
       #Merges the argument with the current evelope and sends back a new
       #envelope without changing the current one
       def extend(envelope)
-        e = Envelope.new([Point.from_x_y(lower_corner.x,lower_corner.y),
-                          Point.from_x_y(upper_corner.x,upper_corner.y)])
+        e = Envelope.from_points([Point.from_x_y(lower_corner.x,lower_corner.y),
+                          Point.from_x_y(upper_corner.x,upper_corner.y)],srid,with_z)
         e.extend!(envelope)
         e
       end
@@ -35,6 +35,15 @@ module GeoRuby
         Point.from_x_y((lower_corner.x + upper_corner.x)/2,(lower_corner.y + upper_corner.y)/2)
       end
 
+      #Tests the equality of line strings
+      def ==(other_envelope)
+        if other_envelope.class != self.class
+          false
+        else
+          upper_corner == other_envelope.upper_corner and lower_corner == other_envelope.lower_corner
+        end
+      end
+
       #georss serialization: Dialect can be passed as option <tt>:dialect</tt> and set to <tt>:simple</tt> (default)
       #<tt>:w3cgeo</tt> or <tt>:gml</tt>. Options <tt>:featuretypetag
       def as_georss(options)
@@ -105,6 +114,21 @@ module GeoRuby
         
         result += "</LatLonAltBox>\n"
       end
+
+      #Creates a new envelope. Accept an array of 2 points as argument
+      def self.from_points(points,srid=DEFAULT_SRID,with_z=false)
+        e = Envelope.new(srid,with_z)
+        e.lower_corner, e.upper_corner = points
+        e
+      end
+
+      #Creates a new envelope. Accept a sequence of points as argument : ((x,y),(x,y))
+      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
+      end
+      
     end
   end
 end

data/lib/geo_ruby/simple_features/geometry.rb

@@ -33,7 +33,7 @@ module GeoRuby#:nodoc:
       
       #Returns an Envelope object for the geometry
       def envelope
-        Envelope.new(bounding_box,srid,with_z)
+        Envelope.from_points(bounding_box,srid,with_z)
       end
             
       #Outputs the geometry as an EWKB string.
@@ -151,6 +151,21 @@ module GeoRuby#:nodoc:
         ewkt_parser.parse(ewkt)
         factory.geometry
       end
+      
+      #sends back a geometry based on the GeoRSS string passed as argument
+      def self.from_georss(georss)
+        georss_parser= GeorssParser::new
+        georss_parser.parse(georss)
+        georss_parser.geometry
+      end
+      
+      #sends back an array: The first element is the goemetry based on the GeoRSS string passed as argument. The second one is the GeoRSSTags (found only with the Simple format)
+      def self.from_georss_with_tags(georss)
+        georss_parser= GeorssParser::new
+        georss_parser.parse(georss,true)
+        [georss_parser.geometry, georss_parser.georss_tags]
+      end
+      
     end
   end
 end

data/lib/geo_ruby/simple_features/geometry_factory.rb

@@ -26,19 +26,35 @@ module GeoRuby
       def add_point_x_y(x,y)
         @geometry_stack.last.set_x_y(x,y)
       end
+      #add 2D points to the current geometry
+      def add_points_x_y(xy)
+        xy.each_slice(2) {|slice| add_point_x_y(*slice)}
+      end
       #add a 3D point to the current geometry
       def add_point_x_y_z(x,y,z)
         @geometry_stack.last.set_x_y_z(x,y,z)
       end
+      #add 3D points to the current geometry
+      def add_points_x_y_z(xyz)
+        xyz.each_slice(3) {|slice| add_point_x_y_z(*slice)}
+      end
       #add a 2D point with M to the current geometry
       def add_point_x_y_m(x,y,m)
         @geometry_stack.last.set_x_y(x,y)
         @geometry_stack.last.m=m
       end
+      #add 2D points with M to the current geometry
+      def add_points_x_y_m(xym)
+        xym.each_slice(3) {|slice| add_point_x_y_m(*slice)}
+      end
       #add a 3D point with M to the current geometry
       def add_point_x_y_z_m(x,y,z,m)
         @geometry_stack.last.set_x_y_z(x,y,z)
         @geometry_stack.last.m=m
+      end
+       #add 3D points with M to the current geometry
+      def add_points_x_y_z_m(xyzm)
+        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)

data/lib/geo_ruby/simple_features/georss_parser.rb

@@ -0,0 +1,135 @@
+require 'geo_ruby/simple_features/point'
+require 'geo_ruby/simple_features/line_string'
+require 'geo_ruby/simple_features/linear_ring'
+require 'geo_ruby/simple_features/polygon'
+require 'geo_ruby/simple_features/multi_point'
+require 'geo_ruby/simple_features/multi_line_string'
+require 'geo_ruby/simple_features/multi_polygon'
+require 'geo_ruby/simple_features/geometry_collection'
+require 'geo_ruby/simple_features/envelope'
+
+module GeoRuby
+  module SimpleFeatures
+
+    #Raised when an error in the GeoRSS string is detected
+    class GeorssFormatError < StandardError
+    end
+
+    #Contains tags possibly found on GeoRss Simple geometries
+    class GeorssTags < Struct.new(:featuretypetag,:relationshiptag,:elev,:floor,:radius)
+    end
+
+    #Parses GeoRSS strings
+    #You can also use directly the static method Geometry.from_georss
+    class GeorssParser
+      attr_reader :georss_tags, :geometry
+ 
+      #Parses the georss geometry  passed as argument and notifies the factory of events
+      #The parser assumes 
+      def parse(georss,with_tags = false)
+        @geometry = nil
+        @georss_tags = GeorssTags.new
+        parse_geometry(georss,with_tags)
+      end
+      
+      private
+      def parse_geometry(georss,with_tags)
+        georss.strip!
+        #check for W3CGeo first
+        if georss =~ /<[^:>]*:lat\s*>([^<]*)</
+          #if valid, it is W3CGeo
+          lat = $1.to_f
+          if georss =~ /<[^:>]*:long\s*>([^<]*)</
+            lon = $1.to_f
+            @geometry = Point.from_x_y(lon,lat)
+          else
+            raise GeorssFormatError.new("Bad W3CGeo GeoRSS format")
+          end
+        elsif georss =~ /^<\s*[^:>]*:where\s*>/
+          #GML format found
+          gml = $'.strip
+          if gml =~ /^<\s*[^:>]*:Point\s*>/
+            #gml point
+            if gml =~ /<\s*[^:>]*:pos\s*>([^<]*)/
+              point = $1.split(" ")
+              #lat comes first
+              @geometry = Point.from_x_y(point[1].to_f,point[0].to_f)
+            else
+              raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed Point")
+            end
+          elsif gml =~ /^<\s*[^:>]*:LineString\s*>/
+            if gml =~ /<\s*[^:>]*:posList\s*>([^<]*)/
+              xy = $1.split(" ")
+              @geometry = LineString.new
+              0.upto(xy.size/2 - 1) { |index| @geometry << Point.from_x_y(xy[index*2 + 1].to_f,xy[index*2].to_f)}
+            else
+              raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed LineString")
+            end
+          elsif gml =~ /^<\s*[^:>]*:Polygon\s*>/
+            if gml =~ /<\s*[^:>]*:posList\s*>([^<]*)/
+              xy = $1.split(" ")
+              @geometry = Polygon.new
+              linear_ring = LinearRing.new
+              @geometry << linear_ring
+              xy = $1.split(" ")
+              0.upto(xy.size/2 - 1) { |index| linear_ring << Point.from_x_y(xy[index*2 + 1].to_f,xy[index*2].to_f)}
+            else
+              raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed Polygon")
+            end
+          elsif gml =~ /^<\s*[^:>]*:Envelope\s*>/
+            if gml =~ /<[^:>]*:LowerCorner\s*>([^<]*)</
+              lc = $1.split(" ").collect { |x| x.to_f}.reverse
+              if gml =~ /<[^:>]*:UpperCorner\s*>([^<]*)</
+                uc = $1.split(" ").collect { |x| x.to_f}.reverse
+                @geometry = Envelope.from_coordinates([lc,uc])
+              else
+                raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed Envelope")
+              end
+            else
+              raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed Envelope")
+            end
+          else
+            raise GeorssFormatError.new("Bad GML GeoRSS format: Unknown geometry type")
+          end
+        else
+          #must be simple format
+          if georss =~ /^<\s*[^>:]*:point([^>]*)>(.*)</m
+            tags = $1
+            point = $2.split(" ")
+            @geometry = Point.from_x_y(point[1].to_f,point[0].to_f)
+          elsif georss =~ /^<\s*[^>:]*:line([^>]*)>(.*)</m
+            tags = $1
+            @geometry = LineString.new
+            xy = $2.split(" ")
+            0.upto(xy.size/2 - 1) { |index| @geometry << Point.from_x_y(xy[index*2 + 1].to_f,xy[index*2].to_f)}
+          elsif georss =~ /^<\s*[^>:]*:polygon([^>]*)>(.*)</m
+            tags = $1
+            @geometry = Polygon.new
+            linear_ring = LinearRing.new
+            @geometry << linear_ring
+            xy = $2.split(" ")
+            0.upto(xy.size/2 - 1) { |index| linear_ring << Point.from_x_y(xy[index*2 + 1].to_f,xy[index*2].to_f)}
+          elsif georss =~ /^<\s*[^>:]*:box([^>]*)>(.*)</m
+            tags = $1
+            corners = []
+            xy = $2.split(" ")
+            0.upto(xy.size/2 - 1) {|index| corners << Point.from_x_y(xy[index*2 + 1].to_f,xy[index*2].to_f)}
+            @geometry = Envelope.from_points(corners)
+          else
+            raise GeorssFormatError.new("Bad Simple GeoRSS format: Unknown geometry type")
+          end
+
+          #geometry found: parse tags
+          return unless with_tags
+
+          @georss_tags.featuretypetag = $1 if tags =~ /featuretypetag="([^"]*)"/
+          @georss_tags.relationshiptag = $1 if tags =~ /relationshiptag="([^"]*)"/
+          @georss_tags.elev = $1.to_f if tags =~ /elev="([^"]*)"/
+          @georss_tags.floor = $1.to_i if tags =~ /floor="([^"]*)"/
+          @georss_tags.radius = $1.to_f if tags =~ /radius="([^"]*)"/
+
+        end
+      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.1.0"
+  s.version = "1.1.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_georss_kml.rb

@@ -7,7 +7,7 @@ include GeoRuby::SimpleFeatures
 
 class TestGeorssKml < Test::Unit::TestCase
 
-  def test_geometry_creation
+  def test_point_creation
     point = Point.from_x_y(3,4)
     
     assert_equal("<georss:point featuretypetag=\"hoyoyo\" elev=\"45.7\">4 3</georss:point>", point.as_georss(:dialect => :simple, :elev => 45.7, :featuretypetag => "hoyoyo").gsub("\n",""))
@@ -65,4 +65,93 @@ class TestGeorssKml < Test::Unit::TestCase
     assert_equal("<LatLonAltBox><north>41.6</north><south>-45.3</south><east>45.4</east><west>4.456</west><minAltitude>-5.4</minAltitude><maxAltitude>34</maxAltitude></LatLonAltBox>",e.as_kml.gsub("\n",""))
   end
 
+  def test_point_georss_read
+    #W3CGeo
+    str = "   <geo:lat >12.3</geo:lat >\n\t  <geo:long>   4.56</geo:long> "
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Point)
+    assert_equal(12.3, geom.lat)
+    assert_equal(4.56, geom.lon)
+
+    str = " <geo:Point> \n \t  <geo:long>   4.56</geo:long> \n\t  <geo:lat >12.3</geo:lat > </geo:Point>  "
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Point)
+    assert_equal(12.3, geom.lat)
+    assert_equal(4.56, geom.lon)
+
+    #gml
+    str = " <georss:where> \t\r  <gml:Point  > \t <gml:pos> 4 \t 3 </gml:pos> </gml:Point> </georss:where>"
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Point)
+    assert_equal(4, geom.lat)
+    assert_equal(3, geom.lon)
+
+
+    #simple 
+    str = "<georss:point > 4 \r\t  3 \t</georss:point >"
+    geom  = Geometry.from_georss(str)
+    assert_equal(geom.class, Point)
+    assert_equal(4, geom.lat)
+    assert_equal(3, geom.lon)
+  
+    #simple with tags
+    str = "<georss:point featuretypetag=\"hoyoyo\"  elev=\"45.7\" \n floor=\"2\" relationshiptag=\"puyopuyo\" radius=\"42\" > 4 \n 3 \t</georss:point >"
+    geom,tags = Geometry.from_georss_with_tags(str)
+    assert_equal(geom.class, Point)
+    assert_equal(4, geom.lat)
+    assert_equal(3, geom.lon)
+    assert_equal("hoyoyo",tags.featuretypetag)
+    assert_equal(45.7,tags.elev)
+    assert_equal("puyopuyo",tags.relationshiptag)
+    assert_equal(2,tags.floor)
+    assert_equal(42,tags.radius)
+  end
+
+  def test_line_string_georss_read
+    ls = LineString.from_points([Point.from_lon_lat(12.4,-45.3),Point.from_lon_lat(45.4,41.6)])
+
+    str = "<georss:line > -45.3 12.4 \n \r41.6\t 45.4</georss:line>"
+    geom  = Geometry.from_georss(str)
+    assert_equal(geom.class, LineString)
+    assert_equal(ls ,geom)
+
+    str = "<georss:where><gml:LineString><gml:posList>-45.3 12.4 41.6 45.4</gml:posList></gml:LineString></georss:where>"
+    geom  = Geometry.from_georss(str)
+    assert_equal(geom.class, LineString)
+    assert_equal(ls ,geom)
+
+  end
+
+  def test_polygon_georss_read
+    linear_ring = LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]]) 
+    polygon = Polygon.from_linear_rings([linear_ring])
+
+    str = "<hoyoyo:polygon featuretypetag=\"42\"  > -45.3 12.4 41.6 \n\r 45.4 1.0698 \r 4.456 -45.3 12.4 </hoyoyo:polygon>"
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Polygon)
+    assert_equal(polygon, geom)
+
+    str = "<georss:where>\r\t \n  <gml:Polygon><gml:exterior>   <gml:LinearRing><gml:posList> -45.3 \n\r 12.4 41.6 \n\t 45.4 1.0698 4.456 -45.3 12.4</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></georss:where>"
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Polygon)
+    assert_equal(polygon, geom)
+  end
+
+  def test_envelope_georss_read
+        
+    e = Envelope.from_coordinates([[4.456,-45.3],[45.4,41.6]])
+    
+    str = "<georss:box  >-45.3 4.456 \n41.6 45.4</georss:box>"
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Envelope)
+    assert_equal(e, geom)
+
+    str = "<georss:where><gml:Envelope><gml:LowerCorner>-45.3 \n 4.456</gml:LowerCorner><gml:UpperCorner>41.6 \t\n 45.4</gml:UpperCorner></gml:Envelope></georss:where>"
+    geom = Geometry.from_georss(str)
+    assert_equal(geom.class, Envelope)
+    assert_equal(e, geom)
+
+  end
+
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-12-31 00:00:00 +01:00
+  version: 1.1.1
+date: 2007-01-02 00:00:00 +01:00
 summary: Ruby data holder for OGC Simple Features
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - lib/geo_ruby/simple_features/geometry.rb
 - lib/geo_ruby/simple_features/geometry_collection.rb
 - lib/geo_ruby/simple_features/geometry_factory.rb
+- lib/geo_ruby/simple_features/georss_parser.rb
 - lib/geo_ruby/simple_features/linear_ring.rb
 - lib/geo_ruby/simple_features/line_string.rb
 - lib/geo_ruby/simple_features/multi_line_string.rb