diff --git a/src/geometry/with_rtree.rs b/src/geometry/with_rtree.rs index e800cef..4783bdc 100644 --- a/src/geometry/with_rtree.rs +++ b/src/geometry/with_rtree.rs @@ -93,10 +93,6 @@ impl< self.init_dot_bbox(dot); } - fn init_dot_bbox(&mut self, dot: DI) { - self.rtree.insert(self.make_dot_bbox(dot)); - } - pub fn add_seg + GetLayer>( &mut self, from: DI, @@ -127,10 +123,6 @@ impl< self.init_seg_bbox(seg); } - fn init_seg_bbox(&mut self, seg: SI) { - self.rtree.insert(self.make_seg_bbox(seg)); - } - pub fn add_bend + GetLayer>( &mut self, from: DI, @@ -169,11 +161,6 @@ impl< .add_compound_at_index(GenericIndex::::new(compound.petgraph_index()), weight); } - fn init_bend_bbox(&mut self, bend: BI) { - self.rtree - .insert(self.make_bend_bbox(bend.into().try_into().unwrap_or_else(|_| unreachable!()))); - } - pub fn add_to_compound(&mut self, primitive: GenericIndex, compound: GenericIndex) { self.rtree.remove(&self.make_compound_bbox(compound)); self.geometry.add_to_compound(primitive, compound); @@ -289,6 +276,18 @@ impl< BI: GetPetgraphIndex + Into + Copy, > GeometryWithRtree { + fn init_dot_bbox(&mut self, dot: DI) { + self.rtree.insert(self.make_dot_bbox(dot)); + } + + fn init_seg_bbox(&mut self, seg: SI) { + self.rtree.insert(self.make_seg_bbox(seg)); + } + + fn init_bend_bbox(&mut self, bend: BI) { + self.rtree.insert(self.make_bend_bbox(bend)); + } + fn make_bbox(&self, primitive: PI) -> BboxedIndex>> { if let Ok(dot) = >::try_into(primitive) { self.make_dot_bbox(dot)