Disambiguate stops and platforms

In the GTFS reference a stop is different to a platform, based on whether
the stop has a parent station.

Author: jamespfennell

enums.go

@@ -242,14 +242,15 @@ func (t RouteType) String() string {
 type StopType int32
 
 const (
-	StopType_Platform       StopType = 0
+	StopType_Stop           StopType = 0
 	StopType_Station        StopType = 1
 	StopType_EntranceOrExit StopType = 2
 	StopType_GenericNode    StopType = 3
 	StopType_BoardingArea   StopType = 4
+	StopType_Platform       StopType = 5
 )
 
-func parseStopType(s string) StopType {
+func parseStopType(s string, hasParentStop bool) StopType {
 	switch s {
 	case "1":
 		return StopType_Station
@@ -260,12 +261,18 @@ func parseStopType(s string) StopType {
 	case "4":
 		return StopType_BoardingArea
 	default:
-		return StopType_Platform
+		if hasParentStop {
+			return StopType_Platform
+		} else {
+			return StopType_Stop
+		}
 	}
 }
 
 func (t StopType) String() string {
 	switch t {
+	case StopType_Stop:
+		return "STOP"
 	case StopType_Platform:
 		return "PLATFORM"
 	case StopType_Station:

realtime.go

@@ -269,9 +269,9 @@ func ParseRealtime(content []byte, opts *ParseRealtimeOptions) (*Realtime, error
 		var ok bool
 
 		if tripUpdate := entity.TripUpdate; tripUpdate != nil {
-			trip, vehicle, ok = parseTripUpdate(tripUpdate, opts, feedMessage.GetHeader().GetTimestamp())
+			trip, vehicle, ok = parseTripUpdate(tripUpdate, opts)
 		} else if vehiclePosition := entity.Vehicle; vehiclePosition != nil {
-			trip, vehicle = parseVehicle(vehiclePosition, opts, feedMessage.GetHeader().GetTimestamp())
+			trip, vehicle = parseVehicle(vehiclePosition, opts)
 			ok = true
 		} else if entityAlert := entity.Alert; entityAlert != nil {
 			alert, alertTrips = parseAlert(entity.GetId(), entityAlert, opts)
@@ -337,7 +337,7 @@ func ParseRealtime(content []byte, opts *ParseRealtimeOptions) (*Realtime, error
 	return &result, nil
 }
 
-func parseTripUpdate(tripUpdate *gtfsrt.TripUpdate, opts *ParseRealtimeOptions, feedCreatedAt uint64) (*Trip, *Vehicle, bool) {
+func parseTripUpdate(tripUpdate *gtfsrt.TripUpdate, opts *ParseRealtimeOptions) (*Trip, *Vehicle, bool) {
 	if tripUpdate.Trip == nil {
 		return nil, nil, false
 	}
@@ -375,19 +375,19 @@ func parseTripUpdate(tripUpdate *gtfsrt.TripUpdate, opts *ParseRealtimeOptions,
 		return trip, nil, true
 	}
 	vehicle := &Vehicle{
-		ID:                parseVehicleDescriptor(tripUpdate.Vehicle, opts),
+		ID:                parseVehicleDescriptor(tripUpdate.Vehicle),
 		IsEntityInMessage: false,
 	}
 	return trip, vehicle, true
 }
 
-func parseVehicle(vehiclePosition *gtfsrt.VehiclePosition, opts *ParseRealtimeOptions, feedCreatedAt uint64) (*Trip, *Vehicle) {
+func parseVehicle(vehiclePosition *gtfsrt.VehiclePosition, opts *ParseRealtimeOptions) (*Trip, *Vehicle) {
 	var congestionLevel = gtfsrt.VehiclePosition_UNKNOWN_CONGESTION_LEVEL
 	if vehiclePosition.CongestionLevel != nil {
 		congestionLevel = *vehiclePosition.CongestionLevel
 	}
 	vehicle := &Vehicle{
-		ID:                  parseVehicleDescriptor(vehiclePosition.Vehicle, opts),
+		ID:                  parseVehicleDescriptor(vehiclePosition.Vehicle),
 		Position:            convertVehiclePosition(vehiclePosition),
 		CurrentStopSequence: vehiclePosition.CurrentStopSequence,
 		StopID:              vehiclePosition.StopId,
@@ -494,7 +494,7 @@ func parseStartDate(startDate *string, timezone *time.Location) (bool, time.Time
 	return true, time.Date(y, time.Month(m), d, 0, 0, 0, 0, timezone)
 }
 
-func parseVehicleDescriptor(vehicleDesc *gtfsrt.VehicleDescriptor, opts *ParseRealtimeOptions) *VehicleID {
+func parseVehicleDescriptor(vehicleDesc *gtfsrt.VehicleDescriptor) *VehicleID {
 	if vehicleDesc == nil {
 		return nil
 	}

static.go

@@ -432,16 +432,22 @@ func parseStops(csv *csv.File) []Stop {
 	stopIdToIndex := map[string]int{}
 	stopIdToParent := map[string]string{}
 	for csv.NextRow() {
+		stopID := idColumn.Read()
+		hasParentStop := false
+		if parentStopId := parentStationColumn.Read(); parentStopId != "" {
+			stopIdToParent[stopID] = parentStopId
+			hasParentStop = true
+		}
 		stop := Stop{
-			Id:                 idColumn.Read(),
+			Id:                 stopID,
 			Code:               codeColumn.Read(),
 			Name:               nameColumn.Read(),
 			Description:        descriptionColumn.Read(),
 			ZoneId:             zoneIdColumn.Read(),
 			Longitude:          parseFloat64(longitudeColumn.Read()),
 			Latitude:           parseFloat64(latitudeColumn.Read()),
 			Url:                urlColumn.Read(),
-			Type:               parseStopType(typeColumn.Read()),
+			Type:               parseStopType(typeColumn.Read(), hasParentStop),
 			Timezone:           timezoneColumn.Read(),
 			WheelchairBoarding: parseWheelchairBoarding(wheelchairBoardingColumn.Read()),
 			PlatformCode:       platformCodeColumn.Read(),
@@ -451,9 +457,6 @@ func parseStops(csv *csv.File) []Stop {
 			continue
 		}
 		stopIdToIndex[stop.Id] = len(stops)
-		if parentStopId := parentStationColumn.Read(); parentStopId != "" {
-			stopIdToParent[stop.Id] = parentStopId
-		}
 		stops = append(stops, stop)
 	}
 	for stopId, parentStopId := range stopIdToParent {

static_test.go

@@ -227,6 +227,7 @@ func TestParse(t *testing.T) {
 					{
 						Id:     "a",
 						Parent: &Stop{Id: "b"},
+						Type:   StopType_Platform,
 					},
 					{
 						Id: "b",