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

Allow LineString creation from vec of two-element CoordinateType array #223

Merged
merged 2 commits into from
May 15, 2018
Merged

Allow LineString creation from vec of two-element CoordinateType array #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac5cf9
Implement LineString::into() for 2-element CoordinateType arrays
urschrei May 15, 2018
d5afeb9
Rustfmt pass
urschrei May 15, 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
45 changes: 36 additions & 9 deletions geo-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use num_traits::{Float, Num, NumCast, Signed, ToPrimitive};
use std::iter::{FromIterator, Iterator};

#[cfg(feature = "spade")]
use spade::{BoundingRect, PointN, SpatialObject, TwoDimensional, SpadeNum};
use spade::{BoundingRect, PointN, SpadeNum, SpatialObject, TwoDimensional};

/// The type of an x or y value of a point/coordinate.
///
Expand Down Expand Up @@ -50,6 +50,15 @@ impl<T: CoordinateType> From<(T, T)> for Coordinate<T> {
}
}

impl<T: CoordinateType> From<[T; 2]> for Coordinate<T> {
fn from(coords: [T; 2]) -> Self {
Coordinate {
x: coords[0],
y: coords[1],
}
}
}

/// A single Point in 2D space.
///
/// Points can be created using the `new(x, y)` constructor, or from a `Coordinate` or pair of points.
Expand Down Expand Up @@ -78,6 +87,12 @@ impl<T: CoordinateType> From<(T, T)> for Point<T> {
}
}

impl<T: CoordinateType> From<[T; 2]> for Point<T> {
fn from(coords: [T; 2]) -> Point<T> {
Point::new(coords[0], coords[1])
}
}

impl<T> Point<T>
where
T: CoordinateType + ToPrimitive,
Expand Down Expand Up @@ -471,6 +486,11 @@ where
/// let line: LineString<f32> = vec![(0., 0.), (10., 0.)].into();
/// ```
///
/// ```
/// # use geo_types::{LineString, Point};
/// let line: LineString<f64> = vec![[0., 0.], [10., 0.]].into();
/// ```
///
/// Or `collect`ing from a Point iterator
///
/// ```
Expand Down Expand Up @@ -594,6 +614,15 @@ impl<T: CoordinateType> IntoIterator for MultiLineString<T> {
/// A representation of an area. Its outer boundary is represented by a [`LineString`](struct.LineString.html) that is both closed and simple
///
/// It has one exterior *ring* or *shell*, and zero or more interior rings, representing holes.
///
/// Polygons can be created from collections of `Point`-like objects, such as arrays or tuples:
///
/// ```
/// use geo_types::{Point, LineString, Polygon};
/// let poly1 = Polygon::new(vec![[0., 0.], [10., 0.]].into(), vec![]);
/// let poly2 = Polygon::new(vec![(0., 0.), (10., 0.)].into(), vec![]);
/// ```
///
#[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct Polygon<T>
Expand Down Expand Up @@ -910,14 +939,12 @@ mod test {
Point::new(1., 0.),
Point::new(0., 0.),
]);
let interiors = vec![
LineString(vec![
Point::new(0.1, 0.1),
Point::new(0.9, 0.9),
Point::new(0.9, 0.1),
Point::new(0.1, 0.1),
]),
];
let interiors = vec![LineString(vec![
Point::new(0.1, 0.1),
Point::new(0.9, 0.9),
Point::new(0.9, 0.1),
Point::new(0.1, 0.1),
])];
let p = Polygon::new(exterior.clone(), interiors.clone());

assert_eq!(p.exterior, exterior);
Expand Down