updated logic

MobilityData · Jan 17, 2025 · 01d60c6 · 01d60c6
1 parent c679b58
commit 01d60c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/.../main/java/org/mobilitydata/gtfsvalidator/validator/ContinuousPickupDropOffValidator.java b/.../main/java/org/mobilitydata/gtfsvalidator/validator/ContinuousPickupDropOffValidator.java
@@ -37,11 +37,9 @@ public ContinuousPickupDropOffValidator(
   public void validate(NoticeContainer noticeContainer) {
     for (GtfsRoute route : routeTable.getEntities()) {
       boolean continuous =
-          (route.continuousPickup() == GtfsContinuousPickupDropOff.ALLOWED
-                  || route.continuousPickup() == GtfsContinuousPickupDropOff.MUST_PHONE
+          (route.continuousPickup() == GtfsContinuousPickupDropOff.MUST_PHONE
                   || route.continuousPickup() == GtfsContinuousPickupDropOff.ON_REQUEST_TO_DRIVER)
-              || (route.continuousDropOff() == GtfsContinuousPickupDropOff.ALLOWED
-                  || route.continuousPickup() == GtfsContinuousPickupDropOff.MUST_PHONE
+              || (route.continuousPickup() == GtfsContinuousPickupDropOff.MUST_PHONE
                   || route.continuousPickup() == GtfsContinuousPickupDropOff.ON_REQUEST_TO_DRIVER);
       if (!continuous) {
         continue;

diff --git a/...t/java/org/mobilitydata/gtfsvalidator/validator/ContinuousPickupDropOffValidatorTest.java b/...t/java/org/mobilitydata/gtfsvalidator/validator/ContinuousPickupDropOffValidatorTest.java
@@ -35,36 +35,7 @@ public void continuousPickupWithPickupDropOffWindowShouldGenerateNotice() {
                 new GtfsRoute.Builder()
                     .setCsvRowNumber(1)
                     .setRouteId("route1")
-                    .setContinuousPickup(1)
-                    .build()),
-            List.of(
-                new GtfsTrip.Builder()
-                    .setCsvRowNumber(2)
-                    .setTripId("trip1")
-                    .setRouteId("route1")
-                    .build()),
-            List.of(
-                new GtfsStopTime.Builder()
-                    .setCsvRowNumber(3)
-                    .setTripId("trip1")
-                    .setStartPickupDropOffWindow(GtfsTime.fromString("08:00:00"))
-                    .setEndPickupDropOffWindow(GtfsTime.fromString("09:00:00"))
-                    .build()));
-    assertThat(notices)
-        .containsExactly(
-            new ContinuousPickupDropOffValidator.ContinuousPickupDropOffNotice(
-                1, "trip1", GtfsTime.fromString("08:00:00"), GtfsTime.fromString("09:00:00")));
-  }
-
-  @Test
-  public void continuousDropOffWithPickupDropOffWindowShouldGenerateNotice() {
-    List<ValidationNotice> notices =
-        generateNotices(
-            List.of(
-                new GtfsRoute.Builder()
-                    .setCsvRowNumber(1)
-                    .setRouteId("route1")
-                    .setContinuousDropOff(2)
+                    .setContinuousPickup(2)
                     .build()),
             List.of(
                 new GtfsTrip.Builder()
@@ -81,7 +52,7 @@ public void continuousDropOffWithPickupDropOffWindowShouldGenerateNotice() {
                     .build()));
     assertThat(notices)
         .containsExactly(
-            new ContinuousPickupDropOffValidator.ContinuousPickupDropOffNotice(
+            new ContinuousPickupDropOffValidator.ForbiddenContinuousPickupDropOffNotice(
                 1, "trip1", GtfsTime.fromString("08:00:00"), GtfsTime.fromString("09:00:00")));
   }