deal with some todos, add more

format/address.js

@@ -3,8 +3,9 @@
 const formatCoord = require('./coord')
 
 const formatAddress = (a) => {
-	// todo: type-checking, better error msgs
+	if (!a.type !== 'location' || !a.latitude || !a.longitude || !a.address) {
-	if (!a.latitude || !a.longitude || !a.name) throw new Error('invalid address.')
+		throw new Error('invalid address')
+	}
 
 	return {
 		type: 'A',

format/poi.js

@@ -3,8 +3,9 @@
 const formatCoord = require('./coord')
 
 const formatPoi = (p) => {
-	// todo: type-checking, better error msgs
+	if (!p.type !== 'location' || !p.latitude || !p.longitude || !p.id || !p.name) {
-	if (!p.latitude || !p.longitude || !p.id || !p.name) throw new Error('invalid poi.')
+		throw new Error('invalid POI')
+	}
 
 	return {
 		type: 'P',

p/db/index.js

@@ -42,7 +42,7 @@ const transformJourneysQuery = (query, opt) => {
 	if (opt.bike) filters.push(bike)
 
 	query.trfReq = {
-		jnyCl: 2, // todo
+		jnyCl: opt.firstClass === true ? 1 : 2,
 		tvlrProf: [{
 			type: 'E',
 			redtnCard: opt.loyaltyCard

parse/journey.js

@@ -11,7 +11,6 @@ const createParseJourney = (profile, stations, lines, remarks) => {
 	// todo: c.dep.dProgType, c.arr.dProgType
 	// todo: c.conSubscr
 	// todo: c.trfRes x vbb-parse-ticket
-	// todo: use computed information from part
 	const parseJourney = (j) => {
 		const parts = j.secL.map(part => parsePart(j, part))
 		const res = {

test/db.js

@@ -16,7 +16,7 @@ const {
 	assertValidLocation,
 	assertValidLine,
 	assertValidStopover,
-	when, isValidWhen // todo: timezone
+	when, isValidWhen
 } = require('./util.js')
 
 const assertValidStationProducts = (t, p) => {

test/util.js

@@ -89,8 +89,10 @@ const hour = 60 * 60 * 1000
 const week = 7 * 24 * hour
 
 // next Monday 10 am
-const dt = DateTime.local().startOf('week').plus({weeks: 1, hours: 10})
+const when = DateTime.fromMillis(Date.now(), {
-const when = new Date(dt.toISO())
+	zone: 'Europe/Berlin',
+	locale: 'de-DE'
+}).startOf('week').plus({weeks: 1, hours: 10}).toJSDate()
 const isValidWhen = (w) => {
 	const ts = +new Date(w)
 	if (Number.isNaN(ts)) return false

test/vbb.js

@@ -19,7 +19,7 @@ const {
 	assertValidLine: _assertValidLine,
 	assertValidStopover,
 	hour, when,
-	assertValidWhen, // todo: timezone
+	assertValidWhen,
 	assertValidTicket
 } = require('./util')