GeoRuby 0.0.4 → 0.1.1

data/lib/geo_ruby/simple_features/multi_line_string.rb

@@ -4,30 +4,33 @@ module GeoRuby
   module SimpleFeatures
     #Represents a group of line strings (see LineString).
     class MultiLineString < GeometryCollection
-      def initialize(srid = DEFAULT_SRID)
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid)
       end
       def binary_geometry_type
         5
       end
+      
       #Text representation of a multi line string
-      def text_representation(dimension = 2)
-        @geometries.collect{|line_string| "(" + line_string.text_representation + ")" }.join(",")
+      def text_representation(allow_z=true,allow_m=true)
+        @geometries.collect{|line_string| "(" + line_string.text_representation(allow_z,allow_m) + ")" }.join(",")
       end
       #WKT geometry type
       def text_geometry_type
         "MULTILINESTRING"
       end
+      
       #Creates a new multi line string from an array of line strings
-      def self.from_line_strings(line_strings,srid=DEFAULT_SRID)
-        multi_line_string = MultiLineString::new(srid)
+      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.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_raw_point_sequences(point_sequences,srid=DEFAULT_SRID)
-        multi_line_string = MultiLineString::new(srid)
-        multi_line_string.concat(point_sequences.collect {|point_sequence| LineString.from_raw_point_sequence(point_sequence,srid) })
+      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.concat(point_sequences.collect {|points| LineString.from_coordinates(points,srid,with_z,with_m) })
         multi_line_string
       end
     end

data/lib/geo_ruby/simple_features/multi_point.rb

@@ -5,16 +5,17 @@ module GeoRuby
     #Represents a group of points (see Point).
     class MultiPoint < GeometryCollection
       
-      def initialize(srid= DEFAULT_SRID)
-        super(srid)
+      def initialize(srid= DEFAULT_SRID,with_z=false,with_m=false)
+        super(srid,with_z,with_m)
       end
-      
+            
       def binary_geometry_type
         4
       end
+
       #Text representation of a MultiPoint
-      def text_representation(dimension=2)
-        @geometries.collect{|point| point.text_representation(dimension)}.join(",")
+      def text_representation(allow_z=true,allow_m=true)
+        @geometries.collect{|point| point.text_representation(allow_z,allow_m)}.join(",")
       end
       #WKT geoemtry type
       def text_geometry_type
@@ -22,16 +23,16 @@ module GeoRuby
       end
 
       #Creates a new multi point from an array of points
-      def self.from_points(points,srid= DEFAULT_SRID)
-        multi_point= MultiPoint::new(srid)
+      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.concat(points)
         multi_point
       end
 
       #Creates a new multi point from a list of point coordinates : ((x,y)...(x,y))
-      def self.from_raw_point_sequence(point_sequence,srid= DEFAULT_SRID)
-        multi_point= MultiPoint::new(srid)
-        multi_point.concat(point_sequence.collect {|point| Point.from_coordinates(point,srid)})
+      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.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

@@ -5,15 +5,15 @@ module GeoRuby
   module SimpleFeatures
     #Represents a group of polygons (see Polygon).
    class MultiPolygon < GeometryCollection
-      def initialize(srid = DEFAULT_SRID)
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
         super(srid)
       end
       def binary_geometry_type
         6
       end
       #Text representation of a MultiPolygon
-      def text_representation(dimension=2)
-        @geometries.collect{|polygon| "(" + polygon.text_representation(dimension) + ")"}.join(",")
+      def text_representation(allow_z=true,allow_m=true)
+        @geometries.collect{|polygon| "(" + polygon.text_representation(allow_z,allow_m) + ")"}.join(",")
       end
       #WKT geometry type
       def text_geometry_type
@@ -21,18 +21,17 @@ module GeoRuby
       end
       
       #Creates a multi polygon from an array of polygons
-      def self.from_polygons(polygons,srid=DEFAULT_SRID)
-        multi_polygon = MultiPolygon::new(srid)
+      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.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_raw_point_sequences(point_sequences, srid= DEFAULT_SRID)
-        multi_polygon = MultiPolygon::new(srid)
-        multi_polygon.concat( point_sequences.collect {|point_sequence| Polygon.from_raw_point_sequences(point_sequence,srid) } )
+      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.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

