Skip to content

Commit 8599b31

Browse files
derhuerstderhuerst
committed
WIP
1 parent 95862da commit 8599b31

File tree

78 files changed

+386
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+386
-267
lines changed

‎app/config.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import htmlParser from 'htm-to-json';
2-
import defaultConfig from './configurations/config.default';
3-
import configMerger from './util/configMerger';
4-
import { boundWithMinimumAreaSimple } from './util/geo-utils';
2+
import defaultConfig from './configurations/config.default.js';
3+
import configMerger from './util/configMerger.js';
4+
import { boundWithMinimumAreaSimple } from './util/geo-utils.js';
55

66
const configs = {}; // cache merged configs for speed
77
const themeMap = {};
@@ -61,14 +61,13 @@ function addMetaData(config) {
6161
});
6262
}
6363

64-
export function getNamedConfiguration(configName) {
64+
export async function getNamedConfiguration(configName) {
6565
if (!configs[configName]) {
6666
let additionalConfig;
6767

6868
if (configName !== 'default') {
6969
// eslint-disable-next-line global-require, import/no-dynamic-require
70-
additionalConfig = require(`./configurations/config.${configName}`)
71-
.default;
70+
additionalConfig = await import (`./configurations/config.${configName}.js`).default;
7271
}
7372

7473
// use cached baseConfig that is potentially patched in server start up

‎app/configurations/config.default.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable prefer-template */
2-
import safeJsonParse from '../util/safeJsonParser';
3-
import { BIKEAVL_WITHMAX } from '../util/citybikes';
2+
import safeJsonParse from '../util/safeJsonParser.js';
3+
import { BIKEAVL_WITHMAX } from '../util/citybikes.js';
4+
import realtime from './realtimeUtils.js';
45

56
const CONFIG = process.env.CONFIG || 'default';
67
const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
@@ -27,7 +28,6 @@ const PORT = process.env.PORT || 8080;
2728
const APP_DESCRIPTION = 'Digitransit journey planning UI';
2829
const OTP_TIMEOUT = process.env.OTP_TIMEOUT || 12000;
2930
const YEAR = 1900 + new Date().getYear();
30-
const realtime = require('./realtimeUtils').default;
3131

3232
const REALTIME_PATCH = safeJsonParse(process.env.REALTIME_PATCH) || {};
3333

‎app/configurations/config.hameenlinna.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
2+
import configMerger from '../util/configMerger.js';
33

44
const CONFIG = 'hameenlinna';
55
const APP_TITLE = 'reittiopas.hameenlinna.fi';
66
const APP_DESCRIPTION = '';
77

8-
const walttiConfig = require('./config.waltti').default;
8+
const walttiConfig = require('./config.waltti.js').default;
99

1010
export default configMerger(walttiConfig, {
1111
CONFIG,

‎app/configurations/config.hsl.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable prefer-template */
2-
import { BIKEAVL_WITHMAX } from '../util/citybikes';
2+
import { BIKEAVL_WITHMAX } from '../util/citybikes.js';
33

44
const CONFIG = 'hsl';
55
const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
@@ -9,8 +9,10 @@ const MAP_URL =
99
const POI_MAP_PREFIX = `${MAP_URL}/map/v3/hsl`;
1010
const APP_DESCRIPTION = 'Helsingin seudun liikenteen Reittiopas.';
1111

12-
const HSLTimetables = require('./timetableConfigUtils').default.HSL;
13-
const HSLParkAndRideUtils = require('../util/ParkAndRideUtils').default.HSL;
12+
import _timetables from './timetableConfigUtils.js';
13+
const { HSL: HSLTimetables } = _timetables;
14+
import _parkAndRideUtils from '../util/ParkAndRideUtils.js';
15+
const { HSL: HSLParkAndRideUtils } = _parkAndRideUtils;
1416

1517
const rootLink = process.env.ROOTLINK || 'https://test.hslfi.hsldev.com';
1618
const BANNER_URL = 'https://content.hsl.fi/api/v1/banners?site=JourneyPlanner';

‎app/configurations/config.joensuu.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
2+
import configMerger from '../util/configMerger.js';
33

44
const CONFIG = 'joensuu';
55
const APP_TITLE = 'Joensuun reittiopas';
66
const APP_DESCRIPTION = 'Joensuun uusi reittiopas';
77

8-
const walttiConfig = require('./config.waltti').default;
8+
const walttiConfig = require('./config.waltti.js').default;
99

1010
export default configMerger(walttiConfig, {
1111
CONFIG,

‎app/configurations/config.jyvaskyla.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
2+
import configMerger from '../util/configMerger.js';
33

44
const CONFIG = 'jyvaskyla';
55
const APP_TITLE = 'Reittiopas Jyväskylä';
66
const APP_DESCRIPTION = 'Jyväskylän uusi reittiopas';
77

8-
const walttiConfig = require('./config.waltti').default;
8+
const walttiConfig = require('./config.waltti.js').default;
99

1010
const minLat = 61.835318;
1111
const maxLat = 62.603473;

‎app/configurations/config.kotka.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
3-
import { BIKEAVL_WITHMAX } from '../util/citybikes';
2+
import configMerger from '../util/configMerger.js';
3+
import { BIKEAVL_WITHMAX } from '../util/citybikes.js';
44

55
const CONFIG = 'kotka';
66
const APP_TITLE = 'Kotkan seudun reittiopas';
77
const APP_DESCRIPTION = 'Kotkan seudun reittiopas';
88

9-
const walttiConfig = require('./config.waltti').default;
9+
const walttiConfig = require('./config.waltti.js').default;
1010

1111
const minLat = 60.423693;
1212
const maxLat = 60.688566;

‎app/configurations/config.kouvola.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
3-
import { BIKEAVL_WITHMAX } from '../util/citybikes';
2+
import configMerger from '../util/configMerger.js';
3+
import { BIKEAVL_WITHMAX } from '../util/citybikes.js';
44

55
const CONFIG = 'kouvola';
66
const APP_TITLE = 'Kouvolan reittiopas';
77
const APP_DESCRIPTION = 'Kouvolan reittiopas';
88

9-
const walttiConfig = require('./config.waltti').default;
9+
const walttiConfig = require('./config.waltti.js').default;
1010

1111
const minLat = 60.574886232976134;
1212
const maxLat = 61.2909051236272;

‎app/configurations/config.kuopio.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
3-
import { BIKEAVL_BIKES } from '../util/citybikes';
2+
import configMerger from '../util/configMerger.js';
3+
import { BIKEAVL_BIKES } from '../util/citybikes.js';
44

55
const CONFIG = 'kuopio';
66
const APP_TITLE = 'Reittiopas Kuopio';
77
const APP_DESCRIPTION = 'Reittiopas Kuopio';
88

9-
const walttiConfig = require('./config.waltti').default;
9+
const walttiConfig = require('./config.waltti.js').default;
1010

1111
export default configMerger(walttiConfig, {
1212
CONFIG,

‎app/configurations/config.lahti.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-disable prefer-template */
2-
import configMerger from '../util/configMerger';
2+
import configMerger from '../util/configMerger.js';
33

44
const CONFIG = 'lahti';
55
const APP_TITLE = 'LSL reittiopas';
66
const APP_DESCRIPTION = 'Lahden seudun liikenteen reittiopas';
77

8-
const walttiConfig = require('./config.waltti').default;
8+
const walttiConfig = require('./config.waltti.js').default;
99

1010
const minLat = 60.692506;
1111
const maxLat = 61.790694;

0 commit comments

Comments
 (0)