Skip to content

Revalidate fast-clip spike repairs #893

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

Open
Symmetricity wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revalidate fast-clip spike repairs #893

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/tile_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,17 +330,22 @@ Geometry TileDataSource::buildWayGeometry(OutputGeometryType const geomType,
fast_clip(mp, box);
geom::correct(mp);
geom::validity_failure_type failure = geom::validity_failure_type::no_failure;
if (!geom::is_valid(mp,failure)) {
bool valid = geom::is_valid(mp,failure);
if (!valid) {
if (failure==geom::failure_spikes) {
geom::remove_spikes(mp);
} else if (failure==geom::failure_self_intersections || failure==geom::failure_intersecting_interiors) {
// retry with Boost intersection if fast_clip has caused self-intersections
failure = geom::validity_failure_type::no_failure;
valid = geom::is_valid(mp,failure);
}
if (!valid && (failure==geom::failure_self_intersections || failure==geom::failure_intersecting_interiors)) {
MultiPolygon output;
geom::intersection(input, box, output);
geom::correct(output);

// retry with Boost intersection if fast_clip has caused self-intersections
multiPolygonClipCache.add(bbox, objectID, output);
return output;
} else {
} else if (!valid) {
// occasionally also wrong_topological_dimension, disconnected_interior
}
}
Expand Down