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.

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

Island pruning #3426

Merged
merged 27 commits into from
Oct 21, 2021
Merged

Island pruning #3426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
aaabde1
feat: more accurate island pruning with traverse mode specific connec…
vesameskanen Sep 8, 2021
f8e5115
fix: formatting
vesameskanen Sep 9, 2021
1818826
fix: do not pollute issueStore by listing every island (they are too …
vesameskanen Sep 9, 2021
a9a529a
chore: improve detailed logging about islands
vesameskanen Sep 10, 2021
867b5e5
fix: do not log irrelevant stop count (always zero)
vesameskanen Sep 13, 2021
2e7b763
feat: use lookup table for nothru colors
vesameskanen Sep 14, 2021
7101a35
fix: move island pruning after stop linking
vesameskanen Sep 14, 2021
f6c425a
chore: tune logging and remove transit unlinking which crashes OTP
vesameskanen Sep 14, 2021
1ca6eac
chore: more logging about islands with stops
vesameskanen Sep 15, 2021
97685ea
fix: do the cleanup in correct way
vesameskanen Sep 22, 2021
f6dcc5e
fix: keep spatial index valid, and relink disconnected stops
vesameskanen Sep 23, 2021
a7092e3
Merge remote-tracking branch 'otp/dev-2.x' into island-pruning
vesameskanen Sep 23, 2021
6cfec29
feat: report graph island related connectivity problems in detail
vesameskanen Sep 23, 2021
79c39f9
chore: restore some cleanup actions
vesameskanen Sep 27, 2021
03b8392
Merge remote-tracking branch 'otp/dev-2.x' into island-pruning
vesameskanen Oct 5, 2021
017042b
fix: remove some more (old and new) tabs
vesameskanen Oct 5, 2021
c589238
cleanup: remove broken old pruning, and make new pruning non-optional…
vesameskanen Oct 6, 2021
ea66dd0
Update src/main/java/org/opentripplanner/graph_builder/module/PruneNo…
vesameskanen Oct 13, 2021
e16c319
Update src/main/java/org/opentripplanner/graph_builder/module/PruneNo…
vesameskanen Oct 13, 2021
11f1121
Update src/main/java/org/opentripplanner/graph_builder/module/PruneNo…
vesameskanen Oct 13, 2021
8704177
fix: use Color array for noThru color definitions
vesameskanen Oct 13, 2021
6a6f278
cleanup: remove outdated duplicate logging
vesameskanen Oct 20, 2021
fcc2216
Merge remote-tracking branch 'otp/dev-2.x' into island-pruning
vesameskanen Oct 20, 2021
6370c32
fix: some null logfile params were left in calls, removed
vesameskanen Oct 20, 2021
62bf562
fix: stop to street linker now logs the linked stop count. No need to…
vesameskanen Oct 20, 2021
e8205f9
Merge remote-tracking branch 'otp/dev-2.x' into island-pruning
vesameskanen Oct 20, 2021
844a867
docs: update changelog
vesameskanen Oct 20, 2021
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
215 changes: 0 additions & 215 deletions src/main/java/org/opentripplanner/common/StreetUtils.java
View file
Open in desktop

This file was deleted.

17 changes: 13 additions & 4 deletions src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.opentripplanner.graph_builder.module.DirectTransferGenerator;
import org.opentripplanner.graph_builder.module.GtfsModule;
import org.opentripplanner.graph_builder.module.PruneFloatingIslands;
import org.opentripplanner.graph_builder.module.PruneNoThruIslands;
import org.opentripplanner.graph_builder.module.StreetLinkerModule;
import org.opentripplanner.graph_builder.module.TransitToTaggedStopsModule;
import org.opentripplanner.graph_builder.module.map.BusRouteStreetMatcher;
Expand Down Expand Up @@ -125,10 +126,18 @@ public static GraphBuilder create(
osmModule.banDiscouragedBiking = config.banDiscouragedBiking;
osmModule.maxAreaNodes = config.maxAreaNodes;
graphBuilder.addModule(osmModule);
PruneFloatingIslands pruneFloatingIslands = new PruneFloatingIslands();
pruneFloatingIslands.setPruningThresholdIslandWithoutStops(config.pruningThresholdIslandWithoutStops);
pruneFloatingIslands.setPruningThresholdIslandWithStops(config.pruningThresholdIslandWithStops);
graphBuilder.addModule(pruneFloatingIslands);
if (OTPFeature.PruneIslands.isOn()) { // original pruning
t2gran marked this conversation as resolved.
Show resolved Hide resolved
PruneFloatingIslands pruneFloatingIslands = new PruneFloatingIslands();
pruneFloatingIslands.setPruningThresholdIslandWithoutStops(config.pruningThresholdIslandWithoutStops);
pruneFloatingIslands.setPruningThresholdIslandWithStops(config.pruningThresholdIslandWithStops);
graphBuilder.addModule(pruneFloatingIslands);
}
if (OTPFeature.PruneNoThru.isOn()) { // more advanced island pruning
PruneNoThruIslands pruneNoThruIslands = new PruneNoThruIslands();
pruneNoThruIslands.setPruningThresholdIslandWithoutStops(config.pruningThresholdIslandWithoutStops);
pruneNoThruIslands.setPruningThresholdIslandWithStops(config.pruningThresholdIslandWithStops);
graphBuilder.addModule(pruneNoThruIslands);
}
}
if ( hasGtfs ) {
List<GtfsBundle> gtfsBundles = Lists.newArrayList();
Expand Down
Loading