EU: Use up-to-date datasets

index.js

@@ -46,7 +46,7 @@ app.get('/', (req, res) => {
    Must be called after the CSV data has changed */
 app.get('/refresh', async (req, res, next) => {
   try {
-    _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
+    _datasetsEU = await nutsData.loadDatasets(_dataEuFilePath)
     _datasetsCZ = await nutsData.loadDatasets(_dataCzFilePath)
     //console.log('Datasets loaded succesfully');
     _ruralDataEU = await nutsData.loadRuralData(_dataEuFilePath)
@@ -69,7 +69,7 @@ app.get('/:aoi?/datasets/', async (req, res, next) => {
 app.get('/:aoi?/scores/:nuts', async (req, res, next) => {
   if (!_datasetsEU) { // datasets must be loaded prior to data loading
     try {
-      _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
+      _datasetsEU = await nutsData.loadDatasets(_dataEuFilePath)
     } catch (e) {
       res.send(e.toString() || e)
     }
@@ -197,10 +197,11 @@ app.get('/ontology/', async (req, res, next) => {
   helpers.formatResponse(onto, req, res)
 });
 
+//FIXME: use ontology to read datasets metadata // CURRENTLY BROKEN
 app.get('/georeport/:nuts', async (req, res, next) => {
   if (!_datasetsEU) { // datasets must be loaded prior to data loading
     try {
-      _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
+      _datasetsEU = await nutsData.loadDatasets(_dataEuFilePath)
     } catch (e) {
       res.send(e.toString() || e)
     }
@@ -236,6 +237,7 @@ function renderPugReport(nuts, req, res) {
         pilot: helpers.getPilotRegion(nuts, pilots)
       };
 
+      //FIXME: don't imput _datasets here but already pre-processed metadata object
       res.render('nuts', { region: region, datasets: _datasetsEU });
       found = true;
     }
@@ -357,7 +359,7 @@ async function loadDatasetsIfNeeded(req, res, aoi) {
         _datasetsAfrica = await nutsData.loadDatasets(_dataAfricaFilePath)
         datasets = _datasetsAfrica
       } else {
-        _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
+        _datasetsEU = await nutsData.loadDatasets(_dataEuFilePath)
         datasets = _datasetsEU
       }
     } catch (e) {