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

feat: 1795 timepoint clarification #1867

Merged
merged 10 commits into from
Oct 9, 2024
Merged

feat: 1795 timepoint clarification #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f334fa
removed @Recommended Column and modified MissingTimepointValue valida…
qcdyx Oct 2, 2024
bcda5a3
fixed broken test
qcdyx Oct 2, 2024
1b3b182
Merge branch 'master' into 1795-timepoint-clarification
qcdyx Oct 2, 2024
f7723b9
reformatted code
qcdyx Oct 2, 2024
cdfede2
Merge branch 'master' into 1795-timepoint-clarification
qcdyx Oct 3, 2024
369e5e6
renamed test method
qcdyx Oct 7, 2024
18ba5fb
Merge branch 'master' into 1795-timepoint-clarification
qcdyx Oct 7, 2024
f3cf34f
formatted code
qcdyx Oct 7, 2024
3ba2365
Merge branch '1795-timepoint-clarification' of github.com:MobilityDat…
qcdyx Oct 7, 2024
f93ef15
Merge branch 'master' into 1795-timepoint-clarification
qcdyx Oct 9, 2024
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
2 changes: 0 additions & 2 deletions main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsStopTimeSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.mobilitydata.gtfsvalidator.annotation.Index;
import org.mobilitydata.gtfsvalidator.annotation.NonNegative;
import org.mobilitydata.gtfsvalidator.annotation.PrimaryKey;
import org.mobilitydata.gtfsvalidator.annotation.RecommendedColumn;
import org.mobilitydata.gtfsvalidator.annotation.Required;
import org.mobilitydata.gtfsvalidator.type.GtfsTime;

Expand Down Expand Up @@ -91,7 +90,6 @@ public interface GtfsStopTimeSchema extends GtfsEntity {
double shapeDistTraveled();

@DefaultValue("1")
@RecommendedColumn
GtfsStopTimeTimepoint timepoint();

@FieldType(FieldTypeEnum.ID)
Expand Down
2 changes: 1 addition & 1 deletion main/src/main/java/org/mobilitydata/gtfsvalidator/validator/TimepointTimeValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void validate(NoticeContainer noticeContainer) {
return;
}
for (GtfsStopTime stopTime : stopTimes.getEntities()) {
if (!stopTime.hasTimepoint()) {
if ((stopTime.hasArrivalTime() || stopTime.hasDepartureTime()) && !stopTime.hasTimepoint()) {
noticeContainer.addValidationNotice(new MissingTimepointValueNotice(stopTime));
}
if (isTimepoint(stopTime)) {
Expand Down
5 changes: 3 additions & 2 deletions main/src/test/java/org/mobilitydata/gtfsvalidator/validator/TimepointTimeValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ public void nonTimepoint_timesProvided_shouldNotGenerateNotice() {
}

@Test
public void emptyTimepoint_noTimesProvided_shouldGenerateNotice() {
public void
emptyTimepoint_noArrivalTime_noDepartureTime_noTimePointProvided_shouldNotGenerateNotice() {
// setting .setTimepoint(null) is used to define a missing value
// (even if the timepoint value is included in header)
List<GtfsStopTime> stopTimes = new ArrayList<>();
Expand All @@ -216,7 +217,7 @@ public void emptyTimepoint_noTimesProvided_shouldGenerateNotice() {
.setTimepoint((Integer) null)
.build());
assertThat(generateNotices(createHeaderWithTimepointColumn(), stopTimes))
.containsExactly(new MissingTimepointValueNotice(stopTimes.get(0)));
.doesNotContain(new MissingTimepointValueNotice(stopTimes.get(0)));
}

@Test
Expand Down
Loading