rest.exe: bugixes 🐛

Author: derhuerst

parse-rest/arrival-or-departure.js

@@ -31,7 +31,7 @@ const createParseArrOrDep = (type) => {
 		}
 
 		if (opt.remarks && Array.isArray(d.notes)) {
-			res.hints = d.notes.map(h => profile.parseHint(profile, h, data))
+			res.hints = d.notes.map(h => profile.parseHint(ctx, h))
 		}
 
 		return res

parse-rest/journey-leg.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const parseIsoDuration = require('parse-iso-duration')
+const sortBy = require('lodash/sortBy')
 
 const parseJourneyLeg = (ctx, l) => { // l = leg
 	const {profile, opt} = ctx
@@ -14,14 +15,14 @@ const parseJourneyLeg = (ctx, l) => { // l = leg
 	}
 
 	// todo: does `dest.rtAlighting` actually if the arrival is cancelled?
-	const arr = profile.parseWhen(ctx, dest.date, dest.rtDate, dest.time, dest.rtTime, dest.rtTz, !dest.rtAlighting)
+	const arr = profile.parseWhen(ctx, dest.date, dest.rtDate, dest.time, dest.rtTime, dest.rtTz, dest.rtAlighting === false)
 	res.arrival = arr.when
 	res.plannedArrival = arr.plannedWhen
 	res.arrivalDelay = arr.delay
 	if (arr.prognosedWhen) res.prognosedArrival = arr.prognosedWhen
 
 	// todo: does `orig.rtBoarding` actually if the departure is cancelled?
-	const dep = profile.parseWhen(ctx, orig.date, orig.rtDate, orig.time, orig.rtTime, orig.tz, !orig.rtBoarding)
+	const dep = profile.parseWhen(ctx, orig.date, orig.rtDate, orig.time, orig.rtTime, orig.tz, orig.rtBoarding === false)
 	res.departure = dep.when
 	res.plannedDeparture = dep.plannedWhen
 	res.departureDelay = dep.delay
@@ -62,7 +63,8 @@ const parseJourneyLeg = (ctx, l) => { // l = leg
 		res.direction = l.direction && profile.parseStationName(ctx, l.direction) || null
 
 		if (opt.stopovers && l.stops) {
-			res.stopovers = l.stops.map(st => profile.parseStopover(ctx, st))
+			res.stopovers = sortBy(l.stops, 'routeIdx')
+			.map(st => profile.parseStopover(ctx, st))
 		}
 	}
 

parse-rest/location.js

@@ -4,20 +4,28 @@ const {parse} = require('qs')
 
 const leadingZeros = /^0+/
 
+const parseNr = nr => parseFloat(nr.slice(0, 2) + '.' + nr.slice(2))
+
 const parseLocation = (ctx, l) => {
 	const {profile, opt} = ctx
 
 	const id = parse(l.id, {delimiter: '@'})
-	const latitude = 'number' === typeof l.lat ? l.lat : (id.Y ? id.Y / 100000 : null)
-	const longitude = 'number' === typeof l.long ? l.long : (id.X ? id.X / 100000 : null)
+	const latitude = 'number' === typeof l.lat ?
+		l.lat :
+		(id.Y ? parseNr(id.Y) : null)
+	const longitude = 'number' === typeof l.lon ?
+		l.lon :
+		(id.X ? parseNr(id.X) : null)
 
 	const res = {
 		type: 'location',
 		id: (l.extId || id.L || id.b || '').replace(leadingZeros, '') || null,
 		latitude, longitude
 	}
 
-	if (l.type === 'S' || l.type === 'ST') {
+	// todo: l.notes https://github.com/public-transport/hafas-client/issues/130
+
+	if (l.type === 'S' || l.type === 'ST' || id.A === '1') {
 		const stop = {
 			type: 'stop',
 			id: res.id,

parse-rest/stopover.js

@@ -3,12 +3,12 @@
 const parseStopover = (ctx, st) => {
 	const {profile} = ctx
 
-	const arr = profile.parseWhen(ctx, st.arrDate, st.rtArrDate, st.arrTime, st.rtArrTime, st.arrTz, !st.rtAlighting)
+	const arr = profile.parseWhen(ctx, st.arrDate, st.rtArrDate, st.arrTime, st.rtArrTime, st.arrTz, st.rtAlighting === false)
 	// todo: is there a `st.rtArrTrack`?
-	const arrPl = profile.parsePlatform(ctx, st.arrTrack, null, !st.rtAlighting)
-	const dep = profile.parseWhen(ctx, st.depDate, st.rtDepDate, st.depTime, st.rtDepTime, st.depTz, !st.rtBoarding)
+	const arrPl = profile.parsePlatform(ctx, st.arrTrack, null, st.rtAlighting === false)
+	const dep = profile.parseWhen(ctx, st.depDate, st.rtDepDate, st.depTime, st.rtDepTime, st.depTz, st.rtBoarding === false)
 	// todo: is there a `st.rtDepTrack`?
-	const depPl = profile.parsePlatform(ctx, st.depTrack, null, !st.rtBoarding)
+	const depPl = profile.parsePlatform(ctx, st.depTrack, null, st.rtBoarding === false)
 
 	const res = {
 		stop: profile.parseLocation(ctx, st) || null,

parse-rest/when.js

@@ -5,6 +5,7 @@ const _parseWhen = require('../parse/when')
 
 const parseWhen = (ctx, date, rtDate, time, rtTime, tzOffset, cncl = false) => {
 	// todo: compute `rtTime` offset using `rtDate`
+	date = rtDate || date
 	if (date) date = date.replace(/-/g, '')
 	if (time) time = time.replace(/:/g, '')
 	if (rtTime) rtTime = rtTime.replace(/:/g, '')

rest-exe.js

@@ -228,7 +228,7 @@ const createRestClient = (profile, token, userAgent) => {
 		query.date = profile.formatDate({profile, opt}, when)
 		query.time = profile.formatTime({profile, opt}, when)
 
-		return await request(method, query)
+		return await request(method, opt, query)
 	}
 
 	const departures = async (stop, opt = {}) => {