Merge branch 'master' into bbox resolving conflicts with PR #43

georust · TeXitoi · Jul 21, 2016 · Jul 14, 2016 · Jul 14, 2016 · Jul 14, 2016
commit 03293f5560c4a085b4b57ca9c73908e5df17f33e
diff --git a/src/algorithm/area.rs b/src/algorithm/area.rs
@@ -1,5 +1,5 @@
 use num::Float;
-use types::{Polygon, Bbox};
+use types::{LineString, Polygon, MultiPolygon, Bbox};
 
 /// Calculation of the area.
 
@@ -59,7 +59,7 @@ impl<T> Area<T> for Bbox<T>
 
 #[cfg(test)]
 mod test {
-    use types::{Coordinate, Point, LineString, Polygon, Bbox};
+    use types::{Coordinate, Point, LineString, Polygon, MultiPolygon, Bbox};
     use algorithm::area::Area;
     // Area of the polygon
     #[test]
@@ -85,4 +85,25 @@ mod test {
         let bbox = Bbox {xmin: 10., xmax: 20., ymin: 30., ymax: 40.};
         assert_eq!(100., bbox.area());
     }
+    #[test]
+    fn area_polygon_inner_test() {
+        let p = |x, y| Point(Coordinate { x: x, y: y });
+        let outer = LineString(vec![p(0., 0.), p(10., 0.), p(10., 10.), p(0., 10.), p(0., 0.)]);
+        let inner0 = LineString(vec![p(1., 1.), p(2., 1.), p(2., 2.), p(1., 2.), p(1., 1.)]);
+        let inner1 = LineString(vec![p(5., 5.), p(6., 5.), p(6., 6.), p(5., 6.), p(5., 5.)]);
+        let poly = Polygon(outer, vec![inner0, inner1]);
+        assert_eq!(poly.area(), 98.);
+    }
+    #[test]
+    fn area_multipolygon_test() {
+        let p = |x, y| Point(Coordinate { x: x, y: y });
+        let poly0 = Polygon(LineString(vec![p(0., 0.), p(10., 0.), p(10., 10.), p(0., 10.), p(0., 0.)]),
+                            Vec::new());
+        let poly1 = Polygon(LineString(vec![p(1., 1.), p(2., 1.), p(2., 2.), p(1., 2.), p(1., 1.)]),
+                            Vec::new());
+        let poly2 = Polygon(LineString(vec![p(5., 5.), p(6., 5.), p(6., 6.), p(5., 6.), p(5., 5.)]),
+                            Vec::new());
+        let mpoly = MultiPolygon(vec![poly0, poly1, poly2]);
+        assert_eq!(mpoly.area(), 102.);
+    }
 }