Merge pull request opentripplanner#6672 from ibi-group/oba-upgrade

Upgrade to OBA 7, remove unused fields

Author: leonardehrenfried

application/pom.xml

@@ -289,7 +289,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>6.1.2</version>
+            <version>7.0.0</version>
         </dependency>
         <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
         <dependency>

application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java

@@ -92,7 +92,6 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) {
     lhs.setPickupType(PickDropMapper.map(rhs.getPickupType()));
     lhs.setDropOffType(PickDropMapper.map(rhs.getDropOffType()));
     lhs.setShapeDistTraveled(rhs.getShapeDistTraveled());
-    lhs.setFarePeriodId(rhs.getFarePeriodId());
     lhs.setFlexWindowStart(rhs.getStartPickupDropOffWindow());
     lhs.setFlexWindowEnd(rhs.getEndPickupDropOffWindow());
 

application/src/main/java/org/opentripplanner/model/StopTime.java

@@ -191,14 +191,6 @@ public void setShapeDistTraveled(double shapeDistTraveled) {
     this.shapeDistTraveled = shapeDistTraveled;
   }
 
-  public String getFarePeriodId() {
-    return farePeriodId;
-  }
-
-  public void setFarePeriodId(String farePeriodId) {
-    this.farePeriodId = farePeriodId;
-  }
-
   public int getFlexWindowStart() {
     return flexWindowStart;
   }

application/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java

@@ -45,8 +45,6 @@ public class StopTimeMapperTest {
 
   private static final int DROP_OFF_TYPE = 2;
 
-  private static final String FARE_PERIOD_ID = "Fare Period Id";
-
   private static final int PICKUP_TYPE = 3;
 
   private static final String ROUTE_SHORT_NAME = "Route Short Name";
@@ -138,7 +136,6 @@ private static StopTime buildStopTime() {
     stopTime.setArrivalTime(ARRIVAL_TIME);
     stopTime.setDepartureTime(DEPARTURE_TIME);
     stopTime.setDropOffType(DROP_OFF_TYPE);
-    stopTime.setFarePeriodId(FARE_PERIOD_ID);
     stopTime.setPickupType(PICKUP_TYPE);
     stopTime.setRouteShortName(ROUTE_SHORT_NAME);
     stopTime.setShapeDistTraveled(SHAPE_DIST_TRAVELED);
@@ -163,7 +160,6 @@ public void testMap() {
     assertEquals(ARRIVAL_TIME, result.getArrivalTime());
     assertEquals(DEPARTURE_TIME, result.getDepartureTime());
     assertEquals(PickDrop.CALL_AGENCY, result.getDropOffType());
-    assertEquals(FARE_PERIOD_ID, result.getFarePeriodId());
     assertEquals(PickDrop.COORDINATE_WITH_DRIVER, result.getPickupType());
     assertEquals(ROUTE_SHORT_NAME, result.getRouteShortName());
     assertEquals(SHAPE_DIST_TRAVELED, result.getShapeDistTraveled(), 0.0001d);
@@ -183,7 +179,6 @@ public void testMapWithNulls() {
     assertFalse(result.isArrivalTimeSet());
     assertFalse(result.isDepartureTimeSet());
     assertEquals(PickDrop.SCHEDULED, result.getDropOffType());
-    assertNull(result.getFarePeriodId());
     assertEquals(PickDrop.SCHEDULED, result.getPickupType());
     assertNull(result.getRouteShortName());
     assertFalse(result.isShapeDistTraveledSet());