@@ -4,16 +4,17 @@ module GeoRuby
   module SimpleFeatures
     #Represents a point. It is in 3D if the Z coordinate is not +nil+.
     class Point < Geometry
-      #Coordinates of the point
-      attr_accessor :x,:y,:z
       
-      def initialize(srid=DEFAULT_SRID)
-        super(srid)
+      attr_accessor :x,:y,:z,:m
+      
+      def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)
+        super(srid,with_z,with_m)
         @x=0.0
         @y=0.0
-        @z=nil
+        @z=0.0 #default value : meaningful if with_z
+        @m=0.0 #default value : meaningful if with_m
       end
-      #sets all coordinates in one call
+      #sets all coordinates in one call. Use the +m+ accessor to set the m.
       def set_x_y_z(x,y,z)
         @x=x
         @y=y
@@ -24,21 +25,20 @@ module GeoRuby
         @x=x
         @y=y
       end
-      #tests the equality of points
+      #tests the equality of the position of points + m
       def ==(other_point)
         if other_point.class != self.class
           false
         else
-          @x == other_point.x and @y == other_point.y and @z == other_point.z
+          @x == other_point.x and @y == other_point.y and @z == other_point.z and @m == other_point.m
         end
       end
       #binary representation of a point. It lacks some headers to be a valid EWKB representation.
-      def binary_representation(dimension=2)
-        if dimension == 2
-          [@x,@y].pack("EE")
-        else
-          [@x,@y,@z || 0].pack("EEE")
-        end
+      def binary_representation(allow_z=true,allow_m=true)
+        bin_rep = [@x,@y].pack("EE")
+        bin_rep += [@z].pack("E") if @with_z and allow_z #Default value so no crash
+        bin_rep += [@m].pack("E") if @with_m and allow_m #idem
+        bin_rep
       end
       #WKB geometry type of a point
       def binary_geometry_type
@@ -46,12 +46,11 @@ module GeoRuby
       end
       
       #text representation of a point
-      def text_representation(dimension=2)
-        if dimension == 2
-          "#{@x} #{@y}"
-        else
-          "#{@x} #{@y} #{@z || 0}"
-        end
+      def text_representation(allow_z=true,allow_m=true)
+        tex_rep = "#{@x} #{@y}"
+        tex_rep += " #{@z}" if @with_z and allow_z
+        tex_rep += " #{@m}" if @with_m and allow_m
+        tex_rep
       end
       #WKT geometry type of a point
       def text_geometry_type
@@ -59,14 +58,16 @@ module GeoRuby
       end
       
       #creates a point from an array of coordinates
-      def self.from_coordinates(coords,srid=DEFAULT_SRID)
-        point= Point::new(srid)
-        if coords.length == 2
-          point.set_x_y(*coords)
+      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
+          from_x_y_z_m(coords[0],coords[1],coords[2],coords[3],srid)
+        elsif with_z
+          from_x_y_z(coords[0],coords[1],coords[2],srid)
         else
-          point.set_x_y_z(*coords)
+          from_x_y_m(coords[0],coords[1],coords[2],srid) 
         end
-        point
       end
       #creates a point from the X and Y coordinates
       def self.from_x_y(x,y,srid=DEFAULT_SRID)
@@ -76,8 +77,22 @@ module GeoRuby
       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)
+        point= 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.m=m
+        point
+      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.m=m
         point
       end
     end

data/lib/geo_ruby/simple_features/polygon.rb

@@ -7,8 +7,8 @@ module GeoRuby
       #the list of rings forming the polygon
       attr_reader :rings
       
-      def initialize(srid = DEFAULT_SRID)
-        super(srid)
+      def initialize(srid = DEFAULT_SRID,with_z=false,with_m=false)
+        super(srid,with_z,with_m)
         @rings = []
       end
       #add one to the polygon
@@ -66,34 +66,36 @@ module GeoRuby
         end
       end
       #binary representation of a polygon, without the headers neccessary for a valid WKB string
-      def binary_representation(dimension=2)
+      def binary_representation(allow_z=true,allow_m=true)
         rep = [length].pack("V")
-        each {|linear_ring| rep << linear_ring.binary_representation(dimension) }
+        each {|linear_ring| rep << linear_ring.binary_representation(allow_z,allow_m)}
         rep
       end
       #WKB geometry type
       def binary_geometry_type
         3
       end
