Skip to content

Bump i_overlay dependency to 3.4.1 #1359

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion geo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ proj = { version = "0.30.0", optional = true }
robust = "1.1.0"
rstar = "0.12.0"
serde = { version = "1.0", optional = true, features = ["derive"] }
i_overlay = { version = "2.0.0, < 2.1.0", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since i_overlay breaks API's on minor versions as a matter of policy, we need to keep i_overlay pinned to a minor version.

i_overlay = { version = "3.4.1", default-features = false }

[dev-dependencies]
approx = ">= 0.4.0, < 0.6.0"
Expand Down
3 changes: 0 additions & 3 deletions geo/src/algorithm/bool_ops/i_overlay_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@ pub(super) mod convert {

pub fn polygon_from_shape<T: BoolOpsNum>(shape: Vec<Vec<BoolOpsCoord<T>>>) -> Polygon<T> {
let mut rings = shape.into_iter().map(|path| {
// From i_overlay: > Note: Outer boundary paths have a clockwise order, and holes have a counterclockwise order.
// Which is the opposite convention we use.
let mut line_string = line_string_from_path(path);
line_string.close();
line_string.0.reverse();
line_string
});
let exterior = rings.next().unwrap_or(LineString::new(vec![]));
Expand Down
4 changes: 2 additions & 2 deletions geo/src/algorithm/bool_ops/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ pub fn unary_union<'a, B: BooleanOps + 'a>(
.collect::<Vec<_>>();

let fill_rule = if winding_order == Some(WindingOrder::Clockwise) {
FillRule::Positive
} else {
FillRule::Negative
} else {
FillRule::Positive
};

let shapes = FloatOverlay::with_subj(&subject).overlay(OverlayRule::Subject, fill_rule);
Expand Down
Loading