Skip to content

Fix hop geometries when one pattern is replaced by another with different number of stops #6136

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

Merged
merged 4 commits into from
Nov 7, 2024
Merged

Fix hop geometries when one pattern is replaced by another with different number of stops #6136

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
372e4f0
add failing test for #6072
miklcct Oct 25, 2024
8753f82
fix failing test
miklcct Oct 25, 2024
00dbdf4
Merge branch 'dev-2.x' into fix-nextLeg-outOfBounds
miklcct Nov 5, 2024
15c862d
Fix conversion of coordinates
leonardehrenfried Nov 4, 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
11 changes: 4 additions & 7 deletions application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,12 @@ private List<LineString> generateHopGeometriesFromOriginalTripPattern() {
// being replaced having a different number of stops. In that case the geometry will be
// preserved up until the first mismatching stop, and a straight line will be used for
// all segments after that.
int sizeOfShortestPattern = Math.min(
stopPattern.getSize(),
originalTripPattern.numberOfStops()
);

List<LineString> hopGeometries = new ArrayList<>();

for (int i = 0; i < sizeOfShortestPattern - 1; i++) {
LineString hopGeometry = originalTripPattern.getHopGeometry(i);
for (int i = 0; i < stopPattern.getSize() - 1; i++) {
LineString hopGeometry = i < originalTripPattern.numberOfStops() - 1
? originalTripPattern.getHopGeometry(i)
: null;

if (hopGeometry != null && stopPattern.sameStops(originalTripPattern.getStopPattern(), i)) {
// Copy hop geometry from previous pattern
Expand Down
27 changes: 25 additions & 2 deletions application/src/test/java/org/opentripplanner/transit/model/network/TripPatternTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ class TripPatternTest {

private static final Route ROUTE = TimetableRepositoryForTest.route("routeId").build();
public static final RegularStop STOP_A = TEST_MODEL.stop("A").build();
public static final RegularStop STOP_X = TEST_MODEL.stop("X").build();
public static final RegularStop STOP_B = TEST_MODEL.stop("B").build();
public static final RegularStop STOP_Y = TEST_MODEL.stop("Y").build();
public static final RegularStop STOP_C = TEST_MODEL.stop("C").build();
private static final StopPattern STOP_PATTERN = TimetableRepositoryForTest.stopPattern(
STOP_A,
Expand All @@ -33,8 +35,8 @@ class TripPatternTest {
);

private static final List<LineString> HOP_GEOMETRIES = List.of(
makeLineString(STOP_A.getCoordinate(), STOP_B.getCoordinate()),
makeLineString(STOP_B.getCoordinate(), STOP_C.getCoordinate())
makeLineString(STOP_A.getCoordinate(), STOP_X.getCoordinate(), STOP_B.getCoordinate()),
makeLineString(STOP_B.getCoordinate(), STOP_Y.getCoordinate(), STOP_C.getCoordinate())
);

private static final TripPattern subject = TripPattern
Expand Down Expand Up @@ -70,6 +72,27 @@ void copy() {
assertEquals(HOP_GEOMETRIES.get(1), copy.getHopGeometry(1));
}

@Test
void hopGeometryForReplacementPattern() {
var pattern = TripPattern
.of(id("replacement"))
.withName("replacement")
.withRoute(ROUTE)
.withStopPattern(TimetableRepositoryForTest.stopPattern(STOP_A, STOP_B, STOP_X, STOP_Y))
.withOriginalTripPattern(subject)
.build();

assertEquals(HOP_GEOMETRIES.get(0), pattern.getHopGeometry(0));
assertEquals(
makeLineString(STOP_B.getCoordinate(), STOP_X.getCoordinate()),
pattern.getHopGeometry(1)
);
assertEquals(
makeLineString(STOP_X.getCoordinate(), STOP_Y.getCoordinate()),
pattern.getHopGeometry(2)
);
}

@Test
void sameAs() {
assertTrue(subject.sameAs(subject.copy().build()));
Expand Down
Loading