+      
       #Text representation of a polygon 
-      def text_representation(dimension=2)
-        @rings.collect{|line_string| "(" + line_string.text_representation(dimension) + ")" }.join(",")
+      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"
       end
+
       #creates a new polygon. Accepts an array of linear strings as argument
-      def self.from_linear_rings(linear_rings,srid = DEFAULT_SRID)
-        polygon = Polygon::new(srid)
+      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.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_raw_point_sequences(point_sequences,srid=DEFAULT_SRID)
-        polygon = Polygon::new(srid)
-        polygon.concat( point_sequences.collect {|point_sequence| LinearRing.from_raw_point_sequence(point_sequence,srid) } )
+      def self.from_coordinates(point_sequences,srid=DEFAULT_SRID,with_z=false,with_m=false)
+        polygon = Polygon::new(srid,with_z,with_m)
+        polygon.concat( point_sequences.collect {|points| LinearRing.from_coordinates(points,srid,with_z,with_m) } )
         polygon
       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.4"
+  s.version = "0.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 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_ewkb_parser.rb

@@ -25,74 +25,147 @@ class TestEWKBParser < Test::Unit::TestCase
     assert(point.instance_of?(Point))
     assert_equal(Point.from_x_y(4.906455,52.377953),point)
   end
+
+  
   
-  def test_point3d
+  def test_point3dz
     @hex_ewkb_parser.parse("01010000A07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC0")
     point = @factory.geometry
     assert(point.instance_of?(Point))
     assert_equal(Point.from_x_y_z(12.4,45.3,-3.5,123),point)
   end
-  
+
+  def test_point4d
+    @hex_ewkb_parser.parse("01010000E07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC00000000000002E40")
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y_z_m(12.4,45.3,-3.5,15,123),point)
+  end
+    
   def test_line_string
     @hex_ewkb_parser.parse("01020000200001000002000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC4440")
     line_string = @factory.geometry
     assert(line_string.instance_of?(LineString))
-    assert_equal(LineString.from_raw_point_sequence([[12.4,-45.3],[45.4,41.6]],256),line_string)
+    assert_equal(LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256),line_string)
+
+    @hex_ewkb_parser.parse("01020000A00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A641403333333333B34640CDCCCCCCCCCC44409A99999999992840")
+    line_string = @factory.geometry
+    assert(line_string.instance_of?(LineString))
+    assert_equal(LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true),line_string)
+    
+    @hex_ewkb_parser.parse("01020000E00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A64140CDCCCCCCCC8C46403333333333B34640CDCCCCCCCCCC44409A999999999928403D0AD7A3701D4440")
+    line_string = @factory.geometry
+    assert(line_string.instance_of?(LineString))
+    assert_equal(LineString.from_coordinates([[12.4,-45.3,35.3,45.1],[45.4,41.6,12.3,40.23]],256,true,true),line_string)
+    
   end
 
   def test_polygon
     @hex_ewkb_parser.parse("0103000020000100000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
     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)
+    assert_equal(Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256),polygon)
+
+    @hex_ewkb_parser.parse("01030000A000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,true),polygon)
+
+    @hex_ewkb_parser.parse("010300006000010000020000000500000000000000000000000000000000000000000000000000004000000000000010400000000000000000000000000000004000000000000010400000000000001040000000000000004000000000000000000000000000001040000000000000004000000000000000000000000000000000000000000000004005000000000000000000F03F000000000000F03F00000000000000400000000000000840000000000000F03F0000000000000040000000000000084000000000000008400000000000000040000000000000F03F00000000000008400000000000000040000000000000F03F000000000000F03F0000000000000040")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,false,true),polygon)
+
+
+    @hex_ewkb_parser.parse("01030000E0000100000200000005000000000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C00000000000001040000000000000000000000000000000400000000000001440000000000000104000000000000010400000000000000040AE47E17A14AE1240000000000000000000000000000010400000000000000040713D0AD7A370F53F000000000000000000000000000000000000000000000040CDCCCCCCCC8C46C005000000000000000000F03F000000000000F03F00000000000000409A999999999928400000000000000840000000000000F03F00000000000000400000000000C05E400000000000000840000000000000084000000000000000406666666666662840000000000000F03F000000000000084000000000000000400000000000002840000000000000F03F000000000000F03F00000000000000409A99999999992840")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],256,true,true),polygon)
+    
+    
   end
 
   def test_geometry_collection
     @hex_ewkb_parser.parse("010700002000010000020000000101000000AE47E17A14AE12403333333333B34640010200000002000000CDCCCCCCCCCC16406666666666E628403333333333E350400000000000004B40")
     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)],256),geometry_collection)
