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

A few minor coord! followup cleanups #765

Merged
merged 2 commits into from
Mar 14, 2022
Merged

A few minor coord! followup cleanups #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa77f28
A few minor coord! followup cleanups
nyurik Mar 11, 2022
479709b
and a few more
nyurik Mar 11, 2022
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
4 changes: 2 additions & 2 deletions geo-types/src/coordinate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ use num_traits::Zero;
/// ```
impl<T: CoordNum> Coordinate<T> {
pub fn zero() -> Self {
Coordinate {
coord! {
x: T::zero(),
y: T::zero(),
}
Expand Down Expand Up @@ -295,7 +295,7 @@ where
const DIMENSIONS: usize = 2;

fn generate(generator: impl Fn(usize) -> Self::Scalar) -> Self {
Coordinate {
coord! {
x: generator(0),
y: generator(1),
}
Expand Down
4 changes: 2 additions & 2 deletions geo-types/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ macro_rules! point {
/// Creates a [`Coordinate`] from the given scalars.
///
/// ```txt
/// coord!(x: <number>, y: <number>)
/// coord! { x: <number>, y: <number> }
/// ```
///
/// # Examples
Expand All @@ -40,7 +40,7 @@ macro_rules! point {
/// ```
/// use geo_types::coord;
///
/// let c = coord!(x: 181.2, y: 51.79);
/// let c = coord! { x: 181.2, y: 51.79 };
///
/// assert_eq!(c, geo_types::coord! { x: 181.2, y: 51.79 });
/// ```
Expand Down
2 changes: 1 addition & 1 deletion geo/src/algorithm/coordinate_position.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ mod test {
CoordPos::OnBoundary
);
assert_eq!(
triangle.coordinate_position(&Coordinate { x: 2.49, y: 5.0 }),
triangle.coordinate_position(&coord! { x: 2.49, y: 5.0 }),
CoordPos::Outside
);
}
Expand Down
91 changes: 44 additions & 47 deletions geo/src/algorithm/lines_iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub trait LinesIter<'a> {
/// ```
/// use geo::line_string;
/// use geo::lines_iter::LinesIter;
/// use geo::{Coordinate, Line};
/// use geo::{coord, Line};
///
/// let ls = line_string![
/// (x: 1., y: 2.),
Expand All @@ -28,15 +28,15 @@ pub trait LinesIter<'a> {
/// let mut iter = ls.lines_iter();
/// assert_eq!(
/// Some(Line::new(
/// Coordinate { x: 1., y: 2. },
/// Coordinate { x: 23., y: 82. }
/// coord! { x: 1., y: 2. },
/// coord! { x: 23., y: 82. }
/// )),
/// iter.next()
/// );
/// assert_eq!(
/// Some(Line::new(
/// Coordinate { x: 23., y: 82. },
/// Coordinate { x: -1., y: 0. }
/// coord! { x: 23., y: 82. },
/// coord! { x: -1., y: 0. }
/// )),
/// iter.next()
/// );
Expand Down Expand Up @@ -165,17 +165,14 @@ mod test {

use super::LinesIter;
use crate::{
line_string, polygon, Coordinate, Line, LineString, MultiLineString, MultiPolygon, Rect,
coord, line_string, polygon, Line, LineString, MultiLineString, MultiPolygon, Rect,
Triangle,
};

#[test]
fn test_line() {
let line = Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 5., y: 10. });
let want = vec![Line::new(
Coordinate { x: 0., y: 0. },
Coordinate { x: 5., y: 10. },
)];
let line = Line::new(coord! { x: 0., y: 0. }, coord! { x: 5., y: 10. });
let want = vec![Line::new(coord! { x: 0., y: 0. }, coord! { x: 5., y: 10. })];
assert_eq!(want, line.lines_iter().collect::<Vec<_>>());
}

Expand All @@ -189,8 +186,8 @@ mod test {
fn test_open_line_string() {
let ls = line_string![(x: 0., y: 0.), (x: 1., y: 1.), (x:2., y: 2.)];
let want = vec![
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 1., y: 1. }),
Line::new(Coordinate { x: 1., y: 1. }, Coordinate { x: 2., y: 2. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 1., y: 1. }),
Line::new(coord! { x: 1., y: 1. }, coord! { x: 2., y: 2. }),
];
assert_eq!(want, ls.lines_iter().collect::<Vec<_>>());
}
Expand All @@ -200,9 +197,9 @@ mod test {
let mut ls = line_string![(x: 0., y: 0.), (x: 1., y: 1.), (x:2., y: 2.)];
ls.close();
let want = vec![
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 1., y: 1. }),
Line::new(Coordinate { x: 1., y: 1. }, Coordinate { x: 2., y: 2. }),
Line::new(Coordinate { x: 2., y: 2. }, Coordinate { x: 0., y: 0. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 1., y: 1. }),
Line::new(coord! { x: 1., y: 1. }, coord! { x: 2., y: 2. }),
Line::new(coord! { x: 2., y: 2. }, coord! { x: 0., y: 0. }),
];
assert_eq!(want, ls.lines_iter().collect::<Vec<_>>());
}
Expand All @@ -215,9 +212,9 @@ mod test {
line_string![(x: 0., y: 0.), (x: 1., y: 1.), (x:2., y: 2.)],
]);
let want = vec![
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 1., y: 1. }),
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 1., y: 1. }),
Line::new(Coordinate { x: 1., y: 1. }, Coordinate { x: 2., y: 2. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 1., y: 1. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 1., y: 1. }),
Line::new(coord! { x: 1., y: 1. }, coord! { x: 2., y: 2. }),
];
assert_eq!(want, mls.lines_iter().collect::<Vec<_>>());
}
Expand All @@ -233,20 +230,20 @@ mod test {
);
let want = vec![
// exterior ring
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 0., y: 10. }),
Line::new(Coordinate { x: 0., y: 10. }, Coordinate { x: 10., y: 10. }),
Line::new(Coordinate { x: 10., y: 10. }, Coordinate { x: 10., y: 0. }),
Line::new(Coordinate { x: 10., y: 0. }, Coordinate { x: 0., y: 0. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 0., y: 10. }),
Line::new(coord! { x: 0., y: 10. }, coord! { x: 10., y: 10. }),
Line::new(coord! { x: 10., y: 10. }, coord! { x: 10., y: 0. }),
Line::new(coord! { x: 10., y: 0. }, coord! { x: 0., y: 0. }),
// first interior ring
Line::new(Coordinate { x: 1., y: 1. }, Coordinate { x: 1., y: 2. }),
Line::new(Coordinate { x: 1., y: 2. }, Coordinate { x: 2., y: 2. }),
Line::new(Coordinate { x: 2., y: 2. }, Coordinate { x: 2., y: 1. }),
Line::new(Coordinate { x: 2., y: 1. }, Coordinate { x: 1., y: 1. }),
Line::new(coord! { x: 1., y: 1. }, coord! { x: 1., y: 2. }),
Line::new(coord! { x: 1., y: 2. }, coord! { x: 2., y: 2. }),
Line::new(coord! { x: 2., y: 2. }, coord! { x: 2., y: 1. }),
Line::new(coord! { x: 2., y: 1. }, coord! { x: 1., y: 1. }),
// second interior ring
Line::new(Coordinate { x: 3., y: 3. }, Coordinate { x: 5., y: 3. }),
Line::new(Coordinate { x: 5., y: 3. }, Coordinate { x: 5., y: 5. }),
Line::new(Coordinate { x: 5., y: 5. }, Coordinate { x: 3., y: 5. }),
Line::new(Coordinate { x: 3., y: 5. }, Coordinate { x: 3., y: 3. }),
Line::new(coord! { x: 3., y: 3. }, coord! { x: 5., y: 3. }),
Line::new(coord! { x: 5., y: 3. }, coord! { x: 5., y: 5. }),
Line::new(coord! { x: 5., y: 5. }, coord! { x: 3., y: 5. }),
Line::new(coord! { x: 3., y: 5. }, coord! { x: 3., y: 3. }),
];
assert_eq!(want, p.lines_iter().collect::<Vec<_>>());
}
Expand All @@ -265,37 +262,37 @@ mod test {
]);
let want = vec![
// first polygon - exterior ring
Line::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 0., y: 10. }),
Line::new(Coordinate { x: 0., y: 10. }, Coordinate { x: 10., y: 10. }),
Line::new(Coordinate { x: 10., y: 10. }, Coordinate { x: 10., y: 0. }),
Line::new(Coordinate { x: 10., y: 0. }, Coordinate { x: 0., y: 0. }),
Line::new(coord! { x: 0., y: 0. }, coord! { x: 0., y: 10. }),
Line::new(coord! { x: 0., y: 10. }, coord! { x: 10., y: 10. }),
Line::new(coord! { x: 10., y: 10. }, coord! { x: 10., y: 0. }),
Line::new(coord! { x: 10., y: 0. }, coord! { x: 0., y: 0. }),
// first polygon - interior ring
Line::new(Coordinate { x: 1., y: 1. }, Coordinate { x: 1., y: 2. }),
Line::new(Coordinate { x: 1., y: 2. }, Coordinate { x: 2., y: 2. }),
Line::new(Coordinate { x: 2., y: 2. }, Coordinate { x: 2., y: 1. }),
Line::new(Coordinate { x: 2., y: 1. }, Coordinate { x: 1., y: 1. }),
Line::new(coord! { x: 1., y: 1. }, coord! { x: 1., y: 2. }),
Line::new(coord! { x: 1., y: 2. }, coord! { x: 2., y: 2. }),
Line::new(coord! { x: 2., y: 2. }, coord! { x: 2., y: 1. }),
Line::new(coord! { x: 2., y: 1. }, coord! { x: 1., y: 1. }),
// second polygon - exterior ring
Line::new(Coordinate { x: 3., y: 3. }, Coordinate { x: 5., y: 3. }),
Line::new(Coordinate { x: 5., y: 3. }, Coordinate { x: 5., y: 5. }),
Line::new(Coordinate { x: 5., y: 5. }, Coordinate { x: 3., y: 5. }),
Line::new(Coordinate { x: 3., y: 5. }, Coordinate { x: 3., y: 3. }),
Line::new(coord! { x: 3., y: 3. }, coord! { x: 5., y: 3. }),
Line::new(coord! { x: 5., y: 3. }, coord! { x: 5., y: 5. }),
Line::new(coord! { x: 5., y: 5. }, coord! { x: 3., y: 5. }),
Line::new(coord! { x: 3., y: 5. }, coord! { x: 3., y: 3. }),
];
assert_eq!(want, mp.lines_iter().collect::<Vec<_>>());
}

