Add contains point impl for bbox

georust · May 7, 2017 · 3e00ef9 · 3e00ef9
1 parent d932c50
commit 3e00ef9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/algorithm/contains.rs b/src/algorithm/contains.rs
@@ -152,6 +152,15 @@ impl<T> Contains<LineString<T>> for Polygon<T>
     }
 }
 
+
+impl<T> Contains<Point<T>> for Bbox<T>
+    where T: Float
+{
+    fn contains(&self, p: &Point<T>) -> bool {
+        p.x() >= self.xmin && p.x() <= self.xmax && p.y() >= self.ymin && p.y() <= self.ymax
+    }
+}
+
 impl<T> Contains<Bbox<T>> for Bbox<T>
     where T: Float
 {

diff --git a/src/algorithm/intersects.rs b/src/algorithm/intersects.rs
@@ -73,7 +73,7 @@ impl<T> Intersects<Bbox<T>> for Bbox<T>
 {
     fn intersects(&self, bbox: &Bbox<T>) -> bool {
         // line intersects inner or outer polygon edge
-        if bbox.contains(&self) {
+        if bbox.contains(self) {
             return false
         } else {
             (self.xmin >= bbox.xmin && self.xmin <= bbox.xmax || self.xmax >= bbox.xmin && self.xmax <= bbox.xmax) &&