+    assert_equal(GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256),geometry_collection)
     assert_equal(256,geometry_collection[0].srid)
+
+    @hex_ewkb_parser.parse("01070000E0000100000200000001010000C0AE47E17A14AE12403333333333B34640F6285C8FC2D54640666666666666024001020000C002000000CDCCCCCCCCCC16406666666666E628403D0AD7A3703D124033333333339358403333333333E350400000000000004B4066666666666628403333333333330B40")
+    geometry_collection = @factory.geometry
+    assert(geometry_collection.instance_of?(GeometryCollection))
+    assert_equal(GeometryCollection.from_geometries([Point.from_x_y_z_m(4.67,45.4,45.67,2.3,256),LineString.from_coordinates([[5.7,12.45,4.56,98.3],[67.55,54,12.2,3.4]],256,true, true)],256,true, true),geometry_collection)
+    assert_equal(256,geometry_collection[0].srid)
+    
+    
   end
   
   def test_multi_point
     @hex_ewkb_parser.parse("0104000020BC010000030000000101000000CDCCCCCCCCCC28403333333333D35EC0010100000066666666664650C09A99999999D95E4001010000001F97DD388EE35E400000000000C05E40")
     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(MultiPoint.from_coordinates([[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)
+
+    @hex_ewkb_parser.parse("01040000A0BC010000030000000101000080CDCCCCCCCCCC28403333333333D35EC00000000000001240010100008066666666664650C09A99999999D95E40333333333333F33F01010000801F97DD388EE35E400000000000C05E406666666666660240")
+    multi_point = @factory.geometry
+    assert(multi_point.instance_of?(MultiPoint))
+    assert_equal(MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,1.2],[123.55555555,123,2.3]],444,true),multi_point)
+    assert_equal(444,multi_point.srid)
+    assert_equal(444,multi_point[0].srid)
+    
+    
   end
   
   def test_multi_line_string
     @hex_ewkb_parser.parse("01050000200001000002000000010200000002000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF010200000003000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF39B4C876BE8F46403333333333D35E40")
     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(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_string)
+    assert_equal(256,multi_line_string.srid)
+    assert_equal(256,multi_line_string[0].srid)
+
+    @hex_ewkb_parser.parse("0105000020000100000200000001020000C002000000000000000000F83F9A99999999994640CDCCCCCCCCCCF43F333333333333F33FE4BD6A65C20F4BC0FA7E6ABC749388BF333333333333F33F000000000000124001020000C003000000000000000000F83F9A99999999994640666666666666144000000000000012C0E4BD6A65C20F4BC0FA7E6ABC749388BF3333333333331BC03333333333330B4039B4C876BE8F46403333333333D35E40000000000000124033333333333315C0")
+    multi_line_string = @factory.geometry
+    assert(multi_line_string.instance_of?(MultiLineString))
+    assert_equal(MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true),multi_line_string)
     assert_equal(256,multi_line_string.srid)
     assert_equal(256,multi_line_string[0].srid)
