Skip to content

Commit 4fc0c2e

Browse files
committed
apply empty to other crates
1 parent 2653f90 commit 4fc0c2e

19 files changed

+29
-33
lines changed

geo-traits/src/to_geo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl<T: CoordNum, G: PolygonTrait<T = T>> ToGeoPolygon<T> for G {
8181
let exterior = if let Some(exterior) = self.exterior() {
8282
exterior.to_line_string()
8383
} else {
84-
LineString::new(vec![])
84+
LineString::empty()
8585
};
8686
let interiors = self
8787
.interiors()

geo/src/algorithm/bool_ops/i_overlay_integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub(super) mod convert {
5454
line_string.0.reverse();
5555
line_string
5656
});
57-
let exterior = rings.next().unwrap_or(LineString::new(vec![]));
57+
let exterior = rings.next().unwrap_or(LineString::empty());
5858

5959
Polygon::new(exterior, rings.collect())
6060
}

geo/src/algorithm/bool_ops/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn test_unary_union_errors() {
3131

3232
let naive_union = {
3333
let start = Instant::now();
34-
let mut output = MultiPolygon::new(Vec::new());
34+
let mut output = MultiPolygon::empty();
3535
for poly in input.iter() {
3636
output = output.union(poly);
3737
}
@@ -279,7 +279,7 @@ mod gh_issues {
279279
wkt!(POLYGON((3.3493652 -55.80127,171.22443 -300.,195.83728 -300.,-46.650635 30.80127,3.3493652 -55.80127))),
280280
];
281281

282-
let mut multi: MultiPolygon<f32> = MultiPolygon::new(Vec::new());
282+
let mut multi: MultiPolygon<f32> = MultiPolygon::empty();
283283
for poly in polygons {
284284
multi = multi.union(&MultiPolygon::new(vec![poly]));
285285
}

geo/src/algorithm/centroid.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ mod test {
745745
// Tests: Centroid of MultiLineString
746746
#[test]
747747
fn empty_multilinestring_test() {
748-
let mls: MultiLineString = MultiLineString::new(vec![]);
748+
let mls: MultiLineString = MultiLineString::empty();
749749
let centroid = mls.centroid();
750750
assert!(centroid.is_none());
751751
}
@@ -924,7 +924,7 @@ mod test {
924924
fn empty_interior_polygon_test() {
925925
let poly = Polygon::new(
926926
LineString::from(vec![p(0., 0.), p(0., 1.), p(1., 1.), p(1., 0.), p(0., 0.)]),
927-
vec![LineString::new(vec![])],
927+
vec![LineString::empty()],
928928
);
929929
assert_eq!(poly.centroid(), Some(p(0.5, 0.5)));
930930
}
@@ -947,7 +947,7 @@ mod test {
947947
// Tests: Centroid of MultiPolygon
948948
#[test]
949949
fn empty_multipolygon_polygon_test() {
950-
assert!(MultiPolygon::<f64>::new(Vec::new()).centroid().is_none());
950+
assert!(MultiPolygon::<f64>::empty().centroid().is_none());
951951
}
952952

953953
#[test]

geo/src/algorithm/closest_point.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ mod tests {
260260

261261
#[test]
262262
fn empty_line_string_is_indeterminate() {
263-
let ls = LineString::new(Vec::new());
263+
let ls = LineString::empty();
264264
let p = Point::new(0.0, 0.0);
265265

266266
let got = ls.closest_point(&p);

geo/src/algorithm/contains/mod.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ mod test {
176176
/// Tests: Point in LineString
177177
#[test]
178178
fn empty_linestring_test() {
179-
let linestring = LineString::new(Vec::new());
179+
let linestring = LineString::empty();
180180
assert!(!linestring.contains(&Point::new(2., 1.)));
181181
}
182182
#[test]
@@ -196,8 +196,7 @@ mod test {
196196
/// Tests: Point in Polygon
197197
#[test]
198198
fn empty_polygon_test() {
199-
let linestring = LineString::new(Vec::new());
200-
let poly = Polygon::new(linestring, Vec::new());
199+
let poly = Polygon::empty();
201200
assert!(!poly.contains(&Point::new(2., 1.)));
202201
}
203202
#[test]
@@ -275,7 +274,7 @@ mod test {
275274
/// Tests: Point in MultiPolygon
276275
#[test]
277276
fn empty_multipolygon_test() {
278-
let multipoly = MultiPolygon::new(Vec::new());
277+
let multipoly = MultiPolygon::empty();
279278
assert!(!multipoly.contains(&Point::new(2., 1.)));
280279
}
281280
#[test]
@@ -605,7 +604,7 @@ mod test {
605604
#[test]
606605
fn rect_contains_empty_polygon() {
607606
let rect = Rect::new(coord! { x: 90., y: 150. }, coord! { x: 300., y: 360. });
608-
let empty_poly = Polygon::new(line_string![], vec![]);
607+
let empty_poly = Polygon::empty();
609608
assert_eq!(
610609
rect.contains(&empty_poly),
611610
rect.relate(&empty_poly).is_contains()

geo/src/algorithm/coordinate_position.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ mod test {
452452

453453
#[test]
454454
fn test_empty_poly() {
455-
let square_poly: Polygon<f64> = Polygon::new(LineString::new(vec![]), vec![]);
455+
let square_poly: Polygon<f64> = Polygon::empty();
456456
assert_eq!(
457457
square_poly.coordinate_position(&Coord::zero()),
458458
CoordPos::Outside

geo/src/algorithm/densify_haversine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ mod tests {
221221

222222
#[test]
223223
fn test_empty_linestring() {
224-
let linestring: LineString<f64> = LineString::new(vec![]);
224+
let linestring: LineString<f64> = LineString::empty();
225225
#[allow(deprecated)]
226226
let dense = linestring.densify_haversine(10.0);
227227
assert_eq!(0, dense.coords_count());

geo/src/algorithm/dimensions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub trait HasDimensions {
5050
/// ]);
5151
/// assert!(!line_string.is_empty());
5252
///
53-
/// let empty_line_string: LineString = LineString::new(vec![]);
53+
/// let empty_line_string: LineString = LineString::empty();
5454
/// assert!(empty_line_string.is_empty());
5555
///
5656
/// let point = Point::new(0.0, 0.0);
@@ -89,7 +89,7 @@ pub trait HasDimensions {
8989
/// assert_eq!(Dimensions::ZeroDimensional, point.dimensions());
9090
///
9191
/// // An `Empty` dimensionality is distinct from, and less than, being 0-dimensional
92-
/// let empty_collection = GeometryCollection::<f32>::new_from(vec![]);
92+
/// let empty_collection = GeometryCollection::<f32>::empty();
9393
/// assert_eq!(Dimensions::Empty, empty_collection.dimensions());
9494
/// assert!(empty_collection.dimensions() < point.dimensions());
9595
/// ```

geo/src/algorithm/euclidean_distance.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,7 @@ mod test {
769769
#[test]
770770
// Point to LineString, empty LineString
771771
fn point_linestring_empty_test() {
772-
let points = vec![];
773-
let ls = LineString::new(points);
772+
let ls = LineString::empty();
774773
let p = Point::new(5.0, 4.0);
775774
let dist = p.euclidean_distance(&ls);
776775
assert_relative_eq!(dist, 0.0);

0 commit comments

Comments
 (0)