GeoRuby 1.2.2 → 1.2.3

data/README

@@ -1,5 +1,5 @@
 =GeoRuby
-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). 
+This is GeoRuby 1.2.3 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 :
@@ -21,7 +21,7 @@ These geometries can be input and output in WKB/EWKB/WKT/EWKT format (as well as
 
 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). These formats can also be input and a GeoRuby geometry will be created. Note that it will not read a valid RSS file, only a geometry string.
 
-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>clampToGround</tt>, the altitude data will not be output even if present. Envelopes output a LatLonAltBox instead of a geometry.
+On top of that, there is now support for KML output and input. 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>clampToGround</tt>, the altitude data will not be output even if present. Envelopes output a LatLonAltBox instead of a geometry. For the output, the following geometric types are supported : Point, LineString, Polygon.
 
 ===SHP Reading
 Support for reading ESRI shapefiles (http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf) has been added. A tool called <tt>shp2sql.rb</tt> is also provided : it shows how to use the SHP reading functionality together with the spatial adapter plugin for Rails to import spatial features into MySQL and PostGIS.

data/lib/geo_ruby/shp4r/shp.rb

@@ -177,12 +177,12 @@ module GeoRuby
           @shp.seek(16,IO::SEEK_CUR)
           ms = Array.new(num_points) {@shp.read(8).unpack("E")[0]}
           points = Array.new(num_points) do |i|
-            Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
+            GeoRuby::SimpleFeatures::Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
           line_strings = Array.new(num_parts) do |i|
-            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],DEFAULT_SRID,true,true)
+            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::DEFAULT_SRID,true,true)
           end
-          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,DEFAULT_SRID,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,GeoRuby::SimpleFeatures::DEFAULT_SRID,true,true)
 
           
         when ShpType::POLYGONZ
@@ -201,9 +201,9 @@ module GeoRuby
             Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
           linear_rings = Array.new(num_parts) do |i|
-            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],DEFAULT_SRID,true,true)
+            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::DEFAULT_SRID,true,true)
           end
-          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],DEFAULT_SRID,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],GeoRuby::SimpleFeatures::DEFAULT_SRID,true,true)
 
 
         when ShpType::MULTIPOINTZ
@@ -219,7 +219,7 @@ module GeoRuby
             Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
           
-          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,DEFAULT_SRID,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,GeoRuby::SimpleFeatures::DEFAULT_SRID,true,true)
 
         when ShpType::POINTM
           x, y, m = @shp.read(24).unpack("E3")
@@ -237,9 +237,9 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
           line_strings = Array.new(num_parts) do |i|
-            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],DEFAULT_SRID,false,true)
+            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::DEFAULT_SRID,false,true)
           end
-          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,DEFAULT_SRID,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,GeoRuby::SimpleFeatures::DEFAULT_SRID,false,true)
 
           
         when ShpType::POLYGONM
@@ -256,9 +256,9 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
           linear_rings = Array.new(num_parts) do |i|
-            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],DEFAULT_SRID,false,true)
+            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::DEFAULT_SRID,false,true)
           end
-          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],DEFAULT_SRID,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],GeoRuby::SimpleFeatures::DEFAULT_SRID,false,true)
 
 
         when ShpType::MULTIPOINTM
@@ -272,7 +272,7 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
           
-          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,DEFAULT_SRID,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,GeoRuby::SimpleFeatures::DEFAULT_SRID,false,true)
         else
           geometry = nil
         end

data/lib/geo_ruby/simple_features/envelope.rb

@@ -122,7 +122,7 @@ module GeoRuby
         e
       end
 
-      #Creates a new envelope. Accept a sequence of points as argument : ((x,y),(x,y))
+      #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)
         e = Envelope.new(srid,with_z)
         e.lower_corner, e.upper_corner =  points.collect{|point_coords| Point.from_coordinates(point_coords,srid,with_z)}

data/lib/geo_ruby/simple_features/georss_parser.rb

@@ -77,9 +77,9 @@ module GeoRuby
               raise GeorssFormatError.new("Bad GML GeoRSS format: Malformed Polygon")
             end
           elsif gml =~ /^<\s*[^:>]*:Envelope\s*>/
-            if gml =~ /<[^:>]*:LowerCorner\s*>([^<]*)</
+            if gml =~ /<\s*[^:>]*:lowerCorner\s*>([^<]*)</
               lc = $1.split(" ").collect { |x| x.to_f}.reverse
-              if gml =~ /<[^:>]*:UpperCorner\s*>([^<]*)</
+              if gml =~ /<\s*[^:>]*:upperCorner\s*>([^<]*)</
                 uc = $1.split(" ").collect { |x| x.to_f}.reverse
                 @geometry = Envelope.from_coordinates([lc,uc])
               else
@@ -95,24 +95,24 @@ module GeoRuby
           #must be simple format
           if georss =~ /^<\s*[^>:]*:point([^>]*)>(.*)</m
             tags = $1
-            point = $2.split(" ")
+            point = $2.gsub(","," ").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(" ")
+            xy = $2.gsub(","," ").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(" ")
+            xy = $2.gsub(","," ").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(" ")
+            xy = $2.gsub(","," ").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
@@ -122,11 +122,11 @@ module GeoRuby
           #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="([^"]*)"/
+          @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

data/lib/geo_ruby/simple_features/point.rb

@@ -4,11 +4,11 @@ module GeoRuby
   module SimpleFeatures
     #Represents a point. It is in 3D if the Z coordinate is not +nil+.
     class Point < Geometry
-      
-      
+            
       attr_accessor :x,:y,:z,:m
-      #if you prefer calling the coordinates lat and lon
+      #if you prefer calling the coordinates lat and lon (or lng, for GeoKit compatibility)
       alias :lon :x
+      alias :lng :x
       alias :lat :y
       
       def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)

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.2"
+  s.version = "1.2.3"
   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

@@ -146,7 +146,7 @@ class TestGeorssKml < Test::Unit::TestCase
     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>"
+    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)

metadata

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