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

Enable mode-specific transfers by storing mode information in transfers #6293

Open
wants to merge 16 commits into
base: dev-2.x
Choose a base branch
from
Open

Enable mode-specific transfers by storing mode information in transfers #6293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
33189c2
Rename 'transferByStopIndex' variable to 'transfersByStopIndex'.
VillePihlava Nov 26, 2024
aa4927e
Add changes for CAR transfers.
VillePihlava Nov 29, 2024
4c882f4
Add EnumSet of StreetModes to PathTransfers and implement mode-specif…
VillePihlava Nov 29, 2024
44e4d31
Add test for mode-specific transfers.
VillePihlava Nov 29, 2024
8448e6e
Remove unused imports and small changes.
VillePihlava Nov 29, 2024
3c46be3
Add logging for mode-specific transfers.
VillePihlava Dec 3, 2024
c4951ff
Merge branch 'dev-2.x' of github.com:opentripplanner/OpenTripPlanner …
VillePihlava Dec 4, 2024
244c537
Fix flex routing transfer calculations and only calculate flex transf…
VillePihlava Dec 4, 2024
012f149
Add changes based on review comments.
VillePihlava Dec 9, 2024
984d34e
Change how EnumSet is copied and make EnumSet immutable in Transfer.
VillePihlava Dec 9, 2024
3ae6eed
Change logging in transfer calculations.
VillePihlava Dec 11, 2024
4a01328
Refactor to use method.
VillePihlava Dec 12, 2024
95e9ca7
Rename getTransfersByMode to findTransfers.
VillePihlava Dec 12, 2024
df64c5a
Changes based on review comments and small optimization.
VillePihlava Dec 13, 2024
9b44df0
Add comments.
VillePihlava Dec 13, 2024
c75b0a2
Fix spelling.
VillePihlava Dec 13, 2024
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
4 changes: 1 addition & 3 deletions application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ public class FlexIndex {

public FlexIndex(TimetableRepository timetableRepository) {
// Flex transfers should only use WALK mode transfers.
StreetMode mode = StreetMode.WALK;
List<PathTransfer> filteredPathTransfers = timetableRepository.getAllPathTransfers().stream().filter(pathTransfer -> pathTransfer.getModes().contains(mode)).toList();
for (PathTransfer transfer : filteredPathTransfers) {
for (PathTransfer transfer : timetableRepository.getTransfersByMode(StreetMode.WALK)) {
transfersToStop.put(transfer.to, transfer);
transfersFromStop.put(transfer.from, transfer);
leonardehrenfried marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
3 changes: 2 additions & 1 deletion application/src/main/java/org/opentripplanner/transit/service/TimetableRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -434,7 +435,7 @@ public Collection<PathTransfer> getTransfersByStop(StopLocation stop) {
return transfersByStop.get(stop);
}

public Collection<PathTransfer> getTransfersByMode(StreetMode mode) {
public List<PathTransfer> getTransfersByMode(StreetMode mode) {
Copy link
Member

Choose a reason for hiding this comment

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

I think this method should be called findTransfers according to the naming conventions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I renamed getTransfersByMode to findTransfers

return transfersByStop
.values()
.stream()
Expand Down
Loading