Merge pull request #5655 from ibi-group/flex-upgrade

Update to newest version of GTFS Flex location groups

doc-templates/Flex.md

@@ -10,8 +10,8 @@
 
 To enable this turn on `FlexRouting` as a feature in `otp-config.json`.
 
-The GTFS feeds should conform to
-the [GTFS-Flex v2.1 draft](https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md)
+The GTFS feeds should conform to the 
+[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388)
 
 ## Configuration
 

docs/sandbox/Flex.md

@@ -10,8 +10,8 @@
 
 To enable this turn on `FlexRouting` as a feature in `otp-config.json`.
 
-The GTFS feeds should conform to
-the [GTFS-Flex v2.1 draft](https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md)
+The GTFS feeds should conform to the 
+[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388)
 
 ## Configuration
 

pom.xml

@@ -831,7 +831,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>1.4.10</version>
+            <version>1.4.15</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java

@@ -24,13 +24,11 @@ public abstract class FlexTest {
 
   private static final ResourceLoader RES = ResourceLoader.of(FlexTest.class);
 
-  protected static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs.zip");
-  protected static final File COBB_FLEX_GTFS = RES.file(
-    "cobblinc-scheduled-deviated-flex.gtfs.zip"
-  );
+  protected static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs");
+  protected static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs");
   protected static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip");
   protected static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip");
-  protected static final File LINCOLN_COUNTY_GBFS = RES.file("lincoln-county-flex.gtfs.zip");
+  protected static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs");
   protected static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf");
 
   protected static final DirectFlexPathCalculator calculator = new DirectFlexPathCalculator();

src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java

@@ -220,7 +220,7 @@ void shouldNotInterpolateFlexTimes() {
    */
   @Test
   void parseContinuousPickup() {
-    var lincolnGraph = FlexTest.buildFlexGraph(LINCOLN_COUNTY_GBFS);
+    var lincolnGraph = FlexTest.buildFlexGraph(LINCOLN_COUNTY_GTFS);
     assertNotNull(lincolnGraph);
   }
 

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/agency.txt

@@ -0,0 +1,2 @@
+agency_id,agency_url,agency_lang,agency_name,agency_phone,agency_timezone,agency_fare_url
+1696,https://www.cityofaspen.com/215/Transportation,en,City of Aspen,970-920-5267,America/Denver,

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/booking_rules.txt

@@ -0,0 +1,2 @@
+booking_rule_id,booking_type,prior_notice_duration_min,prior_notice_duration_max,prior_notice_start_day,prior_notice_start_time,prior_notice_last_day,prior_notice_last_time,prior_notice_service_id,message,pickup_message,drop_off_message,phone_number,info_url,booking_url
+booking_route_17102,0,,,,,,,,"The Downtowner provides free door-to-door transportation within the downtown area of Aspen. To schedule a ride, use the Downtowner Android/iOS mobile app. You may also request a ride by calling (877) 230-6045.",,,877-230-6045,https://www.cityofaspen.com/270/Downtowner,

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar.txt

@@ -0,0 +1,3 @@
+service_id,service_name,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+c_20808_b_29084_d_127,Downtowner Off Season (Flex) (All days of week),1,1,1,1,1,1,1,20210415,20211124
+c_20806_b_28352_d_127,Downtowner Winter (Flex) (All days of week),1,1,1,1,1,1,1,20201126,20210414

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt

@@ -0,0 +1,22 @@
+service_id,service_description
+c_15228_b_30138_d_127,Summer (All days of week)
+c_15228_b_30138_d_31,Summer (Weekday)
+c_15228_b_30138_d_96,Summer (Weekend)
+c_20732_b_28107_d_127,Winter (All days of week)
+c_20733_b_28108_d_127,Winter - Aspen (All days of week)
+c_20733_b_28108_d_31,Winter - Aspen (Weekday)
+c_20733_b_28108_d_32,Winter - Aspen (Saturday only)
+c_20733_b_28108_d_64,Winter - Aspen (Sunday only)
+c_20806_b_28352_d_127,Downtowner Winter (Flex) (All days of week)
+c_20808_b_29084_d_127,Downtowner Off Season (Flex) (All days of week)
+c_21117_b_29087_d_127,BM & AH ending 4/4/21 (All days of week)
+c_21540_b_30150_d_127,Summer Local X Route (All days of week)
+c_2670_b_29268_d_127,Spring (All days of week)
+c_2670_b_29268_d_31,Spring (Weekday)
+c_2670_b_29268_d_32,Spring (Saturday only)
+c_2670_b_29268_d_64,Spring (Sunday only)
+c_2675_b_29280_d_127,Spring - Aspen (All days of week)
+c_2675_b_29280_d_31,Spring - Aspen (Weekday)
+c_2675_b_29280_d_32,Spring - Aspen (Saturday only)
+c_2675_b_29280_d_64,Spring - Aspen (Sunday only)
+c_2927_b_30137_d_127,Summer - Aspen (All days of week)

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt

@@ -0,0 +1 @@
+date,service_id,holiday_name,exception_type

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/feed_info.txt

@@ -0,0 +1,2 @@
+feed_publisher_url,feed_publisher_name,feed_lang,feed_version,feed_license,feed_contact_email,feed_contact_url,feed_start_date,feed_end_date,feed_id
+http://www.trilliumtransit.com,"Trillium Solutions, Inc.",en,UTC: 03-Aug-2021 18:42,,support+test+rfta-co-us@trilliumtransit.com,http://support.trilliumtransit.com,20201126,20211124,1696

src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/location_groups.txt

@@ -0,0 +1 @@
+location_group_id,location_id,location_group_name