WIP

Author: derhuerst

parse-rest/line.js

@@ -17,14 +17,20 @@ const parseLine = (ctx, p) => { // p = line
 	// todo: what is p.catCode?
 
 	// todo: ICEs seem to have a catCode of 0
-	const catCode = parseInt(p.catCode)
-	if (!Number.isNaN(catCode)) {
-		const product = profile.products.find(p => p.bitmasks.includes(catCode))
+	const cls = parseInt(p.cls)
+	if (!Number.isNaN(cls)) {
+		const product = profile.products.find(p => p.bitmasks.includes(cls))
 		res.mode = product && product.mode || null
 		res.product = product && product.id || null
 	}
 
-	if (p.operator) res.operator = p.operator
+	if (p.operator) {
+		res.operator = {
+			type: 'operator',
+			id: slugg(p.operator.trim()),
+			name: p.operator.trim()
+		}
+	}
 
 	return res
 }

parse/journey-leg.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const parseWhen = require('./when')
-const parsePlatform = require('./platform')
 const findRemarks = require('./find-remarks')
 
 const clone = obj => Object.assign({}, obj)

parse/location.js

@@ -8,19 +8,27 @@ const ADDRESS = 'A'
 
 const leadingZeros = /^0+/
 
+const parseNr = nr => parseFloat(nr.slice(0, 2) + '.' + nr.slice(2))
+
 // todo: what is s.rRefL?
 const parseLocation = (ctx, l) => {
 	const {profile, opt} = ctx
 
 	const lid = parse(l.lid, {delimiter: '@'})
 	const res = {
 		type: 'location',
-		id: (l.extId || lid.L || lid.b || '').replace(leadingZeros, '') || null
-	}
-
-	if (l.crd) {
-		res.latitude = l.crd.y / 1000000
-		res.longitude = l.crd.x / 1000000
+		id: (l.extId || lid.L || lid.b || '').replace(leadingZeros, '') || null,
+
+		latitude: (
+			l.crd && 'number' === typeof l.crd.y
+			? parseNr(l.crd.y + '')
+			: (lid.Y ? parseNr(lid.Y) : null)
+		),
+		longitude: (
+			l.crd && 'number' === typeof l.crd.x
+			? parseNr(l.crd.x + '')
+			: (lid.X ? parseNr(lid.X) : null)
+		),
 	}
 
 	if (l.type === STATION) {

parse/stopover.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const parseWhen = require('./when')
-const parsePlatform = require('./platform')
 const findRemarks = require('./find-remarks')
 
 const parseStopover = (ctx, st, date) => { // st = raw stopover

rest-exe-example.js

@@ -26,11 +26,11 @@ const berlinYorckstrS1 = '8089051'
 const frankfurtHbf = '8000105'
 const somewhereInBerlin = {type: 'location', address: 'foo', latitude: 52.51072, longitude: 13.37793}
 
-// journeys('8000150', berlinOstkreuz, {
-// 	results: 3,
-// 	stopovers: true,
-// 	remarks: true
-// })
+journeys('8000150', berlinOstkreuz, {
+	results: 3,
+	stopovers: true,
+	remarks: true
+})
 // .then(journeys => journeys.flatMap(j => [...j.legs, '---']))
 // .then(([journey]) => journey.legs.map(l => l.tripId).find(tripId => !!tripId))
 // .then(trip)