From b9774c1375b8a3df8251ccb6f21952111a357110 Mon Sep 17 00:00:00 2001 From: Teemu Kalvas Date: Thu, 6 Feb 2025 12:07:13 +0200 Subject: [PATCH 1/5] change time calculations in State to whole milliseconds to control rounding error --- .../ext/flex/edgetype/FlexTripEdge.java | 2 +- .../street/VehicleRentalEdge.java | 6 ++--- .../street/model/edge/BikeWalkableEdge.java | 8 +++---- .../street/model/edge/CarPickupableEdge.java | 4 ++-- .../street/model/edge/ElevatorBoardEdge.java | 2 +- .../street/model/edge/ElevatorHopEdge.java | 9 ++++--- .../street/model/edge/EscalatorEdge.java | 2 +- .../street/model/edge/PathwayEdge.java | 14 +++++------ .../street/model/edge/StreetEdge.java | 6 ++--- .../model/edge/StreetTransitEntityLink.java | 2 +- .../street/model/edge/VehicleParkingEdge.java | 4 ++-- .../street/search/state/State.java | 24 +++++++++++-------- .../street/search/state/StateEditor.java | 16 +++++++++---- .../routing/graph/SimpleConcreteEdge.java | 4 ++-- .../routing/graph/TemporaryConcreteEdge.java | 4 ++-- .../street/integration/BikeWalkingTest.java | 2 +- .../street/model/edge/EscalatorEdgeTest.java | 4 ++-- .../street/search/state/StateEditorTest.java | 4 ++-- 18 files changed, 62 insertions(+), 55 deletions(-) diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index 70b0fcdcb3c..659ef9d429c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -97,7 +97,7 @@ public State[] traverse(State s0) { // TODO: decide good value editor.incrementWeight(10 * 60); int timeInSeconds = getTimeInSeconds(); - editor.incrementTimeInSeconds(timeInSeconds); + editor.incrementTimeInMilliseconds(1000L * timeInSeconds); editor.incrementWeight(timeInSeconds); editor.resetEnteredNoThroughTrafficArea(); return editor.makeStateArray(); diff --git a/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java index 0935909e0c7..3cff2e18d16 100644 --- a/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java +++ b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java @@ -162,10 +162,8 @@ public State[] traverse(State s0) { s1.incrementWeight( pickedUp ? preferences.pickupCost().toSeconds() : preferences.dropOffCost().toSeconds() ); - s1.incrementTimeInSeconds( - pickedUp - ? (int) preferences.pickupTime().toSeconds() - : (int) preferences.dropOffTime().toSeconds() + s1.incrementTimeInMilliseconds( + pickedUp ? preferences.pickupTime().toMillis() : preferences.dropOffTime().toMillis() ); s1.setBackMode(null); return s1.makeStateArray(); diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java index 7f61982434d..d79a1f12870 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java @@ -18,8 +18,8 @@ default void switchToWalkingBike(RoutingPreferences preferences, StateEditor edi editor.setBackWalkingBike(true); if (shouldIncludeCost) { editor.incrementWeight(preferences.bike().walking().mountDismountCost().toSeconds()); - editor.incrementTimeInSeconds( - (int) preferences.bike().walking().mountDismountTime().toSeconds() + editor.incrementTimeInMilliseconds( + preferences.bike().walking().mountDismountTime().toMillis() ); } } @@ -31,8 +31,8 @@ default void switchToBiking(RoutingPreferences preferences, StateEditor editor) editor.setBackWalkingBike(false); if (shouldIncludeCost) { editor.incrementWeight(preferences.bike().walking().mountDismountCost().toSeconds()); - editor.incrementTimeInSeconds( - (int) preferences.bike().walking().mountDismountTime().toSeconds() + editor.incrementTimeInMilliseconds( + preferences.bike().walking().mountDismountTime().toMillis() ); } } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java index 7ea1678bbe7..8f69ef1c227 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java @@ -30,13 +30,13 @@ default void dropOffAfterDriving(State state, StateEditor editor) { ? CarPickupState.WALK_TO_PICKUP : CarPickupState.WALK_FROM_DROP_OFF ); - editor.incrementTimeInSeconds((int) state.getPreferences().car().pickupTime().toSeconds()); + editor.incrementTimeInMilliseconds(state.getPreferences().car().pickupTime().toMillis()); editor.incrementWeight(state.getPreferences().car().pickupCost().toSeconds()); } default void driveAfterPickup(State state, StateEditor editor) { editor.setCarPickupState(CarPickupState.IN_CAR); - editor.incrementTimeInSeconds((int) state.getPreferences().car().pickupTime().toSeconds()); + editor.incrementTimeInMilliseconds(state.getPreferences().car().pickupTime().toMillis()); editor.incrementWeight(state.getPreferences().car().pickupCost().toSeconds()); } } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java index cacc97fc2f1..5f12028eb4d 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java @@ -49,7 +49,7 @@ public State[] traverse(State s0) { var streetPreferences = s0.getPreferences().street(); s1.incrementWeight(streetPreferences.elevator().boardCost()); - s1.incrementTimeInSeconds(streetPreferences.elevator().boardTime()); + s1.incrementTimeInMilliseconds(1000L * streetPreferences.elevator().boardTime()); return s1.makeStateArray(); } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java index 75eddb53777..58229d8018b 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java @@ -136,11 +136,10 @@ public State[] traverse(State s0) { ? this.travelTime : (preferences.street().elevator().hopCost() * this.levels) ); - s1.incrementTimeInSeconds( - this.travelTime > 0 - ? this.travelTime - : (int) (preferences.street().elevator().hopTime() * this.levels) - ); + int seconds = this.travelTime > 0 + ? this.travelTime + : (int) (preferences.street().elevator().hopTime() * this.levels); + s1.incrementTimeInMilliseconds(1000L * seconds); return s1.makeStateArray(); } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java index d44b67568d6..aa6a9649bba 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java @@ -36,7 +36,7 @@ public State[] traverse(State s0) { time = duration.toSeconds(); } s1.incrementWeight(s0.getPreferences().walk().escalator().reluctance() * time); - s1.incrementTimeInSeconds((int) Math.round(time)); + s1.incrementTimeInMilliseconds((long) Math.round(1000.0 * time)); s1.incrementWalkDistance(getDistanceMeters()); return s1.makeStateArray(); } else return State.empty(); diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java index cfa82ba85b5..e6c653ff1dd 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java @@ -111,19 +111,19 @@ public State[] traverse(State s0) { RoutingPreferences preferences = s0.getPreferences(); /* TODO: Consider mode, so that passing through multiple fare gates is not possible */ - int time = traversalTime; + long time_ms = 1000L * traversalTime; - if (time == 0) { + if (time_ms == 0) { if (distance > 0) { - time = (int) (distance / preferences.walk().speed()); + time_ms = (long) (1000.0 * distance / preferences.walk().speed()); } else if (isStairs()) { // 1 step corresponds to 20cm, doubling that to compensate for elevation; - time = (int) (0.4 * Math.abs(steps) / preferences.walk().speed()); + time_ms = (long) (1000.0 * 0.4 * Math.abs(steps) / preferences.walk().speed()); } } - if (time > 0) { - double weight = time; + if (time_ms > 0) { + double weight = time_ms / 1000.0; if (s0.getRequest().wheelchair()) { weight *= StreetEdgeReluctanceCalculator.computeWheelchairReluctance( @@ -141,7 +141,7 @@ public State[] traverse(State s0) { isStairs() ); } - s1.incrementTimeInSeconds(time); + s1.incrementTimeInMilliseconds(time_ms); s1.incrementWeight(weight); } else { // elevators often don't have a traversal time, distance or steps, so we need to add diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 02675b1202c..58da81f9161 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -1169,7 +1169,7 @@ private StateEditor doTraverse(State s0, TraverseMode traverseMode, boolean walk default -> otherTraversalCosts(preferences, traverseMode, walkingBike, speed); }; - int time = (int) Math.ceil(traversalCosts.time()); + long time_ms = (long) Math.ceil(1000.0 * traversalCosts.time()); var weight = traversalCosts.weight(); /* Compute turn cost. */ @@ -1234,7 +1234,7 @@ private StateEditor doTraverse(State s0, TraverseMode traverseMode, boolean walk s1.incrementWalkDistance(turnDuration / 100); // just a tie-breaker } - time += (int) Math.ceil(turnDuration); + time_ms += (long) Math.ceil(1000.0 * turnDuration); weight += preferences.street().turnReluctance() * turnDuration; } @@ -1246,7 +1246,7 @@ private StateEditor doTraverse(State s0, TraverseMode traverseMode, boolean walk weight += costExtension.calculateExtraCost(s0, length_mm, traverseMode); } - s1.incrementTimeInSeconds(time); + s1.incrementTimeInMilliseconds(time_ms); s1.incrementWeight(weight); diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 5a62eda0f90..0973547c06a 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -143,7 +143,7 @@ private State[] buildState(State s0, StateEditor s1, RoutingPreferences pref) { // streetToStopTime may be zero so that searching from the stop coordinates instead of // the stop id catch transit departing at that exact search time. int streetToStopTime = getStreetToStopTime(); - s1.incrementTimeInSeconds(streetToStopTime); + s1.incrementTimeInMilliseconds(1000L * streetToStopTime); s1.incrementWeight(STEL_TRAVERSE_COST + streetToStopTime); return s1.makeStateArray(); } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java index a7aa7bb2535..22085be2364 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java @@ -110,7 +110,7 @@ private State[] traverseUnPark( StateEditor s0e = s0.edit(this); s0e.incrementWeight(parkingCost.toSeconds()); - s0e.incrementTimeInSeconds((int) parkingTime.toSeconds()); + s0e.incrementTimeInMilliseconds(parkingTime.toMillis()); s0e.setVehicleParked(false, mode); var parkingPreferences = s0.getRequest().preferences().parking(s0.currentMode()); @@ -156,7 +156,7 @@ private State[] traversePark(State s0, Cost parkingCost, Duration parkingTime) { StateEditor s0e = s0.edit(this); s0e.incrementWeight(parkingCost.toSeconds()); - s0e.incrementTimeInSeconds((int) parkingTime.toSeconds()); + s0e.incrementTimeInMilliseconds(parkingTime.toMillis()); s0e.setVehicleParked(true, TraverseMode.WALK); var parkingPreferences = s0.getRequest().preferences().parking(s0.currentMode()); diff --git a/application/src/main/java/org/opentripplanner/street/search/state/State.java b/application/src/main/java/org/opentripplanner/street/search/state/State.java index 9413cbcbd57..9d022f80959 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/State.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/State.java @@ -29,8 +29,8 @@ public class State implements AStarState, Cloneable { /* Data which is likely to change at most traversals */ - // the current time at this state, in seconds since UNIX epoch - protected long time; + // the current time at this state, in milliseconds since UNIX epoch + protected long time_ms; // accumulated weight up to this state public double weight; @@ -76,7 +76,7 @@ public State(Vertex vertex, Instant startTime, StateData stateData, StreetSearch vertex.rentalRestrictions().noDropOffNetworks(); } this.walkDistance = 0; - this.time = startTime.getEpochSecond(); + this.time_ms = startTime.toEpochMilli(); } /** @@ -169,7 +169,11 @@ public CarPickupState getCarPickupState() { /** Returns time in seconds since epoch */ public long getTimeSeconds() { - return time; + return time_ms / 1000; + } + + public long getTimeMilliseconds() { + return time_ms; } /** returns the length of the trip in seconds up to this state */ @@ -266,8 +270,8 @@ public double getWeight() { return this.weight; } - public int getTimeDeltaSeconds() { - return backState != null ? (int) (getTimeSeconds() - backState.getTimeSeconds()) : 0; + public int getTimeDeltaMilliseconds() { + return backState != null ? (int) (getTimeMilliseconds() - backState.getTimeMilliseconds()) : 0; } public double getWeightDelta() { @@ -311,7 +315,7 @@ public TraverseMode currentMode() { } public Instant getTime() { - return Instant.ofEpochSecond(time); + return Instant.ofEpochMilli(time_ms); } public String getVehicleRentalNetwork() { @@ -351,7 +355,7 @@ public State reverse() { // note the distinction between setFromState and setBackState editor.setFromState(orig); - editor.incrementTimeInSeconds(orig.getAbsTimeDeltaSeconds()); + editor.incrementTimeInMilliseconds(orig.getAbsTimeDeltaMilliseconds()); editor.incrementWeight(orig.getWeightDelta()); editor.incrementWalkDistance(orig.getWalkDistanceDelta()); @@ -485,8 +489,8 @@ void checkNegativeWeight() { } } - private int getAbsTimeDeltaSeconds() { - return Math.abs(getTimeDeltaSeconds()); + private int getAbsTimeDeltaMilliseconds() { + return Math.abs(getTimeDeltaMilliseconds()); } private double getWalkDistanceDelta() { diff --git a/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java b/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java index 271b6e78030..c6447c0760b 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java @@ -117,7 +117,9 @@ public State makeState() { // check that time changes are coherent with edge traversal // direction if ( - traversingBackward ? (child.getTimeDeltaSeconds() > 0) : (child.getTimeDeltaSeconds() < 0) + traversingBackward + ? (child.getTimeDeltaMilliseconds() > 0) + : (child.getTimeDeltaMilliseconds() < 0) ) { LOG.trace( "Time was incremented the wrong direction during state editing. {}", @@ -173,8 +175,8 @@ public void incrementWeight(double weight) { * is inferred from the direction of traversal. This is the only element of state that runs * backward when traversing backward. */ - public void incrementTimeInSeconds(int seconds) { - if (seconds < 0) { + public void incrementTimeInMilliseconds(long milliseconds) { + if (milliseconds < 0) { LOG.warn( "A state's time is being incremented by a negative amount while traversing edge " + child.getBackEdge() @@ -182,7 +184,7 @@ public void incrementTimeInSeconds(int seconds) { defectiveTraversal = true; return; } - child.time += (traversingBackward ? -seconds : seconds); + child.time_ms += (traversingBackward ? -milliseconds : milliseconds); } public void incrementWalkDistance(double length) { @@ -362,7 +364,11 @@ public void setCarPickupState(CarPickupState carPickupState) { } public void setTimeSeconds(long seconds) { - child.time = seconds; + child.time_ms = 1000 * seconds; + } + + public void setTimeMilliseconds(long milliseconds) { + child.time_ms = milliseconds; } /* PUBLIC GETTER METHODS */ diff --git a/application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java b/application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java index f36300de9ef..03d85c78923 100644 --- a/application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java +++ b/application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java @@ -26,9 +26,9 @@ public static SimpleConcreteEdge createSimpleConcreteEdge(Vertex v1, Vertex v2) public State[] traverse(State s0) { double d = getDistanceMeters(); TraverseMode mode = s0.currentMode(); - int t = (int) (d / s0.getPreferences().getSpeed(mode, false)); + int t = (int) (1000.0 * d / s0.getPreferences().getSpeed(mode, false)); StateEditor s1 = s0.edit(this); - s1.incrementTimeInSeconds(t); + s1.incrementTimeInMilliseconds(t); s1.incrementWeight(d); return s1.makeStateArray(); } diff --git a/application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java b/application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java index 19020fc3f4f..7f69f2a0a45 100644 --- a/application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java +++ b/application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java @@ -38,9 +38,9 @@ public static TemporaryConcreteEdge createTemporaryConcreteEdge(Vertex v1, Tempo public State[] traverse(State s0) { double d = getDistanceMeters(); TraverseMode mode = s0.currentMode(); - int t = (int) (d / s0.getPreferences().getSpeed(mode, false)); + int t = (int) (1000.0 * d / s0.getPreferences().getSpeed(mode, false)); StateEditor s1 = s0.edit(this); - s1.incrementTimeInSeconds(t); + s1.incrementTimeInMilliseconds(t); s1.incrementWeight(d); return s1.makeStateArray(); } diff --git a/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index 41ec677b3bb..7287900443a 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -405,7 +405,7 @@ private List runStreetSearchAndCreateDescriptor( "%s%s - %s / %s - %s", s.getBackMode() != null && s.isBackWalkingBike() ? "🚲" : "", s.getBackMode(), - s.getTimeDeltaSeconds(), + s.getTimeDeltaMilliseconds(), s.getBackEdge() != null ? ((double) Math.round(s.getWeightDelta() * 10)) / 10 : 0.0, s.getBackEdge() != null ? s.getBackEdge().getDefaultName() : null ) diff --git a/application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java index 23ae7a567f8..efd984acc3d 100644 --- a/application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java +++ b/application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java @@ -38,7 +38,7 @@ void testWalking(double escalatorReluctance, double expectedWeight) { var res = edge.traverse(new State(from, req.build()))[0]; assertEquals(expectedWeight, res.weight); - assertEquals(100, res.getTimeDeltaSeconds()); + assertEquals(100_000, res.getTimeDeltaMilliseconds()); } @Test @@ -47,7 +47,7 @@ void testDuration() { var edge = EscalatorEdge.createEscalatorEdge(from, to, 45, Duration.ofSeconds(60)); var req = StreetSearchRequest.of().withMode(StreetMode.WALK); var res = edge.traverse(new State(from, req.build()))[0]; - assertEquals(60, res.getTimeDeltaSeconds()); + assertEquals(60_000, res.getTimeDeltaMilliseconds()); } @Test diff --git a/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java b/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java index 6df2df38bf9..95a213df763 100644 --- a/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java +++ b/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java @@ -20,11 +20,11 @@ public class StateEditorTest { static Vertex vertex = StreetModelForTest.intersectionVertex(1, 1); @Test - public final void testIncrementTimeInSeconds() { + public final void testIncrementTimeInMilliseconds() { StateEditor stateEditor = new StateEditor(vertex, StreetSearchRequest.of().build()); stateEditor.setTimeSeconds(0); - stateEditor.incrementTimeInSeconds(999999999); + stateEditor.incrementTimeInMilliseconds(999999999); assertEquals(999999999, stateEditor.child.getTimeSeconds()); } From 0f7eb0cac9b1d2e06b5f91e46f4ef0e4dab04ce5 Mon Sep 17 00:00:00 2001 From: Teemu Kalvas Date: Mon, 10 Feb 2025 10:26:20 +0200 Subject: [PATCH 2/5] fix tests, many trips are now faster. fix search so that forwards and backwards are always the same length, to the millisecond, and also when rounded to seconds --- .../ext/flex/FlexIntegrationTest.java | 2 +- .../street/search/state/State.java | 28 +- .../__snapshots__/BikeRentalSnapshotTest.snap | 378 +-- .../__snapshots__/CarSnapshotTest.snap | 100 +- .../__snapshots__/ElevationSnapshotTest.snap | 150 +- .../__snapshots__/TransitSnapshotTest.snap | 2126 +++++++++-------- .../integration/BicycleParkAndRideTest.java | 4 +- .../street/integration/BikeWalkingTest.java | 2 +- .../integration/CarParkAndRideTest.java | 8 +- .../street/model/edge/StreetEdgeTest.java | 4 +- .../street/search/state/StateEditorTest.java | 2 +- .../travelSearch-expected-results-bd.csv | 4 +- .../travelSearch-expected-results-bdr.csv | 4 +- .../travelSearch-expected-results-bt.csv | 4 +- .../travelSearch-expected-results-btr.csv | 4 +- .../travelSearch-expected-results-mc.csv | 8 +- .../travelSearch-expected-results-md.csv | 8 +- .../travelSearch-expected-results-sr.csv | 8 +- .../travelSearch-expected-results-srr.csv | 10 +- 19 files changed, 1569 insertions(+), 1285 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index fb19f1dff36..46ee09af07b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -154,7 +154,7 @@ void flexDirect() { // walk, flex assertEquals(2, itin.getLegs().size()); - assertEquals("2021-12-02T12:52:42-05:00[America/New_York]", itin.startTime().toString()); + assertEquals("2021-12-02T12:52:54-05:00[America/New_York]", itin.startTime().toString()); assertEquals(3203, itin.getGeneralizedCost()); var walkToFlex = itin.getStreetLeg(0); diff --git a/application/src/main/java/org/opentripplanner/street/search/state/State.java b/application/src/main/java/org/opentripplanner/street/search/state/State.java index 9d022f80959..13f7383c906 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/State.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/State.java @@ -167,9 +167,19 @@ public CarPickupState getCarPickupState() { return stateData.carPickupState; } + /** Always round the same way and in the same direction when converting milliseconds to seconds. + * This means that request.arriveBy must be taken into account. Used in many places. */ + private long secondsOfMilliseconds(long milliseconds) { + if (request.arriveBy()) { + return milliseconds / 1000L; + } else { + return (milliseconds + 999L) / 1000L; + } + } + /** Returns time in seconds since epoch */ public long getTimeSeconds() { - return time_ms / 1000; + return secondsOfMilliseconds(time_ms); } public long getTimeMilliseconds() { @@ -178,7 +188,11 @@ public long getTimeMilliseconds() { /** returns the length of the trip in seconds up to this state */ public long getElapsedTimeSeconds() { - return Math.abs(getTimeSeconds() - request.startTime().getEpochSecond()); + return (getElapsedTimeMilliseconds() + 999L) / 1000L; + } + + public long getElapsedTimeMilliseconds() { + return Math.abs(getTimeMilliseconds() - request.startTime().toEpochMilli()); } public boolean isCompatibleVehicleRentalState(State state) { @@ -270,6 +284,10 @@ public double getWeight() { return this.weight; } + public int getTimeDeltaSeconds() { + return (int) secondsOfMilliseconds(getTimeDeltaMilliseconds()); + } + public int getTimeDeltaMilliseconds() { return backState != null ? (int) (getTimeMilliseconds() - backState.getTimeMilliseconds()) : 0; } @@ -315,6 +333,12 @@ public TraverseMode currentMode() { } public Instant getTime() { + // We're not letting the subsecond time out right now, because everything else + // expects whole seconds. + return Instant.ofEpochSecond(secondsOfMilliseconds(time_ms)); + } + + public Instant getTimeAccurate() { return Instant.ofEpochMilli(time_ms); } diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap index 5e2a04c07d7..c809da5dd4e 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap @@ -2,10 +2,10 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1049, + "duration" : 1040, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:32:24.000+00:00", + "endTime" : "2009-10-21T23:32:22.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -39,9 +39,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:17:26.000+00:00", + "endTime" : "2009-10-21T23:17:29.000+00:00", "from" : { - "departure" : "2009-10-21T23:14:55.000+00:00", + "departure" : "2009-10-21T23:15:02.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -58,7 +58,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:14:55.000+00:00", + "startTime" : "2009-10-21T23:15:02.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -101,9 +101,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:17:26.000+00:00", + "arrival" : "2009-10-21T23:17:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:17:26.000+00:00", + "departure" : "2009-10-21T23:17:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -120,11 +120,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:19:58.000+00:00", + "endTime" : "2009-10-21T23:19:59.000+00:00", "from" : { - "arrival" : "2009-10-21T23:17:26.000+00:00", + "arrival" : "2009-10-21T23:17:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:17:26.000+00:00", + "departure" : "2009-10-21T23:17:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -144,7 +144,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:17:26.000+00:00", + "startTime" : "2009-10-21T23:17:29.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -174,9 +174,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:19:58.000+00:00", + "arrival" : "2009-10-21T23:19:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:19:58.000+00:00", + "departure" : "2009-10-21T23:19:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -195,9 +195,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 29.46, "endTime" : "2009-10-21T23:20:25.000+00:00", "from" : { - "arrival" : "2009-10-21T23:19:58.000+00:00", + "arrival" : "2009-10-21T23:19:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:19:58.000+00:00", + "departure" : "2009-10-21T23:19:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -217,7 +217,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:19:58.000+00:00", + "startTime" : "2009-10-21T23:19:59.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -402,7 +402,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 188.35, - "endTime" : "2009-10-21T23:32:24.000+00:00", + "endTime" : "2009-10-21T23:32:22.000+00:00", "from" : { "arrival" : "2009-10-21T23:30:00.000+00:00", "departure" : "2009-10-21T23:30:00.000+00:00", @@ -442,7 +442,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:32:24.000+00:00", + "arrival" : "2009-10-21T23:32:22.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -452,21 +452,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:14:55.000+00:00", + "startTime" : "2009-10-21T23:15:02.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 575, "waitingTime" : 0, "walkDistance" : 817.83, "walkLimitExceeded" : false, - "walkTime" : 474 + "walkTime" : 465 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1296, + "duration" : 1278, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:38:09.000+00:00", + "endTime" : "2009-10-21T23:37:59.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -502,7 +502,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 565.96, "endTime" : "2009-10-21T23:23:59.000+00:00", "from" : { - "departure" : "2009-10-21T23:16:33.000+00:00", + "departure" : "2009-10-21T23:16:41.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -519,7 +519,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:16:33.000+00:00", + "startTime" : "2009-10-21T23:16:41.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -782,7 +782,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 308.24, - "endTime" : "2009-10-21T23:38:09.000+00:00", + "endTime" : "2009-10-21T23:37:59.000+00:00", "from" : { "arrival" : "2009-10-21T23:34:00.000+00:00", "departure" : "2009-10-21T23:34:00.000+00:00", @@ -861,7 +861,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:38:09.000+00:00", + "arrival" : "2009-10-21T23:37:59.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -871,18 +871,18 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:16:33.000+00:00", + "startTime" : "2009-10-21T23:16:41.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 601, "waitingTime" : 0, "walkDistance" : 874.2, "walkLimitExceeded" : false, - "walkTime" : 695 + "walkTime" : 677 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1001, + "duration" : 998, "elevationGained" : 0.0, "elevationLost" : 0.0, "endTime" : "2009-10-21T23:40:10.000+00:00", @@ -921,7 +921,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 220.15, "endTime" : "2009-10-21T23:26:21.000+00:00", "from" : { - "departure" : "2009-10-21T23:23:29.000+00:00", + "departure" : "2009-10-21T23:23:32.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -938,7 +938,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:23:29.000+00:00", + "startTime" : "2009-10-21T23:23:32.000+00:00", "steps" : [ { "absoluteDirection" : "NORTH", @@ -1186,21 +1186,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:23:29.000+00:00", + "startTime" : "2009-10-21T23:23:32.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 791, "waitingTime" : 0, "walkDistance" : 270.09, "walkLimitExceeded" : false, - "walkTime" : 210 + "walkTime" : 207 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1049, + "duration" : 1040, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:45:24.000+00:00", + "endTime" : "2009-10-21T23:45:22.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1234,9 +1234,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:30:26.000+00:00", + "endTime" : "2009-10-21T23:30:29.000+00:00", "from" : { - "departure" : "2009-10-21T23:27:55.000+00:00", + "departure" : "2009-10-21T23:28:02.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -1253,7 +1253,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:27:55.000+00:00", + "startTime" : "2009-10-21T23:28:02.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -1296,9 +1296,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:30:26.000+00:00", + "arrival" : "2009-10-21T23:30:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:30:26.000+00:00", + "departure" : "2009-10-21T23:30:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -1315,11 +1315,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:32:58.000+00:00", + "endTime" : "2009-10-21T23:32:59.000+00:00", "from" : { - "arrival" : "2009-10-21T23:30:26.000+00:00", + "arrival" : "2009-10-21T23:30:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:30:26.000+00:00", + "departure" : "2009-10-21T23:30:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -1339,7 +1339,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:30:26.000+00:00", + "startTime" : "2009-10-21T23:30:29.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -1369,9 +1369,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:32:58.000+00:00", + "arrival" : "2009-10-21T23:32:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:32:58.000+00:00", + "departure" : "2009-10-21T23:32:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -1390,9 +1390,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 29.46, "endTime" : "2009-10-21T23:33:25.000+00:00", "from" : { - "arrival" : "2009-10-21T23:32:58.000+00:00", + "arrival" : "2009-10-21T23:32:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:32:58.000+00:00", + "departure" : "2009-10-21T23:32:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -1412,7 +1412,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:32:58.000+00:00", + "startTime" : "2009-10-21T23:32:59.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -1597,7 +1597,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 188.35, - "endTime" : "2009-10-21T23:45:24.000+00:00", + "endTime" : "2009-10-21T23:45:22.000+00:00", "from" : { "arrival" : "2009-10-21T23:43:00.000+00:00", "departure" : "2009-10-21T23:43:00.000+00:00", @@ -1637,7 +1637,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:45:24.000+00:00", + "arrival" : "2009-10-21T23:45:22.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -1647,21 +1647,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:27:55.000+00:00", + "startTime" : "2009-10-21T23:28:02.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 575, "waitingTime" : 0, "walkDistance" : 817.83, "walkLimitExceeded" : false, - "walkTime" : 474 + "walkTime" : 465 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1049, + "duration" : 1040, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:54:24.000+00:00", + "endTime" : "2009-10-21T23:54:22.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1695,9 +1695,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:39:26.000+00:00", + "endTime" : "2009-10-21T23:39:29.000+00:00", "from" : { - "departure" : "2009-10-21T23:36:55.000+00:00", + "departure" : "2009-10-21T23:37:02.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -1714,7 +1714,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:36:55.000+00:00", + "startTime" : "2009-10-21T23:37:02.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -1757,9 +1757,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:39:26.000+00:00", + "arrival" : "2009-10-21T23:39:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:39:26.000+00:00", + "departure" : "2009-10-21T23:39:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -1776,11 +1776,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:41:58.000+00:00", + "endTime" : "2009-10-21T23:41:59.000+00:00", "from" : { - "arrival" : "2009-10-21T23:39:26.000+00:00", + "arrival" : "2009-10-21T23:39:29.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:39:26.000+00:00", + "departure" : "2009-10-21T23:39:29.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -1800,7 +1800,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:39:26.000+00:00", + "startTime" : "2009-10-21T23:39:29.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -1830,9 +1830,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:41:58.000+00:00", + "arrival" : "2009-10-21T23:41:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:41:58.000+00:00", + "departure" : "2009-10-21T23:41:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -1851,9 +1851,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 29.46, "endTime" : "2009-10-21T23:42:25.000+00:00", "from" : { - "arrival" : "2009-10-21T23:41:58.000+00:00", + "arrival" : "2009-10-21T23:41:59.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:41:58.000+00:00", + "departure" : "2009-10-21T23:41:59.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -1873,7 +1873,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:41:58.000+00:00", + "startTime" : "2009-10-21T23:41:59.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2058,7 +2058,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 188.35, - "endTime" : "2009-10-21T23:54:24.000+00:00", + "endTime" : "2009-10-21T23:54:22.000+00:00", "from" : { "arrival" : "2009-10-21T23:52:00.000+00:00", "departure" : "2009-10-21T23:52:00.000+00:00", @@ -2098,7 +2098,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } ], "to" : { - "arrival" : "2009-10-21T23:54:24.000+00:00", + "arrival" : "2009-10-21T23:54:22.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -2108,18 +2108,18 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:36:55.000+00:00", + "startTime" : "2009-10-21T23:37:02.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 575, "waitingTime" : 0, "walkDistance" : 817.83, "walkLimitExceeded" : false, - "walkTime" : 474 + "walkTime" : 465 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1001, + "duration" : 998, "elevationGained" : 0.0, "elevationLost" : 0.0, "endTime" : "2009-10-21T23:56:10.000+00:00", @@ -2158,7 +2158,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "distance" : 220.15, "endTime" : "2009-10-21T23:42:21.000+00:00", "from" : { - "departure" : "2009-10-21T23:39:29.000+00:00", + "departure" : "2009-10-21T23:39:32.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -2175,7 +2175,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:39:29.000+00:00", + "startTime" : "2009-10-21T23:39:32.000+00:00", "steps" : [ { "absoluteDirection" : "NORTH", @@ -2423,14 +2423,14 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:39:29.000+00:00", + "startTime" : "2009-10-21T23:39:32.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 791, "waitingTime" : 0, "walkDistance" : 270.09, "walkLimitExceeded" : false, - "walkTime" : 210 + "walkTime" : 207 } ] ] @@ -2440,10 +2440,10 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 477, + "duration" : 469, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:17:57.000+00:00", + "endTime" : "2009-10-21T23:17:49.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -2455,7 +2455,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:12:31.000+00:00", + "endTime" : "2009-10-21T23:12:27.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.52832, @@ -2517,9 +2517,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:12:31.000+00:00", + "arrival" : "2009-10-21T23:12:27.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:31.000+00:00", + "departure" : "2009-10-21T23:12:27.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -2536,11 +2536,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:15:03.000+00:00", + "endTime" : "2009-10-21T23:14:57.000+00:00", "from" : { - "arrival" : "2009-10-21T23:12:31.000+00:00", + "arrival" : "2009-10-21T23:12:27.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:31.000+00:00", + "departure" : "2009-10-21T23:12:27.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -2560,7 +2560,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:12:31.000+00:00", + "startTime" : "2009-10-21T23:12:27.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -2590,9 +2590,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:15:03.000+00:00", + "arrival" : "2009-10-21T23:14:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:15:03.000+00:00", + "departure" : "2009-10-21T23:14:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -2609,11 +2609,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 219.06, - "endTime" : "2009-10-21T23:17:57.000+00:00", + "endTime" : "2009-10-21T23:17:49.000+00:00", "from" : { - "arrival" : "2009-10-21T23:15:03.000+00:00", + "arrival" : "2009-10-21T23:14:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:15:03.000+00:00", + "departure" : "2009-10-21T23:14:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -2633,7 +2633,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:15:03.000+00:00", + "startTime" : "2009-10-21T23:14:57.000+00:00", "steps" : [ { "absoluteDirection" : "EAST", @@ -2676,7 +2676,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:17:57.000+00:00", + "arrival" : "2009-10-21T23:17:49.000+00:00", "lat" : 45.52704, "lon" : -122.6924, "name" : "NW Hoyt St. & NW 20th Ave. (P2)", @@ -2693,7 +2693,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "waitingTime" : 0, "walkDistance" : 819.08, "walkLimitExceeded" : false, - "walkTime" : 477 + "walkTime" : 469 } ] ] @@ -2703,7 +2703,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR [ { "arrivedAtDestinationWithRentedBicycle" : true, - "duration" : 338, + "duration" : 329, "elevationGained" : 0.0, "elevationLost" : 0.0, "endTime" : "2009-10-21T23:10:00.000+00:00", @@ -2718,9 +2718,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:06:53.000+00:00", + "endTime" : "2009-10-21T23:06:58.000+00:00", "from" : { - "departure" : "2009-10-21T23:04:22.000+00:00", + "departure" : "2009-10-21T23:04:31.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -2737,7 +2737,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:04:22.000+00:00", + "startTime" : "2009-10-21T23:04:31.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -2780,9 +2780,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:06:53.000+00:00", + "arrival" : "2009-10-21T23:06:58.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:06:53.000+00:00", + "departure" : "2009-10-21T23:06:58.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -2801,9 +2801,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "distance" : 711.97, "endTime" : "2009-10-21T23:10:00.000+00:00", "from" : { - "arrival" : "2009-10-21T23:06:53.000+00:00", + "arrival" : "2009-10-21T23:06:58.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:06:53.000+00:00", + "departure" : "2009-10-21T23:06:58.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -2823,7 +2823,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:06:53.000+00:00", + "startTime" : "2009-10-21T23:06:58.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -2889,14 +2889,14 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:04:22.000+00:00", + "startTime" : "2009-10-21T23:04:31.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 0, "waitingTime" : 0, "walkDistance" : 818.56, "walkLimitExceeded" : false, - "walkTime" : 338 + "walkTime" : 329 } ] ] @@ -2906,10 +2906,10 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR [ { "arrivedAtDestinationWithRentedBicycle" : true, - "duration" : 337, + "duration" : 329, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:15:37.000+00:00", + "endTime" : "2009-10-21T23:15:29.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -2921,7 +2921,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:12:31.000+00:00", + "endTime" : "2009-10-21T23:12:27.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.52832, @@ -2983,9 +2983,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:12:31.000+00:00", + "arrival" : "2009-10-21T23:12:27.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:31.000+00:00", + "departure" : "2009-10-21T23:12:27.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -3002,11 +3002,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 712.49, - "endTime" : "2009-10-21T23:15:37.000+00:00", + "endTime" : "2009-10-21T23:15:29.000+00:00", "from" : { - "arrival" : "2009-10-21T23:12:31.000+00:00", + "arrival" : "2009-10-21T23:12:27.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:31.000+00:00", + "departure" : "2009-10-21T23:12:27.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -3026,7 +3026,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:12:31.000+00:00", + "startTime" : "2009-10-21T23:12:27.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -3082,7 +3082,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR } ], "to" : { - "arrival" : "2009-10-21T23:15:37.000+00:00", + "arrival" : "2009-10-21T23:15:29.000+00:00", "lat" : 45.52704, "lon" : -122.6924, "name" : "NW Hoyt St. & NW 20th Ave. (P2)", @@ -3099,7 +3099,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.directBikeR "waitingTime" : 0, "walkDistance" : 819.08, "walkLimitExceeded" : false, - "walkTime" : 337 + "walkTime" : 329 } ] ] @@ -3109,10 +3109,10 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 977, + "duration" : 966, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:28:51.000+00:00", + "endTime" : "2009-10-21T23:28:43.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -3148,7 +3148,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 167.87, "endTime" : "2009-10-21T23:14:50.000+00:00", "from" : { - "departure" : "2009-10-21T23:12:34.000+00:00", + "departure" : "2009-10-21T23:12:37.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -3165,7 +3165,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:12:34.000+00:00", + "startTime" : "2009-10-21T23:12:37.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -3389,7 +3389,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 28.26, - "endTime" : "2009-10-21T23:24:58.000+00:00", + "endTime" : "2009-10-21T23:24:57.000+00:00", "from" : { "arrival" : "2009-10-21T23:23:32.000+00:00", "departure" : "2009-10-21T23:23:32.000+00:00", @@ -3442,9 +3442,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:24:58.000+00:00", + "arrival" : "2009-10-21T23:24:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:24:58.000+00:00", + "departure" : "2009-10-21T23:24:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -3461,11 +3461,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:27:20.000+00:00", + "endTime" : "2009-10-21T23:27:17.000+00:00", "from" : { - "arrival" : "2009-10-21T23:24:58.000+00:00", + "arrival" : "2009-10-21T23:24:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:24:58.000+00:00", + "departure" : "2009-10-21T23:24:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -3485,7 +3485,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:24:58.000+00:00", + "startTime" : "2009-10-21T23:24:57.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -3515,9 +3515,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:27:20.000+00:00", + "arrival" : "2009-10-21T23:27:17.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:27:20.000+00:00", + "departure" : "2009-10-21T23:27:17.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -3534,11 +3534,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:28:51.000+00:00", + "endTime" : "2009-10-21T23:28:43.000+00:00", "from" : { - "arrival" : "2009-10-21T23:27:20.000+00:00", + "arrival" : "2009-10-21T23:27:17.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:27:20.000+00:00", + "departure" : "2009-10-21T23:27:17.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -3558,7 +3558,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:27:20.000+00:00", + "startTime" : "2009-10-21T23:27:17.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -3601,7 +3601,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:28:51.000+00:00", + "arrival" : "2009-10-21T23:28:43.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -3611,21 +3611,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:12:34.000+00:00", + "startTime" : "2009-10-21T23:12:37.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 522, "waitingTime" : 0, "walkDistance" : 796.15, "walkLimitExceeded" : false, - "walkTime" : 455 + "walkTime" : 444 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1276, + "duration" : 1260, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:35:24.000+00:00", + "endTime" : "2009-10-21T23:35:16.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -3661,7 +3661,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 287.82, "endTime" : "2009-10-21T23:18:00.000+00:00", "from" : { - "departure" : "2009-10-21T23:14:08.000+00:00", + "departure" : "2009-10-21T23:14:16.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -3678,7 +3678,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:14:08.000+00:00", + "startTime" : "2009-10-21T23:14:16.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -3915,7 +3915,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 563.7, - "endTime" : "2009-10-21T23:35:24.000+00:00", + "endTime" : "2009-10-21T23:35:16.000+00:00", "from" : { "arrival" : "2009-10-21T23:28:03.000+00:00", "departure" : "2009-10-21T23:28:03.000+00:00", @@ -3994,7 +3994,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:35:24.000+00:00", + "arrival" : "2009-10-21T23:35:16.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -4004,21 +4004,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:14:08.000+00:00", + "startTime" : "2009-10-21T23:14:16.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 603, "waitingTime" : 0, "walkDistance" : 851.52, "walkLimitExceeded" : false, - "walkTime" : 673 + "walkTime" : 657 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1134, + "duration" : 1122, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:37:21.000+00:00", + "endTime" : "2009-10-21T23:37:14.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -4054,7 +4054,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 252.88, "endTime" : "2009-10-21T23:21:53.000+00:00", "from" : { - "departure" : "2009-10-21T23:18:27.000+00:00", + "departure" : "2009-10-21T23:18:32.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -4071,7 +4071,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:18:27.000+00:00", + "startTime" : "2009-10-21T23:18:32.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -4295,7 +4295,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 580.63, - "endTime" : "2009-10-21T23:37:21.000+00:00", + "endTime" : "2009-10-21T23:37:14.000+00:00", "from" : { "arrival" : "2009-10-21T23:29:50.000+00:00", "departure" : "2009-10-21T23:29:50.000+00:00", @@ -4361,7 +4361,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:37:21.000+00:00", + "arrival" : "2009-10-21T23:37:14.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -4371,21 +4371,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:18:27.000+00:00", + "startTime" : "2009-10-21T23:18:32.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 477, "waitingTime" : 0, "walkDistance" : 833.51, "walkLimitExceeded" : false, - "walkTime" : 657 + "walkTime" : 645 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 977, + "duration" : 966, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:43:51.000+00:00", + "endTime" : "2009-10-21T23:43:43.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -4421,7 +4421,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 167.87, "endTime" : "2009-10-21T23:29:50.000+00:00", "from" : { - "departure" : "2009-10-21T23:27:34.000+00:00", + "departure" : "2009-10-21T23:27:37.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -4438,7 +4438,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:27:34.000+00:00", + "startTime" : "2009-10-21T23:27:37.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -4662,7 +4662,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 28.26, - "endTime" : "2009-10-21T23:39:58.000+00:00", + "endTime" : "2009-10-21T23:39:57.000+00:00", "from" : { "arrival" : "2009-10-21T23:38:32.000+00:00", "departure" : "2009-10-21T23:38:32.000+00:00", @@ -4715,9 +4715,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:39:58.000+00:00", + "arrival" : "2009-10-21T23:39:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:39:58.000+00:00", + "departure" : "2009-10-21T23:39:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -4734,11 +4734,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:42:20.000+00:00", + "endTime" : "2009-10-21T23:42:17.000+00:00", "from" : { - "arrival" : "2009-10-21T23:39:58.000+00:00", + "arrival" : "2009-10-21T23:39:57.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:39:58.000+00:00", + "departure" : "2009-10-21T23:39:57.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -4758,7 +4758,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:39:58.000+00:00", + "startTime" : "2009-10-21T23:39:57.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -4788,9 +4788,9 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:42:20.000+00:00", + "arrival" : "2009-10-21T23:42:17.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:42:20.000+00:00", + "departure" : "2009-10-21T23:42:17.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -4807,11 +4807,11 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:43:51.000+00:00", + "endTime" : "2009-10-21T23:43:43.000+00:00", "from" : { - "arrival" : "2009-10-21T23:42:20.000+00:00", + "arrival" : "2009-10-21T23:42:17.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:42:20.000+00:00", + "departure" : "2009-10-21T23:42:17.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -4831,7 +4831,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:42:20.000+00:00", + "startTime" : "2009-10-21T23:42:17.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -4874,7 +4874,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:43:51.000+00:00", + "arrival" : "2009-10-21T23:43:43.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -4884,21 +4884,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:27:34.000+00:00", + "startTime" : "2009-10-21T23:27:37.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 522, "waitingTime" : 0, "walkDistance" : 796.15, "walkLimitExceeded" : false, - "walkTime" : 455 + "walkTime" : 444 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1336, + "duration" : 1320, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:51:24.000+00:00", + "endTime" : "2009-10-21T23:51:16.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -4934,7 +4934,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 287.82, "endTime" : "2009-10-21T23:33:00.000+00:00", "from" : { - "departure" : "2009-10-21T23:29:08.000+00:00", + "departure" : "2009-10-21T23:29:16.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -4951,7 +4951,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:29:08.000+00:00", + "startTime" : "2009-10-21T23:29:16.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -5188,7 +5188,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 563.7, - "endTime" : "2009-10-21T23:51:24.000+00:00", + "endTime" : "2009-10-21T23:51:16.000+00:00", "from" : { "arrival" : "2009-10-21T23:44:03.000+00:00", "departure" : "2009-10-21T23:44:03.000+00:00", @@ -5267,7 +5267,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:51:24.000+00:00", + "arrival" : "2009-10-21T23:51:16.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -5277,21 +5277,21 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:29:08.000+00:00", + "startTime" : "2009-10-21T23:29:16.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 663, "waitingTime" : 0, "walkDistance" : 851.52, "walkLimitExceeded" : false, - "walkTime" : 673 + "walkTime" : 657 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1134, + "duration" : 1122, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:56:21.000+00:00", + "endTime" : "2009-10-21T23:56:14.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -5327,7 +5327,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "distance" : 252.88, "endTime" : "2009-10-21T23:40:53.000+00:00", "from" : { - "departure" : "2009-10-21T23:37:27.000+00:00", + "departure" : "2009-10-21T23:37:32.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -5344,7 +5344,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:37:27.000+00:00", + "startTime" : "2009-10-21T23:37:32.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -5568,7 +5568,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 580.63, - "endTime" : "2009-10-21T23:56:21.000+00:00", + "endTime" : "2009-10-21T23:56:14.000+00:00", "from" : { "arrival" : "2009-10-21T23:48:50.000+00:00", "departure" : "2009-10-21T23:48:50.000+00:00", @@ -5634,7 +5634,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } ], "to" : { - "arrival" : "2009-10-21T23:56:21.000+00:00", + "arrival" : "2009-10-21T23:56:14.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -5644,14 +5644,14 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "walkingBike" : false } ], - "startTime" : "2009-10-21T23:37:27.000+00:00", + "startTime" : "2009-10-21T23:37:32.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 477, "waitingTime" : 0, "walkDistance" : 833.51, "walkLimitExceeded" : false, - "walkTime" : 657 + "walkTime" : 645 } ] ] \ No newline at end of file diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap index 80614689ff4..2772c0a964f 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap @@ -2,10 +2,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 253, + "duration" : 248, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:14:13.000+00:00", + "endTime" : "2009-10-21T23:14:08.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -17,7 +17,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 181.36, - "endTime" : "2009-10-21T23:10:44.000+00:00", + "endTime" : "2009-10-21T23:10:42.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.53261, @@ -92,8 +92,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ } ], "to" : { - "arrival" : "2009-10-21T23:10:44.000+00:00", - "departure" : "2009-10-21T23:10:44.000+00:00", + "arrival" : "2009-10-21T23:10:42.000+00:00", + "departure" : "2009-10-21T23:10:42.000+00:00", "lat" : 45.5316391, "lon" : -122.7016859, "name" : "P+R (#2)", @@ -121,10 +121,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 184.06, - "endTime" : "2009-10-21T23:14:13.000+00:00", + "endTime" : "2009-10-21T23:14:08.000+00:00", "from" : { - "arrival" : "2009-10-21T23:10:44.000+00:00", - "departure" : "2009-10-21T23:10:44.000+00:00", + "arrival" : "2009-10-21T23:10:42.000+00:00", + "departure" : "2009-10-21T23:10:42.000+00:00", "lat" : 45.5314019, "lon" : -122.7016931, "name" : "P+R (#1)", @@ -155,7 +155,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:10:44.000+00:00", + "startTime" : "2009-10-21T23:10:42.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -198,7 +198,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ } ], "to" : { - "arrival" : "2009-10-21T23:14:13.000+00:00", + "arrival" : "2009-10-21T23:14:08.000+00:00", "lat" : 45.53046, "lon" : -122.70067, "name" : "NW Marshall St. & NW 24th Ave. (P2)", @@ -215,7 +215,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "waitingTime" : 0, "walkDistance" : 365.42, "walkLimitExceeded" : false, - "walkTime" : 253 + "walkTime" : 248 } ] ] @@ -225,10 +225,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 379, + "duration" : 369, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:16:19.000+00:00", + "endTime" : "2009-10-21T23:16:09.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -240,7 +240,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 108.24, - "endTime" : "2009-10-21T23:11:30.000+00:00", + "endTime" : "2009-10-21T23:11:27.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.53335, @@ -276,8 +276,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:11:30.000+00:00", - "departure" : "2009-10-21T23:11:30.000+00:00", + "arrival" : "2009-10-21T23:11:27.000+00:00", + "departure" : "2009-10-21T23:11:27.000+00:00", "lat" : 45.5325089, "lon" : -122.7048383, "name" : "corner of path and Northwest Pettygrove Street", @@ -291,10 +291,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 864.7, - "endTime" : "2009-10-21T23:14:08.000+00:00", + "endTime" : "2009-10-21T23:14:01.000+00:00", "from" : { - "arrival" : "2009-10-21T23:11:30.000+00:00", - "departure" : "2009-10-21T23:11:30.000+00:00", + "arrival" : "2009-10-21T23:11:27.000+00:00", + "departure" : "2009-10-21T23:11:27.000+00:00", "lat" : 45.5325089, "lon" : -122.7048383, "name" : "corner of path and Northwest Pettygrove Street", @@ -311,7 +311,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:11:30.000+00:00", + "startTime" : "2009-10-21T23:11:27.000+00:00", "steps" : [ { "absoluteDirection" : "EAST", @@ -341,8 +341,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:14:08.000+00:00", - "departure" : "2009-10-21T23:14:08.000+00:00", + "arrival" : "2009-10-21T23:14:01.000+00:00", + "departure" : "2009-10-21T23:14:01.000+00:00", "lat" : 45.5306177, "lon" : -122.6966188, "name" : "corner of Northwest 22nd Avenue and path", @@ -356,10 +356,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 85.65, - "endTime" : "2009-10-21T23:16:19.000+00:00", + "endTime" : "2009-10-21T23:16:09.000+00:00", "from" : { - "arrival" : "2009-10-21T23:14:08.000+00:00", - "departure" : "2009-10-21T23:14:08.000+00:00", + "arrival" : "2009-10-21T23:14:01.000+00:00", + "departure" : "2009-10-21T23:14:01.000+00:00", "lat" : 45.5306177, "lon" : -122.6966188, "name" : "corner of Northwest 22nd Avenue and path", @@ -376,7 +376,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:14:08.000+00:00", + "startTime" : "2009-10-21T23:14:01.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -393,7 +393,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:16:19.000+00:00", + "arrival" : "2009-10-21T23:16:09.000+00:00", "lat" : 45.5306, "lon" : -122.69771, "name" : "Legacy Good Samaritan Medical Center (P4)", @@ -410,7 +410,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "waitingTime" : 0, "walkDistance" : 1058.59, "walkLimitExceeded" : false, - "walkTime" : 379 + "walkTime" : 369 } ] ] @@ -420,7 +420,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 379, + "duration" : 369, "elevationGained" : 0.0, "elevationLost" : 0.0, "endTime" : "2009-10-21T23:16:54.000+00:00", @@ -435,9 +435,9 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 108.24, - "endTime" : "2009-10-21T23:13:13.000+00:00", + "endTime" : "2009-10-21T23:13:20.000+00:00", "from" : { - "departure" : "2009-10-21T23:10:35.000+00:00", + "departure" : "2009-10-21T23:10:45.000+00:00", "lat" : 45.53335, "lon" : -122.70517, "name" : "Chapman Elementary School (P3)", @@ -454,7 +454,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:10:35.000+00:00", + "startTime" : "2009-10-21T23:10:45.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -471,8 +471,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:13:13.000+00:00", - "departure" : "2009-10-21T23:13:13.000+00:00", + "arrival" : "2009-10-21T23:13:20.000+00:00", + "departure" : "2009-10-21T23:13:20.000+00:00", "lat" : 45.5325089, "lon" : -122.7048383, "name" : "corner of path and Northwest Pettygrove Street", @@ -486,10 +486,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 864.7, - "endTime" : "2009-10-21T23:15:47.000+00:00", + "endTime" : "2009-10-21T23:15:49.000+00:00", "from" : { - "arrival" : "2009-10-21T23:13:13.000+00:00", - "departure" : "2009-10-21T23:13:13.000+00:00", + "arrival" : "2009-10-21T23:13:20.000+00:00", + "departure" : "2009-10-21T23:13:20.000+00:00", "lat" : 45.5325089, "lon" : -122.7048383, "name" : "corner of path and Northwest Pettygrove Street", @@ -506,7 +506,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:13:13.000+00:00", + "startTime" : "2009-10-21T23:13:20.000+00:00", "steps" : [ { "absoluteDirection" : "EAST", @@ -536,8 +536,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:15:47.000+00:00", - "departure" : "2009-10-21T23:15:47.000+00:00", + "arrival" : "2009-10-21T23:15:49.000+00:00", + "departure" : "2009-10-21T23:15:49.000+00:00", "lat" : 45.5306177, "lon" : -122.6966188, "name" : "corner of Northwest 22nd Avenue and path", @@ -553,8 +553,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "distance" : 85.65, "endTime" : "2009-10-21T23:16:54.000+00:00", "from" : { - "arrival" : "2009-10-21T23:15:47.000+00:00", - "departure" : "2009-10-21T23:15:47.000+00:00", + "arrival" : "2009-10-21T23:15:49.000+00:00", + "departure" : "2009-10-21T23:15:49.000+00:00", "lat" : 45.5306177, "lon" : -122.6966188, "name" : "corner of Northwest 22nd Avenue and path", @@ -571,7 +571,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:15:47.000+00:00", + "startTime" : "2009-10-21T23:15:49.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -598,14 +598,14 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "walkingBike" : false } ], - "startTime" : "2009-10-21T23:10:35.000+00:00", + "startTime" : "2009-10-21T23:10:45.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 0, "waitingTime" : 0, "walkDistance" : 1058.59, "walkLimitExceeded" : false, - "walkTime" : 379 + "walkTime" : 369 } ] ] @@ -615,10 +615,10 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 34, + "duration" : 30, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-10-21T23:10:34.000+00:00", + "endTime" : "2009-10-21T23:10:30.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -630,7 +630,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 240.19, - "endTime" : "2009-10-21T23:10:34.000+00:00", + "endTime" : "2009-10-21T23:10:30.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.53261, @@ -679,7 +679,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit } ], "to" : { - "arrival" : "2009-10-21T23:10:34.000+00:00", + "arrival" : "2009-10-21T23:10:30.000+00:00", "lat" : 45.53046, "lon" : -122.70067, "name" : "NW Marshall St. & NW 24th Ave. (P2)", @@ -696,7 +696,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPickupWit "waitingTime" : 0, "walkDistance" : 240.19, "walkLimitExceeded" : false, - "walkTime" : 34 + "walkTime" : 30 } ] ] \ No newline at end of file diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap index 390185cd96f..6a9a19708b6 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap @@ -2,7 +2,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBike=[ [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 746, + "duration" : 720, "elevationGained" : 18.9, "elevationLost" : 30.64, "endTime" : "2009-10-21T23:10:00.000+00:00", @@ -19,7 +19,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBike=[ "distance" : 2636.74, "endTime" : "2009-10-21T23:10:00.000+00:00", "from" : { - "departure" : "2009-10-21T22:57:34.000+00:00", + "departure" : "2009-10-21T22:58:00.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -37,7 +37,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBike=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T22:57:34.000+00:00", + "startTime" : "2009-10-21T22:58:00.000+00:00", "steps" : [ { "absoluteDirection" : "NORTH", @@ -116,14 +116,14 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBike=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T22:57:34.000+00:00", + "startTime" : "2009-10-21T22:58:00.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 0, "waitingTime" : 0, "walkDistance" : 2636.74, "walkLimitExceeded" : false, - "walkTime" : 746 + "walkTime" : 720 } ] ] @@ -133,10 +133,10 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 459, + "duration" : 451, "elevationGained" : 12.88, "elevationLost" : 38.14, - "endTime" : "2009-10-21T23:17:39.000+00:00", + "endTime" : "2009-10-21T23:17:31.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -148,7 +148,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 106.59, - "endTime" : "2009-10-21T23:12:38.000+00:00", + "endTime" : "2009-10-21T23:12:35.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.52832, @@ -211,9 +211,9 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe } ], "to" : { - "arrival" : "2009-10-21T23:12:38.000+00:00", + "arrival" : "2009-10-21T23:12:35.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:38.000+00:00", + "departure" : "2009-10-21T23:12:35.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -230,11 +230,11 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 493.43, - "endTime" : "2009-10-21T23:14:47.000+00:00", + "endTime" : "2009-10-21T23:14:41.000+00:00", "from" : { - "arrival" : "2009-10-21T23:12:38.000+00:00", + "arrival" : "2009-10-21T23:12:35.000+00:00", "bikeShareId" : "-102309", - "departure" : "2009-10-21T23:12:38.000+00:00", + "departure" : "2009-10-21T23:12:35.000+00:00", "lat" : 45.5277374, "lon" : -122.7003879, "name" : "-102309", @@ -255,7 +255,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "realTime" : false, "rentedBike" : true, "route" : "", - "startTime" : "2009-10-21T23:12:38.000+00:00", + "startTime" : "2009-10-21T23:12:35.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -285,9 +285,9 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe } ], "to" : { - "arrival" : "2009-10-21T23:14:47.000+00:00", + "arrival" : "2009-10-21T23:14:41.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:14:47.000+00:00", + "departure" : "2009-10-21T23:14:41.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -304,11 +304,11 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 219.06, - "endTime" : "2009-10-21T23:17:39.000+00:00", + "endTime" : "2009-10-21T23:17:31.000+00:00", "from" : { - "arrival" : "2009-10-21T23:14:47.000+00:00", + "arrival" : "2009-10-21T23:14:41.000+00:00", "bikeShareId" : "-102323", - "departure" : "2009-10-21T23:14:47.000+00:00", + "departure" : "2009-10-21T23:14:41.000+00:00", "lat" : 45.5278491, "lon" : -122.6942362, "name" : "-102323", @@ -329,7 +329,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:14:47.000+00:00", + "startTime" : "2009-10-21T23:14:41.000+00:00", "steps" : [ { "absoluteDirection" : "EAST", @@ -372,7 +372,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe } ], "to" : { - "arrival" : "2009-10-21T23:17:39.000+00:00", + "arrival" : "2009-10-21T23:17:31.000+00:00", "lat" : 45.52704, "lon" : -122.6924, "name" : "NW Hoyt St. & NW 20th Ave. (P2)", @@ -389,7 +389,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directBikeRe "waitingTime" : 0, "walkDistance" : 819.08, "walkLimitExceeded" : false, - "walkTime" : 459 + "walkTime" : 451 } ] ] @@ -399,10 +399,10 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directWalk=[ [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1863, + "duration" : 1834, "elevationGained" : 0.7, "elevationLost" : 12.44, - "endTime" : "2009-10-21T23:41:03.000+00:00", + "endTime" : "2009-10-21T23:40:34.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -414,7 +414,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directWalk=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 2431.99, - "endTime" : "2009-10-21T23:41:03.000+00:00", + "endTime" : "2009-10-21T23:40:34.000+00:00", "from" : { "departure" : "2009-10-21T23:10:00.000+00:00", "lat" : 45.52832, @@ -503,7 +503,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directWalk=[ } ], "to" : { - "arrival" : "2009-10-21T23:41:03.000+00:00", + "arrival" : "2009-10-21T23:40:34.000+00:00", "lat" : 45.54549, "lon" : -122.69659, "name" : "Sulzer Pump (P4)", @@ -520,7 +520,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.directWalk=[ "waitingTime" : 0, "walkDistance" : 2431.99, "walkLimitExceeded" : false, - "walkTime" : 1863 + "walkTime" : 1834 } ] ] @@ -530,10 +530,10 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1125, + "duration" : 1119, "elevationGained" : 15.03, "elevationLost" : 4.23, - "endTime" : "2009-10-21T23:31:21.000+00:00", + "endTime" : "2009-10-21T23:31:16.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -569,7 +569,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 167.87, "endTime" : "2009-10-21T23:14:50.000+00:00", "from" : { - "departure" : "2009-10-21T23:12:36.000+00:00", + "departure" : "2009-10-21T23:12:37.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -587,7 +587,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:12:36.000+00:00", + "startTime" : "2009-10-21T23:12:37.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -811,7 +811,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 562.98, - "endTime" : "2009-10-21T23:31:21.000+00:00", + "endTime" : "2009-10-21T23:31:16.000+00:00", "from" : { "arrival" : "2009-10-21T23:23:32.000+00:00", "departure" : "2009-10-21T23:23:32.000+00:00", @@ -878,7 +878,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:31:21.000+00:00", + "arrival" : "2009-10-21T23:31:16.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -888,21 +888,21 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:12:36.000+00:00", + "startTime" : "2009-10-21T23:12:37.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 522, "waitingTime" : 0, "walkDistance" : 730.85, "walkLimitExceeded" : false, - "walkTime" : 603 + "walkTime" : 597 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1256, + "duration" : 1241, "elevationGained" : 5.48, "elevationLost" : 23.58, - "endTime" : "2009-10-21T23:35:04.000+00:00", + "endTime" : "2009-10-21T23:34:56.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -938,7 +938,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 287.82, "endTime" : "2009-10-21T23:18:00.000+00:00", "from" : { - "departure" : "2009-10-21T23:14:08.000+00:00", + "departure" : "2009-10-21T23:14:15.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -956,7 +956,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:14:08.000+00:00", + "startTime" : "2009-10-21T23:14:15.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -1193,7 +1193,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 563.7, - "endTime" : "2009-10-21T23:35:04.000+00:00", + "endTime" : "2009-10-21T23:34:56.000+00:00", "from" : { "arrival" : "2009-10-21T23:28:03.000+00:00", "departure" : "2009-10-21T23:28:03.000+00:00", @@ -1273,7 +1273,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:35:04.000+00:00", + "arrival" : "2009-10-21T23:34:56.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -1283,21 +1283,21 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:14:08.000+00:00", + "startTime" : "2009-10-21T23:14:15.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 603, "waitingTime" : 0, "walkDistance" : 851.52, "walkLimitExceeded" : false, - "walkTime" : 653 + "walkTime" : 638 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1156, + "duration" : 1144, "elevationGained" : 9.14, "elevationLost" : 1.09, - "endTime" : "2009-10-21T23:37:44.000+00:00", + "endTime" : "2009-10-21T23:37:37.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1333,7 +1333,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 252.88, "endTime" : "2009-10-21T23:21:53.000+00:00", "from" : { - "departure" : "2009-10-21T23:18:28.000+00:00", + "departure" : "2009-10-21T23:18:33.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -1351,7 +1351,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:18:28.000+00:00", + "startTime" : "2009-10-21T23:18:33.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -1575,7 +1575,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 580.63, - "endTime" : "2009-10-21T23:37:44.000+00:00", + "endTime" : "2009-10-21T23:37:37.000+00:00", "from" : { "arrival" : "2009-10-21T23:29:50.000+00:00", "departure" : "2009-10-21T23:29:50.000+00:00", @@ -1642,7 +1642,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:37:44.000+00:00", + "arrival" : "2009-10-21T23:37:37.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -1652,21 +1652,21 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:18:28.000+00:00", + "startTime" : "2009-10-21T23:18:33.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 477, "waitingTime" : 0, "walkDistance" : 833.51, "walkLimitExceeded" : false, - "walkTime" : 679 + "walkTime" : 667 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1535, + "duration" : 1514, "elevationGained" : 9.48, "elevationLost" : 4.76, - "endTime" : "2009-10-21T23:46:18.000+00:00", + "endTime" : "2009-10-21T23:46:15.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1702,7 +1702,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 618.76, "endTime" : "2009-10-21T23:29:00.000+00:00", "from" : { - "departure" : "2009-10-21T23:20:43.000+00:00", + "departure" : "2009-10-21T23:21:01.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -1720,7 +1720,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:20:43.000+00:00", + "startTime" : "2009-10-21T23:21:01.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2022,7 +2022,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 250.02, - "endTime" : "2009-10-21T23:46:18.000+00:00", + "endTime" : "2009-10-21T23:46:15.000+00:00", "from" : { "arrival" : "2009-10-21T23:42:47.000+00:00", "departure" : "2009-10-21T23:42:47.000+00:00", @@ -2089,7 +2089,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:46:18.000+00:00", + "arrival" : "2009-10-21T23:46:15.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -2099,21 +2099,21 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:20:43.000+00:00", + "startTime" : "2009-10-21T23:21:01.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 827, "waitingTime" : 0, "walkDistance" : 868.78, "walkLimitExceeded" : false, - "walkTime" : 708 + "walkTime" : 687 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1125, + "duration" : 1119, "elevationGained" : 15.03, "elevationLost" : 4.23, - "endTime" : "2009-10-21T23:46:21.000+00:00", + "endTime" : "2009-10-21T23:46:16.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -2149,7 +2149,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 167.87, "endTime" : "2009-10-21T23:29:50.000+00:00", "from" : { - "departure" : "2009-10-21T23:27:36.000+00:00", + "departure" : "2009-10-21T23:27:37.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -2167,7 +2167,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:27:36.000+00:00", + "startTime" : "2009-10-21T23:27:37.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2391,7 +2391,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 562.98, - "endTime" : "2009-10-21T23:46:21.000+00:00", + "endTime" : "2009-10-21T23:46:16.000+00:00", "from" : { "arrival" : "2009-10-21T23:38:32.000+00:00", "departure" : "2009-10-21T23:38:32.000+00:00", @@ -2458,7 +2458,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:46:21.000+00:00", + "arrival" : "2009-10-21T23:46:16.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -2468,21 +2468,21 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:27:36.000+00:00", + "startTime" : "2009-10-21T23:27:37.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 522, "waitingTime" : 0, "walkDistance" : 730.85, "walkLimitExceeded" : false, - "walkTime" : 603 + "walkTime" : 597 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1316, + "duration" : 1301, "elevationGained" : 5.48, "elevationLost" : 23.58, - "endTime" : "2009-10-21T23:51:04.000+00:00", + "endTime" : "2009-10-21T23:50:56.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -2518,7 +2518,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "distance" : 287.82, "endTime" : "2009-10-21T23:33:00.000+00:00", "from" : { - "departure" : "2009-10-21T23:29:08.000+00:00", + "departure" : "2009-10-21T23:29:15.000+00:00", "lat" : 45.52523, "lon" : -122.67525, "name" : "NW Everett St. & NW 5th Ave. (P3)", @@ -2536,7 +2536,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-10-21T23:29:08.000+00:00", + "startTime" : "2009-10-21T23:29:15.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2773,7 +2773,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 563.7, - "endTime" : "2009-10-21T23:51:04.000+00:00", + "endTime" : "2009-10-21T23:50:56.000+00:00", "from" : { "arrival" : "2009-10-21T23:44:03.000+00:00", "departure" : "2009-10-21T23:44:03.000+00:00", @@ -2853,7 +2853,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } ], "to" : { - "arrival" : "2009-10-21T23:51:04.000+00:00", + "arrival" : "2009-10-21T23:50:56.000+00:00", "lat" : 45.52832, "lon" : -122.70059, "name" : "SW Johnson St. & NW 24th Ave. (P1)", @@ -2863,14 +2863,14 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "walkingBike" : false } ], - "startTime" : "2009-10-21T23:29:08.000+00:00", + "startTime" : "2009-10-21T23:29:15.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 663, "waitingTime" : 0, "walkDistance" : 851.52, "walkLimitExceeded" : false, - "walkTime" : 653 + "walkTime" : 638 } ] ] \ No newline at end of file diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap index 0f00b88e65b..ca7628e90a8 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap @@ -2,10 +2,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 3821, + "duration" : 3744, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T19:03:41.000+00:00", + "endTime" : "2009-11-17T19:02:24.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -17,7 +17,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 4923.15, - "endTime" : "2009-11-17T19:03:41.000+00:00", + "endTime" : "2009-11-17T19:02:24.000+00:00", "from" : { "departure" : "2009-11-17T18:00:00.000+00:00", "lat" : 45.51726, @@ -209,7 +209,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T19:03:41.000+00:00", + "arrival" : "2009-11-17T19:02:24.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -226,14 +226,14 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "waitingTime" : 0, "walkDistance" : 4923.15, "walkLimitExceeded" : false, - "walkTime" : 3821 + "walkTime" : 3744 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2020, + "duration" : 2000, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:35:19.000+00:00", + "endTime" : "2009-11-17T18:35:17.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -280,7 +280,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 4023, + "generalizedCost" : 4026, "legs" : [ { "agencyTimeZoneOffset" : -28800000, @@ -289,7 +289,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 1022.47, "endTime" : "2009-11-17T18:14:50.000+00:00", "from" : { - "departure" : "2009-11-17T18:01:39.000+00:00", + "departure" : "2009-11-17T18:01:57.000+00:00", "lat" : 45.51726, "lon" : -122.64847, "name" : "SE Morrison St. & SE 17th Ave. (P1)", @@ -306,7 +306,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:01:39.000+00:00", + "startTime" : "2009-11-17T18:01:57.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -478,7 +478,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 51.83, - "endTime" : "2009-11-17T18:19:32.000+00:00", + "endTime" : "2009-11-17T18:19:29.000+00:00", "from" : { "arrival" : "2009-11-17T18:18:49.000+00:00", "departure" : "2009-11-17T18:18:49.000+00:00", @@ -518,7 +518,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:19:32.000+00:00", + "arrival" : "2009-11-17T18:19:29.000+00:00", "departure" : "2009-11-17T18:22:05.000+00:00", "lat" : 45.531586, "lon" : -122.660482, @@ -541,7 +541,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 3448.6, "endTime" : "2009-11-17T18:34:55.000+00:00", "from" : { - "arrival" : "2009-11-17T18:19:32.000+00:00", + "arrival" : "2009-11-17T18:19:29.000+00:00", "departure" : "2009-11-17T18:22:05.000+00:00", "lat" : 45.531586, "lon" : -122.660482, @@ -553,7 +553,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "vertexType" : "TRANSIT", "zoneId" : "0" }, - "generalizedCost" : 1523, + "generalizedCost" : 1526, "headsign" : "Montgomery Park", "interlineWithPreviousLeg" : false, "intermediateStops" : [ @@ -712,7 +712,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 18.81, - "endTime" : "2009-11-17T18:35:19.000+00:00", + "endTime" : "2009-11-17T18:35:17.000+00:00", "from" : { "arrival" : "2009-11-17T18:34:55.000+00:00", "departure" : "2009-11-17T18:34:55.000+00:00", @@ -752,7 +752,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:35:19.000+00:00", + "arrival" : "2009-11-17T18:35:17.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -762,21 +762,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:01:39.000+00:00", + "startTime" : "2009-11-17T18:01:57.000+00:00", "tooSloped" : false, "transfers" : 1, "transitTime" : 1009, - "waitingTime" : 153, + "waitingTime" : 156, "walkDistance" : 1093.11, "walkLimitExceeded" : false, - "walkTime" : 858 + "walkTime" : 835 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2261, + "duration" : 2235, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:38:41.000+00:00", + "endTime" : "2009-11-17T18:38:28.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -812,7 +812,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 920.33, "endTime" : "2009-11-17T18:12:58.000+00:00", "from" : { - "departure" : "2009-11-17T18:01:00.000+00:00", + "departure" : "2009-11-17T18:01:13.000+00:00", "lat" : 45.51726, "lon" : -122.64847, "name" : "SE Morrison St. & SE 17th Ave. (P1)", @@ -829,7 +829,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:01:00.000+00:00", + "startTime" : "2009-11-17T18:01:13.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -1144,7 +1144,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 999.1, - "endTime" : "2009-11-17T18:38:41.000+00:00", + "endTime" : "2009-11-17T18:38:28.000+00:00", "from" : { "arrival" : "2009-11-17T18:25:49.000+00:00", "departure" : "2009-11-17T18:25:49.000+00:00", @@ -1210,7 +1210,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:38:41.000+00:00", + "arrival" : "2009-11-17T18:38:28.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -1220,21 +1220,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:01:00.000+00:00", + "startTime" : "2009-11-17T18:01:13.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 771, "waitingTime" : 0, "walkDistance" : 1919.43, "walkLimitExceeded" : false, - "walkTime" : 1490 + "walkTime" : 1464 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1470, + "duration" : 1465, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:39:22.000+00:00", + "endTime" : "2009-11-17T18:39:18.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1270,7 +1270,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 62.01, "endTime" : "2009-11-17T18:15:40.000+00:00", "from" : { - "departure" : "2009-11-17T18:14:52.000+00:00", + "departure" : "2009-11-17T18:14:53.000+00:00", "lat" : 45.51726, "lon" : -122.64847, "name" : "SE Morrison St. & SE 17th Ave. (P1)", @@ -1287,7 +1287,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:14:52.000+00:00", + "startTime" : "2009-11-17T18:14:53.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -1680,7 +1680,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 266.21, - "endTime" : "2009-11-17T18:39:22.000+00:00", + "endTime" : "2009-11-17T18:39:18.000+00:00", "from" : { "arrival" : "2009-11-17T18:35:54.000+00:00", "departure" : "2009-11-17T18:35:54.000+00:00", @@ -1733,7 +1733,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:39:22.000+00:00", + "arrival" : "2009-11-17T18:39:18.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -1743,21 +1743,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:14:52.000+00:00", + "startTime" : "2009-11-17T18:14:53.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 1214, "waitingTime" : 0, "walkDistance" : 328.22, "walkLimitExceeded" : false, - "walkTime" : 256 + "walkTime" : 251 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2020, + "duration" : 2000, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:51:19.000+00:00", + "endTime" : "2009-11-17T18:51:17.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -1804,7 +1804,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 4023, + "generalizedCost" : 4026, "legs" : [ { "agencyTimeZoneOffset" : -28800000, @@ -1813,7 +1813,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 1022.47, "endTime" : "2009-11-17T18:30:50.000+00:00", "from" : { - "departure" : "2009-11-17T18:17:39.000+00:00", + "departure" : "2009-11-17T18:17:57.000+00:00", "lat" : 45.51726, "lon" : -122.64847, "name" : "SE Morrison St. & SE 17th Ave. (P1)", @@ -1830,7 +1830,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:17:39.000+00:00", + "startTime" : "2009-11-17T18:17:57.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2002,7 +2002,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 51.83, - "endTime" : "2009-11-17T18:35:36.000+00:00", + "endTime" : "2009-11-17T18:35:33.000+00:00", "from" : { "arrival" : "2009-11-17T18:34:53.000+00:00", "departure" : "2009-11-17T18:34:53.000+00:00", @@ -2042,7 +2042,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:35:36.000+00:00", + "arrival" : "2009-11-17T18:35:33.000+00:00", "departure" : "2009-11-17T18:38:05.000+00:00", "lat" : 45.531586, "lon" : -122.660482, @@ -2065,7 +2065,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 3448.6, "endTime" : "2009-11-17T18:50:55.000+00:00", "from" : { - "arrival" : "2009-11-17T18:35:36.000+00:00", + "arrival" : "2009-11-17T18:35:33.000+00:00", "departure" : "2009-11-17T18:38:05.000+00:00", "lat" : 45.531586, "lon" : -122.660482, @@ -2077,7 +2077,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "vertexType" : "TRANSIT", "zoneId" : "0" }, - "generalizedCost" : 1519, + "generalizedCost" : 1522, "headsign" : "Montgomery Park", "interlineWithPreviousLeg" : false, "intermediateStops" : [ @@ -2236,7 +2236,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 18.81, - "endTime" : "2009-11-17T18:51:19.000+00:00", + "endTime" : "2009-11-17T18:51:17.000+00:00", "from" : { "arrival" : "2009-11-17T18:50:55.000+00:00", "departure" : "2009-11-17T18:50:55.000+00:00", @@ -2276,7 +2276,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:51:19.000+00:00", + "arrival" : "2009-11-17T18:51:17.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -2286,21 +2286,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:17:39.000+00:00", + "startTime" : "2009-11-17T18:17:57.000+00:00", "tooSloped" : false, "transfers" : 1, "transitTime" : 1013, - "waitingTime" : 149, + "waitingTime" : 152, "walkDistance" : 1093.11, "walkLimitExceeded" : false, - "walkTime" : 858 + "walkTime" : 835 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2275, + "duration" : 2249, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:53:55.000+00:00", + "endTime" : "2009-11-17T18:53:42.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -2336,7 +2336,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "distance" : 920.33, "endTime" : "2009-11-17T18:27:58.000+00:00", "from" : { - "departure" : "2009-11-17T18:16:00.000+00:00", + "departure" : "2009-11-17T18:16:13.000+00:00", "lat" : 45.51726, "lon" : -122.64847, "name" : "SE Morrison St. & SE 17th Ave. (P1)", @@ -2353,7 +2353,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:16:00.000+00:00", + "startTime" : "2009-11-17T18:16:13.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -2668,7 +2668,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 999.1, - "endTime" : "2009-11-17T18:53:55.000+00:00", + "endTime" : "2009-11-17T18:53:42.000+00:00", "from" : { "arrival" : "2009-11-17T18:41:03.000+00:00", "departure" : "2009-11-17T18:41:03.000+00:00", @@ -2734,7 +2734,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:53:55.000+00:00", + "arrival" : "2009-11-17T18:53:42.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -2744,14 +2744,14 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:16:00.000+00:00", + "startTime" : "2009-11-17T18:16:13.000+00:00", "tooSloped" : false, "transfers" : 0, "transitTime" : 785, "waitingTime" : 0, "walkDistance" : 1919.43, "walkLimitExceeded" : false, - "walkTime" : 1490 + "walkTime" : 1464 } ] ] @@ -2761,10 +2761,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 3451, + "duration" : 3376, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:57:31.000+00:00", + "endTime" : "2009-11-17T18:56:16.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -2776,7 +2776,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 4442.91, - "endTime" : "2009-11-17T18:57:31.000+00:00", + "endTime" : "2009-11-17T18:56:16.000+00:00", "from" : { "departure" : "2009-11-17T18:00:00.000+00:00", "lat" : 45.52337, @@ -2932,7 +2932,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:57:31.000+00:00", + "arrival" : "2009-11-17T18:56:16.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -2949,14 +2949,14 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "waitingTime" : 0, "walkDistance" : 4442.91, "walkLimitExceeded" : false, - "walkTime" : 3451 + "walkTime" : 3376 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1553, + "duration" : 2136, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:38:40.000+00:00", + "endTime" : "2009-11-17T18:37:25.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -2980,19 +2980,39 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ] + }, + { + "legIndices" : [ + 3 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "regular" + } + ] } ] }, - "generalizedCost" : 2895, + "generalizedCost" : 3863, "legs" : [ { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 87.02, - "endTime" : "2009-11-17T18:14:00.000+00:00", + "endTime" : "2009-11-17T18:03:00.000+00:00", "from" : { - "departure" : "2009-11-17T18:12:47.000+00:00", + "departure" : "2009-11-17T18:01:49.000+00:00", "lat" : 45.52337, "lon" : -122.653725, "name" : "NE 12th & Couch", @@ -3012,7 +3032,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:12:47.000+00:00", + "startTime" : "2009-11-17T18:01:49.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -3042,8 +3062,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:14:00.000+00:00", - "departure" : "2009-11-17T18:14:00.000+00:00", + "arrival" : "2009-11-17T18:03:00.000+00:00", + "departure" : "2009-11-17T18:03:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -3062,338 +3082,467 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "agencyUrl" : "http://trimet.org", "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 3729.97, - "endTime" : "2009-11-17T18:26:49.000+00:00", + "distance" : 2007.51, + "endTime" : "2009-11-17T18:10:35.000+00:00", "from" : { - "arrival" : "2009-11-17T18:14:00.000+00:00", - "departure" : "2009-11-17T18:14:00.000+00:00", + "arrival" : "2009-11-17T18:03:00.000+00:00", + "departure" : "2009-11-17T18:03:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", "stopCode" : "5055", "stopId" : "prt:5055", - "stopIndex" : 94, - "stopSequence" : 95, + "stopIndex" : 32, + "stopSequence" : 33, "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 1369, - "headsign" : "Beaverton TC", + "generalizedCost" : 1055, + "headsign" : "112th & Mt Scott Blvd", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:14:47.000+00:00", - "departure" : "2009-11-17T18:14:47.000+00:00", + "arrival" : "2009-11-17T18:03:47.000+00:00", + "departure" : "2009-11-17T18:03:47.000+00:00", "lat" : 45.523024, "lon" : -122.656526, "name" : "E Burnside & NE 9th", "stopCode" : "819", "stopId" : "prt:819", - "stopIndex" : 95, - "stopSequence" : 96, + "stopIndex" : 33, + "stopSequence" : 34, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:15:24.000+00:00", - "departure" : "2009-11-17T18:15:24.000+00:00", + "arrival" : "2009-11-17T18:04:24.000+00:00", + "departure" : "2009-11-17T18:04:24.000+00:00", "lat" : 45.523012, "lon" : -122.659365, "name" : "E Burnside & NE 6th", "stopCode" : "805", "stopId" : "prt:805", - "stopIndex" : 96, - "stopSequence" : 97, + "stopIndex" : 34, + "stopSequence" : 35, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:15:52.000+00:00", - "departure" : "2009-11-17T18:15:52.000+00:00", + "arrival" : "2009-11-17T18:04:52.000+00:00", + "departure" : "2009-11-17T18:04:52.000+00:00", "lat" : 45.523015, "lon" : -122.661534, "name" : "E Burnside & NE M L King", "stopCode" : "705", "stopId" : "prt:705", - "stopIndex" : 97, - "stopSequence" : 98, + "stopIndex" : 35, + "stopSequence" : 36, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:18:00.000+00:00", - "departure" : "2009-11-17T18:18:00.000+00:00", + "arrival" : "2009-11-17T18:07:00.000+00:00", + "departure" : "2009-11-17T18:07:00.000+00:00", "lat" : 45.523249, "lon" : -122.671269, "name" : "W Burnside & Burnside Bridge", "stopCode" : "689", "stopId" : "prt:689", - "stopIndex" : 98, - "stopSequence" : 99, - "vertexType" : "TRANSIT", - "zoneId" : "0" - }, - { - "arrival" : "2009-11-17T18:19:00.000+00:00", - "departure" : "2009-11-17T18:19:00.000+00:00", - "lat" : 45.523169, - "lon" : -122.675893, - "name" : "W Burnside & NW 5th", - "stopCode" : "782", - "stopId" : "prt:782", - "stopIndex" : 99, - "stopSequence" : 100, - "vertexType" : "TRANSIT", - "zoneId" : "0" - }, - { - "arrival" : "2009-11-17T18:20:17.000+00:00", - "departure" : "2009-11-17T18:20:17.000+00:00", - "lat" : 45.523115, - "lon" : -122.678939, - "name" : "W Burnside & NW Park", - "stopCode" : "716", - "stopId" : "prt:716", - "stopIndex" : 100, - "stopSequence" : 101, - "vertexType" : "TRANSIT", - "zoneId" : "0" - }, - { - "arrival" : "2009-11-17T18:21:25.000+00:00", - "departure" : "2009-11-17T18:21:25.000+00:00", - "lat" : 45.523048, - "lon" : -122.681606, - "name" : "W Burnside & NW 10th", - "stopCode" : "10791", - "stopId" : "prt:10791", - "stopIndex" : 101, - "stopSequence" : 102, + "stopIndex" : 36, + "stopSequence" : 37, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:22:14.000+00:00", - "departure" : "2009-11-17T18:22:14.000+00:00", - "lat" : 45.523, - "lon" : -122.683535, - "name" : "W Burnside & NW 12th", - "stopCode" : "11032", - "stopId" : "prt:11032", - "stopIndex" : 102, - "stopSequence" : 103, + "arrival" : "2009-11-17T18:09:49.000+00:00", + "departure" : "2009-11-17T18:09:49.000+00:00", + "lat" : 45.521958, + "lon" : -122.675956, + "name" : "SW 5th & Pine", + "stopCode" : "7631", + "stopId" : "prt:7631", + "stopIndex" : 37, + "stopSequence" : 38, "vertexType" : "TRANSIT", "zoneId" : "0" - }, - { - "arrival" : "2009-11-17T18:24:09.000+00:00", - "departure" : "2009-11-17T18:24:09.000+00:00", - "lat" : 45.522985, - "lon" : -122.688091, - "name" : "W Burnside & NW 17th", - "stopCode" : "10809", - "stopId" : "prt:10809", - "stopIndex" : 103, - "stopSequence" : 104, - "vertexType" : "TRANSIT", - "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:25:00.000+00:00", - "departure" : "2009-11-17T18:25:00.000+00:00", - "lat" : 45.523097, - "lon" : -122.690083, - "name" : "W Burnside & NW 19th", - "stopCode" : "735", - "stopId" : "prt:735", - "stopIndex" : 104, - "stopSequence" : 105, - "vertexType" : "TRANSIT", - "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:25:21.000+00:00", - "departure" : "2009-11-17T18:25:21.000+00:00", - "lat" : 45.523176, - "lon" : -122.692139, - "name" : "W Burnside & NW 20th", - "stopCode" : "741", - "stopId" : "prt:741", - "stopIndex" : 105, - "stopSequence" : 106, - "vertexType" : "TRANSIT", - "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:25:31.000+00:00", - "departure" : "2009-11-17T18:25:31.000+00:00", - "lat" : 45.52322, - "lon" : -122.69313, - "name" : "W Burnside & NW 20th Pl", - "stopCode" : "742", - "stopId" : "prt:742", - "stopIndex" : 106, - "stopSequence" : 107, - "vertexType" : "TRANSIT", - "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:25:49.000+00:00", - "departure" : "2009-11-17T18:25:49.000+00:00", - "lat" : 45.523312, - "lon" : -122.694901, - "name" : "W Burnside & NW King", - "stopCode" : "747", - "stopId" : "prt:747", - "stopIndex" : 107, - "stopSequence" : 108, - "vertexType" : "TRANSIT", - "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:26:22.000+00:00", - "departure" : "2009-11-17T18:26:22.000+00:00", - "lat" : 45.523512, - "lon" : -122.698081, - "name" : "W Burnside & NW 23rd", - "stopCode" : "755", - "stopId" : "prt:755", - "stopIndex" : 108, - "stopSequence" : 109, - "vertexType" : "TRANSIT", - "zoneId" : "1" } ], "legGeometry" : { - "length" : 95, - "points" : "weztGdtrkV?BPj@@jA?jEAhE?pD???VAjE?hE?dB?b@???`AAhE?dD???l@C`EAhEEhE?bAA|@?XAZ@\\AzACnGKbKAjC?bE???JEnE@fEDlE@hE@~A??@rBBzDBpE@~A???Z@tD@RBnEB|A???@BdB?lEBjA??BnBApF@dB?X?^@r@?f@@bCAx@EtB???VChAE|BGnD??AXKnEGnD???XGjD??AZEfCC`AEzB??AXCfAGxDE|AEtBIlC??APu@lJMhBI`@" + "length" : 46, + "points" : "weztGdtrkV?BPj@@jA?jEAhE?pD???VAjE?hE?dB?b@???`AAhE?dD???l@C`EAhEEhE?bAA|@?XAZ@\\AzACnGKbKAjC?bE???JEnE@fEDlE@hE\\CPBt@ZvAl@d@R??|Ar@rB|@" }, "mode" : "BUS", "pathway" : false, "realTime" : false, - "route" : "Burnside/Stark", - "routeId" : "prt:20", - "routeLongName" : "Burnside/Stark", - "routeShortName" : "20", + "route" : "Woodstock/Glisan", + "routeId" : "prt:19", + "routeLongName" : "Woodstock/Glisan", + "routeShortName" : "19", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:14:00.000+00:00", + "startTime" : "2009-11-17T18:03:00.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T18:26:49.000+00:00", - "departure" : "2009-11-17T18:26:49.000+00:00", - "lat" : 45.523897, - "lon" : -122.700681, - "name" : "W Burnside & NW 23rd Pl", - "stopCode" : "9555", - "stopId" : "prt:9555", - "stopIndex" : 109, - "stopSequence" : 110, + "arrival" : "2009-11-17T18:10:35.000+00:00", + "departure" : "2009-11-17T18:10:35.000+00:00", + "lat" : 45.520924, + "lon" : -122.676535, + "name" : "SW 5th & Stark", + "stopCode" : "7636", + "stopId" : "prt:7636", + "stopIndex" : 38, + "stopSequence" : 39, "vertexType" : "TRANSIT", - "zoneId" : "1" + "zoneId" : "0" }, "transitLeg" : true, - "tripBlockId" : "2002", - "tripId" : "prt:200W1200" + "tripBlockId" : "1942", + "tripId" : "prt:190W1210" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 913.81, - "endTime" : "2009-11-17T18:38:40.000+00:00", + "distance" : 422.72, + "endTime" : "2009-11-17T18:16:01.000+00:00", "from" : { - "arrival" : "2009-11-17T18:26:49.000+00:00", - "departure" : "2009-11-17T18:26:49.000+00:00", - "lat" : 45.523897, - "lon" : -122.700681, - "name" : "W Burnside & NW 23rd Pl", - "stopCode" : "9555", - "stopId" : "prt:9555", + "arrival" : "2009-11-17T18:10:35.000+00:00", + "departure" : "2009-11-17T18:10:35.000+00:00", + "lat" : 45.520924, + "lon" : -122.676535, + "name" : "SW 5th & Stark", + "stopCode" : "7636", + "stopId" : "prt:7636", "vertexType" : "TRANSIT", - "zoneId" : "1" + "zoneId" : "0" }, - "generalizedCost" : 1388, + "generalizedCost" : 645, "interlineWithPreviousLeg" : false, "legGeometry" : { - "length" : 39, - "points" : "ikztGh~{kVNDEVUzACPOUQO_@Yc@[QMMEOKOIECGCIAMCGCGAECECECOOMOGKIFMLk@BsABGDGBoCBkCDoC@mCBmCDoCDmCD?qA" + "length" : 25, + "points" : "wxytGjgwkVDWF@LFABCJm@lDADCRABCNi@zCETEXm@lD]hBo@rDCPADL@H@F@JB@@@K" }, "mode" : "WALK", "pathway" : false, "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:26:49.000+00:00", + "startTime" : "2009-11-17T18:10:35.000+00:00", "steps" : [ { - "absoluteDirection" : "WEST", + "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 54.63, + "distance" : 12.2, "elevation" : "", - "lat" : 45.5238156, - "lon" : -122.7007199, + "lat" : 45.5208921, + "lon" : -122.6764107, "relativeDirection" : "DEPART", "stayOn" : false, - "streetName" : "West Burnside Street", + "streetName" : "Southwest 5th Avenue", "walkingBike" : false }, { - "absoluteDirection" : "NORTHEAST", + "absoluteDirection" : "WEST", "area" : false, "bogusName" : false, - "distance" : 176.41, + "distance" : 385.03, "elevation" : "", - "lat" : 45.5239733, - "lon" : -122.701384, + "lat" : 45.5207895, + "lon" : -122.6764662, "relativeDirection" : "RIGHT", "stayOn" : false, - "streetName" : "Northwest 24th Place", + "streetName" : "Southwest Stark Street", "walkingBike" : false }, { - "absoluteDirection" : "NORTHWEST", + "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 15.26, + "distance" : 25.48, "elevation" : "", - "lat" : 45.5253583, - "lon" : -122.7003357, + "lat" : 45.5220244, + "lon" : -122.6810834, "relativeDirection" : "LEFT", "stayOn" : false, - "streetName" : "Northwest Westover Road", - "walkingBike" : false - }, - { - "absoluteDirection" : "NORTH", - "area" : false, - "bogusName" : false, - "distance" : 635.66, - "elevation" : "", - "lat" : 45.5254724, - "lon" : -122.7004445, - "relativeDirection" : "SLIGHTLY_RIGHT", - "stayOn" : false, - "streetName" : "Northwest 24th Avenue", + "streetName" : "Southwest 10th Avenue", "walkingBike" : false + } + ], + "to" : { + "arrival" : "2009-11-17T18:16:01.000+00:00", + "departure" : "2009-11-17T18:18:09.000+00:00", + "lat" : 45.521786, + "lon" : -122.68109, + "name" : "SW 10th & Stark", + "stopCode" : "10769", + "stopId" : "prt:10769", + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + "transitLeg" : false, + "walkingBike" : false + }, + { + "agencyId" : "prt:prt", + "agencyName" : "TriMet", + "agencyTimeZoneOffset" : -28800000, + "agencyUrl" : "http://trimet.org", + "arrivalDelay" : 0, + "departureDelay" : 0, + "distance" : 2493.24, + "endTime" : "2009-11-17T18:35:00.000+00:00", + "from" : { + "arrival" : "2009-11-17T18:16:01.000+00:00", + "departure" : "2009-11-17T18:18:09.000+00:00", + "lat" : 45.521786, + "lon" : -122.68109, + "name" : "SW 10th & Stark", + "stopCode" : "10769", + "stopId" : "prt:10769", + "stopIndex" : 12, + "stopSequence" : 13, + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + "generalizedCost" : 1739, + "headsign" : "NW 23rd Ave", + "interlineWithPreviousLeg" : false, + "intermediateStops" : [ + { + "arrival" : "2009-11-17T18:19:35.000+00:00", + "departure" : "2009-11-17T18:19:35.000+00:00", + "lat" : 45.523593, + "lon" : -122.681083, + "name" : "NW 10th & Couch", + "stopCode" : "10770", + "stopId" : "prt:10770", + "stopIndex" : 13, + "stopSequence" : 14, + "vertexType" : "TRANSIT", + "zoneId" : "0" }, { - "absoluteDirection" : "EAST", + "arrival" : "2009-11-17T18:20:41.000+00:00", + "departure" : "2009-11-17T18:20:41.000+00:00", + "lat" : 45.525011, + "lon" : -122.681113, + "name" : "NW 10th & Everett", + "stopCode" : "10771", + "stopId" : "prt:10771", + "stopIndex" : 14, + "stopSequence" : 15, + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + { + "arrival" : "2009-11-17T18:21:49.000+00:00", + "departure" : "2009-11-17T18:21:49.000+00:00", + "lat" : 45.526446, + "lon" : -122.68118, + "name" : "NW 10th & Glisan", + "stopCode" : "10772", + "stopId" : "prt:10772", + "stopIndex" : 15, + "stopSequence" : 16, + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + { + "arrival" : "2009-11-17T18:23:30.000+00:00", + "departure" : "2009-11-17T18:23:30.000+00:00", + "lat" : 45.528572, + "lon" : -122.68125, + "name" : "NW 10th & Johnson", + "stopCode" : "10773", + "stopId" : "prt:10773", + "stopIndex" : 16, + "stopSequence" : 17, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:25:11.000+00:00", + "departure" : "2009-11-17T18:25:11.000+00:00", + "lat" : 45.530707, + "lon" : -122.68132, + "name" : "NW 10th & Marshall", + "stopCode" : "10774", + "stopId" : "prt:10774", + "stopIndex" : 17, + "stopSequence" : 18, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:26:52.000+00:00", + "departure" : "2009-11-17T18:26:52.000+00:00", + "lat" : 45.531534, + "lon" : -122.683319, + "name" : "NW 12th & Northrup", + "stopCode" : "12796", + "stopId" : "prt:12796", + "stopIndex" : 18, + "stopSequence" : 19, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:28:00.000+00:00", + "departure" : "2009-11-17T18:30:00.000+00:00", + "lat" : 45.531503, + "lon" : -122.685357, + "name" : "NW Northrup & 14th", + "stopCode" : "10775", + "stopId" : "prt:10775", + "stopIndex" : 19, + "stopSequence" : 20, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:31:26.000+00:00", + "departure" : "2009-11-17T18:31:26.000+00:00", + "lat" : 45.531434, + "lon" : -122.689417, + "name" : "NW Northrup & 18th", + "stopCode" : "10776", + "stopId" : "prt:10776", + "stopIndex" : 20, + "stopSequence" : 21, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:33:13.000+00:00", + "departure" : "2009-11-17T18:33:13.000+00:00", + "lat" : 45.531346, + "lon" : -122.694455, + "name" : "NW Northrup & 21st", + "stopCode" : "10777", + "stopId" : "prt:10777", + "stopIndex" : 21, + "stopSequence" : 22, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + { + "arrival" : "2009-11-17T18:33:55.000+00:00", + "departure" : "2009-11-17T18:33:55.000+00:00", + "lat" : 45.531308, + "lon" : -122.696445, + "name" : "NW Northrup & 22nd", + "stopCode" : "10778", + "stopId" : "prt:10778", + "stopIndex" : 22, + "stopSequence" : 23, + "vertexType" : "TRANSIT", + "zoneId" : "1" + } + ], + "legGeometry" : { + "length" : 55, + "points" : "e~ytGbdxkV[OQ@{CFa@B{B@??S@mC@Q@eB@??U@mCB{BD??S?mCBmCFyBB??U?kCBsCDsBD??W?kCBBlE@lD???XBjEBpD???VBlE?dA@t@?b@?h@BfEBrD???VBhEFtKDvJ??@\\DnJ???d@FtKvBE" + }, + "mode" : "TRAM", + "pathway" : false, + "realTime" : false, + "route" : "Portland Streetcar", + "routeId" : "prt:193", + "routeLongName" : "Portland Streetcar", + "routeType" : 0, + "serviceDate" : "2009-11-17", + "startTime" : "2009-11-17T18:18:09.000+00:00", + "steps" : [ ], + "to" : { + "arrival" : "2009-11-17T18:35:00.000+00:00", + "departure" : "2009-11-17T18:35:00.000+00:00", + "lat" : 45.530612, + "lon" : -122.698688, + "name" : "NW 23rd & Marshall", + "stopCode" : "8989", + "stopId" : "prt:8989", + "stopIndex" : 23, + "stopSequence" : 24, + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + "transitLeg" : true, + "tripBlockId" : "9384", + "tripId" : "prt:1930W1210" + }, + { + "agencyTimeZoneOffset" : -28800000, + "arrivalDelay" : 0, + "departureDelay" : 0, + "distance" : 187.24, + "endTime" : "2009-11-17T18:37:25.000+00:00", + "from" : { + "arrival" : "2009-11-17T18:35:00.000+00:00", + "departure" : "2009-11-17T18:35:00.000+00:00", + "lat" : 45.530612, + "lon" : -122.698688, + "name" : "NW 23rd & Marshall", + "stopCode" : "8989", + "stopId" : "prt:8989", + "vertexType" : "TRANSIT", + "zoneId" : "1" + }, + "generalizedCost" : 286, + "interlineWithPreviousLeg" : false, + "legGeometry" : { + "length" : 7, + "points" : "iu{tGxq{kV?DK?GBwADK?DpH" + }, + "mode" : "WALK", + "pathway" : false, + "realTime" : false, + "rentedBike" : false, + "route" : "", + "startTime" : "2009-11-17T18:35:00.000+00:00", + "steps" : [ + { + "absoluteDirection" : "NORTH", "area" : false, "bogusName" : false, - "distance" : 31.86, + "distance" : 60.76, "elevation" : "", - "lat" : 45.531181, - "lon" : -122.7007063, - "relativeDirection" : "RIGHT", + "lat" : 45.5306118, + "lon" : -122.6987102, + "relativeDirection" : "DEPART", + "stayOn" : false, + "streetName" : "Northwest 23rd Avenue", + "walkingBike" : false + }, + { + "absoluteDirection" : "NORTH", + "area" : false, + "bogusName" : true, + "distance" : 7.29, + "elevation" : "", + "lat" : 45.531153, + "lon" : -122.6987606, + "relativeDirection" : "CONTINUE", + "stayOn" : false, + "streetName" : "path", + "walkingBike" : false + }, + { + "absoluteDirection" : "WEST", + "area" : false, + "bogusName" : false, + "distance" : 119.18, + "elevation" : "", + "lat" : 45.5312184, + "lon" : -122.698768, + "relativeDirection" : "LEFT", "stayOn" : false, "streetName" : "Northwest Northrup Street", "walkingBike" : false } ], "to" : { - "arrival" : "2009-11-17T18:38:40.000+00:00", + "arrival" : "2009-11-17T18:37:25.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -3403,21 +3552,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:12:47.000+00:00", + "startTime" : "2009-11-17T18:01:49.000+00:00", "tooSloped" : false, - "transfers" : 0, - "transitTime" : 769, - "waitingTime" : 0, - "walkDistance" : 1000.83, + "transfers" : 1, + "transitTime" : 1466, + "waitingTime" : 128, + "walkDistance" : 696.98, "walkLimitExceeded" : false, - "walkTime" : 784 + "walkTime" : 542 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1583, + "duration" : 1540, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:54:10.000+00:00", + "endTime" : "2009-11-17T18:38:29.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -3444,16 +3593,16 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 2925, + "generalizedCost" : 2895, "legs" : [ { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 87.02, - "endTime" : "2009-11-17T18:29:00.000+00:00", + "endTime" : "2009-11-17T18:14:00.000+00:00", "from" : { - "departure" : "2009-11-17T18:27:47.000+00:00", + "departure" : "2009-11-17T18:12:49.000+00:00", "lat" : 45.52337, "lon" : -122.653725, "name" : "NE 12th & Couch", @@ -3473,7 +3622,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:27:47.000+00:00", + "startTime" : "2009-11-17T18:12:49.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -3503,8 +3652,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:29:00.000+00:00", - "departure" : "2009-11-17T18:29:00.000+00:00", + "arrival" : "2009-11-17T18:14:00.000+00:00", + "departure" : "2009-11-17T18:14:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -3524,10 +3673,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 3729.97, - "endTime" : "2009-11-17T18:42:19.000+00:00", + "endTime" : "2009-11-17T18:26:49.000+00:00", "from" : { - "arrival" : "2009-11-17T18:29:00.000+00:00", - "departure" : "2009-11-17T18:29:00.000+00:00", + "arrival" : "2009-11-17T18:14:00.000+00:00", + "departure" : "2009-11-17T18:14:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -3538,13 +3687,13 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 1399, - "headsign" : "23rd Ave to Tichner", + "generalizedCost" : 1369, + "headsign" : "Beaverton TC", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:29:47.000+00:00", - "departure" : "2009-11-17T18:29:47.000+00:00", + "arrival" : "2009-11-17T18:14:47.000+00:00", + "departure" : "2009-11-17T18:14:47.000+00:00", "lat" : 45.523024, "lon" : -122.656526, "name" : "E Burnside & NE 9th", @@ -3556,8 +3705,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:30:24.000+00:00", - "departure" : "2009-11-17T18:30:24.000+00:00", + "arrival" : "2009-11-17T18:15:24.000+00:00", + "departure" : "2009-11-17T18:15:24.000+00:00", "lat" : 45.523012, "lon" : -122.659365, "name" : "E Burnside & NE 6th", @@ -3569,8 +3718,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:30:52.000+00:00", - "departure" : "2009-11-17T18:30:52.000+00:00", + "arrival" : "2009-11-17T18:15:52.000+00:00", + "departure" : "2009-11-17T18:15:52.000+00:00", "lat" : 45.523015, "lon" : -122.661534, "name" : "E Burnside & NE M L King", @@ -3582,8 +3731,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:33:00.000+00:00", - "departure" : "2009-11-17T18:33:00.000+00:00", + "arrival" : "2009-11-17T18:18:00.000+00:00", + "departure" : "2009-11-17T18:18:00.000+00:00", "lat" : 45.523249, "lon" : -122.671269, "name" : "W Burnside & Burnside Bridge", @@ -3595,8 +3744,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:34:00.000+00:00", - "departure" : "2009-11-17T18:34:00.000+00:00", + "arrival" : "2009-11-17T18:19:00.000+00:00", + "departure" : "2009-11-17T18:19:00.000+00:00", "lat" : 45.523169, "lon" : -122.675893, "name" : "W Burnside & NW 5th", @@ -3608,8 +3757,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:35:17.000+00:00", - "departure" : "2009-11-17T18:35:17.000+00:00", + "arrival" : "2009-11-17T18:20:17.000+00:00", + "departure" : "2009-11-17T18:20:17.000+00:00", "lat" : 45.523115, "lon" : -122.678939, "name" : "W Burnside & NW Park", @@ -3621,8 +3770,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:36:25.000+00:00", - "departure" : "2009-11-17T18:36:25.000+00:00", + "arrival" : "2009-11-17T18:21:25.000+00:00", + "departure" : "2009-11-17T18:21:25.000+00:00", "lat" : 45.523048, "lon" : -122.681606, "name" : "W Burnside & NW 10th", @@ -3634,8 +3783,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:37:14.000+00:00", - "departure" : "2009-11-17T18:37:14.000+00:00", + "arrival" : "2009-11-17T18:22:14.000+00:00", + "departure" : "2009-11-17T18:22:14.000+00:00", "lat" : 45.523, "lon" : -122.683535, "name" : "W Burnside & NW 12th", @@ -3647,8 +3796,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:39:09.000+00:00", - "departure" : "2009-11-17T18:39:09.000+00:00", + "arrival" : "2009-11-17T18:24:09.000+00:00", + "departure" : "2009-11-17T18:24:09.000+00:00", "lat" : 45.522985, "lon" : -122.688091, "name" : "W Burnside & NW 17th", @@ -3660,8 +3809,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:40:00.000+00:00", - "departure" : "2009-11-17T18:40:00.000+00:00", + "arrival" : "2009-11-17T18:25:00.000+00:00", + "departure" : "2009-11-17T18:25:00.000+00:00", "lat" : 45.523097, "lon" : -122.690083, "name" : "W Burnside & NW 19th", @@ -3673,8 +3822,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:40:27.000+00:00", - "departure" : "2009-11-17T18:40:27.000+00:00", + "arrival" : "2009-11-17T18:25:21.000+00:00", + "departure" : "2009-11-17T18:25:21.000+00:00", "lat" : 45.523176, "lon" : -122.692139, "name" : "W Burnside & NW 20th", @@ -3686,8 +3835,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:40:40.000+00:00", - "departure" : "2009-11-17T18:40:40.000+00:00", + "arrival" : "2009-11-17T18:25:31.000+00:00", + "departure" : "2009-11-17T18:25:31.000+00:00", "lat" : 45.52322, "lon" : -122.69313, "name" : "W Burnside & NW 20th Pl", @@ -3699,8 +3848,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:41:03.000+00:00", - "departure" : "2009-11-17T18:41:03.000+00:00", + "arrival" : "2009-11-17T18:25:49.000+00:00", + "departure" : "2009-11-17T18:25:49.000+00:00", "lat" : 45.523312, "lon" : -122.694901, "name" : "W Burnside & NW King", @@ -3712,8 +3861,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:41:44.000+00:00", - "departure" : "2009-11-17T18:41:44.000+00:00", + "arrival" : "2009-11-17T18:26:22.000+00:00", + "departure" : "2009-11-17T18:26:22.000+00:00", "lat" : 45.523512, "lon" : -122.698081, "name" : "W Burnside & NW 23rd", @@ -3738,11 +3887,11 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "routeShortName" : "20", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:29:00.000+00:00", + "startTime" : "2009-11-17T18:14:00.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T18:42:19.000+00:00", - "departure" : "2009-11-17T18:42:19.000+00:00", + "arrival" : "2009-11-17T18:26:49.000+00:00", + "departure" : "2009-11-17T18:26:49.000+00:00", "lat" : 45.523897, "lon" : -122.700681, "name" : "W Burnside & NW 23rd Pl", @@ -3754,18 +3903,18 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, "transitLeg" : true, - "tripBlockId" : "2071", - "tripId" : "prt:200W1210" + "tripBlockId" : "2002", + "tripId" : "prt:200W1200" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 913.81, - "endTime" : "2009-11-17T18:54:10.000+00:00", + "endTime" : "2009-11-17T18:38:29.000+00:00", "from" : { - "arrival" : "2009-11-17T18:42:19.000+00:00", - "departure" : "2009-11-17T18:42:19.000+00:00", + "arrival" : "2009-11-17T18:26:49.000+00:00", + "departure" : "2009-11-17T18:26:49.000+00:00", "lat" : 45.523897, "lon" : -122.700681, "name" : "W Burnside & NW 23rd Pl", @@ -3785,7 +3934,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:42:19.000+00:00", + "startTime" : "2009-11-17T18:26:49.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -3854,7 +4003,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:54:10.000+00:00", + "arrival" : "2009-11-17T18:38:29.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -3864,21 +4013,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:27:47.000+00:00", + "startTime" : "2009-11-17T18:12:49.000+00:00", "tooSloped" : false, "transfers" : 0, - "transitTime" : 799, + "transitTime" : 769, "waitingTime" : 0, "walkDistance" : 1000.83, "walkLimitExceeded" : false, - "walkTime" : 784 + "walkTime" : 771 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2260, + "duration" : 1759, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T19:07:27.000+00:00", + "endTime" : "2009-11-17T18:44:08.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -3925,16 +4074,16 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 4058, + "generalizedCost" : 3705, "legs" : [ { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 87.02, - "endTime" : "2009-11-17T18:31:00.000+00:00", + "endTime" : "2009-11-17T18:16:00.000+00:00", "from" : { - "departure" : "2009-11-17T18:29:47.000+00:00", + "departure" : "2009-11-17T18:14:49.000+00:00", "lat" : 45.52337, "lon" : -122.653725, "name" : "NE 12th & Couch", @@ -3954,7 +4103,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:29:47.000+00:00", + "startTime" : "2009-11-17T18:14:49.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -3984,8 +4133,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:31:00.000+00:00", - "departure" : "2009-11-17T18:31:00.000+00:00", + "arrival" : "2009-11-17T18:16:00.000+00:00", + "departure" : "2009-11-17T18:16:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -4004,81 +4153,68 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "agencyUrl" : "http://trimet.org", "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 1883.59, - "endTime" : "2009-11-17T18:38:19.000+00:00", + "distance" : 1427.62, + "endTime" : "2009-11-17T18:20:00.000+00:00", "from" : { - "arrival" : "2009-11-17T18:31:00.000+00:00", - "departure" : "2009-11-17T18:31:00.000+00:00", + "arrival" : "2009-11-17T18:16:00.000+00:00", + "departure" : "2009-11-17T18:16:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", "stopCode" : "5055", "stopId" : "prt:5055", - "stopIndex" : 84, - "stopSequence" : 85, + "stopIndex" : 33, + "stopSequence" : 34, "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 1039, - "headsign" : "Sherwood via Portland city center", + "generalizedCost" : 840, + "headsign" : "King City via Portland city center", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:31:47.000+00:00", - "departure" : "2009-11-17T18:31:47.000+00:00", + "arrival" : "2009-11-17T18:16:47.000+00:00", + "departure" : "2009-11-17T18:16:47.000+00:00", "lat" : 45.523024, "lon" : -122.656526, "name" : "E Burnside & NE 9th", "stopCode" : "819", "stopId" : "prt:819", - "stopIndex" : 85, - "stopSequence" : 86, + "stopIndex" : 34, + "stopSequence" : 35, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:32:24.000+00:00", - "departure" : "2009-11-17T18:32:24.000+00:00", + "arrival" : "2009-11-17T18:17:24.000+00:00", + "departure" : "2009-11-17T18:17:24.000+00:00", "lat" : 45.523012, "lon" : -122.659365, "name" : "E Burnside & NE 6th", "stopCode" : "805", "stopId" : "prt:805", - "stopIndex" : 86, - "stopSequence" : 87, + "stopIndex" : 35, + "stopSequence" : 36, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:32:52.000+00:00", - "departure" : "2009-11-17T18:32:52.000+00:00", + "arrival" : "2009-11-17T18:17:52.000+00:00", + "departure" : "2009-11-17T18:17:52.000+00:00", "lat" : 45.523015, "lon" : -122.661534, "name" : "E Burnside & NE M L King", "stopCode" : "705", "stopId" : "prt:705", - "stopIndex" : 87, - "stopSequence" : 88, + "stopIndex" : 36, + "stopSequence" : 37, "vertexType" : "TRANSIT", "zoneId" : "1" - }, - { - "arrival" : "2009-11-17T18:35:00.000+00:00", - "departure" : "2009-11-17T18:35:00.000+00:00", - "lat" : 45.523249, - "lon" : -122.671269, - "name" : "W Burnside & Burnside Bridge", - "stopCode" : "689", - "stopId" : "prt:689", - "stopIndex" : 88, - "stopSequence" : 89, - "vertexType" : "TRANSIT", - "zoneId" : "0" } ], "legGeometry" : { - "length" : 43, - "points" : "weztGdtrkV?BPj@@jA?jEAhE?pD???VAjE?hE?dB?b@???`AAhE?dD???l@C`EAhEEhE?bAA|@?XAZ@\\AzACnGKbKAjC?bE???JEnE@fEDlE@hE\\CPBt@ZvAl@d@R" + "length" : 32, + "points" : "weztGdtrkV?BPj@@jA?jEAhE?pD???VAjE?hE?dB?b@???`AAhE?dD???l@C`EAhEEhE?bAA|@?XAZ@\\AzACnGKbKAjC?bE" }, "mode" : "BUS", "pathway" : false, @@ -4089,142 +4225,142 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "routeShortName" : "12", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:31:00.000+00:00", + "startTime" : "2009-11-17T18:16:00.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T18:38:19.000+00:00", - "departure" : "2009-11-17T18:38:19.000+00:00", - "lat" : 45.521958, - "lon" : -122.675956, - "name" : "SW 5th & Pine", - "stopCode" : "7631", - "stopId" : "prt:7631", - "stopIndex" : 89, - "stopSequence" : 90, + "arrival" : "2009-11-17T18:20:00.000+00:00", + "departure" : "2009-11-17T18:20:00.000+00:00", + "lat" : 45.523249, + "lon" : -122.671269, + "name" : "W Burnside & Burnside Bridge", + "stopCode" : "689", + "stopId" : "prt:689", + "stopIndex" : 37, + "stopSequence" : 38, "vertexType" : "TRANSIT", "zoneId" : "0" }, "transitLeg" : true, - "tripBlockId" : "1235", - "tripId" : "prt:120W1270" + "tripBlockId" : "1207", + "tripId" : "prt:120W1260" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 534.33, - "endTime" : "2009-11-17T18:45:25.000+00:00", + "distance" : 444.49, + "endTime" : "2009-11-17T18:25:45.000+00:00", "from" : { - "arrival" : "2009-11-17T18:38:19.000+00:00", - "departure" : "2009-11-17T18:38:19.000+00:00", - "lat" : 45.521958, - "lon" : -122.675956, - "name" : "SW 5th & Pine", - "stopCode" : "7631", - "stopId" : "prt:7631", + "arrival" : "2009-11-17T18:20:00.000+00:00", + "departure" : "2009-11-17T18:20:00.000+00:00", + "lat" : 45.523249, + "lon" : -122.671269, + "name" : "W Burnside & Burnside Bridge", + "stopCode" : "689", + "stopId" : "prt:689", "vertexType" : "TRANSIT", "zoneId" : "0" }, - "generalizedCost" : 820, + "generalizedCost" : 680, "interlineWithPreviousLeg" : false, "legGeometry" : { - "length" : 24, - "points" : "e_ztGvcwkVADlAl@NFi@|CAFCJCJCNi@|CCRGXm@lDdCfA]hBo@rDCPADL@H@F@JB@@@K" + "length" : 32, + "points" : "ggztGlfvkVA?Ab@?\\AbC?BAD?NP?RA?R?JB~B?h@@\\@jB?d@@X?T@z@?v@@f@?R?F?L?HBfD?N?BLDLDD[" }, "mode" : "WALK", "pathway" : false, "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:38:19.000+00:00", + "startTime" : "2009-11-17T18:20:00.000+00:00", "steps" : [ { - "absoluteDirection" : "SOUTH", + "absoluteDirection" : "WEST", "area" : false, "bogusName" : false, - "distance" : 47.2, + "distance" : 76.58, "elevation" : "", - "lat" : 45.5219669, - "lon" : -122.6759883, + "lat" : 45.5232599, + "lon" : -122.6712685, "relativeDirection" : "DEPART", "stayOn" : false, - "streetName" : "Southwest 5th Avenue", + "streetName" : "Burnside Bridge", "walkingBike" : false }, { - "absoluteDirection" : "SOUTH", + "absoluteDirection" : "WEST", "area" : false, "bogusName" : true, - "distance" : 9.01, + "distance" : 10.69, "elevation" : "", - "lat" : 45.5215719, - "lon" : -122.67621, + "lat" : 45.5232723, + "lon" : -122.6722513, "relativeDirection" : "CONTINUE", "stayOn" : false, "streetName" : "path", "walkingBike" : false }, { - "absoluteDirection" : "WEST", + "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 243.52, + "distance" : 10.22, "elevation" : "", - "lat" : 45.5214961, - "lon" : -122.676251, - "relativeDirection" : "RIGHT", + "lat" : 45.5232877, + "lon" : -122.6723821, + "relativeDirection" : "LEFT", "stayOn" : false, - "streetName" : "Southwest Oak Street", + "streetName" : "Northwest 2nd Avenue", "walkingBike" : false }, { "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 79.59, + "distance" : 11.14, "elevation" : "", - "lat" : 45.5222784, - "lon" : -122.6791704, - "relativeDirection" : "LEFT", + "lat" : 45.5231958, + "lon" : -122.6723802, + "relativeDirection" : "CONTINUE", "stayOn" : false, - "streetName" : "Southwest Park Avenue", + "streetName" : "Southwest 2nd Avenue", "walkingBike" : false }, { "absoluteDirection" : "WEST", "area" : false, "bogusName" : false, - "distance" : 129.53, + "distance" : 320.31, "elevation" : "", - "lat" : 45.5216085, - "lon" : -122.6795303, + "lat" : 45.5230956, + "lon" : -122.6723768, "relativeDirection" : "RIGHT", "stayOn" : false, - "streetName" : "Southwest Stark Street", + "streetName" : "West Burnside Street", "walkingBike" : false }, { "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 25.48, + "distance" : 15.55, "elevation" : "", - "lat" : 45.5220244, - "lon" : -122.6810834, + "lat" : 45.5230026, + "lon" : -122.6764861, "relativeDirection" : "LEFT", "stayOn" : false, - "streetName" : "Southwest 10th Avenue", + "streetName" : "Southwest 6th Avenue", "walkingBike" : false } ], "to" : { - "arrival" : "2009-11-17T18:45:25.000+00:00", - "departure" : "2009-11-17T18:48:09.000+00:00", - "lat" : 45.521786, - "lon" : -122.68109, - "name" : "SW 10th & Stark", - "stopCode" : "10769", - "stopId" : "prt:10769", + "arrival" : "2009-11-17T18:25:45.000+00:00", + "departure" : "2009-11-17T18:27:47.000+00:00", + "lat" : 45.522833, + "lon" : -122.676408, + "name" : "SW 6th & W Burnside", + "stopCode" : "7751", + "stopId" : "prt:7751", "vertexType" : "TRANSIT", "zoneId" : "0" }, @@ -4238,251 +4374,252 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "agencyUrl" : "http://trimet.org", "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 2493.24, - "endTime" : "2009-11-17T19:05:00.000+00:00", + "distance" : 2354.46, + "endTime" : "2009-11-17T18:38:21.000+00:00", "from" : { - "arrival" : "2009-11-17T18:45:25.000+00:00", - "departure" : "2009-11-17T18:48:09.000+00:00", - "lat" : 45.521786, - "lon" : -122.68109, - "name" : "SW 10th & Stark", - "stopCode" : "10769", - "stopId" : "prt:10769", - "stopIndex" : 12, - "stopSequence" : 13, + "arrival" : "2009-11-17T18:25:45.000+00:00", + "departure" : "2009-11-17T18:27:47.000+00:00", + "lat" : 45.522833, + "lon" : -122.676408, + "name" : "SW 6th & W Burnside", + "stopCode" : "7751", + "stopId" : "prt:7751", + "stopIndex" : 65, + "stopSequence" : 66, "vertexType" : "TRANSIT", "zoneId" : "0" }, - "generalizedCost" : 1775, - "headsign" : "NW 23rd Ave", + "generalizedCost" : 1356, + "headsign" : "Montgomery Park", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:49:35.000+00:00", - "departure" : "2009-11-17T18:49:35.000+00:00", - "lat" : 45.523593, - "lon" : -122.681083, - "name" : "NW 10th & Couch", - "stopCode" : "10770", - "stopId" : "prt:10770", - "stopIndex" : 13, - "stopSequence" : 14, + "arrival" : "2009-11-17T18:29:17.000+00:00", + "departure" : "2009-11-17T18:29:17.000+00:00", + "lat" : 45.52583, + "lon" : -122.676422, + "name" : "NW 6th & Flanders", + "stopCode" : "9300", + "stopId" : "prt:9300", + "stopIndex" : 66, + "stopSequence" : 67, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:50:41.000+00:00", - "departure" : "2009-11-17T18:50:41.000+00:00", - "lat" : 45.525011, - "lon" : -122.681113, - "name" : "NW 10th & Everett", - "stopCode" : "10771", - "stopId" : "prt:10771", - "stopIndex" : 14, - "stopSequence" : 15, + "arrival" : "2009-11-17T18:30:01.000+00:00", + "departure" : "2009-11-17T18:30:01.000+00:00", + "lat" : 45.526678, + "lon" : -122.677476, + "name" : "NW Glisan & Broadway", + "stopCode" : "1997", + "stopId" : "prt:1997", + "stopIndex" : 67, + "stopSequence" : 68, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:51:49.000+00:00", - "departure" : "2009-11-17T18:51:49.000+00:00", - "lat" : 45.526446, - "lon" : -122.68118, - "name" : "NW 10th & Glisan", - "stopCode" : "10772", - "stopId" : "prt:10772", - "stopIndex" : 15, - "stopSequence" : 16, + "arrival" : "2009-11-17T18:30:35.000+00:00", + "departure" : "2009-11-17T18:30:35.000+00:00", + "lat" : 45.526643, + "lon" : -122.679075, + "name" : "NW Glisan & Park", + "stopCode" : "2007", + "stopId" : "prt:2007", + "stopIndex" : 68, + "stopSequence" : 69, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:53:30.000+00:00", - "departure" : "2009-11-17T18:53:30.000+00:00", - "lat" : 45.528572, - "lon" : -122.68125, - "name" : "NW 10th & Johnson", - "stopCode" : "10773", - "stopId" : "prt:10773", - "stopIndex" : 16, - "stopSequence" : 17, + "arrival" : "2009-11-17T18:31:18.000+00:00", + "departure" : "2009-11-17T18:31:18.000+00:00", + "lat" : 45.526601, + "lon" : -122.681091, + "name" : "NW Glisan & 10th", + "stopCode" : "2011", + "stopId" : "prt:2011", + "stopIndex" : 69, + "stopSequence" : 70, "vertexType" : "TRANSIT", - "zoneId" : "1" + "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:55:11.000+00:00", - "departure" : "2009-11-17T18:55:11.000+00:00", - "lat" : 45.530707, - "lon" : -122.68132, - "name" : "NW 10th & Marshall", - "stopCode" : "10774", - "stopId" : "prt:10774", - "stopIndex" : 17, - "stopSequence" : 18, + "arrival" : "2009-11-17T18:32:02.000+00:00", + "departure" : "2009-11-17T18:32:02.000+00:00", + "lat" : 45.526578, + "lon" : -122.683142, + "name" : "NW Glisan & 12th", + "stopCode" : "2030", + "stopId" : "prt:2030", + "stopIndex" : 70, + "stopSequence" : 71, "vertexType" : "TRANSIT", - "zoneId" : "1" + "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:56:52.000+00:00", - "departure" : "2009-11-17T18:56:52.000+00:00", - "lat" : 45.531534, - "lon" : -122.683319, - "name" : "NW 12th & Northrup", - "stopCode" : "12796", - "stopId" : "prt:12796", - "stopIndex" : 18, - "stopSequence" : 19, + "arrival" : "2009-11-17T18:32:46.000+00:00", + "departure" : "2009-11-17T18:32:46.000+00:00", + "lat" : 45.526532, + "lon" : -122.685164, + "name" : "NW Glisan & 14th", + "stopCode" : "2046", + "stopId" : "prt:2046", + "stopIndex" : 71, + "stopSequence" : 72, + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + { + "arrival" : "2009-11-17T18:33:28.000+00:00", + "departure" : "2009-11-17T18:33:28.000+00:00", + "lat" : 45.526503, + "lon" : -122.687165, + "name" : "NW Glisan & 16th", + "stopCode" : "2062", + "stopId" : "prt:2062", + "stopIndex" : 72, + "stopSequence" : 73, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:58:00.000+00:00", - "departure" : "2009-11-17T19:00:00.000+00:00", - "lat" : 45.531503, - "lon" : -122.685357, - "name" : "NW Northrup & 14th", - "stopCode" : "10775", - "stopId" : "prt:10775", - "stopIndex" : 19, - "stopSequence" : 20, + "arrival" : "2009-11-17T18:34:33.000+00:00", + "departure" : "2009-11-17T18:34:33.000+00:00", + "lat" : 45.526412, + "lon" : -122.690196, + "name" : "NW Glisan & 19th", + "stopCode" : "2086", + "stopId" : "prt:2086", + "stopIndex" : 73, + "stopSequence" : 74, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:01:26.000+00:00", - "departure" : "2009-11-17T19:01:26.000+00:00", - "lat" : 45.531434, - "lon" : -122.689417, - "name" : "NW Northrup & 18th", - "stopCode" : "10776", - "stopId" : "prt:10776", - "stopIndex" : 20, - "stopSequence" : 21, + "arrival" : "2009-11-17T18:35:52.000+00:00", + "departure" : "2009-11-17T18:35:52.000+00:00", + "lat" : 45.526387, + "lon" : -122.693889, + "name" : "NW Glisan & 21st", + "stopCode" : "2099", + "stopId" : "prt:2099", + "stopIndex" : 74, + "stopSequence" : 75, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:03:13.000+00:00", - "departure" : "2009-11-17T19:03:13.000+00:00", - "lat" : 45.531346, - "lon" : -122.694455, - "name" : "NW Northrup & 21st", - "stopCode" : "10777", - "stopId" : "prt:10777", - "stopIndex" : 21, - "stopSequence" : 22, + "arrival" : "2009-11-17T18:36:45.000+00:00", + "departure" : "2009-11-17T18:36:45.000+00:00", + "lat" : 45.527648, + "lon" : -122.694407, + "name" : "NW 21st & Irving", + "stopCode" : "7113", + "stopId" : "prt:7113", + "stopIndex" : 75, + "stopSequence" : 76, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:03:55.000+00:00", - "departure" : "2009-11-17T19:03:55.000+00:00", - "lat" : 45.531308, - "lon" : -122.696445, - "name" : "NW Northrup & 22nd", - "stopCode" : "10778", - "stopId" : "prt:10778", - "stopIndex" : 22, - "stopSequence" : 23, + "arrival" : "2009-11-17T18:38:00.000+00:00", + "departure" : "2009-11-17T18:38:00.000+00:00", + "lat" : 45.530114, + "lon" : -122.694475, + "name" : "NW 21st & Lovejoy", + "stopCode" : "7122", + "stopId" : "prt:7122", + "stopIndex" : 76, + "stopSequence" : 77, "vertexType" : "TRANSIT", "zoneId" : "1" } ], "legGeometry" : { - "length" : 55, - "points" : "e~ytGbdxkV[OQ@{CFa@B{B@??S@mC@Q@eB@??U@mCB{BD??S?mCBmCFyBB??U?kCBsCDsBD??W?kCBBlE@lD???XBjEBpD???VBlE?dA@t@?b@?h@BfEBrD???VBhEFtKDvJ??@\\DnJ???d@FtKvBE" + "length" : 56, + "points" : "}dztGpgwkVe@S]EoB@mCBoCF{BB??Q?kC@@zD???PBjE?`B??@X@jEBjD???\\BhEBpD???XBhE@nD??@Z?hEBtA?h@@h@??@Z@nEBhEBhD???`@FtKDhH??@hBoCD}BB??O@mCBoCDM@_C@q@@??{AByBD" }, - "mode" : "TRAM", + "mode" : "BUS", "pathway" : false, "realTime" : false, - "route" : "Portland Streetcar", - "routeId" : "prt:193", - "routeLongName" : "Portland Streetcar", - "routeType" : 0, + "route" : "Holgate/NW 21st", + "routeId" : "prt:17", + "routeLongName" : "Holgate/NW 21st", + "routeShortName" : "17", + "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:48:09.000+00:00", + "startTime" : "2009-11-17T18:27:47.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T19:05:00.000+00:00", - "departure" : "2009-11-17T19:05:00.000+00:00", - "lat" : 45.530612, - "lon" : -122.698688, - "name" : "NW 23rd & Marshall", - "stopCode" : "8989", - "stopId" : "prt:8989", - "stopIndex" : 23, - "stopSequence" : 24, + "arrival" : "2009-11-17T18:38:21.000+00:00", + "departure" : "2009-11-17T18:38:21.000+00:00", + "lat" : 45.531179, + "lon" : -122.69454, + "name" : "NW 21st & Northrup", + "stopCode" : "7128", + "stopId" : "prt:7128", + "stopIndex" : 77, + "stopSequence" : 78, "vertexType" : "TRANSIT", "zoneId" : "1" }, "transitLeg" : true, - "tripBlockId" : "9380", - "tripId" : "prt:1930W1240" + "tripBlockId" : "1711", + "tripId" : "prt:171W1260" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 187.24, - "endTime" : "2009-11-17T19:07:27.000+00:00", + "distance" : 456.16, + "endTime" : "2009-11-17T18:44:08.000+00:00", "from" : { - "arrival" : "2009-11-17T19:05:00.000+00:00", - "departure" : "2009-11-17T19:05:00.000+00:00", - "lat" : 45.530612, - "lon" : -122.698688, - "name" : "NW 23rd & Marshall", - "stopCode" : "8989", - "stopId" : "prt:8989", + "arrival" : "2009-11-17T18:38:21.000+00:00", + "departure" : "2009-11-17T18:38:21.000+00:00", + "lat" : 45.531179, + "lon" : -122.69454, + "name" : "NW 21st & Northrup", + "stopCode" : "7128", + "stopId" : "prt:7128", "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 286, + "generalizedCost" : 691, "interlineWithPreviousLeg" : false, "legGeometry" : { - "length" : 7, - "points" : "iu{tGxq{kV?DK?GBwADK?DpH" + "length" : 13, + "points" : "yx{tGzwzkV?LI?M@?PFlJ?RDbH@xA?D?P?RDpH" }, "mode" : "WALK", "pathway" : false, "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T19:05:00.000+00:00", + "startTime" : "2009-11-17T18:38:21.000+00:00", "steps" : [ { "absoluteDirection" : "NORTH", "area" : false, "bogusName" : false, - "distance" : 60.76, + "distance" : 13.06, "elevation" : "", - "lat" : 45.5306118, - "lon" : -122.6987102, + "lat" : 45.5311778, + "lon" : -122.6946072, "relativeDirection" : "DEPART", "stayOn" : false, - "streetName" : "Northwest 23rd Avenue", - "walkingBike" : false - }, - { - "absoluteDirection" : "NORTH", - "area" : false, - "bogusName" : true, - "distance" : 7.29, - "elevation" : "", - "lat" : 45.531153, - "lon" : -122.6987606, - "relativeDirection" : "CONTINUE", - "stayOn" : false, - "streetName" : "path", + "streetName" : "Northwest 21st Avenue", "walkingBike" : false }, { "absoluteDirection" : "WEST", "area" : false, "bogusName" : false, - "distance" : 119.18, + "distance" : 443.1, "elevation" : "", - "lat" : 45.5312184, - "lon" : -122.698768, + "lat" : 45.5312952, + "lon" : -122.6946111, "relativeDirection" : "LEFT", "stayOn" : false, "streetName" : "Northwest Northrup Street", @@ -4490,7 +4627,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T19:07:27.000+00:00", + "arrival" : "2009-11-17T18:44:08.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -4500,21 +4637,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:29:47.000+00:00", + "startTime" : "2009-11-17T18:14:49.000+00:00", "tooSloped" : false, "transfers" : 1, - "transitTime" : 1450, - "waitingTime" : 164, - "walkDistance" : 808.59, + "transitTime" : 874, + "waitingTime" : 122, + "walkDistance" : 987.67, "walkLimitExceeded" : false, - "walkTime" : 646 + "walkTime" : 763 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1553, + "duration" : 1570, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T19:09:40.000+00:00", + "endTime" : "2009-11-17T18:53:59.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -4541,16 +4678,16 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 2895, + "generalizedCost" : 2925, "legs" : [ { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 87.02, - "endTime" : "2009-11-17T18:45:00.000+00:00", + "endTime" : "2009-11-17T18:29:00.000+00:00", "from" : { - "departure" : "2009-11-17T18:43:47.000+00:00", + "departure" : "2009-11-17T18:27:49.000+00:00", "lat" : 45.52337, "lon" : -122.653725, "name" : "NE 12th & Couch", @@ -4570,7 +4707,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:43:47.000+00:00", + "startTime" : "2009-11-17T18:27:49.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", @@ -4600,8 +4737,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:45:00.000+00:00", - "departure" : "2009-11-17T18:45:00.000+00:00", + "arrival" : "2009-11-17T18:29:00.000+00:00", + "departure" : "2009-11-17T18:29:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -4621,10 +4758,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 3729.97, - "endTime" : "2009-11-17T18:57:49.000+00:00", + "endTime" : "2009-11-17T18:42:19.000+00:00", "from" : { - "arrival" : "2009-11-17T18:45:00.000+00:00", - "departure" : "2009-11-17T18:45:00.000+00:00", + "arrival" : "2009-11-17T18:29:00.000+00:00", + "departure" : "2009-11-17T18:29:00.000+00:00", "lat" : 45.523103, "lon" : -122.653064, "name" : "NE Sandy & 12th", @@ -4635,13 +4772,13 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 1369, - "headsign" : "Beaverton TC", + "generalizedCost" : 1399, + "headsign" : "23rd Ave to Tichner", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:45:47.000+00:00", - "departure" : "2009-11-17T18:45:47.000+00:00", + "arrival" : "2009-11-17T18:29:47.000+00:00", + "departure" : "2009-11-17T18:29:47.000+00:00", "lat" : 45.523024, "lon" : -122.656526, "name" : "E Burnside & NE 9th", @@ -4653,8 +4790,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:46:24.000+00:00", - "departure" : "2009-11-17T18:46:24.000+00:00", + "arrival" : "2009-11-17T18:30:24.000+00:00", + "departure" : "2009-11-17T18:30:24.000+00:00", "lat" : 45.523012, "lon" : -122.659365, "name" : "E Burnside & NE 6th", @@ -4666,8 +4803,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:46:52.000+00:00", - "departure" : "2009-11-17T18:46:52.000+00:00", + "arrival" : "2009-11-17T18:30:52.000+00:00", + "departure" : "2009-11-17T18:30:52.000+00:00", "lat" : 45.523015, "lon" : -122.661534, "name" : "E Burnside & NE M L King", @@ -4679,8 +4816,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:49:00.000+00:00", - "departure" : "2009-11-17T18:49:00.000+00:00", + "arrival" : "2009-11-17T18:33:00.000+00:00", + "departure" : "2009-11-17T18:33:00.000+00:00", "lat" : 45.523249, "lon" : -122.671269, "name" : "W Burnside & Burnside Bridge", @@ -4692,8 +4829,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:50:00.000+00:00", - "departure" : "2009-11-17T18:50:00.000+00:00", + "arrival" : "2009-11-17T18:34:00.000+00:00", + "departure" : "2009-11-17T18:34:00.000+00:00", "lat" : 45.523169, "lon" : -122.675893, "name" : "W Burnside & NW 5th", @@ -4705,8 +4842,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:51:17.000+00:00", - "departure" : "2009-11-17T18:51:17.000+00:00", + "arrival" : "2009-11-17T18:35:17.000+00:00", + "departure" : "2009-11-17T18:35:17.000+00:00", "lat" : 45.523115, "lon" : -122.678939, "name" : "W Burnside & NW Park", @@ -4718,8 +4855,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:52:25.000+00:00", - "departure" : "2009-11-17T18:52:25.000+00:00", + "arrival" : "2009-11-17T18:36:25.000+00:00", + "departure" : "2009-11-17T18:36:25.000+00:00", "lat" : 45.523048, "lon" : -122.681606, "name" : "W Burnside & NW 10th", @@ -4731,8 +4868,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:53:14.000+00:00", - "departure" : "2009-11-17T18:53:14.000+00:00", + "arrival" : "2009-11-17T18:37:14.000+00:00", + "departure" : "2009-11-17T18:37:14.000+00:00", "lat" : 45.523, "lon" : -122.683535, "name" : "W Burnside & NW 12th", @@ -4744,8 +4881,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:55:09.000+00:00", - "departure" : "2009-11-17T18:55:09.000+00:00", + "arrival" : "2009-11-17T18:39:09.000+00:00", + "departure" : "2009-11-17T18:39:09.000+00:00", "lat" : 45.522985, "lon" : -122.688091, "name" : "W Burnside & NW 17th", @@ -4757,8 +4894,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:56:00.000+00:00", - "departure" : "2009-11-17T18:56:00.000+00:00", + "arrival" : "2009-11-17T18:40:00.000+00:00", + "departure" : "2009-11-17T18:40:00.000+00:00", "lat" : 45.523097, "lon" : -122.690083, "name" : "W Burnside & NW 19th", @@ -4770,8 +4907,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:56:21.000+00:00", - "departure" : "2009-11-17T18:56:21.000+00:00", + "arrival" : "2009-11-17T18:40:27.000+00:00", + "departure" : "2009-11-17T18:40:27.000+00:00", "lat" : 45.523176, "lon" : -122.692139, "name" : "W Burnside & NW 20th", @@ -4783,8 +4920,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:56:31.000+00:00", - "departure" : "2009-11-17T18:56:31.000+00:00", + "arrival" : "2009-11-17T18:40:40.000+00:00", + "departure" : "2009-11-17T18:40:40.000+00:00", "lat" : 45.52322, "lon" : -122.69313, "name" : "W Burnside & NW 20th Pl", @@ -4796,8 +4933,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:56:49.000+00:00", - "departure" : "2009-11-17T18:56:49.000+00:00", + "arrival" : "2009-11-17T18:41:03.000+00:00", + "departure" : "2009-11-17T18:41:03.000+00:00", "lat" : 45.523312, "lon" : -122.694901, "name" : "W Burnside & NW King", @@ -4809,8 +4946,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:57:22.000+00:00", - "departure" : "2009-11-17T18:57:22.000+00:00", + "arrival" : "2009-11-17T18:41:44.000+00:00", + "departure" : "2009-11-17T18:41:44.000+00:00", "lat" : 45.523512, "lon" : -122.698081, "name" : "W Burnside & NW 23rd", @@ -4835,11 +4972,11 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "routeShortName" : "20", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:45:00.000+00:00", + "startTime" : "2009-11-17T18:29:00.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T18:57:49.000+00:00", - "departure" : "2009-11-17T18:57:49.000+00:00", + "arrival" : "2009-11-17T18:42:19.000+00:00", + "departure" : "2009-11-17T18:42:19.000+00:00", "lat" : 45.523897, "lon" : -122.700681, "name" : "W Burnside & NW 23rd Pl", @@ -4851,18 +4988,18 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "zoneId" : "1" }, "transitLeg" : true, - "tripBlockId" : "2037", - "tripId" : "prt:200W1220" + "tripBlockId" : "2071", + "tripId" : "prt:200W1210" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 913.81, - "endTime" : "2009-11-17T19:09:40.000+00:00", + "endTime" : "2009-11-17T18:53:59.000+00:00", "from" : { - "arrival" : "2009-11-17T18:57:49.000+00:00", - "departure" : "2009-11-17T18:57:49.000+00:00", + "arrival" : "2009-11-17T18:42:19.000+00:00", + "departure" : "2009-11-17T18:42:19.000+00:00", "lat" : 45.523897, "lon" : -122.700681, "name" : "W Burnside & NW 23rd Pl", @@ -4882,7 +5019,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:57:49.000+00:00", + "startTime" : "2009-11-17T18:42:19.000+00:00", "steps" : [ { "absoluteDirection" : "WEST", @@ -4951,7 +5088,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T19:09:40.000+00:00", + "arrival" : "2009-11-17T18:53:59.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -4961,21 +5098,21 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:43:47.000+00:00", + "startTime" : "2009-11-17T18:27:49.000+00:00", "tooSloped" : false, "transfers" : 0, - "transitTime" : 769, + "transitTime" : 799, "waitingTime" : 0, "walkDistance" : 1000.83, "walkLimitExceeded" : false, - "walkTime" : 784 + "walkTime" : 771 }, { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 1567, + "duration" : 1759, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T19:11:51.000+00:00", + "endTime" : "2009-11-17T18:59:08.000+00:00", "fare" : { "details" : { }, "fare" : { }, @@ -5002,7 +5139,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan }, { "legIndices" : [ - 2 + 3 ], "products" : [ { @@ -5022,16 +5159,16 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ] }, - "generalizedCost" : 2957, + "generalizedCost" : 3705, "legs" : [ { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 20.74, - "endTime" : "2009-11-17T18:46:00.000+00:00", + "distance" : 87.02, + "endTime" : "2009-11-17T18:31:00.000+00:00", "from" : { - "departure" : "2009-11-17T18:45:44.000+00:00", + "departure" : "2009-11-17T18:29:49.000+00:00", "lat" : 45.52337, "lon" : -122.653725, "name" : "NE 12th & Couch", @@ -5040,24 +5177,24 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 33, + "generalizedCost" : 137, "interlineWithPreviousLeg" : false, "legGeometry" : { - "length" : 4, - "points" : "ahztGxxrkV@Sb@??W" + "length" : 9, + "points" : "ahztGxxrkV@Sb@?`@@?a@?k@GGKY@A" }, "mode" : "WALK", "pathway" : false, "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T18:45:44.000+00:00", + "startTime" : "2009-11-17T18:29:49.000+00:00", "steps" : [ { "absoluteDirection" : "SOUTH", "area" : false, "bogusName" : false, - "distance" : 20.74, + "distance" : 39.06, "elevation" : "", "lat" : 45.5233684, "lon" : -122.6536225, @@ -5065,16 +5202,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "stayOn" : false, "streetName" : "Northeast 12th Avenue", "walkingBike" : false + }, + { + "absoluteDirection" : "EAST", + "area" : false, + "bogusName" : true, + "distance" : 47.96, + "elevation" : "", + "lat" : 45.5230172, + "lon" : -122.6536338, + "relativeDirection" : "LEFT", + "stayOn" : false, + "streetName" : "path", + "walkingBike" : false } ], "to" : { - "arrival" : "2009-11-17T18:46:00.000+00:00", - "departure" : "2009-11-17T18:46:00.000+00:00", - "lat" : 45.52318, - "lon" : -122.653507, - "name" : "NE 12th & Sandy", - "stopCode" : "6592", - "stopId" : "prt:6592", + "arrival" : "2009-11-17T18:31:00.000+00:00", + "departure" : "2009-11-17T18:31:00.000+00:00", + "lat" : 45.523103, + "lon" : -122.653064, + "name" : "NE Sandy & 12th", + "stopCode" : "5055", + "stopId" : "prt:5055", "vertexType" : "TRANSIT", "zoneId" : "1" }, @@ -5088,109 +5238,219 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "agencyUrl" : "http://trimet.org", "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 1355.21, - "endTime" : "2009-11-17T18:51:01.000+00:00", + "distance" : 1427.62, + "endTime" : "2009-11-17T18:35:00.000+00:00", "from" : { - "arrival" : "2009-11-17T18:46:00.000+00:00", - "departure" : "2009-11-17T18:46:00.000+00:00", - "lat" : 45.52318, - "lon" : -122.653507, - "name" : "NE 12th & Sandy", - "stopCode" : "6592", - "stopId" : "prt:6592", - "stopIndex" : 34, - "stopSequence" : 35, + "arrival" : "2009-11-17T18:31:00.000+00:00", + "departure" : "2009-11-17T18:31:00.000+00:00", + "lat" : 45.523103, + "lon" : -122.653064, + "name" : "NE Sandy & 12th", + "stopCode" : "5055", + "stopId" : "prt:5055", + "stopIndex" : 84, + "stopSequence" : 85, "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 901, - "headsign" : "Rose Qtr TC", + "generalizedCost" : 840, + "headsign" : "Sherwood via Portland city center", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:47:45.000+00:00", - "departure" : "2009-11-17T18:47:45.000+00:00", - "lat" : 45.527449, - "lon" : -122.653462, - "name" : "NE 12th & Irving", - "stopCode" : "6582", - "stopId" : "prt:6582", - "stopIndex" : 35, - "stopSequence" : 36, + "arrival" : "2009-11-17T18:31:47.000+00:00", + "departure" : "2009-11-17T18:31:47.000+00:00", + "lat" : 45.523024, + "lon" : -122.656526, + "name" : "E Burnside & NE 9th", + "stopCode" : "819", + "stopId" : "prt:819", + "stopIndex" : 85, + "stopSequence" : 86, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:49:00.000+00:00", - "departure" : "2009-11-17T18:49:00.000+00:00", - "lat" : 45.529793, - "lon" : -122.654429, - "name" : "NE 11th & Holladay", - "stopCode" : "8513", - "stopId" : "prt:8513", - "stopIndex" : 36, - "stopSequence" : 37, - "vertexType" : "TRANSIT", - "zoneId" : "0" - }, - { - "arrival" : "2009-11-17T18:49:39.000+00:00", - "departure" : "2009-11-17T18:49:39.000+00:00", - "lat" : 45.53135, - "lon" : -122.654497, - "name" : "NE 11th & Multnomah", - "stopCode" : "8938", - "stopId" : "prt:8938", - "stopIndex" : 37, - "stopSequence" : 38, + "arrival" : "2009-11-17T18:32:24.000+00:00", + "departure" : "2009-11-17T18:32:24.000+00:00", + "lat" : 45.523012, + "lon" : -122.659365, + "name" : "E Burnside & NE 6th", + "stopCode" : "805", + "stopId" : "prt:805", + "stopIndex" : 86, + "stopSequence" : 87, "vertexType" : "TRANSIT", - "zoneId" : "0" + "zoneId" : "1" }, { - "arrival" : "2009-11-17T18:50:15.000+00:00", - "departure" : "2009-11-17T18:50:15.000+00:00", - "lat" : 45.531573, - "lon" : -122.656408, - "name" : "NE Multnomah & 9th", - "stopCode" : "4056", - "stopId" : "prt:4056", - "stopIndex" : 38, - "stopSequence" : 39, + "arrival" : "2009-11-17T18:32:52.000+00:00", + "departure" : "2009-11-17T18:32:52.000+00:00", + "lat" : 45.523015, + "lon" : -122.661534, + "name" : "E Burnside & NE M L King", + "stopCode" : "705", + "stopId" : "prt:705", + "stopIndex" : 87, + "stopSequence" : 88, "vertexType" : "TRANSIT", - "zoneId" : "0" + "zoneId" : "1" } ], "legGeometry" : { - "length" : 33, - "points" : "{fztG`xrkVwA?mCAmC?oCA}C?sDC??aBAm@@k@AY?uABU@I@IBQFb@fC}@d@OFO@q@???Q?]?gGA??[??nJ???b@?vK?rA" + "length" : 32, + "points" : "weztGdtrkV?BPj@@jA?jEAhE?pD???VAjE?hE?dB?b@???`AAhE?dD???l@C`EAhEEhE?bAA|@?XAZ@\\AzACnGKbKAjC?bE" }, "mode" : "BUS", "pathway" : false, "realTime" : false, - "route" : "12th Ave", - "routeId" : "prt:70", - "routeLongName" : "12th Ave", - "routeShortName" : "70", + "route" : "Barbur/Sandy Blvd", + "routeId" : "prt:12", + "routeLongName" : "Barbur/Sandy Blvd", + "routeShortName" : "12", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:46:00.000+00:00", + "startTime" : "2009-11-17T18:31:00.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T18:51:01.000+00:00", - "departure" : "2009-11-17T18:54:29.000+00:00", - "lat" : 45.531569, - "lon" : -122.659045, - "name" : "NE Multnomah & 7th", - "stopCode" : "4054", - "stopId" : "prt:4054", - "stopIndex" : 39, - "stopSequence" : 40, + "arrival" : "2009-11-17T18:35:00.000+00:00", + "departure" : "2009-11-17T18:35:00.000+00:00", + "lat" : 45.523249, + "lon" : -122.671269, + "name" : "W Burnside & Burnside Bridge", + "stopCode" : "689", + "stopId" : "prt:689", + "stopIndex" : 88, + "stopSequence" : 89, "vertexType" : "TRANSIT", "zoneId" : "0" }, "transitLeg" : true, - "tripBlockId" : "7002", - "tripId" : "prt:700W1170" + "tripBlockId" : "1235", + "tripId" : "prt:120W1270" + }, + { + "agencyTimeZoneOffset" : -28800000, + "arrivalDelay" : 0, + "departureDelay" : 0, + "distance" : 444.49, + "endTime" : "2009-11-17T18:40:45.000+00:00", + "from" : { + "arrival" : "2009-11-17T18:35:00.000+00:00", + "departure" : "2009-11-17T18:35:00.000+00:00", + "lat" : 45.523249, + "lon" : -122.671269, + "name" : "W Burnside & Burnside Bridge", + "stopCode" : "689", + "stopId" : "prt:689", + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + "generalizedCost" : 680, + "interlineWithPreviousLeg" : false, + "legGeometry" : { + "length" : 32, + "points" : "ggztGlfvkVA?Ab@?\\AbC?BAD?NP?RA?R?JB~B?h@@\\@jB?d@@X?T@z@?v@@f@?R?F?L?HBfD?N?BLDLDD[" + }, + "mode" : "WALK", + "pathway" : false, + "realTime" : false, + "rentedBike" : false, + "route" : "", + "startTime" : "2009-11-17T18:35:00.000+00:00", + "steps" : [ + { + "absoluteDirection" : "WEST", + "area" : false, + "bogusName" : false, + "distance" : 76.58, + "elevation" : "", + "lat" : 45.5232599, + "lon" : -122.6712685, + "relativeDirection" : "DEPART", + "stayOn" : false, + "streetName" : "Burnside Bridge", + "walkingBike" : false + }, + { + "absoluteDirection" : "WEST", + "area" : false, + "bogusName" : true, + "distance" : 10.69, + "elevation" : "", + "lat" : 45.5232723, + "lon" : -122.6722513, + "relativeDirection" : "CONTINUE", + "stayOn" : false, + "streetName" : "path", + "walkingBike" : false + }, + { + "absoluteDirection" : "SOUTH", + "area" : false, + "bogusName" : false, + "distance" : 10.22, + "elevation" : "", + "lat" : 45.5232877, + "lon" : -122.6723821, + "relativeDirection" : "LEFT", + "stayOn" : false, + "streetName" : "Northwest 2nd Avenue", + "walkingBike" : false + }, + { + "absoluteDirection" : "SOUTH", + "area" : false, + "bogusName" : false, + "distance" : 11.14, + "elevation" : "", + "lat" : 45.5231958, + "lon" : -122.6723802, + "relativeDirection" : "CONTINUE", + "stayOn" : false, + "streetName" : "Southwest 2nd Avenue", + "walkingBike" : false + }, + { + "absoluteDirection" : "WEST", + "area" : false, + "bogusName" : false, + "distance" : 320.31, + "elevation" : "", + "lat" : 45.5230956, + "lon" : -122.6723768, + "relativeDirection" : "RIGHT", + "stayOn" : false, + "streetName" : "West Burnside Street", + "walkingBike" : false + }, + { + "absoluteDirection" : "SOUTH", + "area" : false, + "bogusName" : false, + "distance" : 15.55, + "elevation" : "", + "lat" : 45.5230026, + "lon" : -122.6764861, + "relativeDirection" : "LEFT", + "stayOn" : false, + "streetName" : "Southwest 6th Avenue", + "walkingBike" : false + } + ], + "to" : { + "arrival" : "2009-11-17T18:40:45.000+00:00", + "departure" : "2009-11-17T18:42:47.000+00:00", + "lat" : 45.522833, + "lon" : -122.676408, + "name" : "SW 6th & W Burnside", + "stopCode" : "7751", + "stopId" : "prt:7751", + "vertexType" : "TRANSIT", + "zoneId" : "0" + }, + "transitLeg" : false, + "walkingBike" : false }, { "agencyId" : "prt:prt", @@ -5199,260 +5459,260 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "agencyUrl" : "http://trimet.org", "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 3838.71, - "endTime" : "2009-11-17T19:08:50.000+00:00", + "distance" : 2354.46, + "endTime" : "2009-11-17T18:53:21.000+00:00", "from" : { - "arrival" : "2009-11-17T18:51:01.000+00:00", - "departure" : "2009-11-17T18:54:29.000+00:00", - "lat" : 45.531569, - "lon" : -122.659045, - "name" : "NE Multnomah & 7th", - "stopCode" : "4054", - "stopId" : "prt:4054", - "stopIndex" : 81, - "stopSequence" : 82, + "arrival" : "2009-11-17T18:40:45.000+00:00", + "departure" : "2009-11-17T18:42:47.000+00:00", + "lat" : 45.522833, + "lon" : -122.676408, + "name" : "SW 6th & W Burnside", + "stopCode" : "7751", + "stopId" : "prt:7751", + "stopIndex" : 65, + "stopSequence" : 66, "vertexType" : "TRANSIT", "zoneId" : "0" }, - "generalizedCost" : 1669, - "headsign" : "Montgomery Park", + "generalizedCost" : 1356, + "headsign" : "Sauvie Is. via St.Johns", "interlineWithPreviousLeg" : false, "intermediateStops" : [ { - "arrival" : "2009-11-17T18:55:05.000+00:00", - "departure" : "2009-11-17T18:55:05.000+00:00", - "lat" : 45.531586, - "lon" : -122.660482, - "name" : "NE Multnomah & Grand", - "stopCode" : "4043", - "stopId" : "prt:4043", - "stopIndex" : 82, - "stopSequence" : 83, + "arrival" : "2009-11-17T18:44:17.000+00:00", + "departure" : "2009-11-17T18:44:17.000+00:00", + "lat" : 45.52583, + "lon" : -122.676422, + "name" : "NW 6th & Flanders", + "stopCode" : "9300", + "stopId" : "prt:9300", + "stopIndex" : 66, + "stopSequence" : 67, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:56:09.000+00:00", - "departure" : "2009-11-17T18:56:09.000+00:00", - "lat" : 45.531159, - "lon" : -122.66293, - "name" : "NE Multnomah & 3rd", - "stopCode" : "11492", - "stopId" : "prt:11492", - "stopIndex" : 83, - "stopSequence" : 84, + "arrival" : "2009-11-17T18:45:01.000+00:00", + "departure" : "2009-11-17T18:45:01.000+00:00", + "lat" : 45.526678, + "lon" : -122.677476, + "name" : "NW Glisan & Broadway", + "stopCode" : "1997", + "stopId" : "prt:1997", + "stopIndex" : 67, + "stopSequence" : 68, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T18:58:00.000+00:00", - "departure" : "2009-11-17T18:58:00.000+00:00", - "lat" : 45.530005, - "lon" : -122.666476, - "name" : "Rose Quarter Transit Center", - "stopCode" : "2592", - "stopId" : "prt:2592", - "stopIndex" : 84, - "stopSequence" : 85, + "arrival" : "2009-11-17T18:45:35.000+00:00", + "departure" : "2009-11-17T18:45:35.000+00:00", + "lat" : 45.526643, + "lon" : -122.679075, + "name" : "NW Glisan & Park", + "stopCode" : "2007", + "stopId" : "prt:2007", + "stopIndex" : 68, + "stopSequence" : 69, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T19:01:20.000+00:00", - "departure" : "2009-11-17T19:01:20.000+00:00", - "lat" : 45.526655, - "lon" : -122.676462, - "name" : "NW Glisan & 6th", - "stopCode" : "10803", - "stopId" : "prt:10803", - "stopIndex" : 85, - "stopSequence" : 86, + "arrival" : "2009-11-17T18:46:18.000+00:00", + "departure" : "2009-11-17T18:46:18.000+00:00", + "lat" : 45.526601, + "lon" : -122.681091, + "name" : "NW Glisan & 10th", + "stopCode" : "2011", + "stopId" : "prt:2011", + "stopIndex" : 69, + "stopSequence" : 70, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T19:02:15.000+00:00", - "departure" : "2009-11-17T19:02:15.000+00:00", - "lat" : 45.528799, - "lon" : -122.677238, - "name" : "NW Station Way & Union Station", - "stopCode" : "12801", - "stopId" : "prt:12801", - "stopIndex" : 86, - "stopSequence" : 87, + "arrival" : "2009-11-17T18:47:02.000+00:00", + "departure" : "2009-11-17T18:47:02.000+00:00", + "lat" : 45.526578, + "lon" : -122.683142, + "name" : "NW Glisan & 12th", + "stopCode" : "2030", + "stopId" : "prt:2030", + "stopIndex" : 70, + "stopSequence" : 71, "vertexType" : "TRANSIT", "zoneId" : "0" }, { - "arrival" : "2009-11-17T19:04:00.000+00:00", - "departure" : "2009-11-17T19:04:00.000+00:00", - "lat" : 45.531582, - "lon" : -122.681193, - "name" : "NW Northrup & 10th", - "stopCode" : "12802", - "stopId" : "prt:12802", - "stopIndex" : 87, - "stopSequence" : 88, + "arrival" : "2009-11-17T18:47:46.000+00:00", + "departure" : "2009-11-17T18:47:46.000+00:00", + "lat" : 45.526532, + "lon" : -122.685164, + "name" : "NW Glisan & 14th", + "stopCode" : "2046", + "stopId" : "prt:2046", + "stopIndex" : 71, + "stopSequence" : 72, "vertexType" : "TRANSIT", - "zoneId" : "1" + "zoneId" : "0" }, { - "arrival" : "2009-11-17T19:04:33.000+00:00", - "departure" : "2009-11-17T19:04:33.000+00:00", - "lat" : 45.531534, - "lon" : -122.683319, - "name" : "NW 12th & Northrup", - "stopCode" : "12796", - "stopId" : "prt:12796", - "stopIndex" : 88, - "stopSequence" : 89, + "arrival" : "2009-11-17T18:48:28.000+00:00", + "departure" : "2009-11-17T18:48:28.000+00:00", + "lat" : 45.526503, + "lon" : -122.687165, + "name" : "NW Glisan & 16th", + "stopCode" : "2062", + "stopId" : "prt:2062", + "stopIndex" : 72, + "stopSequence" : 73, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:05:04.000+00:00", - "departure" : "2009-11-17T19:05:04.000+00:00", - "lat" : 45.531503, - "lon" : -122.685357, - "name" : "NW Northrup & 14th", - "stopCode" : "10775", - "stopId" : "prt:10775", - "stopIndex" : 89, - "stopSequence" : 90, + "arrival" : "2009-11-17T18:49:33.000+00:00", + "departure" : "2009-11-17T18:49:33.000+00:00", + "lat" : 45.526412, + "lon" : -122.690196, + "name" : "NW Glisan & 19th", + "stopCode" : "2086", + "stopId" : "prt:2086", + "stopIndex" : 73, + "stopSequence" : 74, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:06:07.000+00:00", - "departure" : "2009-11-17T19:06:07.000+00:00", - "lat" : 45.531434, - "lon" : -122.689417, - "name" : "NW Northrup & 18th", - "stopCode" : "10776", - "stopId" : "prt:10776", - "stopIndex" : 90, - "stopSequence" : 91, + "arrival" : "2009-11-17T18:50:52.000+00:00", + "departure" : "2009-11-17T18:50:52.000+00:00", + "lat" : 45.526387, + "lon" : -122.693889, + "name" : "NW Glisan & 21st", + "stopCode" : "2099", + "stopId" : "prt:2099", + "stopIndex" : 74, + "stopSequence" : 75, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:07:24.000+00:00", - "departure" : "2009-11-17T19:07:24.000+00:00", - "lat" : 45.531346, - "lon" : -122.694455, - "name" : "NW Northrup & 21st", - "stopCode" : "10777", - "stopId" : "prt:10777", - "stopIndex" : 91, - "stopSequence" : 92, + "arrival" : "2009-11-17T18:51:45.000+00:00", + "departure" : "2009-11-17T18:51:45.000+00:00", + "lat" : 45.527648, + "lon" : -122.694407, + "name" : "NW 21st & Irving", + "stopCode" : "7113", + "stopId" : "prt:7113", + "stopIndex" : 75, + "stopSequence" : 76, "vertexType" : "TRANSIT", "zoneId" : "1" }, { - "arrival" : "2009-11-17T19:07:55.000+00:00", - "departure" : "2009-11-17T19:07:55.000+00:00", - "lat" : 45.531308, - "lon" : -122.696445, - "name" : "NW Northrup & 22nd", - "stopCode" : "10778", - "stopId" : "prt:10778", - "stopIndex" : 92, - "stopSequence" : 93, + "arrival" : "2009-11-17T18:53:00.000+00:00", + "departure" : "2009-11-17T18:53:00.000+00:00", + "lat" : 45.530114, + "lon" : -122.694475, + "name" : "NW 21st & Lovejoy", + "stopCode" : "7122", + "stopId" : "prt:7122", + "stopIndex" : 76, + "stopSequence" : 77, "vertexType" : "TRANSIT", "zoneId" : "1" } ], "legGeometry" : { - "length" : 109, - "points" : "yz{tG`zskV?tBCfD???^?nE?V@Z?PH\\Nb@`@~@Rf@??`@bANb@FV@R?P?pE?jA@h@AnAbBl@LFJN\\f@LT??NXJPPVJFf@Vf@Pp@Nd@NRLB@RNXZR\\vAhC@BhAhD`AhClAbDBrDCnG@n@@^@d@HdAP`CBjEDvD???LqCFmCDYBGDEBGJkAzAQR??KNa@b@MJuBBY?OHW@u@~@aD`EcBhBBrD@xC??@l@BlE@lD???XBjEBpD???VBlE?dA@t@?b@?h@BfEBrD???VBhEFtKDvJ??@\\DnJ???d@FtKmCBo@@" + "length" : 56, + "points" : "}dztGpgwkVe@S]EoB@mCBoCF{BB??Q?kC@@zD???PBjE?`B??@X@jEBjD???\\BhEBpD???XBhE@nD??@Z?hEBtA?h@@h@??@Z@nEBhEBhD???`@FtKDhH??@hBoCD}BB??O@mCBoCDM@_C@q@@??{AByBD" }, "mode" : "BUS", "pathway" : false, "realTime" : false, - "route" : "Broadway/Halsey", - "routeId" : "prt:77", - "routeLongName" : "Broadway/Halsey", - "routeShortName" : "77", + "route" : "Holgate/NW 21st", + "routeId" : "prt:17", + "routeLongName" : "Holgate/NW 21st", + "routeShortName" : "17", "routeType" : 3, "serviceDate" : "2009-11-17", - "startTime" : "2009-11-17T18:54:29.000+00:00", + "startTime" : "2009-11-17T18:42:47.000+00:00", "steps" : [ ], "to" : { - "arrival" : "2009-11-17T19:08:50.000+00:00", - "departure" : "2009-11-17T19:08:50.000+00:00", - "lat" : 45.532159, - "lon" : -122.698634, - "name" : "NW 23rd & Overton", - "stopCode" : "8981", - "stopId" : "prt:8981", - "stopIndex" : 93, - "stopSequence" : 94, + "arrival" : "2009-11-17T18:53:21.000+00:00", + "departure" : "2009-11-17T18:53:21.000+00:00", + "lat" : 45.531179, + "lon" : -122.69454, + "name" : "NW 21st & Northrup", + "stopCode" : "7128", + "stopId" : "prt:7128", + "stopIndex" : 77, + "stopSequence" : 78, "vertexType" : "TRANSIT", "zoneId" : "1" }, "transitLeg" : true, - "tripBlockId" : "7702", - "tripId" : "prt:771W1180" + "tripBlockId" : "1714", + "tripId" : "prt:171W1270" }, { "agencyTimeZoneOffset" : -28800000, "arrivalDelay" : 0, "departureDelay" : 0, - "distance" : 231.46, - "endTime" : "2009-11-17T19:11:51.000+00:00", + "distance" : 456.16, + "endTime" : "2009-11-17T18:59:08.000+00:00", "from" : { - "arrival" : "2009-11-17T19:08:50.000+00:00", - "departure" : "2009-11-17T19:08:50.000+00:00", - "lat" : 45.532159, - "lon" : -122.698634, - "name" : "NW 23rd & Overton", - "stopCode" : "8981", - "stopId" : "prt:8981", + "arrival" : "2009-11-17T18:53:21.000+00:00", + "departure" : "2009-11-17T18:53:21.000+00:00", + "lat" : 45.531179, + "lon" : -122.69454, + "name" : "NW 21st & Northrup", + "stopCode" : "7128", + "stopId" : "prt:7128", "vertexType" : "TRANSIT", "zoneId" : "1" }, - "generalizedCost" : 353, + "generalizedCost" : 691, "interlineWithPreviousLeg" : false, "legGeometry" : { - "length" : 10, - "points" : "}~{tGnq{kV?LVAF?J?L?rBCLA?RDpH" + "length" : 13, + "points" : "yx{tGzwzkV?LI?M@?PFlJ?RDbH@xA?D?P?RDpH" }, "mode" : "WALK", "pathway" : false, "realTime" : false, "rentedBike" : false, "route" : "", - "startTime" : "2009-11-17T19:08:50.000+00:00", + "startTime" : "2009-11-17T18:53:21.000+00:00", "steps" : [ { - "absoluteDirection" : "SOUTH", + "absoluteDirection" : "NORTH", "area" : false, "bogusName" : false, - "distance" : 104.46, + "distance" : 13.06, "elevation" : "", - "lat" : 45.5321578, - "lon" : -122.6987026, + "lat" : 45.5311778, + "lon" : -122.6946072, "relativeDirection" : "DEPART", "stayOn" : false, - "streetName" : "Northwest 23rd Avenue", + "streetName" : "Northwest 21st Avenue", "walkingBike" : false }, { "absoluteDirection" : "WEST", "area" : false, "bogusName" : false, - "distance" : 127.01, + "distance" : 443.1, "elevation" : "", - "lat" : 45.5312188, - "lon" : -122.6986675, - "relativeDirection" : "RIGHT", + "lat" : 45.5312952, + "lon" : -122.6946111, + "relativeDirection" : "LEFT", "stayOn" : false, "streetName" : "Northwest Northrup Street", "walkingBike" : false } ], "to" : { - "arrival" : "2009-11-17T19:11:51.000+00:00", + "arrival" : "2009-11-17T18:59:08.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -5462,14 +5722,14 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "walkingBike" : false } ], - "startTime" : "2009-11-17T18:45:44.000+00:00", + "startTime" : "2009-11-17T18:29:49.000+00:00", "tooSloped" : false, "transfers" : 1, - "transitTime" : 1162, - "waitingTime" : 208, - "walkDistance" : 252.2, + "transitTime" : 874, + "waitingTime" : 122, + "walkDistance" : 987.67, "walkLimitExceeded" : false, - "walkTime" : 197 + "walkTime" : 763 } ] ] @@ -5479,10 +5739,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 3804, + "duration" : 3717, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T19:03:24.000+00:00", + "endTime" : "2009-11-17T19:01:57.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -5494,7 +5754,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 4875.79, - "endTime" : "2009-11-17T19:03:24.000+00:00", + "endTime" : "2009-11-17T19:01:57.000+00:00", "from" : { "departure" : "2009-11-17T18:00:00.000+00:00", "lat" : 45.51932, @@ -5712,7 +5972,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T19:03:24.000+00:00", + "arrival" : "2009-11-17T19:01:57.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -5729,7 +5989,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "waitingTime" : 0, "walkDistance" : 4875.79, "walkLimitExceeded" : false, - "walkTime" : 3804 + "walkTime" : 3717 } ] ] @@ -5739,10 +5999,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 3230, + "duration" : 3159, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:53:50.000+00:00", + "endTime" : "2009-11-17T18:52:39.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -5754,7 +6014,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 4154.15, - "endTime" : "2009-11-17T18:53:50.000+00:00", + "endTime" : "2009-11-17T18:52:39.000+00:00", "from" : { "departure" : "2009-11-17T18:00:00.000+00:00", "lat" : 45.52337, @@ -5910,7 +6170,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:53:50.000+00:00", + "arrival" : "2009-11-17T18:52:39.000+00:00", "lat" : 45.53122, "lon" : -122.69659, "name" : "NW Northrup St. & NW 22nd Ave. (P2)", @@ -5927,7 +6187,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "waitingTime" : 0, "walkDistance" : 4154.15, "walkLimitExceeded" : false, - "walkTime" : 3230 + "walkTime" : 3159 } ] ] @@ -5937,10 +6197,10 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan [ { "arrivedAtDestinationWithRentedBicycle" : false, - "duration" : 2366, + "duration" : 2321, "elevationGained" : 0.0, "elevationLost" : 0.0, - "endTime" : "2009-11-17T18:39:26.000+00:00", + "endTime" : "2009-11-17T18:38:41.000+00:00", "fare" : { "details" : { }, "fare" : { } @@ -5952,7 +6212,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "arrivalDelay" : 0, "departureDelay" : 0, "distance" : 2985.43, - "endTime" : "2009-11-17T18:39:26.000+00:00", + "endTime" : "2009-11-17T18:38:41.000+00:00", "from" : { "departure" : "2009-11-17T18:00:00.000+00:00", "lat" : 45.530244, @@ -6121,7 +6381,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } ], "to" : { - "arrival" : "2009-11-17T18:39:26.000+00:00", + "arrival" : "2009-11-17T18:38:41.000+00:00", "lat" : 45.531, "lon" : -122.70029, "name" : "NW Northrup St. & NW 24th Ave. (P3)", @@ -6138,7 +6398,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "waitingTime" : 0, "walkDistance" : 2985.43, "walkLimitExceeded" : false, - "walkTime" : 2366 + "walkTime" : 2321 } ] ] \ No newline at end of file diff --git a/application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java b/application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java index b22c5775ae3..e6c4e3dded9 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java @@ -82,7 +82,7 @@ public void bicycleParkingToBicycleParkingPlaceTest() { "null - BikePark Entrance (328.07, 66)", "null (parked) - BikePark Entrance (448.07, 126)", "null (parked) - BikePark Entrance (449.07, 126)", - "WALK (parked) - CD street (579.89, 192)" + "WALK (parked) - CD street (579.89, 191)" ); } @@ -97,7 +97,7 @@ public void bicycleParkingToCarAndBicycleParkingPlaceTest() { "null - All Park Entrance (35.80, 18)", "null (parked) - All Park Entrance (155.80, 78)", "null (parked) - All Park Entrance (156.80, 78)", - "WALK (parked) - AB street (287.63, 144)" + "WALK (parked) - AB street (287.63, 143)" ); } } diff --git a/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index 7287900443a..41ec677b3bb 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -405,7 +405,7 @@ private List runStreetSearchAndCreateDescriptor( "%s%s - %s / %s - %s", s.getBackMode() != null && s.isBackWalkingBike() ? "🚲" : "", s.getBackMode(), - s.getTimeDeltaMilliseconds(), + s.getTimeDeltaSeconds(), s.getBackEdge() != null ? ((double) Math.round(s.getWeightDelta() * 10)) / 10 : 0.0, s.getBackEdge() != null ? s.getBackEdge().getDefaultName() : null ) diff --git a/application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java b/application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java index d10230b2595..31691f90575 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java @@ -101,7 +101,7 @@ public void carParkingToCarParkingPlaceTest() { "null (parked) - CarPark #2 Entrance (241.00, 180)", "null (parked) - CarPark #2 Entrance (242.00, 180)", "WALK (parked) - DE street (372.83, 246)", - "WALK (parked) - EF street (503.65, 312)" + "WALK (parked) - EF street (503.65, 311)" ); } @@ -116,8 +116,8 @@ public void carParkingToCarAndBicycleParkingPlaceTest() { "null (parked) - AllPark Entrance (241.00, 180)", "null (parked) - AllPark Entrance (242.00, 180)", "WALK (parked) - CD street (372.83, 246)", - "WALK (parked) - DE street (503.65, 312)", - "WALK (parked) - EF street (634.48, 378)" + "WALK (parked) - DE street (503.65, 311)", + "WALK (parked) - EF street (634.48, 377)" ); } @@ -153,7 +153,7 @@ public void wheelchairPlacesAvailable() { "null (parked) - CarPark #2 Entrance (241.00, 180)", "null (parked) - CarPark #2 Entrance (242.00, 180)", "WALK (parked) - DE street (372.83, 246)", - "WALK (parked) - EF street (503.65, 312)" + "WALK (parked) - EF street (503.65, 311)" ); } diff --git a/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index bbc77656a23..aa95bfd9f47 100644 --- a/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -170,8 +170,8 @@ void testTraverseModeSwitchBike() { State s4 = e1.traverse(s3)[0]; State s5 = e0.traverse(s4)[0]; - assertEquals(88, s2.getElapsedTimeSeconds()); - assertEquals(88, s5.getElapsedTimeSeconds()); + assertEquals(86, s2.getElapsedTimeSeconds()); + assertEquals(86, s5.getElapsedTimeSeconds()); } /** diff --git a/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java b/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java index 95a213df763..d947ec1593e 100644 --- a/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java +++ b/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java @@ -26,7 +26,7 @@ public final void testIncrementTimeInMilliseconds() { stateEditor.setTimeSeconds(0); stateEditor.incrementTimeInMilliseconds(999999999); - assertEquals(999999999, stateEditor.child.getTimeSeconds()); + assertEquals(999999999, stateEditor.child.getTimeMilliseconds()); } @Test diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv index b38e60d5edb..9f5b3834d52 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv @@ -1,3 +1,3 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,42m16s,-1,0,12:00:00,12:42:16,,,,,Unknown transit 0tx 42m16s -2,0,42m16s,-1,0,12:00:00,12:42:16,,,,,Unknown transit 0tx 42m16s +1,0,41m59s,-1,0,12:00:00,12:41:59,,,,,Unknown transit 0tx 41m59s +2,0,41m59s,-1,0,12:00:00,12:41:59,,,,,Unknown transit 0tx 41m59s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv index 4308492da33..27e343a0dd1 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv @@ -1,3 +1,3 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,43m3s,-1,0,13:16:57,14:00:00,,,,,Unknown transit 0tx 43m3s -2,0,43m3s,-1,0,13:16:57,14:00:00,,,,,Unknown transit 0tx 43m3s +1,0,42m50s,-1,0,13:17:10,14:00:00,,,,,Unknown transit 0tx 42m50s +2,0,42m50s,-1,0,13:17:10,14:00:00,,,,,Unknown transit 0tx 42m50s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv index 3d457aa7c22..2cd872bbfb0 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv @@ -1,3 +1,3 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,1h35s,-1,0,12:00:00,13:00:35,,,,,Unknown transit 0tx 1h35s -2,0,1h35s,-1,0,12:00:00,13:00:35,,,,,Unknown transit 0tx 1h35s +1,0,1h25s,-1,0,12:00:00,13:00:25,,,,,Unknown transit 0tx 1h25s +2,0,1h25s,-1,0,12:00:00,13:00:25,,,,,Unknown transit 0tx 1h25s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv index db49235d649..2278718a957 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv @@ -1,3 +1,3 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,1h9m14s,-1,0,12:50:46,14:00:00,,,,,Unknown transit 0tx 1h9m14s -2,0,1h9m14s,-1,0,12:50:46,14:00:00,,,,,Unknown transit 0tx 1h9m14s +1,0,1h9m13s,-1,0,12:50:47,14:00:00,,,,,Unknown transit 0tx 1h9m13s +2,0,1h9m13s,-1,0,12:50:47,14:00:00,,,,,Unknown transit 0tx 1h9m13s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv index 252d31eeeb3..7c1c4ff5548 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv @@ -1,5 +1,5 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,56m49s,5095,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,5095,1458,12:18:46,13:15:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,5095,1458,12:33:46,13:30:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:41:20 13:19:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -2,0,56m49s,5095,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s +1,0,56m36s,5095,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +1,2,1h4m19s,7780,2813,12:10:47,13:15:06,TriMet,BUS,73|70|9,prt:7106|prt:4056|prt:4055|prt:4536|prt:4538|prt:143,Walk 2m19s ~ NE 21st & Clackamas(7106) ~ BUS 73 12:13:06 12:16:45 ~ NE Multnomah & 9th(4056) ~ Walk 35s ~ NE Multnomah & 9th(4055) ~ BUS 70 12:19:38 12:35 ~ SE Powell & Milwaukie(4536) ~ Walk 1m18s ~ SE Powell & Milwaukie(4538) ~ BUS 9 12:39 12:42:50 ~ SW Arthur & 1st(143) ~ Walk 32m16s +1,1,1h9m34s,8236,3803,12:05:32,13:15:06,TriMet,BUS,70|9,prt:8937|prt:4536|prt:4538|prt:143,Walk 15m28s ~ NE Holladay & 11th(8937) ~ BUS 70 12:21 12:35 ~ SE Powell & Milwaukie(4536) ~ Walk 1m18s ~ SE Powell & Milwaukie(4538) ~ BUS 9 12:39 12:42:50 ~ SW Arthur & 1st(143) ~ Walk 32m16s +2,0,56m36s,5095,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-md.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-md.csv index 252d31eeeb3..7c1c4ff5548 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-md.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-md.csv @@ -1,5 +1,5 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,56m49s,5095,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,5095,1458,12:18:46,13:15:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,5095,1458,12:33:46,13:30:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:41:20 13:19:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -2,0,56m49s,5095,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s +1,0,56m36s,5095,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +1,2,1h4m19s,7780,2813,12:10:47,13:15:06,TriMet,BUS,73|70|9,prt:7106|prt:4056|prt:4055|prt:4536|prt:4538|prt:143,Walk 2m19s ~ NE 21st & Clackamas(7106) ~ BUS 73 12:13:06 12:16:45 ~ NE Multnomah & 9th(4056) ~ Walk 35s ~ NE Multnomah & 9th(4055) ~ BUS 70 12:19:38 12:35 ~ SE Powell & Milwaukie(4536) ~ Walk 1m18s ~ SE Powell & Milwaukie(4538) ~ BUS 9 12:39 12:42:50 ~ SW Arthur & 1st(143) ~ Walk 32m16s +1,1,1h9m34s,8236,3803,12:05:32,13:15:06,TriMet,BUS,70|9,prt:8937|prt:4536|prt:4538|prt:143,Walk 15m28s ~ NE Holladay & 11th(8937) ~ BUS 70 12:21 12:35 ~ SE Powell & Milwaukie(4536) ~ Walk 1m18s ~ SE Powell & Milwaukie(4538) ~ BUS 9 12:39 12:42:50 ~ SW Arthur & 1st(143) ~ Walk 32m16s +2,0,56m36s,5095,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv index faeebbb95ed..07332745d7f 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv @@ -1,5 +1,5 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,56m49s,0,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,0,1458,12:18:46,13:15:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,0,1458,12:33:46,13:30:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:41:20 13:19:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -2,0,58m8s,0,1507,12:02:27,13:00:35,TriMet,BUS,8,prt:6779|prt:6548,Walk 8m18s ~ NE 15th & Weidler(6779) ~ BUS 8 12:10:45 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s +1,0,56m36s,0,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +1,2,1h4m19s,0,2813,12:10:47,13:15:06,TriMet,BUS,73|70|9,prt:7106|prt:4056|prt:4055|prt:4536|prt:4538|prt:143,Walk 2m19s ~ NE 21st & Clackamas(7106) ~ BUS 73 12:13:06 12:16:45 ~ NE Multnomah & 9th(4056) ~ Walk 35s ~ NE Multnomah & 9th(4055) ~ BUS 70 12:19:38 12:35 ~ SE Powell & Milwaukie(4536) ~ Walk 1m18s ~ SE Powell & Milwaukie(4538) ~ BUS 9 12:39 12:42:50 ~ SW Arthur & 1st(143) ~ Walk 32m16s +1,0,56m36s,0,1458,12:18:49,13:15:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +2,0,57m54s,0,1507,12:02:31,13:00:25,TriMet,BUS,8,prt:6779|prt:6548,Walk 8m14s ~ NE 15th & Weidler(6779) ~ BUS 8 12:10:45 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s diff --git a/application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv index 3b516abca45..04be59c0388 100644 --- a/application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv +++ b/application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv @@ -1,6 +1,6 @@ tcId,nTransfers,duration,cost,walkDistance,startTime,endTime,agencies,modes,routes,stops,details -1,0,56m49s,0,1458,12:03:46,13:00:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,0,1458,12:18:46,13:15:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -1,0,56m49s,0,1458,12:33:46,13:30:35,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:41:20 13:19:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m16s -2,0,1h4m28s,0,1902,12:48:46,13:53:14,TriMet,BUS,8,prt:6789|prt:5028,Walk 7m34s ~ NE 15th & Halsey(6789) ~ BUS 8 12:56:20 13:36 ~ SW Sam Jackson Pk & OHSU(5028) ~ Walk 17m14s -2,1,1h2m28s,0,1488,12:50:46,13:53:14,TriMet,BUS,73|8,prt:7106|prt:2592|prt:5028,Walk 2m20s ~ NE 21st & Clackamas(7106) ~ BUS 73 12:53:06 13:01 ~ Rose Quarter Transit Center(2592) ~ BUS 8 13:04 13:36 ~ SW Sam Jackson Pk & OHSU(5028) ~ Walk 17m14s +1,0,56m36s,0,1458,12:03:49,13:00:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:11:20 12:49:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +1,0,56m36s,0,1458,12:18:49,13:15:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:26:20 13:04:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +1,0,56m36s,0,1458,12:33:49,13:30:25,TriMet,BUS,8,prt:6789|prt:6548,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:41:20 13:19:19 ~ SW 11th & Gibbs(6548) ~ Walk 11m6s +2,0,1h3m59s,0,1902,12:48:49,13:52:48,TriMet,BUS,8,prt:6789|prt:5028,Walk 7m31s ~ NE 15th & Halsey(6789) ~ BUS 8 12:56:20 13:36 ~ SW Sam Jackson Pk & OHSU(5028) ~ Walk 16m48s +2,1,1h2m1s,0,1488,12:50:47,13:52:48,TriMet,BUS,73|8,prt:7106|prt:2592|prt:5028,Walk 2m19s ~ NE 21st & Clackamas(7106) ~ BUS 73 12:53:06 13:01 ~ Rose Quarter Transit Center(2592) ~ BUS 8 13:04 13:36 ~ SW Sam Jackson Pk & OHSU(5028) ~ Walk 16m48s From f9a8e9077a9ca00a391605175a1208dd93a62a50 Mon Sep 17 00:00:00 2001 From: Teemu Kalvas Date: Mon, 10 Feb 2025 16:01:09 +0200 Subject: [PATCH 3/5] better naming, incrementTimeInSeconds to StateEditor --- .../opentripplanner/ext/flex/edgetype/FlexTripEdge.java | 2 +- .../org/opentripplanner/street/search/state/State.java | 8 ++++---- .../opentripplanner/street/search/state/StateEditor.java | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index 659ef9d429c..70b0fcdcb3c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -97,7 +97,7 @@ public State[] traverse(State s0) { // TODO: decide good value editor.incrementWeight(10 * 60); int timeInSeconds = getTimeInSeconds(); - editor.incrementTimeInMilliseconds(1000L * timeInSeconds); + editor.incrementTimeInSeconds(timeInSeconds); editor.incrementWeight(timeInSeconds); editor.resetEnteredNoThroughTrafficArea(); return editor.makeStateArray(); diff --git a/application/src/main/java/org/opentripplanner/street/search/state/State.java b/application/src/main/java/org/opentripplanner/street/search/state/State.java index 13f7383c906..90336cdaa2a 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/State.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/State.java @@ -169,7 +169,7 @@ public CarPickupState getCarPickupState() { /** Always round the same way and in the same direction when converting milliseconds to seconds. * This means that request.arriveBy must be taken into account. Used in many places. */ - private long secondsOfMilliseconds(long milliseconds) { + private long millisecondsToSeconds(long milliseconds) { if (request.arriveBy()) { return milliseconds / 1000L; } else { @@ -179,7 +179,7 @@ private long secondsOfMilliseconds(long milliseconds) { /** Returns time in seconds since epoch */ public long getTimeSeconds() { - return secondsOfMilliseconds(time_ms); + return millisecondsToSeconds(time_ms); } public long getTimeMilliseconds() { @@ -285,7 +285,7 @@ public double getWeight() { } public int getTimeDeltaSeconds() { - return (int) secondsOfMilliseconds(getTimeDeltaMilliseconds()); + return (int) millisecondsToSeconds(getTimeDeltaMilliseconds()); } public int getTimeDeltaMilliseconds() { @@ -335,7 +335,7 @@ public TraverseMode currentMode() { public Instant getTime() { // We're not letting the subsecond time out right now, because everything else // expects whole seconds. - return Instant.ofEpochSecond(secondsOfMilliseconds(time_ms)); + return Instant.ofEpochSecond(millisecondsToSeconds(time_ms)); } public Instant getTimeAccurate() { diff --git a/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java b/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java index c6447c0760b..82bd46e152b 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java @@ -187,6 +187,10 @@ public void incrementTimeInMilliseconds(long milliseconds) { child.time_ms += (traversingBackward ? -milliseconds : milliseconds); } + public void incrementTimeInSeconds(long seconds) { + incrementTimeInMilliseconds(1000L * seconds); + } + public void incrementWalkDistance(double length) { if (length < 0) { LOG.warn("A state's walk distance is being incremented by a negative amount."); From 022707fda8743d47749e1eb133ad6d5c212074e8 Mon Sep 17 00:00:00 2001 From: Teemu Kalvas Date: Thu, 13 Feb 2025 15:42:02 +0200 Subject: [PATCH 4/5] use incrementTimeInSeconds instead of Milliseconds whenever applicable --- .../opentripplanner/street/model/edge/ElevatorBoardEdge.java | 2 +- .../org/opentripplanner/street/model/edge/EscalatorEdge.java | 2 +- .../street/model/edge/StreetTransitEntityLink.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java index 5f12028eb4d..cacc97fc2f1 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java @@ -49,7 +49,7 @@ public State[] traverse(State s0) { var streetPreferences = s0.getPreferences().street(); s1.incrementWeight(streetPreferences.elevator().boardCost()); - s1.incrementTimeInMilliseconds(1000L * streetPreferences.elevator().boardTime()); + s1.incrementTimeInSeconds(streetPreferences.elevator().boardTime()); return s1.makeStateArray(); } diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java index aa6a9649bba..e16a1ccb67d 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java @@ -36,7 +36,7 @@ public State[] traverse(State s0) { time = duration.toSeconds(); } s1.incrementWeight(s0.getPreferences().walk().escalator().reluctance() * time); - s1.incrementTimeInMilliseconds((long) Math.round(1000.0 * time)); + s1.incrementTimeInSeconds((long) time); s1.incrementWalkDistance(getDistanceMeters()); return s1.makeStateArray(); } else return State.empty(); diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 0973547c06a..5a62eda0f90 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -143,7 +143,7 @@ private State[] buildState(State s0, StateEditor s1, RoutingPreferences pref) { // streetToStopTime may be zero so that searching from the stop coordinates instead of // the stop id catch transit departing at that exact search time. int streetToStopTime = getStreetToStopTime(); - s1.incrementTimeInMilliseconds(1000L * streetToStopTime); + s1.incrementTimeInSeconds(streetToStopTime); s1.incrementWeight(STEL_TRAVERSE_COST + streetToStopTime); return s1.makeStateArray(); } From 1cdaca7cc141f2cd83c948bb664d88d5beb73c6e Mon Sep 17 00:00:00 2001 From: Teemu Kalvas Date: Fri, 14 Feb 2025 12:56:46 +0200 Subject: [PATCH 5/5] missed one incrementTimeInMilliseconds(1000 * x) --- .../org/opentripplanner/street/model/edge/ElevatorHopEdge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java index 58229d8018b..34c2cc76f11 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java @@ -139,7 +139,7 @@ public State[] traverse(State s0) { int seconds = this.travelTime > 0 ? this.travelTime : (int) (preferences.street().elevator().hopTime() * this.levels); - s1.incrementTimeInMilliseconds(1000L * seconds); + s1.incrementTimeInSeconds(seconds); return s1.makeStateArray(); }