Skip to content

Commit f591ae8

Browse files
committed
Run cargo fmt
1 parent d23dc57 commit f591ae8

File tree

2 files changed

+45
-12
lines changed

2 files changed

+45
-12
lines changed

src/contour.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,15 @@ impl ContourBuilder {
8080
/// * `dy` - The number of rows in the grid.
8181
/// * `smooth` - Whether or not the generated rings will be smoothed using linear interpolation.
8282
pub fn new(dx: u32, dy: u32, smooth: bool) -> Self {
83-
ContourBuilder { dx, dy, smooth, x_origin: 0f64, y_origin: 0f64, x_step: 1f64, y_step: 1f64 }
83+
ContourBuilder {
84+
dx,
85+
dy,
86+
smooth,
87+
x_origin: 0f64,
88+
y_origin: 0f64,
89+
x_step: 1f64,
90+
y_step: 1f64,
91+
}
8492
}
8593

8694
/// Sets the x origin of the grid.
@@ -171,7 +179,9 @@ impl ContourBuilder {
171179
self.smoooth_linear(&mut ring, values, threshold);
172180
}
173181
// Compute the polygon coordinates according to the grid properties if needed
174-
if (self.x_origin, self.y_origin) != (0f64, 0f64) || (self.x_step, self.y_step) != (1f64, 1f64) {
182+
if (self.x_origin, self.y_origin) != (0f64, 0f64)
183+
|| (self.x_step, self.y_step) != (1f64, 1f64)
184+
{
175185
ring.iter_mut()
176186
.map(|point| {
177187
point[0] = point[0] * self.x_step + self.x_origin;

src/lib.rs

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,20 +457,43 @@ mod tests {
457457
geojson::Value::MultiPolygon(p) => {
458458
assert_eq!(
459459
p,
460-
vec![vec![vec![vec![110.0, 215.0], vec![110.0, 213.0], vec![110.0, 211.0], vec![110.0, 209.0],
461-
vec![110.0, 207.0], vec![109.0, 206.0], vec![107.0, 206.0], vec![106.0, 207.0],
462-
vec![106.0, 209.0], vec![106.0, 211.0], vec![106.0, 213.0], vec![106.0, 215.0],
463-
vec![107.0, 216.0], vec![109.0, 216.0], vec![110.0, 215.0]]],
464-
vec![vec![vec![114.0, 215.0], vec![114.0, 213.0], vec![114.0, 211.0], vec![114.0, 209.0],
465-
vec![114.0, 207.0], vec![113.0, 206.0], vec![112.0, 207.0], vec![112.0, 209.0],
466-
vec![112.0, 211.0], vec![112.0, 213.0], vec![112.0, 215.0], vec![113.0, 216.0], vec![114.0, 215.0]
467-
]
468-
]
460+
vec![
461+
vec![vec![
462+
vec![110.0, 215.0],
463+
vec![110.0, 213.0],
464+
vec![110.0, 211.0],
465+
vec![110.0, 209.0],
466+
vec![110.0, 207.0],
467+
vec![109.0, 206.0],
468+
vec![107.0, 206.0],
469+
vec![106.0, 207.0],
470+
vec![106.0, 209.0],
471+
vec![106.0, 211.0],
472+
vec![106.0, 213.0],
473+
vec![106.0, 215.0],
474+
vec![107.0, 216.0],
475+
vec![109.0, 216.0],
476+
vec![110.0, 215.0]
477+
]],
478+
vec![vec![
479+
vec![114.0, 215.0],
480+
vec![114.0, 213.0],
481+
vec![114.0, 211.0],
482+
vec![114.0, 209.0],
483+
vec![114.0, 207.0],
484+
vec![113.0, 206.0],
485+
vec![112.0, 207.0],
486+
vec![112.0, 209.0],
487+
vec![112.0, 211.0],
488+
vec![112.0, 213.0],
489+
vec![112.0, 215.0],
490+
vec![113.0, 216.0],
491+
vec![114.0, 215.0]
492+
]]
469493
]
470494
);
471495
}
472496
_ => panic!(""),
473497
};
474498
}
475-
476499
}

0 commit comments

Comments
 (0)