Skip to content

Fix criterion for non-rev trips #658

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
binh-dam-ibigroup merged 2 commits into from
Jul 14, 2026
Merged

Fix criterion for non-rev trips #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e0ff
fix(RemoveNonRev...): Fix criterion for non-rev trips.
binh-dam-ibigroup Jul 9, 2026
00dfb8b
improvement(RemoveNonRev...): Report changes only if rows are deleted.
binh-dam-ibigroup Jul 14, 2026
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
36 changes: 21 additions & 15 deletions .../com/conveyal/datatools/manager/models/transform/RemoveNonRevenueTripsTransformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,27 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
LOG.warn("No revenue trips! All trips and related stop times will be removed.");
}

writeToFile(
zipTarget,
"stop_times.txt",
revenueStopTimes.getStopTimeRows().values().stream().flatMap(List::stream).collect(Collectors.toList()),
headersForStopTime,
revenueStopTimes.getDeletedRowCount()
);
// Only update tables and report change if rows are removed.

writeToFile(
zipTarget,
"trips.txt",
revenueTrips.tripRows,
headersForTrips,
revenueTrips.getDeletedRowCount()
);
if (revenueStopTimes.getDeletedRowCount() != 0) {
writeToFile(
zipTarget,
"stop_times.txt",
revenueStopTimes.getStopTimeRows().values().stream().flatMap(List::stream).collect(Collectors.toList()),
headersForStopTime,
revenueStopTimes.getDeletedRowCount()
);
}

if (revenueTrips.getDeletedRowCount() != 0) {
writeToFile(
zipTarget,
"trips.txt",
revenueTrips.tripRows,
headersForTrips,
revenueTrips.getDeletedRowCount()
);
}
} catch (Exception e) {
LOG.error("Unknown error encountered while attempting to remove non revenue trip from zip file.", e);
}
Expand Down Expand Up @@ -231,7 +237,7 @@ private boolean isRevenueStopTime(
private boolean isRevenuePickupDropOff(CsvReader csvReader, Map<String, Integer> fieldIndexes) throws IOException {
String pickup = csvReader.get(fieldIndexes.get(PICKUP_FIELD_NAME));
String dropOff = csvReader.get(fieldIndexes.get(DROP_OFF_FIELD_NAME));
return !"1".equals(pickup) && !"1".equals(dropOff);
return !"1".equals(pickup) || !"1".equals(dropOff);
}

/**
Expand Down
11 changes: 6 additions & 5 deletions .../conveyal/datatools/manager/models/transform/RemoveNonRevenueTripsTransformationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,16 @@ static Stream<Arguments> createNonRevenueCases() {
return Stream.of(
Arguments.of(
List.of(
"non-revenue-trip1,1,",
"non-revenue-trip1,1,1",
"non-revenue-trip1,1,1",
"non-revenue-trip1,1,"
"non-revenue-trip1,1,1",
"non-revenue-trip1,1,1"
),
List.of(
"revenue-trip,0,0",
"revenue-trip,1,1",
"revenue-trip,1,1",
"revenue-trip,2,1",
"revenue-trip,1,2",
"revenue-trip,0,0"
),
fieldIndexes
Expand All @@ -131,8 +132,8 @@ static Stream<Arguments> createNonRevenueCases() {
List.of(
"revenue-trip,0,0,2,2",
"revenue-trip,0,0,1,1",
"revenue-trip,0,0,2,2",
"revenue-trip,0,0,2,2"
"revenue-trip,0,0,2,1",
"revenue-trip,0,0,1,2"
),
allFieldIndexes
)
Expand Down
Loading