rest.exe: arrivals() via stationBoard()

Author: derhuerst

parse-rest/arrival-or-departure.js

@@ -1,8 +1,5 @@
 'use strict'
 
-const DEPARTURE = 'departure'
-const ARRIVAL = 'arrival'
-
 // todo: d.JourneyStatus
 // todo: d.Notes
 // todo: d.prognosisType
@@ -25,7 +22,7 @@ const createParseArrOrDep = (profile, opt, data, type) => {
 				extId: d.stopExtId
 			}),
 			line: profile.parseLine(profile, opt, data)(product) || null,
-			direction: type === DEPARTURE && d.direction || null,
+			direction: type === 'departure' && d.direction || null, // todo: arrivals
 			// todo: is there `d.rtDate` & `d.tz` & `d.rtTz`?
 			...profile.parseWhen(profile, d.date, null, d.time, d.rtTime, null, !!d.cancelled),
 			platform: d.track || null

rest-exe.js

@@ -107,6 +107,7 @@ const profile = {
 	parseJourney,
 	parseJourneyLeg,
 	parseStopover,
+	parseArrivalOrDeparture,
 	parseLocation,
 	formatDate,
 	formatTime
@@ -263,19 +264,20 @@ const tripAlternatives = async (tripCtx, origin, destination) => {
 	return res.Trip.map(parseJourney(profile, opt))
 }
 
-const departures = async (stop, opt = {}) => {
+const _stationBoard = async (method, stop, opt) => {
 	const stopId = 'string' === typeof stop ? stop : stop.id
 	if ('string' !== typeof stopId) {
 		throw new TypeError('stop must be a stop object or a string.')
 	}
 
 	opt = {
-		direction: null, // only show departures stopping by this station
-		duration: 10, // show departures for the next n minutes
-		results: null, // number of departures – `null` means "whatever HAFAS returns"
+		// todo: for arrivals(), this is actually a station it *has already* stopped by
+		direction: null, // only show arrivals/departures stopping by this station
+		duration: 10, // show arrivals/departures for the next n minutes
+		results: null, // number of arrivals/departures – `null` means "whatever HAFAS returns"
 		products: {}, // enabled/disable certain products to search for
 		remarks: true, // parse & expose hints & warnings?
-		// departures at related stations
+		// arrivals/departures at related stations
 		// e.g. those that belong together on the metro map.
 		includeRelatedStations: true,
 		...opt
@@ -304,20 +306,23 @@ const departures = async (stop, opt = {}) => {
 	query.date = profile.formatDate(profile, when)
 	query.time = profile.formatTime(profile, when)
 
-	const res = await request('departureBoard', query)
-	const parse = parseArrivalOrDeparture(profile, opt, {})
-	return res.departureAndMessage ? res.departureAndMessage.map(d => parse(d.Departure)) : []
+	return await request(method, query)
 }
 
-const arrivals = async (stop) => {
-	const res = await request('arrivalBoard', {
-		extId: '8000152',
-		// todo: direction, date, time, duration, products, operators, lines
-		// todo: maxJourneys, filterEquiv, attributes, rtMode
-	})
+const departures = async (stop, opt = {}) => {
+	const res = await _stationBoard('departureBoard', stop, opt)
+	const results = res.departureAndMessage || []
+
+	const parse = profile.parseArrivalOrDeparture(profile, opt, {}, 'departure')
+	return results.map(result => parse(result.Departure))
+}
+
+const arrivals = async (stop, opt = {}) => {
+	const res = await _stationBoard('arrivalBoard', stop, opt)
+	const results = res.arrivalAndMessage || []
 
-	const parse = parseArrivalOrDeparture(profile, opt, {})
-	return res.arrivalAndMessage.map(d => parse(d.Arrival))
+	const parse = profile.parseArrivalOrDeparture(profile, opt, {}, 'arrival')
+	return results.map(result => parse(result.Arrival))
 }
 
 const trip = async (id) => {