Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dt 462 add stop times validator #10

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public enum NewGTFSErrorType {
NUMBER_TOO_SMALL(Priority.MEDIUM, "Number was below the allowed range."),
OVERLAPPING_TRIP(Priority.MEDIUM, "Blocks?"),
REFERENTIAL_INTEGRITY(Priority.HIGH, "This line references an ID that does not exist in the target table."),
REPEATED_ARRIVAL_TIME(Priority.MEDIUM, "Arrival time at current stop is equal to the previous stop."),
REQUIRED_TABLE_EMPTY(Priority.MEDIUM, "This table is required by the GTFS specification but is empty."),
ROUTE_DESCRIPTION_SAME_AS_NAME(Priority.LOW, "The description of a route is identical to its name, so does not add any information."),
ROUTE_LONG_NAME_CONTAINS_SHORT_NAME(Priority.LOW, "The long name of a route should complement the short name, not include it."),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ public void validateTrip(Trip trip, Route route, List<StopTime> stopTimes, List<
double distanceMeters = 0;
for (int i = beginIndex + 1; i < stopTimes.size(); i++) {
StopTime currStopTime = stopTimes.get(i);
// Additional check: Ensure arrival_time is not the same for consecutive stops
if (currStopTime.arrival_time == prevStopTime.arrival_time) {
registerError(currStopTime, NewGTFSErrorType.REPEATED_ARRIVAL_TIME);
}
if (currStopTime.pickup_type == 1 && currStopTime.drop_off_type == 1 && currStopTime.timepoint == 0) {
// stop_time allows neither pickup or drop off and is not a timepoint, so it serves no purpose.
// stop_time allows neither pickup nor drop off and is not a timepoint, so it serves no purpose.
registerError(currStopTime, NewGTFSErrorType.STOP_TIME_UNUSED);
}
Stop currStop = stops.get(i);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
import static com.conveyal.gtfs.GTFS.load;
import static com.conveyal.gtfs.GTFS.validate;
import static com.conveyal.gtfs.TestUtils.assertThatSqlCountQueryYieldsExpectedCount;
import static com.conveyal.gtfs.error.NewGTFSErrorType.TRAVEL_TOO_FAST;
import static com.conveyal.gtfs.error.NewGTFSErrorType.TRAVEL_TOO_SLOW;
import static com.conveyal.gtfs.error.NewGTFSErrorType.*;

/**
* Distances recorded against each unit test have been produced using the lat/lon values from
Expand Down Expand Up @@ -112,6 +111,11 @@ public void tripTravelingTooSlowWithMissingStopTimesHasError() {
checkFeedHasError(TRAVEL_TOO_SLOW, "6", 3);
}

@Test
public void tripHasDuplicateArrivalTimesHasError() {
checkFeedHasError(REPEATED_ARRIVAL_TIME,"7",2);
}

/**
* Check that the test feed has exactly one error for the given type, entityId, and entitySequence.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_t
5,23:59:00,23:59:00,1562,3,,0,0,9.39290047,0
6,00:00:00,00:00:00,4957,1,,0,0,,1
6,,,1558,2,,0,0,8.34879971,0
6,23:59:00,23:59:00,1562,3,,0,0,9.39290047,0
6,23:59:00,23:59:00,1562,3,,0,0,9.39290047,0
7,01:00:00,01:00:00,4957,1,,0,0,,0
7,01:00:00,01:00:00,1558,2,,0,0,8.34879971,0
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ route_id,service_id,trip_id,trip_headsign,trip_short_name,direction_id,block_id,
23,1,4,PALO ALTO TRANSIT CTR 4,,1,2145,101395,0,0
23,1,5,PALO ALTO TRANSIT CTR 5,,1,2145,101395,0,0
23,1,6,PALO ALTO TRANSIT CTR 6,,1,2145,101395,0,0
23,1,7,PALO ALTO TRANSIT CTR 7,,1,2145,101395,0,0
Loading