GeoRuby 0.0.2 → 0.0.3

data/README

@@ -1,5 +1,5 @@
 =GeoRuby
-This is GeoRuby 0.0.2. It is intended as a holder for data returned from PostGIS queries. Therefore, 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 0.0.3. It is intended as a holder for data returned from PostGIS queries. Therefore, 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 :
@@ -13,12 +13,15 @@ The following geometric data types are provided :
 - Geometry collection
 
 ===Input and output
-These geometries can be input and output in WKB/EWKB format (as well as the related HexWKB and HexEWKB formats). Since EWKB and HexEWKB are respectively the canonical binary and ASCII representations of geometries in PostGIS, this functionality can prove useful. Geometries can also be output as WKT/EWKT.
+These geometries can be input and output in WKB/EWKB/WKT/EWKT format (as well as the related HexWKB and HexEWKB formats). Since EWKB and HexEWKB are respectively the canonical binary and ASCII representations of geometries in PostGIS, this functionality can prove useful.
 
 ===Installation
 Just type :
       gem install GeoRuby
 
+===Changes since the last version
+Geometries can be input in WKT/EWKT format
+
 ===License
 GeoRuby is released under the MIT license.
 

data/lib/geo_ruby.rb

@@ -8,5 +8,6 @@ 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/ewkb_parser'
+require 'geo_ruby/simple_features/ewkt_parser'
 require 'geo_ruby/simple_features/geometry_factory'
 

data/lib/geo_ruby/simple_features/ewkb_parser.rb

@@ -37,6 +37,7 @@ module GeoRuby
         @unpack_structure=UnpackStructure::new(ewkb)
         parse_geometry
         @unpack_structure.done
+        @srid=nil
       end
       private
       def parse_geometry
@@ -67,15 +68,15 @@ module GeoRuby
       def parse_geometry_collection
         parse_multi_geometries(GeometryCollection)
       end
-      ##must be corrected : endianness + geometry_type present
+      
       def parse_multi_polygon
         parse_multi_geometries(MultiPolygon)
       end
-      #must be corrected
+      
       def parse_multi_line_string
         parse_multi_geometries(MultiLineString)
       end
-      #must be corrected
+      
       def parse_multi_point
         parse_multi_geometries(MultiPoint)
       end

data/lib/geo_ruby/simple_features/ewkt_parser.rb

@@ -0,0 +1,138 @@
+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 'strscan'
+
+module GeoRuby
+  module SimpleFeatures
+    #Parses EWKT strings and notifies of events (such as the beginning of the definition of geometry, the value of the SRID...) the factory passed as argument to the constructor.
+    #
+    #=Example
+    # factory = GeometryFactory::new
+    # ewkt_parser = EWKTParser::new(factory)
+    # ewkt_parser.parse(<EWKT String>)
+    # geometry = @factory.geometry
+    class EWKTParser
+  
+      def initialize(factory)
+        @factory = factory
+        @parse_options ={
+          "POINT" => method(:parse_point),
+          "LINESTRING" => method(:parse_line_string),
+          "POLYGON" => method(:parse_polygon),
+          "MULTIPOINT" => method(:parse_multi_point),
+          "MULTILINESTRING" => method(:parse_multi_line_string),
+          "MULTIPOLYGON" => method(:parse_multi_polygon),
+          "GEOMETRYCOLLECTION" => method(:parse_geometry_collection)
+        }
+      end
+      
+      #Parses the ewkt string passed as argument and notifies the factory of events
+      def parse(ewkt)
+        @factory.reset
+        parse_geometry(ewkt)
+        @srid=nil
+      end
+      
+      private
+      def parse_geometry(ewkt)
+        scanner = StringScanner.new(ewkt)
+        if scanner.scan(/SRID=(\d+);/) 
+          @srid = scanner[1].to_i
+        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 parent, we take the default srid
+          @srid= @srid || DEFAULT_SRID
+        end
+        
+        if scanner.scan(/(\w+)/) and @parse_options.has_key? scanner[1]
+          to_call = scanner[1]
+          if scanner.scan(/\((.*)\)/)
+            @parse_options[to_call].call(scanner[1])
+          else
+            raise StandardError::new("Bad token : " + scanner.rest)
+          end
+        else
+          raise StandardError::new("Unknown geometry type")
+        end
+      end
+      def parse_geometry_collection(string)
+        @factory.begin_geometry(GeometryCollection,@srid)
+        scanner = StringScanner.new(string)
+        while(scanner.scan(/(.*?),(?=[A-Z])/))
+          parse_geometry(scanner[1])
+        end
+        parse_geometry(scanner.rest)
+        @factory.end_geometry
+      end
+      
+      def parse_multi_polygon(string)
+        @factory.begin_geometry(MultiPolygon,@srid)
+        scanner = StringScanner.new(string)
+        while(scanner.scan(/\((\((.*?)\))\),?/))
+          parse_polygon(scanner[1])
+        end
+        @factory.end_geometry
+      end
+                 
+      def parse_multi_line_string(string)
+        @factory.begin_geometry(MultiLineString,@srid)
+        scanner = StringScanner.new(string)
+        while(scanner.scan(/\(([^\)]*)\),?/))
+          parse_line_string(scanner[1])
+        end
+        @factory.end_geometry
+      end
+
+      def parse_polygon(string)
+        @factory.begin_geometry(Polygon,@srid)
+        scanner = StringScanner.new(string)
+        while(scanner.scan(/\(([^\)]*)\),?/))
+          parse_linear_ring(scanner[1])
+        end
+        @factory.end_geometry
+      end
+      
+      
+      def parse_multi_point(string)
+        parse_point_list(MultiPoint,string)
+      end
+      def parse_linear_ring(string)
+        parse_point_list(LinearRing,string)
+      end
+      def parse_line_string(string)
+        parse_point_list(LineString,string)
+      end
+      #used to parse line_strings and linear_rings
+      def parse_point_list(geometry_type,string)
+        @factory.begin_geometry(geometry_type,@srid)
+        scanner = StringScanner.new(string)
+        while(scanner.scan(/([^,]*),?/))
+          parse_point(scanner[1])
+        end
+        @factory.end_geometry
+      end
+      
+      def parse_point(string)
+        @factory.begin_geometry(Point,@srid)
+        scanner = StringScanner.new(string)
+        coords = Array.new
+        while scanner.scan(/\s*([-+]?[\d.]+)\s*/)
+          coords << scanner[1].to_f
+        end
+        if(coords.length == 2)
+          @factory.add_point_x_y(*coords)
+        else
+          @factory.add_point_x_y_z(*coords)
+        end
+        @factory.end_geometry
+      end
+    end
+    
+  end
+end