+    
+
   end
   
   def test_multi_polygon
     @hex_ewkb_parser.parse("0106000020000100000200000001030000000200000004000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC44406DE7FBA9F1D211403D2CD49AE61DF13FCDCCCCCCCCCC28406666666666A646C004000000333333333333034033333333333315409A999999999915408A8EE4F21FD2F63FEC51B81E85EB2C40F6285C8FC2F5F03F3333333333330340333333333333154001030000000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
     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(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_polygon)
+    assert_equal(256,multi_polygon.srid)
+    assert_equal(256,multi_polygon[0].srid)
+
+    @hex_ewkb_parser.parse("0106000020000100000200000001030000400200000004000000CDCCCCCCCCCC28406666666666A646C0333333333333F33F3333333333B34640CDCCCCCCCCCC4440333333333333F33F6DE7FBA9F1D211403D2CD49AE61DF13F333333333333F33FCDCCCCCCCCCC28406666666666A646C0333333333333F33F0400000033333333333303403333333333331540333333333333F33F9A999999999915408A8EE4F21FD2F63F333333333333F33FEC51B81E85EB2C40F6285C8FC2F5F03F333333333333F33F33333333333303403333333333331540333333333333F33F0103000040020000000500000000000000000000000000000000000000333333333333F33F00000000000010400000000000000000333333333333F33F00000000000010400000000000001040666666666666024000000000000000000000000000001040333333333333F33F00000000000000000000000000000000333333333333F33F05000000000000000000F03F000000000000F03F9A999999999901400000000000000840000000000000F03F6666666666660A40000000000000084000000000000008409A9999999999F13F000000000000F03F00000000000008403333333333330340000000000000F03F000000000000F03F9A99999999990140")
+    multi_polygon = @factory.geometry
+    assert(multi_polygon.instance_of?(MultiPolygon))
+    assert_equal(MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3,1.2],[45.4,41.6,1.2],[4.456,1.0698,1.2],[12.4,-45.3,1.2]],[[2.4,5.3,1.2],[5.4,1.4263,1.2],[14.46,1.06,1.2],[2.4,5.3,1.2]]],256,false,true),Polygon.from_coordinates([[[0,0,1.2],[4,0,1.2],[4,4,2.3],[0,4,1.2],[0,0,1.2]],[[1,1,2.2],[3,1,3.3],[3,3,1.1],[1,3,2.4],[1,1,2.2]]],256,false,true)],256,false,true),multi_polygon)
     assert_equal(256,multi_polygon.srid)
     assert_equal(256,multi_polygon[0].srid)
   end
+
+
   def test_failure_trailing_data
     #added A345 at the end
-    assert_raise(StandardError){@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC28406666666666A64640A345")}
+    assert_raise(EWKBFormatError){@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC28406666666666A64640A345")}
   end
   def test_failure_unknown_geometry_type
-    assert_raise(StandardError){@hex_ewkb_parser.parse("01090000207B000000CDCCCCCCCCCC28406666666666A64640")}
+    assert_raise(EWKBFormatError){@hex_ewkb_parser.parse("01090000207B000000CDCCCCCCCCCC28406666666666A64640")}
   end
   def test_failure_m
-    assert_raise(StandardError){@hex_ewkb_parser.parse("01010000607B000000CDCCCCCCCCCC28406666666666A64640")}
+    assert_raise(EWKBFormatError){@hex_ewkb_parser.parse("01010000607B000000CDCCCCCCCCCC28406666666666A64640")}
   end
   def test_failure_truncated_data
-    assert_raise(StandardError){@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC2840666666")}
+    assert_raise(EWKBFormatError){@hex_ewkb_parser.parse("01010000207B000000CDCCCCCCCCCC2840666666")}
   end
   
 end

data/test/test_ewkt_parser.rb

@@ -28,48 +28,121 @@ class TestEWKTParser < Test::Unit::TestCase
     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)
+    assert_equal(point.as_ewkt(true,false),ewkt)
   end
   
-  def test_point3d
+  def test_point3dz
     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)
+    assert_equal(point.as_ewkt(false),ewkt)
+  end
+
+  def test_point3dm
+    ewkt="POINTM(3.456 0.123 123.667)"
+    @ewkt_parser.parse(ewkt)
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y_m(3.456,0.123,123.667),point)
+    assert_equal(point.as_ewkt(false),ewkt)
+  end
+
+  def test_point4d
+    ewkt="POINT(3.456 0.123 123.667 15.0)"
+    @ewkt_parser.parse(ewkt)
+    point = @factory.geometry
+    assert(point.instance_of?(Point))
+    assert_equal(Point.from_x_y_z_m(3.456,0.123,123.667,15.0),point)
+    assert_equal(point.as_ewkt(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)
+     @ewkt_parser.parse("LINESTRING(3.456 0.123,123.44 123.56,54555.22 123.3)")
+     line_string = @factory.geometry
+     assert(line_string.instance_of?(LineString))
+     assert_equal(LineString.from_coordinates([[3.456,0.123],[123.44,123.56],[54555.22,123.3]]),line_string)
+     
+     @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3,45.4 41.6)")
+     line_string = @factory.geometry
+     assert(line_string.instance_of?(LineString))
+     assert_equal(LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256),line_string)
+     
+     @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3 35.3,45.4 41.6 12.3)")
+     line_string = @factory.geometry
+     assert(line_string.instance_of?(LineString))
+     assert_equal(LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true),line_string)
+     
+     @ewkt_parser.parse("SRID=256;LINESTRINGM(12.4 -45.3 35.3,45.4 41.6 12.3)")
+     line_string = @factory.geometry
+     assert(line_string.instance_of?(LineString))
+     assert_equal(LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true),line_string)
+   
+   @ewkt_parser.parse("SRID=256;LINESTRING(12.4 -45.3 35.3 25.2,45.4 41.6 12.3 13.75)")
+   line_string = @factory.geometry
+   assert(line_string.instance_of?(LineString))
+   assert_equal(LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true),line_string)
+     
   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)
