a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-24 23:15:24 +03:00
Code Issues Projects Releases Wiki Activity

Cleanup formatting after #371

Browse Source
This commit is contained in:
Dustin Carlino 2020-10-23 10:42:12 -07:00
parent c74dcf025f
commit 536971b641
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geom/src/polygon.rs
View File

@ -4,7 +4,6 @@ use std::fmt;
use geo::algorithm::area::Area;
use geo::algorithm::convex_hull::ConvexHull;
use geo_booleanop::boolean::BooleanOp;
use geo::algorithm::intersects::Intersects;
use serde::{Deserialize, Serialize};
use crate::{Angle, Bounds, Distance, HashablePt2D, PolyLine, Pt2D, Ring};
@ -302,8 +301,7 @@ impl Polygon {
}
pub fn polylabel(&self) -> Pt2D {
let polygon: geo::Polygon<_> = to_geo(&self.points());
let pt = polylabel::polylabel(&polygon, &1.0).unwrap();
let pt = polylabel::polylabel(&to_geo(&self.points()), &1.0).unwrap();
Pt2D::new(pt.x(), pt.y())
}
@ -315,7 +313,9 @@ impl Polygon {
Ok(Polygon::union_all(
rings.iter().map(|r| r.to_outline(thickness)).collect(),
))
} else { Ring::new(self.points.clone()).map(|r| r.to_outline(thickness)) }
} else {
Ring::new(self.points.clone()).map(|r| r.to_outline(thickness))
}
}
/// Remove the internal rings used for to_outline. This is fine to do if the polygon is being