Fix async/await

index.js

@@ -56,7 +56,7 @@ app.get('/refresh', async (req, res, next) => {
 app.get('/:aoi?/datasets/', async (req, res, next) => {
   console.log('received datasets/ GET request')
   const aoi = req.params.aoi || 'eu'
-  const datasets = loadDatasetsIfNeeded(req, res, aoi)
+  const datasets = await loadDatasetsIfNeeded(req, res, aoi)
   helpers.formatResponse(datasets, req, res)
 });
 
@@ -83,8 +83,8 @@ app.get('/:aoi?/scores/:nuts', async (req, res, next) => {
 app.get('/:aoi?/scores', async (req, res, next) => {
   console.log('received scores/cz GET request')
   const aoi = req.params.aoi || 'eu'
-  loadDatasetsIfNeeded(req, res, aoi)
-  const ruralData = loadRuralDataIfNeeded(req, res, aoi)
+  await loadDatasetsIfNeeded(req, res, aoi)
+  const ruralData = await loadRuralDataIfNeeded(req, res, aoi)
   helpers.formatResponse(ruralData, req, res)
 });
 
@@ -94,8 +94,8 @@ app.post('/:aoi?/scores', async (req, res, next) => {
   console.log('received scores/ POST request')
   //console.log("query: " + JSON.stringify(req.body.factors, null, 4));
   const aoi = req.params.aoi || 'eu'
-  loadDatasetsIfNeeded(req, res, aoi)
-  loadRuralDataIfNeeded(req, res, aoi)
+  await loadDatasetsIfNeeded(req, res, aoi)
+  await loadRuralDataIfNeeded(req, res, aoi)
   returnAllScores(req, res, aoi)
 });
 
@@ -137,7 +137,7 @@ app.get('/:aoi?/clusters/', (req, res, next) => {
 */
 app.post('/:aoi?/clusters/', async (req, res, next) => {
   const aoi = req.params.aoi || 'eu'
-  const datasets = loadDatasetsIfNeeded(req, res, aoi)
+  const datasets = await loadDatasetsIfNeeded(req, res, aoi)
   const dataFilePath = aoi == 'cz' ? _clusteringCzInputFilePath : _dataEuFilePath
   const clusteringModifiedFilePath = aoi == 'cz' ? _clusteringCzModifiedFilePath : _clusteringEuModifiedFilePath
   const idString = aoi == 'cz' ? 'LAU2' : 'NUTS_ID'
@@ -275,7 +275,7 @@ function handleRCall(req, res, aoi = 'eu') {
   );
 }
 
-function loadDatasetsIfNeeded(req, res, aoi) {
+async function loadDatasetsIfNeeded(req, res, aoi) {
   let datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEU
   if (!datasets) {
     try {
@@ -293,7 +293,7 @@ function loadDatasetsIfNeeded(req, res, aoi) {
   return datasets
 }
 
-function loadRuralDataIfNeeded(req, res, aoi) {
+async function loadRuralDataIfNeeded(req, res, aoi) {
   let ruralData = aoi == 'cz' ? _ruralDataCZ : _ruralDataEU
   const datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEU
   if (!ruralData) {