Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polygon-Line euclidean distance fix #226

Merged
merged 5 commits into from
May 16, 2018
Merged

Polygon-Line euclidean distance fix #226

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
764e7c5
Simplify distance algorithms using Clippy suggestions
urschrei May 15, 2018
4c5a288
Correctly implement Line-Polygon distance
urschrei May 15, 2018
3b6c879
Add Line-Line euclidean distance
urschrei May 16, 2018
956c27a
Fix Line-inside-ring special case
urschrei May 16, 2018
8b71df6
Update CHANGES and bump version
urschrei May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Line-inside-ring special case
  • Loading branch information
@urschrei
urschrei committed May 16, 2018
commit 956c27af55f03a66f59776bd397760fb3c9d3bfb
40 changes: 36 additions & 4 deletions geo/src/algorithm/euclidean_distance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ where
// Line to Polygon distance
impl<T> EuclideanDistance<T, Polygon<T>> for Line<T>
where
T: Float + Signed + SpadeFloat,
T: Float + Signed + SpadeFloat + FloatConst,
{
fn euclidean_distance(&self, other: &Polygon<T>) -> T {
if other.contains(self) || self.intersects(other) {
Expand All @@ -355,8 +355,8 @@ where
.interiors
.iter()
.map(|ring| {
ring.points().fold(T::max_value(), |acc, point| {
acc.min(self.euclidean_distance(point))
ring.lines().fold(T::max_value(), |acc, line| {
acc.min(self.euclidean_distance(&line))
})
})
.fold(T::max_value(), |acc, ring_min| acc.min(ring_min));
Expand Down Expand Up @@ -862,7 +862,7 @@ mod test {
}
#[test]
// Line-Polygon test: closest point on Polygon is NOT nearest to a Line end-point
fn flibble() {
fn test_line_polygon_simple() {
let line = Line::new(Point::new(0.0, 0.0), Point::new(0.0, 3.0));
let v = vec![
(5.0, 1.0),
Expand All @@ -873,4 +873,36 @@ mod test {
let poly = Polygon::new(v.into(), vec![]);
assert_eq!(line.euclidean_distance(&poly), 0.25);
}
#[test]
// Line-Polygon test: Line intersects Polygon
fn test_line_polygon_intersects() {
let line = Line::new(Point::new(0.5, 0.0), Point::new(0.0, 3.0));
let v = vec![
(5.0, 1.0),
(5.0, 2.0),
(0.25, 1.5),
(5.0, 1.0)
];
let poly = Polygon::new(v.into(), vec![]);
assert_eq!(line.euclidean_distance(&poly), 0.0);
}
#[test]
// Line-Polygon test: Line contained by interior ring
fn test_line_polygon_inside_ring() {
let line = Line::new(Point::new(4.4, 1.5), Point::new(4.45, 1.5));
let v = vec![
(5.0, 1.0),
(5.0, 2.0),
(0.25, 1.0),
(5.0, 1.0)
];
let v2 = vec![
(4.5, 1.2),
(4.5, 1.8),
(3.5, 1.2),
(4.5, 1.2)
];
let poly = Polygon::new(v.into(), vec![v2.into()]);
assert_eq!(line.euclidean_distance(&poly), 0.04999999999999982);
}
}