Merge pull request #6171 from Jnction/coach_gtfs_import

Distinct coach from bus when reading in GTFS data in GTFS GraphQL API
opentripplanner · Nov 7, 2024 · 0999ca7 · 0999ca7
2 parents 7688365 + 13949af
commit 0999ca7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/...ion/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java b/...ion/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java
@@ -231,7 +231,7 @@ void carHail() {
   @Test
   void carHailWithTransit() {
     var modeSet = new QualifiedModeSet("CAR_HAIL,BUS,RAIL");
-    assertEquals(Set.of(COACH, BUS, RAIL), Set.copyOf(modeSet.getTransitModes()));
+    assertEquals(Set.of(BUS, RAIL), Set.copyOf(modeSet.getTransitModes()));
 
     assertEquals(WALK, modeSet.getRequestModes().directMode);
     assertEquals(CAR_HAILING, modeSet.getRequestModes().accessMode);

diff --git a/application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java b/application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java
@@ -12,7 +12,8 @@ public enum ApiRequestMode {
   TRAM(TransitMode.TRAM),
   SUBWAY(TransitMode.SUBWAY),
   RAIL(TransitMode.RAIL),
-  BUS(TransitMode.BUS, TransitMode.COACH),
+  BUS(TransitMode.BUS),
+  COACH(TransitMode.COACH),
   FERRY(TransitMode.FERRY),
   CABLE_CAR(TransitMode.CABLE_CAR),
   GONDOLA(TransitMode.GONDOLA),

diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java
@@ -20,7 +20,7 @@ public static TransitMode mapMode(int routeType) {
       // Railway Service
       return TransitMode.RAIL;
     } else if (routeType >= 200 && routeType < 300) { //Coach Service
-      return TransitMode.BUS;
+      return TransitMode.COACH;
     } else if (routeType >= 300 && routeType < 500) { //Suburban Railway Service and Urban Railway service
       if (routeType >= 401 && routeType <= 402) {
         return TransitMode.SUBWAY;

diff --git a/...java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/...java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
@@ -135,11 +135,15 @@ static Stream<Arguments> transportModesCases() {
       of(List.of(mode("BICYCLE")), "[ExcludeAllTransitFilter{}]"),
       of(
         List.of(mode("BUS")),
+        "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS]}]}]"
+      ),
+      of(
+        List.of(mode("BUS"), mode("COACH")),
         "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH]}]}]"
       ),
       of(
         List.of(mode("BUS"), mode("MONORAIL")),
-        "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH, MONORAIL]}]}]"
+        "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, MONORAIL]}]}]"
       )
     );
   }

diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java
@@ -5,6 +5,7 @@
 import static org.opentripplanner.transit.model.basic.TransitMode.BUS;
 import static org.opentripplanner.transit.model.basic.TransitMode.CABLE_CAR;
 import static org.opentripplanner.transit.model.basic.TransitMode.CARPOOL;
+import static org.opentripplanner.transit.model.basic.TransitMode.COACH;
 import static org.opentripplanner.transit.model.basic.TransitMode.FERRY;
 import static org.opentripplanner.transit.model.basic.TransitMode.FUNICULAR;
 import static org.opentripplanner.transit.model.basic.TransitMode.GONDOLA;
@@ -42,6 +43,8 @@ static Stream<Arguments> testCases() {
       // https://groups.google.com/g/gtfs-changes/c/keT5rTPS7Y0/m/71uMz2l6ke0J?pli=1
       Arguments.of(100, RAIL),
       Arguments.of(199, RAIL),
+      Arguments.of(200, COACH),
+      Arguments.of(299, COACH),
       Arguments.of(400, RAIL),
       Arguments.of(401, SUBWAY),
       Arguments.of(402, SUBWAY),