refactor(geometry::poly): PolyShape should be equal to Polygon

crates/topola-egui/src/overlay.rs

@@ -19,7 +19,7 @@ use topola::{
     geometry::shape::{AccessShape, Shape},
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{
-        poly::{MakePolyShape, PolyWeight},
+        poly::{MakePolygon, PolyWeight},
         via::ViaWeight,
         CompoundWeight, Layout, NodeIndex,
     },

crates/topola-egui/src/painter.rs

@@ -5,7 +5,10 @@
 use geo::{CoordsIter, Point, Polygon};
 use rstar::AABB;
 use topola::{
-    geometry::primitive::{AccessPrimitiveShape, PrimitiveShape},
+    geometry::{
+        primitive::{AccessPrimitiveShape, PrimitiveShape},
+        shape::AccessShape,
+    },
     math::Circle,
 };
 
@@ -54,7 +57,7 @@ impl<'a> Painter<'a> {
         self.ui.painter().add(epaint_shape);
 
         if self.paint_bboxes {
-            self.paint_bbox(AccessPrimitiveShape::bbox(shape, 0.0));
+            self.paint_bbox(AccessShape::bbox(shape, 0.0));
         }
     }
 

crates/topola-egui/src/viewport.rs

@@ -19,7 +19,7 @@ use topola::{
         primitive::MakePrimitiveShape,
     },
     geometry::{shape::AccessShape, GenericNode},
-    layout::{poly::MakePolyShape, via::ViaWeight},
+    layout::{poly::MakePolygon, via::ViaWeight},
     math::Circle,
 };
 
@@ -175,10 +175,7 @@ impl Viewport {
                                             .normal
                                     };
 
-                                    painter.paint_polygon(
+                                    painter.paint_polygon(&board.layout().poly(poly).shape(), color)
-                                        &board.layout().poly(poly).shape().polygon,
-                                        color,
-                                    )
                                 }
                             }
                         }

src/autorouter/ratsnest.rs

@@ -30,7 +30,7 @@ use crate::{
     geometry::shape::AccessShape,
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{
-        poly::{MakePolyShape, PolyWeight},
+        poly::{MakePolygon, PolyWeight},
         Layout,
     },
     triangulation::{GetTrianvertexNodeIndex, Triangulation},

src/board/mod.rs

@@ -28,7 +28,7 @@ use crate::{
     geometry::{edit::ApplyGeometryEdit, shape::AccessShape, GenericNode},
     graph::GenericIndex,
     layout::{
-        poly::{GetMaybeApex, MakePolyShape, PolyWeight},
+        poly::{GetMaybeApex, MakePolygon, PolyWeight},
         CompoundWeight, Layout, LayoutEdit, NodeIndex,
     },
     math::Circle,

src/geometry/mod.rs

@@ -6,7 +6,7 @@
 mod geometry;
 pub mod compound;
 pub mod edit;
-pub mod poly;
+mod poly;
 pub mod primitive;
 pub mod recording_with_rtree;
 pub mod shape;

src/geometry/poly.rs

@@ -8,16 +8,11 @@ use rstar::AABB;
 
 use crate::geometry::shape::{AccessShape, MeasureLength};
 
-#[derive(Debug, Clone, PartialEq)]
+impl MeasureLength for Polygon {
-pub struct PolyShape {
-    pub polygon: Polygon,
-}
-
-impl MeasureLength for PolyShape {
     fn length(&self) -> f64 {
         let mut length = 0.0;
 
-        for line in self.polygon.exterior().lines() {
+        for line in self.exterior().lines() {
             length += line.length::<Euclidean>();
         }
 
@@ -25,19 +20,18 @@ impl MeasureLength for PolyShape {
     }
 }
 
-impl AccessShape for PolyShape {
+impl AccessShape for Polygon {
     fn center(&self) -> Point {
-        self.polygon.centroid().unwrap()
+        self.centroid().unwrap()
     }
 
     fn contains_point(&self, p: Point) -> bool {
-        self.polygon.contains(&p)
+        self.contains(&p)
     }
 
     fn bbox_without_margin(&self) -> AABB<[f64; 2]> {
         AABB::from_points(
-            self.polygon
+            self.exterior()
-                .exterior()
                 .0
                 .iter()
                 .map(|coord| [coord.x, coord.y])

src/geometry/primitive.rs

@@ -166,10 +166,7 @@ impl AccessShape for SegShape {
     }
 
     fn bbox_without_margin(&self) -> AABB<[f64; 2]> {
-        super::poly::PolyShape {
+        self.polygon().bbox_without_margin()
-            polygon: self.polygon(),
-        }
-        .bbox_without_margin()
     }
 }
 

src/geometry/shape.rs

@@ -3,13 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 use enum_dispatch::enum_dispatch;
-use geo::Point;
+use geo::{Point, Polygon};
 use rstar::AABB;
 
-use crate::geometry::{
+use crate::geometry::primitive::{BendShape, DotShape, PrimitiveShape, SegShape};
-    poly::PolyShape,
-    primitive::{BendShape, DotShape, PrimitiveShape, SegShape},
-};
 
 #[enum_dispatch]
 pub trait MeasureLength {
@@ -37,7 +34,7 @@ pub enum Shape {
     Dot(DotShape),
     Seg(SegShape),
     Bend(BendShape),
-    Poly(PolyShape),
+    Poly(Polygon),
 }
 
 impl From<PrimitiveShape> for Shape {

src/layout/layout.rs

@@ -27,7 +27,7 @@ use crate::{
     geometry::{edit::ApplyGeometryEdit, shape::Shape, GenericNode},
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{
-        poly::{MakePolyShape, Poly, PolyWeight},
+        poly::{MakePolygon, Poly, PolyWeight},
         via::{Via, ViaWeight},
     },
 };

src/layout/poly.rs

@@ -16,14 +16,14 @@ use crate::{
         rules::AccessRules,
         seg::SegIndex,
     },
-    geometry::{poly::PolyShape, GetPos},
+    geometry::GetPos,
     graph::{GenericIndex, GetPetgraphIndex},
     layout::{CompoundWeight, Layout},
 };
 
 #[enum_dispatch]
-pub trait MakePolyShape {
+pub trait MakePolygon {
-    fn shape(&self) -> PolyShape;
+    fn shape(&self) -> Polygon;
 }
 
 #[enum_dispatch]
@@ -75,10 +75,9 @@ impl<'a, R: AccessRules> GetMaybeNet for Poly<'a, R> {
     }
 }
 
-impl<'a, R: AccessRules> MakePolyShape for Poly<'a, R> {
+impl<'a, R: AccessRules> MakePolygon for Poly<'a, R> {
-    fn shape(&self) -> PolyShape {
+    fn shape(&self) -> Polygon {
-        PolyShape {
+        Polygon::new(
-            polygon: Polygon::new(
             LineString::from(
                 self.layout
                     .drawing()
@@ -104,8 +103,7 @@ impl<'a, R: AccessRules> MakePolyShape for Poly<'a, R> {
                     .collect::<Vec<Point>>(),
             ),
             vec![],
-            ),
+        )
-        }
     }
 }