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.

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

Jump to bottom

fix: comments on #1587 #1592

Merged
merged 6 commits into from
Oct 11, 2023
Merged

fix: comments on #1587 #1592

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c64c200
fix: comments on #1587
cka-y Sep 29, 2023
1101b0c
fix: removed unused variable
cka-y Sep 29, 2023
fe5e516
fix: formatting
cka-y Sep 29, 2023
42ed0e9
fix: rollback sources for acceptance test
cka-y Oct 10, 2023
4b5fe91
fix: removing source causing timeout
cka-y Oct 10, 2023
c00c6a0
fix: removing source causing timeout
cka-y Oct 10, 2023
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
61 changes: 27 additions & 34 deletions ...src/main/java/org/mobilitydata/gtfsvalidator/validator/TripAndShapeDistanceValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import static org.mobilitydata.gtfsvalidator.notice.SeverityLevel.ERROR;

import java.util.List;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.mobilitydata.gtfsvalidator.annotation.GtfsValidationNotice;
import org.mobilitydata.gtfsvalidator.annotation.GtfsValidationNotice.FileRefs;
Expand Down Expand Up @@ -53,38 +51,33 @@ public class TripAndShapeDistanceValidator extends FileValidator {

@Override
public void validate(NoticeContainer noticeContainer) {
List<String> uniqueShapeIds =
shapeTable.getEntities().stream()
.map(GtfsShape::shapeId)
.distinct()
.collect(Collectors.toList());

uniqueShapeIds.forEach(
shapeId -> {
double maxShapeDist =
shapeTable.getEntities().stream()
.filter(s -> s.shapeId().equals(shapeId))
.mapToDouble(GtfsShape::shapeDistTraveled)
.max()
.orElse(Double.NEGATIVE_INFINITY);

tripTable
.byShapeId(shapeId)
.forEach(
trip -> {
double maxStopTimeDist =
stopTimeTable.byTripId(trip.tripId()).stream()
.mapToDouble(GtfsStopTime::shapeDistTraveled)
.max()
.orElse(Double.NEGATIVE_INFINITY);

if (maxStopTimeDist > maxShapeDist) {
noticeContainer.addValidationNotice(
new TripDistanceExceedsShapeDistanceNotice(
trip.tripId(), shapeId, maxStopTimeDist, maxShapeDist));
}
});
});
shapeTable
.byShapeIdMap()
.forEach(
(shapeId, shape) -> {
double maxShapeDist =
shapeTable.byShapeId(shapeId).stream()
cka-y marked this conversation as resolved.
Show resolved Hide resolved
.mapToDouble(GtfsShape::shapeDistTraveled)
.max()
jcpitre marked this conversation as resolved.
Show resolved Hide resolved
.orElse(Double.NEGATIVE_INFINITY);

tripTable
.byShapeId(shapeId)
.forEach(
trip -> {
double maxStopTimeDist =
stopTimeTable.byTripId(trip.tripId()).stream()
.mapToDouble(GtfsStopTime::shapeDistTraveled)
.max()
jcpitre marked this conversation as resolved.
Show resolved Hide resolved
.orElse(Double.NEGATIVE_INFINITY);

if (maxStopTimeDist > maxShapeDist) {
noticeContainer.addValidationNotice(
new TripDistanceExceedsShapeDistanceNotice(
trip.tripId(), shapeId, maxStopTimeDist, maxShapeDist));
}
});
});
}

/** The distance traveled by a trip should be less or equal to the max length of its shape. */
Expand Down
1 change: 0 additions & 1 deletion scripts/mobility-database-harvester/harvest_latest_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
# Sources to exclude because they are too big for the workflow.
SOURCES_TO_EXCLUDE = [
"de-unknown-rursee-schifffahrt-kg-gtfs-784",
"de-unknown-ulmer-eisenbahnfreunde-gtfs-1081",
"no-unknown-agder-kollektivtrafikk-as-gtfs-1078",
cka-y marked this conversation as resolved.
Show resolved Hide resolved
"hu-unknown-volanbusz-gtfs-1836",
"de-baden-wurttemberg-verkehrsverbund-rhein-neckar-gtfs-1173",
Expand Down
Loading