RFC: Use extension trait to simplify combinator usage.

rstar/src/lib.rs

@@ -43,7 +43,7 @@ pub use crate::algorithm::rstar::RStarInsertionStrategy;
 pub use crate::algorithm::selection_functions::SelectionFunction;
 pub use crate::envelope::Envelope;
 pub use crate::node::{ParentNode, RTreeNode};
-pub use crate::object::{PointDistance, RTreeObject};
+pub use crate::object::{PointDistance, RTreeObject, RTreeObjectExt};
 pub use crate::params::{DefaultParams, InsertionStrategy, RTreeParams};
 pub use crate::point::{Point, RTreeNum};
 pub use crate::rtree::RTree;

rstar/src/object.rs

@@ -1,6 +1,7 @@
 use crate::aabb::AABB;
 use crate::envelope::Envelope;
 use crate::point::{Point, PointExt};
+use crate::primitives::{CachedEnvelope, GeomWithData};
 
 /// An object that can be inserted into an r-tree.
 ///
@@ -225,3 +226,35 @@ where
         }
     }
 }
+
+/// TODO
+pub trait RTreeObjectExt: RTreeObject {
+    /// TODO
+    fn with_data<S>(self, data: S) -> GeomWithData<Self, S>
+    where
+        Self: Sized;
+
+    /// TODO
+    fn cached_envelope(self) -> CachedEnvelope<Self>
+    where
+        Self: Sized;
+}
+
+impl<T> RTreeObjectExt for T
+where
+    T: RTreeObject,
+{
+    fn with_data<S>(self, data: S) -> GeomWithData<Self, S>
+    where
+        Self: Sized,
+    {
+        GeomWithData::new(self, data)
+    }
+
+    fn cached_envelope(self) -> CachedEnvelope<Self>
+    where
+        Self: Sized,
+    {
+        CachedEnvelope::new(self)
+    }
+}