diff --git a/.attach_pid128911 b/.attach_pid128911 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java b/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java index 4a01b3562c7..628a8dc1a61 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java @@ -52,7 +52,6 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } final NearbyStop that = (NearbyStop) o; return Double.compare(that.distance, distance) == 0 - && distanceIndependentTime == that.distanceIndependentTime && stop.equals(that.stop) && Objects.equals(edges, that.edges) && Objects.equals(geometry, that.geometry) @@ -61,14 +60,13 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(stop, distance, distanceIndependentTime, edges, geometry, state); + return Objects.hash(stop, distance, edges, geometry, state); } public String toString() { return String.format( - "stop %s at %.1f meters%s%s%s%s", + "stop %s at %.1f meters%s%s%s", stop, distance, - distanceIndependentTime > 0 ? " +" + distanceIndependentTime + " seconds" : "", edges != null ? " (" + edges.size() + " edges)" : "", geometry != null ? " w/geometry" : "", state != null ? " w/state" : "" diff --git a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java b/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java index 2baac49cc99..0fe38ee2113 100644 --- a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java +++ b/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java @@ -1,11 +1,12 @@ package org.opentripplanner.api.parameter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.opentripplanner.routing.api.request.RequestModes; import javax.ws.rs.BadRequestException; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.opentripplanner.routing.api.request.StreetMode.BIKE; import static org.opentripplanner.routing.api.request.StreetMode.BIKE_RENTAL; @@ -13,11 +14,6 @@ import static org.opentripplanner.routing.api.request.StreetMode.FLEXIBLE; import static org.opentripplanner.routing.api.request.StreetMode.WALK; -import java.util.Set; -import javax.ws.rs.BadRequestException; -import org.junit.Test; -import org.opentripplanner.routing.api.request.RequestModes; - public class QualifiedModeSetTest { @Test public void emptyModeSet() { @@ -28,14 +24,14 @@ public void emptyModeSet() { public void singleWalk() { QualifiedModeSet modeSet = new QualifiedModeSet("WALK"); assertEquals(Set.of(new QualifiedMode("WALK")), modeSet.qModes); - assertEquals(new RequestModes(WALK, WALK, WALK, Set.of()), modeSet.getRequestModes()); + assertEquals(new RequestModes(WALK, WALK, WALK, WALK, Set.of()), modeSet.getRequestModes()); } @Test public void multipleWalks() { QualifiedModeSet modeSet = new QualifiedModeSet("WALK,WALK,WALK"); assertEquals(Set.of(new QualifiedMode("WALK")), modeSet.qModes); - assertEquals(new RequestModes(WALK, WALK, WALK, Set.of()), modeSet.getRequestModes()); + assertEquals(new RequestModes(WALK, WALK, WALK, WALK, Set.of()), modeSet.getRequestModes()); } @Test @@ -45,7 +41,7 @@ public void singleWalkAndBicycle() { new QualifiedMode("WALK"), new QualifiedMode("BICYCLE") ), modeSet.qModes); - assertEquals(new RequestModes(BIKE, BIKE, BIKE, Set.of()), modeSet.getRequestModes()); + assertEquals(new RequestModes(BIKE, BIKE, BIKE, BIKE, Set.of()), modeSet.getRequestModes()); } @Test @@ -65,7 +61,7 @@ public void singleWalkAndBicycleToPark() { new QualifiedMode("WALK"), new QualifiedMode("BICYCLE_PARK") ), modeSet.qModes); - assertEquals(new RequestModes(BIKE_TO_PARK, WALK, BIKE_TO_PARK, Set.of()), modeSet.getRequestModes()); + assertEquals(new RequestModes(BIKE_TO_PARK, WALK, WALK, BIKE_TO_PARK, Set.of()), modeSet.getRequestModes()); } @Test @@ -75,7 +71,7 @@ public void multipleWalksAndBicycle() { new QualifiedMode("WALK"), new QualifiedMode("BICYCLE") ), modeSet.qModes); - assertEquals(new RequestModes(BIKE, BIKE, BIKE, Set.of()), modeSet.getRequestModes()); + assertEquals(new RequestModes(BIKE, BIKE, BIKE, BIKE, Set.of()), modeSet.getRequestModes()); } @Test diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java index 3448415c52f..d11d78d2f1a 100644 --- a/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java +++ b/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java @@ -37,8 +37,8 @@ public void build() { @Test void findClosestStops() { - var ns1 = new NearbyStop(S1, 0, null, linestring(47.500, 19.000, 47.500, 19.000), null); - var ns2 = new NearbyStop(S2, 1112, null, linestring(47.500, 19.000, 47.510, 19.000), null); + var ns1 = new NearbyStop(S1.getStop(), 0, null, null, null); + var ns2 = new NearbyStop(S2.getStop(), 1112, null, null, null); var testee = new DirectGraphFinder(graph); assertEquals( diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java index 6e88d4063fe..2465072f5eb 100644 --- a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java +++ b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java @@ -19,10 +19,8 @@ import org.opentripplanner.routing.algorithm.GraphRoutingTest; import org.opentripplanner.routing.edgetype.StreetTraversalPermission; import org.opentripplanner.routing.graph.GraphIndex; -import org.opentripplanner.routing.vertextype.BikeParkVertex; import org.opentripplanner.routing.vertextype.BikeRentalStationVertex; import org.opentripplanner.routing.vertextype.IntersectionVertex; -import org.opentripplanner.routing.vertextype.ParkAndRideVertex; import org.opentripplanner.routing.vertextype.TransitStopVertex; class StreetGraphFinderTest extends GraphRoutingTest { @@ -30,8 +28,6 @@ class StreetGraphFinderTest extends GraphRoutingTest { private TransitStopVertex S1, S2, S3; private IntersectionVertex A, B, C, D; private BikeRentalStationVertex BR1, BR2; - private BikeParkVertex BP1; - private ParkAndRideVertex PR1, PR2; private RoutingService routingService; private StreetGraphFinder graphFinder; private Route R1, R2; @@ -59,24 +55,28 @@ public void build() { BR1 = bikeRentalStation("BR1", 47.500, 18.999); BR2 = bikeRentalStation("BR2", 47.520, 18.999); - BP1 = bikePark("BP1", 47.520, 18.999); - - PR1 = carPark("PR1", 47.510, 18.999); - PR2 = carPark("PR2", 47.530, 18.999); - A = intersection("A", 47.500, 19.00); B = intersection("B", 47.510, 19.00); C = intersection("C", 47.520, 19.00); D = intersection("D", 47.530, 19.00); + vehicleParking("BP1", 47.520, 18.999, true, false, List.of( + vehicleParkingEntrance(A, "All Park Entrance", true, true) + )); + + vehicleParking("PR1", 47.510, 18.999, false, true, List.of( + vehicleParkingEntrance(A, "All Park Entrance", true, true) + )); + vehicleParking("PR2", 47.530, 18.999, false, true, List.of( + vehicleParkingEntrance(A, "All Park Entrance", true, true) + )); + + biLink(A, S1); biLink(A, BR1); biLink(B, S2); - biLink(B, PR1); biLink(C, S3); - biLink(C, BP1); biLink(C, BR2); - biLink(D, PR2); street(A, B, 100, StreetTraversalPermission.ALL); street(B, C, 100, StreetTraversalPermission.ALL); @@ -99,8 +99,8 @@ public void build() { @Test void findClosestStops() { - var ns1 = new NearbyStop(S1, 0, null, linestring(47.500, 19.000, 47.500, 19.001), null); - var ns2 = new NearbyStop(S2, 100, null, linestring(47.500, 19.000, 47.510, 19.000, 47.510, 19.001), null); + var ns1 = new NearbyStop(S1.getStop(), 0, null, null, null); + var ns2 = new NearbyStop(S2.getStop(), 100, null, null, null); assertEquals( List.of(ns1), @@ -294,10 +294,9 @@ void findClosestPlacesWithACarParkFilter() { private List simplify(List closestStops) { return closestStops.stream().map( ns -> new NearbyStop( - ns.stop, ns.distance, ns.distanceIndependentTime, null, ns.geometry, null + ns.stop, ns.distance, null, ns.geometry, null ) - ) - .collect(Collectors.toList()); + ).collect(Collectors.toList()); } private StopTime st(TransitStopVertex s1) {