Remove route short name from StopTime

Author: leonardehrenfried

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

@@ -88,7 +88,6 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) {
     lhs.setTimepoint(rhs.getTimepoint());
     lhs.setStopSequence(rhs.getStopSequence());
     lhs.setStopHeadsign(stopHeadsign);
-    lhs.setRouteShortName(rhs.getRouteShortName());
     lhs.setPickupType(PickDropMapper.map(rhs.getPickupType()));
     lhs.setDropOffType(PickDropMapper.map(rhs.getDropOffType()));
     lhs.setShapeDistTraveled(rhs.getShapeDistTraveled());

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

@@ -38,8 +38,6 @@ public final class StopTime implements Comparable<StopTime> {
 
   private List<String> headsignVias;
 
-  private String routeShortName;
-
   private PickDrop pickupType = PickDrop.SCHEDULED;
 
   private PickDrop dropOffType = PickDrop.SCHEDULED;
@@ -152,14 +150,6 @@ public void setStopHeadsign(I18NString headSign) {
     this.stopHeadsign = headSign;
   }
 
-  public String getRouteShortName() {
-    return routeShortName;
-  }
-
-  public void setRouteShortName(String routeShortName) {
-    this.routeShortName = routeShortName;
-  }
-
   public PickDrop getPickupType() {
     return pickupType;
   }

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

@@ -47,8 +47,6 @@ public class StopTimeMapperTest {
 
   private static final int PICKUP_TYPE = 3;
 
-  private static final String ROUTE_SHORT_NAME = "Route Short Name";
-
   private static final double SHAPE_DIST_TRAVELED = 2.5d;
 
   private static final String STOP_NAME = "Stop";
@@ -137,7 +135,6 @@ private static StopTime buildStopTime() {
     stopTime.setDepartureTime(DEPARTURE_TIME);
     stopTime.setDropOffType(DROP_OFF_TYPE);
     stopTime.setPickupType(PICKUP_TYPE);
-    stopTime.setRouteShortName(ROUTE_SHORT_NAME);
     stopTime.setShapeDistTraveled(SHAPE_DIST_TRAVELED);
     stopTime.setStopHeadsign(HEAD_SIGN);
     stopTime.setStopSequence(STOP_SEQUENCE);
@@ -161,7 +158,6 @@ public void testMap() {
     assertEquals(DEPARTURE_TIME, result.getDepartureTime());
     assertEquals(PickDrop.CALL_AGENCY, result.getDropOffType());
     assertEquals(PickDrop.COORDINATE_WITH_DRIVER, result.getPickupType());
-    assertEquals(ROUTE_SHORT_NAME, result.getRouteShortName());
     assertEquals(SHAPE_DIST_TRAVELED, result.getShapeDistTraveled(), 0.0001d);
     assertNotNull(result.getStop());
     assertEquals(HEAD_SIGN, result.getStopHeadsign().toString());
@@ -180,7 +176,6 @@ public void testMapWithNulls() {
     assertFalse(result.isDepartureTimeSet());
     assertEquals(PickDrop.SCHEDULED, result.getDropOffType());
     assertEquals(PickDrop.SCHEDULED, result.getPickupType());
-    assertNull(result.getRouteShortName());
     assertFalse(result.isShapeDistTraveledSet());
     assertNotNull(result.getStop());
     assertNull(result.getStopHeadsign());

application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java

@@ -193,7 +193,6 @@ private StopTime stopTime(Trip trip, RegularStop stop, int time, int seq) {
     s.setDepartureTime(time);
     s.setStopSequence(seq);
     s.setStopHeadsign(new NonLocalizedString("NA"));
-    s.setRouteShortName("NA");
     return s;
   }