rename journey.parts -> journey.legs

index.js

@@ -169,7 +169,7 @@ const createClient = (profile) => {
 		})
 	}
 
-	const journeyPart = (ref, lineName, opt = {}) => {
+	const journeyLeg = (ref, lineName, opt = {}) => {
 		opt = Object.assign({
 			passedStations: true // return stations on the way?
 		}, opt)
@@ -185,15 +185,15 @@ const createClient = (profile) => {
 			}
 		})
 		.then((d) => {
-			const parse = profile.parseJourneyPart(profile, d.locations, d.lines, d.remarks)
+			const parse = profile.parseJourneyLeg(profile, d.locations, d.lines, d.remarks)
 
-			const part = { // pretend the part is contained in a journey
+			const leg = { // pretend the leg is contained in a journey
 				type: 'JNY',
 				dep: minBy(d.journey.stopL, 'idx'),
 				arr: maxBy(d.journey.stopL, 'idx'),
 				jny: d.journey
 			}
-			return parse(d.journey, part, !!opt.passedStations)
+			return parse(d.journey, leg, !!opt.passedStations)
 		})
 	}
 
@@ -239,7 +239,7 @@ const createClient = (profile) => {
 	}
 
 	const client = {departures, journeys, locations, nearby}
-	if (profile.journeyPart) client.journeyPart = journeyPart
+	if (profile.journeyLeg) client.journeyLeg = journeyLeg
 	if (profile.radar) client.radar = radar
 	Object.defineProperty(client, 'profile', {value: profile})
 	return client

lib/default-profile.js

@@ -2,7 +2,7 @@
 
 const parseDateTime = require('../parse/date-time')
 const parseDeparture = require('../parse/departure')
-const parseJourneyPart = require('../parse/journey-part')
+const parseJourneyLeg = require('../parse/journey-leg')
 const parseJourney = require('../parse/journey')
 const parseLine = require('../parse/line')
 const parseLocation = require('../parse/location')
@@ -33,7 +33,7 @@ const defaultProfile = {
 
 	parseDateTime,
 	parseDeparture,
-	parseJourneyPart,
+	parseJourneyLeg,
 	parseJourney,
 	parseLine,
 	parseStationName: id,
@@ -55,7 +55,7 @@ const defaultProfile = {
 	formatRectangle,
 	filters,
 
-	journeyPart: false,
+	journeyLeg: false,
 	radar: false
 }
 

lib/validate-profile.js

@@ -11,7 +11,7 @@ const types = {
 
 	parseDateTime: 'function',
 	parseDeparture: 'function',
-	parseJourneyPart: 'function',
+	parseJourneyLeg: 'function',
 	parseJourney: 'function',
 	parseLine: 'function',
 	parseStationName: 'function',

p/vbb/index.js

@@ -178,7 +178,7 @@ const vbbProfile = {
 	formatStation,
 	formatProducts,
 
-	journeyPart: true,
+	journeyLeg: true,
 	radar: true
 }
 

parse/index.js

@@ -7,7 +7,7 @@ module.exports = {
 	remark: require('./remark'),
 	operator: require('./operator'),
 	stopover: require('./stopover'),
-	journeyPart: require('./journey-part'),
+	journeyLeg: require('./journey-leg'),
 	journey: require('./journey'),
 	nearby: require('./nearby'),
 	movement: require('./movement')

parse/journey-leg.js

@@ -4,7 +4,7 @@ const parseDateTime = require('./date-time')
 
 const clone = obj => Object.assign({}, obj)
 
-const createParseJourneyPart = (profile, stations, lines, remarks) => {
+const createParseJourneyLeg = (profile, stations, lines, remarks) => {
 	// todo: finish parse/remark.js first
 	const applyRemark = (j, rm) => {}
 
@@ -13,7 +13,7 @@ const createParseJourneyPart = (profile, stations, lines, remarks) => {
 	// todo: what is pt.jny.dirFlg?
 	// todo: how does pt.freq work?
 	// todo: what is pt.himL?
-	const parseJourneyPart = (j, pt, passed = true) => { // j = journey, pt = part
+	const parseJourneyLeg = (j, pt, passed = true) => { // j = journey, pt = part
 		const dep = profile.parseDateTime(profile, j.date, pt.dep.dTimeR || pt.dep.dTimeS)
 		const arr = profile.parseDateTime(profile, j.date, pt.arr.aTimeR || pt.arr.aTimeS)
 		const res = {
@@ -79,7 +79,7 @@ const createParseJourneyPart = (profile, stations, lines, remarks) => {
 		return res
 	}
 
-	return parseJourneyPart
+	return parseJourneyLeg
 }
 
-module.exports = createParseJourneyPart
+module.exports = createParseJourneyLeg

parse/journey.js

@@ -1,26 +1,26 @@
 'use strict'
 
-const createParseJourneyPart = require('./journey-part')
+const createParseJourneyLeg = require('./journey-leg')
 
 const clone = obj => Object.assign({}, obj)
 
 const createParseJourney = (profile, stations, lines, remarks) => {
-	const parsePart = createParseJourneyPart(profile, stations, lines, remarks)
+	const parseLeg = createParseJourneyLeg(profile, stations, lines, remarks)
 
 	// todo: c.sDays
 	// todo: c.dep.dProgType, c.arr.dProgType
 	// todo: c.conSubscr
 	// todo: c.trfRes x vbb-parse-ticket
 	const parseJourney = (j) => {
-		const parts = j.secL.map(part => parsePart(j, part))
+		const legs = j.secL.map(leg => parseLeg(j, leg))
 		const res = {
-			parts,
+			legs,
-			origin: parts[0].origin,
+			origin: legs[0].origin,
-			destination: parts[parts.length - 1].destination,
+			destination: legs[legs.length - 1].destination,
-			departure: parts[0].departure,
+			departure: legs[0].departure,
-			arrival: parts[parts.length - 1].arrival
+			arrival: legs[legs.length - 1].arrival
 		}
-		if (parts.some(p => p.cancelled)) {
+		if (legs.some(p => p.cancelled)) {
 			res.cancelled = true
 			res.departure = res.arrival = null
 		}