Add tests for insert Geometry/GeometryCollection

Author: kestred

src/ewkb.rs

@@ -1136,19 +1136,20 @@ impl<'a, P, PI, MP, L, LI, ML, Y, YI, MY, G, GI, GC> EwkbWrite for EwkbGeometryC
 
     fn write_ewkb_body<W: Write+?Sized>(&self, w: &mut W) -> Result<(), Error> {
         w.write_u32::<LittleEndian>(self.geom.geometries().len() as u32)?;
+
         for geom in self.geom.geometries() {
             match geom.as_type() {
                 postgis::GeometryType::Point(geom) => {
                     let wkb = EwkbPoint { geom: geom, srid: None, point_type: self.point_type.clone() };
-                    wkb.write_ewkb_body(w)?;
+                    wkb.write_ewkb(w)?;
                 },
                 postgis::GeometryType::LineString(geom) => {
                     let wkb = EwkbLineString { geom: geom, srid: None, point_type: self.point_type.clone() };
-                    wkb.write_ewkb_body(w)?;
+                    wkb.write_ewkb(w)?;
                 },
                 postgis::GeometryType::Polygon(geom) => {
                     let wkb = EwkbPolygon { geom: geom, srid: None, point_type: self.point_type.clone() };
-                    wkb.write_ewkb_body(w)?;
+                    wkb.write_ewkb(w)?;
                 },
                 postgis::GeometryType::MultiPoint(geom) => {
                     let wkb = EwkbMultiPoint { geom: geom, srid: None, point_type: self.point_type.clone() };
@@ -1164,7 +1165,7 @@ impl<'a, P, PI, MP, L, LI, ML, Y, YI, MY, G, GI, GC> EwkbWrite for EwkbGeometryC
                 },
                 postgis::GeometryType::GeometryCollection(geom) => {
                     let wkb = EwkbGeometryCollection { geom: geom, srid: None, point_type: self.point_type.clone() };
-                    wkb.write_ewkb_body(w)?;
+                    wkb.write_ewkb(w)?;
                 },
             }
         }

src/postgis.rs

@@ -405,7 +405,7 @@ mod tests {
 
     #[test]
     #[ignore]
-    fn test_insert_multipoylgon() {
+    fn test_insert_multipolygon() {
         let conn = connect();
         or_panic!(conn.execute("CREATE TEMPORARY TABLE geomtests (geom geometry(MultiPolygon))", &[]));
         let p = |x, y| ewkb::Point { x: x, y: y, srid: Some(4326) };
@@ -420,6 +420,55 @@ mod tests {
         assert!(result.iter().map(|r| r.get::<_, bool>(0)).last().unwrap());
     }
 
+    #[test]
+    #[ignore]
+    fn test_insert_geometry() {
+        let conn = connect();
+        or_panic!(conn.execute("CREATE TEMPORARY TABLE geomtests (geom geometry)", &[]));
+        let p = |x, y| ewkb::Point { x: x, y: y, srid: Some(4326) };
+        // SELECT 'SRID=4326;MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((10 10, -2 10, -2 -2, 10 -2, 10 10)))'::geometry
+        let multipoly = {
+            let line = ewkb::LineString {srid: Some(4326), points: vec![p(0., 0.), p(2., 0.), p(2., 2.), p(0., 2.), p(0., 0.)]};
+            let poly1 = ewkb::Polygon {srid: Some(4326), rings: vec![line]};
+            let line = ewkb::LineString {srid: Some(4326), points: vec![p(10., 10.), p(-2., 10.), p(-2., -2.), p(10., -2.), p(10., 10.)]};
+            let poly2 = ewkb::Polygon {srid: Some(4326), rings: vec![line]};
+            ewkb::MultiPolygon {srid: Some(4326), polygons: vec![poly1, poly2]}
+        };
+        let geometry = ewkb::GeometryT::MultiPolygon(multipoly);
+        or_panic!(conn.execute("INSERT INTO geomtests (geom) VALUES ($1)", &[&geometry]));
+        let result = or_panic!(conn.query("SELECT geom=ST_GeomFromEWKT('SRID=4326;MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((10 10, -2 10, -2 -2, 10 -2, 10 10)))') FROM geomtests", &[]));
+        assert!(result.iter().map(|r| r.get::<_, bool>(0)).last().unwrap());
+    }
+
+    #[test]
+    #[ignore]
+    fn test_insert_geometrycollection() {
+        let conn = connect();
+        or_panic!(conn.execute("CREATE TEMPORARY TABLE geomtests (geom geometry(GeometryCollection))", &[]));
+        let p = |x, y| ewkb::Point { x: x, y: y, srid: Some(4326) };
+        // SELECT 'SRID=4326;LINESTRING (10 -20, -0 -0.5)'
+        let line = ewkb::LineString {srid: Some(4326), points: vec![p(10.0, -20.0), p(0., -0.5)]};
+        // SELECT 'SRID=4326;MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((10 10, -2 10, -2 -2, 10 -2, 10 10)))'::geometry
+        let multipoly = {
+            let line = ewkb::LineString {srid: Some(4326), points: vec![p(0., 0.), p(2., 0.), p(2., 2.), p(0., 2.), p(0., 0.)]};
+            let poly1 = ewkb::Polygon {srid: Some(4326), rings: vec![line]};
+            let line = ewkb::LineString {srid: Some(4326), points: vec![p(10., 10.), p(-2., 10.), p(-2., -2.), p(10., -2.), p(10., 10.)]};
+            let poly2 = ewkb::Polygon {srid: Some(4326), rings: vec![line]};
+            ewkb::MultiPolygon {srid: Some(4326), polygons: vec![poly1, poly2]}
+        };
+        // SELECT 'SRID=4326;GEOMETRYCOLLECTION (LINESTRING (10 -20,0 -0.5), MULTIPOLYGON (((0 0,2 0,2 2,0 2,0 0)),((10 10,-2 10,-2 -2,10 -2,10 10))))'::geometry
+        let collection = ewkb::GeometryCollection{
+            srid: Some(4326),
+            geometries: vec![
+                ewkb::GeometryT::LineString(line),
+                ewkb::GeometryT::MultiPolygon(multipoly),
+            ],
+        };
+        or_panic!(conn.execute("INSERT INTO geomtests (geom) VALUES ($1)", &[&collection]));
+        let result = or_panic!(conn.query("SELECT geom=ST_GeomFromEWKT('SRID=4326;GEOMETRYCOLLECTION (LINESTRING (10 -20,0 -0.5), MULTIPOLYGON (((0 0,2 0,2 2,0 2,0 0)),((10 10,-2 10,-2 -2,10 -2,10 10))))') FROM geomtests", &[]));
+        assert!(result.iter().map(|r| r.get::<_, bool>(0)).last().unwrap());
+    }
+
     #[test]
     #[ignore]
     fn test_select_point() {