Skip to content

Commit

Permalink
Merge 6931011 into 30e6c69
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelle-dr authored Mar 3, 2023
2 parents 30e6c69 + 6931011 commit 05f2e1a
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
*
* <ul>
* <li>{@link DecreasingShapeDistanceNotice}
* <li>{@link EqualShapeDistanceSameCoordinatesNotice}
* <li>{@link EqualShapeDistanceDiffCoordinatesNotice}
* <li>{@link EqualShapeDistanceSameCoordinatesNotice2}
* <li>{@link EqualShapeDistanceDiffCoordinatesNotice2}
* </ul>
*/
@GtfsValidator
Expand Down Expand Up @@ -69,11 +69,11 @@ public void validate(NoticeContainer noticeContainer) {
// equal shape_dist_traveled and different coordinates
if (!(curr.shapePtLon() == prev.shapePtLon() && curr.shapePtLat() == prev.shapePtLat())) {
noticeContainer.addValidationNotice(
new EqualShapeDistanceDiffCoordinatesNotice(prev, curr));
new EqualShapeDistanceDiffCoordinatesNotice2(prev, curr));
} else {
// equal shape_dist_traveled and same coordinates
noticeContainer.addValidationNotice(
new EqualShapeDistanceSameCoordinatesNotice(prev, curr));
new EqualShapeDistanceSameCoordinatesNotice2(prev, curr));
}
}
}
Expand Down Expand Up @@ -120,7 +120,7 @@ static class DecreasingShapeDistanceNotice extends ValidationNotice {
*
* <p>Severity: {@code SeverityLevel.WARNING}
*/
static class EqualShapeDistanceSameCoordinatesNotice extends ValidationNotice {
static class EqualShapeDistanceSameCoordinatesNotice2 extends ValidationNotice {
private final String shapeId;
private final int csvRowNumber;
private final double shapeDistTraveled;
Expand All @@ -129,7 +129,7 @@ static class EqualShapeDistanceSameCoordinatesNotice extends ValidationNotice {
private final double prevShapeDistTraveled;
private final int prevShapePtSequence;

EqualShapeDistanceSameCoordinatesNotice(GtfsShape previous, GtfsShape current) {
EqualShapeDistanceSameCoordinatesNotice2(GtfsShape previous, GtfsShape current) {
super(SeverityLevel.WARNING);
this.shapeId = current.shapeId();
this.csvRowNumber = current.csvRowNumber();
Expand All @@ -150,7 +150,7 @@ static class EqualShapeDistanceSameCoordinatesNotice extends ValidationNotice {
*
* <p>Severity: {@code SeverityLevel.ERROR}
*/
static class EqualShapeDistanceDiffCoordinatesNotice extends ValidationNotice {
static class EqualShapeDistanceDiffCoordinatesNotice2 extends ValidationNotice {
private final String shapeId;
private final int csvRowNumber;
private final double shapeDistTraveled;
Expand All @@ -160,7 +160,7 @@ static class EqualShapeDistanceDiffCoordinatesNotice extends ValidationNotice {
private final int prevShapePtSequence;
private final double actualDistanceBetweenShapePoints;

EqualShapeDistanceDiffCoordinatesNotice(GtfsShape previous, GtfsShape current) {
EqualShapeDistanceDiffCoordinatesNotice2(GtfsShape previous, GtfsShape current) {
super(SeverityLevel.ERROR);
this.shapeId = current.shapeId();
this.csvRowNumber = current.csvRowNumber();
Expand Down

0 comments on commit 05f2e1a

Please sign in to comment.