+    assert_equal(Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256),polygon)
+
+     @ewkt_parser.parse("SRID=256;POLYGON((0 0 2,4 0 2,4 4 2,0 4 2,0 0 2),(1 1 2,3 1 2,3 3 2,1 3 2,1 1 2))")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,true),polygon)
+
+     @ewkt_parser.parse("SRID=256;POLYGONM((0 0 2,4 0 2,4 4 2,0 4 2,0 0 2),(1 1 2,3 1 2,3 3 2,1 3 2,1 1 2))")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256,false,true),polygon)
+
+     
+     @ewkt_parser.parse("SRID=256;POLYGON((0 0 2 -45.1,4 0 2 5,4 4 2 4.67,0 4 2 1.34,0 0 2 -45.1),(1 1 2 12.3,3 1 2 123,3 3 2 12.2,1 3 2 12,1 1 2 12.3))")
+    polygon = @factory.geometry
+    assert(polygon.instance_of?(Polygon))
+    assert_equal(Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],256,true,true),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(MultiPoint.from_coordinates([[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)
+     
+     @ewkt_parser.parse("SRID=444;MULTIPOINT(12.4 -123.3 4.5,-65.1 123.4 6.7,123.55555555 123 7.8)")
+     multi_point = @factory.geometry
+     assert(multi_point.instance_of?(MultiPoint))
+     assert_equal(MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true),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(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_string)
+    assert_equal(256,multi_line_string.srid)
+    assert_equal(256,multi_line_string[0].srid)
+     
+     @ewkt_parser.parse("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))")
+    multi_line_string = @factory.geometry
+    assert(multi_line_string.instance_of?(MultiLineString))
+    assert_equal(MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true),multi_line_string)
     assert_equal(256,multi_line_string.srid)
     assert_equal(256,multi_line_string[0].srid)
+
+
   end
 
    def test_multi_polygon
@@ -77,18 +150,35 @@ class TestEWKTParser < Test::Unit::TestCase
      @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(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_polygon)
      assert_equal(256,multi_polygon.srid)
      assert_equal(256,multi_polygon[0].srid)
-     assert_equal(multi_polygon.as_text,ewkt)
+     assert_equal(multi_polygon.as_ewkt,ewkt)
+
+     ewkt="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)))"
+     @ewkt_parser.parse(ewkt)
+     multi_polygon = @factory.geometry
+     assert(multi_polygon.instance_of?(MultiPolygon))
+     assert_equal(MultiPolygon.from_polygons([Polygon.from_coordinates([[[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]]],DEFAULT_SRID,true),Polygon.from_coordinates([[[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]]],DEFAULT_SRID,true)],DEFAULT_SRID,true),multi_polygon)
+     assert_equal(-1,multi_polygon.srid)
+     assert_equal(-1,multi_polygon[0].srid)
+     
   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(GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4,256),LineString.from_coordinates([[5.7,12.45],[67.55,54]],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),geometry_collection)
     assert_equal(256,geometry_collection[0].srid)
-  end
+  
+     @ewkt_parser.parse("SRID=256;GEOMETRYCOLLECTIONM(POINTM(4.67 45.4 45.6),LINESTRINGM(5.7 12.45 5.6,67.55 54 6.7))")
+    geometry_collection = @factory.geometry
+    assert(geometry_collection.instance_of?(GeometryCollection))
+    assert_equal(GeometryCollection.from_geometries([Point.from_x_y_m(4.67,45.4,45.6,256),LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true),geometry_collection)
+    assert_equal(256,geometry_collection[0].srid)
+
+
+   end
 
 end