#[test]
fn test_rect() {
let rect = Rect::new(Coordinate { x: 0., y: 0. }, Coordinate { x: 1., y: 2. });
let rect = Rect::new(coord! { x: 0., y: 0. }, coord! { x: 1., y: 2. });
let want = rect.to_polygon().lines_iter().collect::<Vec<_>>();
assert_eq!(want, rect.lines_iter().collect::<Vec<_>>());
}

#[test]
fn test_triangle() {
let triangle = Triangle(
Coordinate { x: 0., y: 0. },
Coordinate { x: 1., y: 2. },
Coordinate { x: 2., y: 3. },
coord! { x: 0., y: 0. },
coord! { x: 1., y: 2. },
coord! { x: 2., y: 3. },
);
let want = triangle.to_polygon().lines_iter().collect::<Vec<_>>();
assert_eq!(want, triangle.lines_iter().collect::<Vec<_>>());
Expand Down
4 changes: 2 additions & 2 deletions geo/src/algorithm/map_coords.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,8 @@ mod test {
}
});
let new_rect = result.unwrap();
assert_eq!(new_rect.min(), Coordinate { x: 1, y: 1 });
assert_eq!(new_rect.max(), Coordinate { x: 4, y: 4 });
assert_eq!(new_rect.min(), coord! { x: 1, y: 1 });
assert_eq!(new_rect.max(), coord! { x: 4, y: 4 });
}

#[test]
Expand Down