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.

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

Remove the transformation that shrinks overlapping roads. #167

Merged
merged 1 commit into from
Jan 3, 2023
Merged
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
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions docs/how_it_works.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ There are special cases documented in the code.

A "simple sausage link" is a dual carriageway that split very briefly and then re-joins, with no intermediate roads. These are collapsed into one road between the intersections, with a barrier lane inserted in the middle. The code is well-documented and better reference.

### ShrinkOverlappingRoads

This is a hack to make dual carriageways drawn close together in OSM look half-reasonable, before we successfully merge them. It looks for road polygons that physically overlap, then just halves all lane widths. It doesn't attempt to shift the road center or re-apply placement tags.

### MergeDualCarriageways (experimental)

TODO. Explain branches and bridges.
Expand Down
1 change: 0 additions & 1 deletion osm2streets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ authors = ["Dustin Carlino <[email protected]>"]
edition = "2021"

[dependencies]
aabb-quadtree = "0.1.0"
abstutil = { git = "https://github.com/a-b-street/abstreet" }
anyhow = "1.0.38"
geom = { git = "https://github.com/a-b-street/abstreet" }
Expand Down
7 changes: 0 additions & 7 deletions osm2streets/src/transform/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ mod intersection_geometry;
mod remove_disconnected;
mod sausage_links;
mod separate_cycletracks;
mod shrink_roads;

/// An in-place transformation of a `StreetNetwork`.
pub enum Transformation {
Expand All @@ -19,7 +18,6 @@ pub enum Transformation {
CollapseShortRoads,
CollapseDegenerateIntersections,
CollapseSausageLinks,
ShrinkOverlappingRoads,
MergeDualCarriageways,
GenerateIntersectionGeometry,
}
Expand All @@ -32,7 +30,6 @@ impl Transformation {
Transformation::CollapseSausageLinks,
Transformation::CollapseShortRoads,
Transformation::CollapseDegenerateIntersections,
Transformation::ShrinkOverlappingRoads,
Transformation::GenerateIntersectionGeometry,
// The above may discover more roads to collapse
Transformation::CollapseShortRoads,
Expand Down Expand Up @@ -73,7 +70,6 @@ impl Transformation {
Transformation::CollapseShortRoads => "collapse short roads",
Transformation::CollapseDegenerateIntersections => "collapse degenerate intersections",
Transformation::CollapseSausageLinks => "collapse sausage links",
Transformation::ShrinkOverlappingRoads => "shrink overlapping roads",
Transformation::MergeDualCarriageways => "merge dual carriageways",
Transformation::GenerateIntersectionGeometry => "generate intersection geometry",
}
Expand All @@ -100,9 +96,6 @@ impl Transformation {
Transformation::CollapseSausageLinks => {
sausage_links::collapse_sausage_links(streets);
}
Transformation::ShrinkOverlappingRoads => {
shrink_roads::shrink(streets, timer);
}
Transformation::MergeDualCarriageways => {
dual_carriageways::merge(streets);
}
Expand Down
73 changes: 0 additions & 73 deletions osm2streets/src/transform/shrink_roads.rs

This file was deleted.

Loading