From 6c5409fbce53d7b841588ab2880133d9a3b00257 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Fri, 30 Aug 2019 19:19:31 +0200 Subject: [PATCH] extract parseIcon from parseCommon --- lib/default-profile.js | 6 ++++++ parse/common.js | 13 +------------ parse/icon.js | 13 +++++++++++++ 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 parse/icon.js diff --git a/lib/default-profile.js b/lib/default-profile.js index 767d08ca..ad054497 100644 --- a/lib/default-profile.js +++ b/lib/default-profile.js @@ -1,6 +1,9 @@ 'use strict' const parseDateTime = require('../parse/date-time') +const parsePlatform = require('../parse/platform') +const parseIcon = require('../parse/icon') +const parseWhen = require('../parse/when') const parseDeparture = require('../parse/departure') const parseArrival = require('../parse/arrival') const parseJourneyLeg = require('../parse/journey-leg') @@ -40,6 +43,9 @@ const defaultProfile = { transformJourneysQuery: id, parseDateTime, + parsePlatform, + parseIcon, + parseWhen, parseDeparture, parseArrival, parseJourneyLeg, diff --git a/parse/common.js b/parse/common.js index eaa83326..11c5967f 100644 --- a/parse/common.js +++ b/parse/common.js @@ -3,17 +3,6 @@ const get = require('lodash/get') const findInTree = require('../lib/find-in-tree') -// todo: move to separate file -const parseIcon = (i) => { - const res = { - type: i.res || null, - title: i.text || null - } - if (i.fg) res.fgColor = i.fg - if (i.bg) res.bgColor = i.bg - return res -} - const parseCommonData = (profile, opt, res) => { const c = res.common || {} @@ -27,7 +16,7 @@ const parseCommonData = (profile, opt, res) => { res.icons = [] if (Array.isArray(c.icoL)) { - res.icons = c.icoL.map(parseIcon) + res.icons = c.icoL.map(icon => profile.parseIcon(profile, icon)) findInTree(res, '**.icoX', (idx, parent) => { if ('number' === typeof idx) parent.icon = res.icons[idx] }) diff --git a/parse/icon.js b/parse/icon.js new file mode 100644 index 00000000..939e74f2 --- /dev/null +++ b/parse/icon.js @@ -0,0 +1,13 @@ +'use strict' + +const parseIcon = (profile, i) => { + const res = { + type: i.res || null, + title: i.text || null + } + if (i.fg) res.fgColor = i.fg + if (i.bg) res.bgColor = i.bg + return res +} + +module.exports = parseIcon