data/lib/geo_ruby/simple_features/geometry.rb

@@ -82,6 +82,13 @@ module GeoRuby#:nodoc:
         hexewkb_parser.parse(hexewkb)
         factory.geometry
       end
+
+      def self.from_ewkt(ewkt)
+        factory = GeometryFactory::new
+        ewkt_parser= EWKTParser::new(factory)
+        ewkt_parser.parse(ewkt)
+        factory.geometry
+      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 = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "Ruby data holder for OGC Simple Features"
   s.description = <<EOF
 GeoRuby is intended as a holder for data returned from PostGIS queries. Therefore, 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_ewkt_parser.rb

@@ -0,0 +1,94 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'geo_ruby'
+require 'test/unit'
+
+
+include GeoRuby::SimpleFeatures
+
+class TestEWKTParser < Test::Unit::TestCase
+  
+  def setup
+    @factory = GeometryFactory::new
+    @ewkt_parser = EWKTParser::new(@factory)
+  end
+  
+  def test_point
+    ewkt="POINT( 3.456 0.123)"
+    @ewkt_parser.parse(ewkt)
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y(3.456,0.123),point)
+  end
+  
+  def test_point_with_srid
+    ewkt="SRID=245;POINT(0.0 2.0)"
+    @ewkt_parser.parse(ewkt)
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y(0,2,245),point)
+    assert_equal(245,point.srid)
+    assert_equal(point.as_text(2),ewkt)
+  end
+  
+  def test_point3d
+    ewkt="POINT(3.456 0.123 123.667)"
+    @ewkt_parser.parse(ewkt)
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y_z(3.456,0.123,123.667),point)
+    assert_equal(point.as_text(3,false),ewkt)
+  end
+
+   def test_linestring
+    @ewkt_parser.parse("LINESTRING(3.456 0.123,123.44 123.56,54555.22 123.3)")
+    linestring = @factory.geometry
+    assert(linestring.instance_of?(LineString))
+    assert_equal(LineString.from_raw_point_sequence([[3.456,0.123],[123.44,123.56],[54555.22,123.3]]),linestring)
+  end
+
+   def test_polygon
+    @ewkt_parser.parse("POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1))")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_raw_point_sequences([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256),polygon)
+   end
+
+   def test_multi_point
+    @ewkt_parser.parse("SRID=444;MULTIPOINT(12.4 -123.3,-65.1 123.4,123.55555555 123)")
+    multi_point = @factory.geometry
+    assert(multi_point.instance_of?(MultiPoint))
+    assert_equal(MultiPoint.from_raw_point_sequence([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444),multi_point)
+    assert_equal(444,multi_point.srid)
+    assert_equal(444,multi_point[0].srid)
+  end
+
+   def test_multi_line_string
+    @ewkt_parser.parse("SRID=256;MULTILINESTRING((1.5 45.2,-54.12312 -0.012),(1.5 45.2,-54.12312 -0.012,45.123 123.3))")
+    multi_line_string = @factory.geometry
+    assert(multi_line_string.instance_of?(MultiLineString))
+    assert_equal(MultiLineString.from_line_strings([LineString.from_raw_point_sequence([[1.5,45.2],[-54.12312,-0.012]],256),LineString.from_raw_point_sequence([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256),multi_line_string)
+    assert_equal(256,multi_line_string.srid)
+    assert_equal(256,multi_line_string[0].srid)
+  end
+
+   def test_multi_polygon
+     ewkt="SRID=256;MULTIPOLYGON(((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 0.0,4.0 0.0,4.0 4.0,0.0 4.0,0.0 0.0),(1.0 1.0,3.0 1.0,3.0 3.0,1.0 3.0,1.0 1.0)))"
+     @ewkt_parser.parse(ewkt)
+     multi_polygon = @factory.geometry
+     assert(multi_polygon.instance_of?(MultiPolygon))
+     assert_equal(MultiPolygon.from_polygons([Polygon.from_raw_point_sequences([[[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_raw_point_sequences([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256),multi_polygon)
+     assert_equal(256,multi_polygon.srid)
+     assert_equal(256,multi_polygon[0].srid)
+     assert_equal(multi_polygon.as_text,ewkt)
+  end
+
+   def test_geometry_collection
+    @ewkt_parser.parse("SRID=256;GEOMETRYCOLLECTION(POINT(4.67 45.4),LINESTRING(5.7 12.45,67.55 54),POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))")
+    geometry_collection = @factory.geometry
+    assert(geometry_collection.instance_of?(GeometryCollection))
+    assert_equal(GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_raw_point_sequence([[5.7,12.45],[67.55,54]],256),Polygon.from_raw_point_sequences([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256),geometry_collection)
+    assert_equal(256,geometry_collection[0].srid)
+  end
+
+end

metadata

@@ -1,62 +1,66 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-04-09
+  version: 0.0.3
+date: 2006-04-16 00:00:00 +05:00
 summary: Ruby data holder for OGC Simple Features
 require_paths: 
-  - lib
+- lib
 email: guilhem.vellut+georuby@gmail.com
 homepage: http://thepochisuperstarmegashow.com
 rubyforge_project: 
-description: "GeoRuby is intended as a holder for data returned from PostGIS queries.
-  Therefore, 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)"
+description: GeoRuby is intended as a holder for data returned from PostGIS queries. Therefore, 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)
 autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Guilhem Vellut
+- Guilhem Vellut
 files: 
-  - lib/geo_ruby.rb
-  - lib/geo_ruby/simple_features/ewkb_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
-  - 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
-  - lib/geo_ruby/simple_features/multi_point.rb
-  - lib/geo_ruby/simple_features/multi_polygon.rb
-  - lib/geo_ruby/simple_features/point.rb
-  - lib/geo_ruby/simple_features/polygon.rb
-  - test/test_ewkb_parser.rb
-  - test/test_simple_features.rb
-  - README
-  - MIT-LICENSE
-  - rakefile.rb
+- lib/geo_ruby.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
+- 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
+- lib/geo_ruby/simple_features/multi_point.rb
+- lib/geo_ruby/simple_features/multi_polygon.rb
+- lib/geo_ruby/simple_features/point.rb
+- lib/geo_ruby/simple_features/polygon.rb
+- test/test_ewkb_parser.rb
+- test/test_ewkt_parser.rb
+- test/test_simple_features.rb
+- README
+- MIT-LICENSE
+- rakefile.rb
 test_files: 
-  - test/test_ewkb_parser.rb
-  - test/test_simple_features.rb
+- test/test_ewkb_parser.rb
+- test/test_ewkt_parser.rb
+- test/test_simple_features.rb
 rdoc_options: 
-  - "--main"
-  - README
+- --main
+- README
 extra_rdoc_files: 
-  - README
+- README
 executables: []
+
 extensions: []
+
 requirements: 
-  - none
-dependencies: []
+- none
+dependencies: []
+