Use even more consistent naming

index.js

@@ -17,9 +17,9 @@ const _clusteringEuModifiedFilePath = 'data/clustering/input_modified.csv';
 const _clusteringCzModifiedFilePath = 'data/cz/input_modified.csv';
 const _clustersEuFilePath = 'data/clustering/out_file.csv';
 const _clustersCzFilePath = 'data/cz/out_file_cz.csv';
-var _datasetsEu = undefined;
+var _datasetsEU = undefined;
 var _datasetsCZ = undefined;
-var _ruralDataEu = undefined;
+var _ruralDataEU = undefined;
 var _ruralDataCZ = undefined;
 
 // parse incoming POST requests body to JSON
@@ -40,10 +40,10 @@ 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(_datasetsEuFilePath)
     _datasetsCZ = await nutsData.loadDatasets(_datasetsCzFilePath)
     //console.log('Datasets loaded succesfully');
-    _ruralDataEu = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEu)
+    _ruralDataEU = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEU)
     _ruralDataCZ = await nutsData.loadRuralData(_datasetsCzFilePath, _datasetsCZ)
     //console.log('Rural data loaded succesfully');
   } catch (e) {
@@ -62,16 +62,16 @@ app.get('/:aoi?/datasets/', async (req, res, next) => {
 
 /* Returns attractivity data for the region with ID equal to the 'nuts' parameter */
 app.get('/:aoi?/scores/:nuts', async (req, res, next) => {
-  if (!_datasetsEu) { // datasets must be loaded prior to data loading
+  if (!_datasetsEU) { // datasets must be loaded prior to data loading
     try {
-      _datasetsEu = await nutsData.loadDatasets(_datasetsEuFilePath)
+      _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
     } catch (e) {
       res.send(e.toString() || e)
     }
   }
-  if (!_ruralDataEu) {
+  if (!_ruralDataEU) {
     try {
-      _ruralDataEu = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEu)
+      _ruralDataEU = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEU)
     } catch (e) {
       res.send(e.toString() || e)
     }
@@ -160,16 +160,16 @@ app.post('/:aoi?/clusters/', async (req, res, next) => {
 });
 
 app.get('/georeport/:nuts', async (req, res, next) => {
-  if (!_datasetsEu) { // datasets must be loaded prior to data loading
+  if (!_datasetsEU) { // datasets must be loaded prior to data loading
     try {
-      _datasetsEu = await nutsData.loadDatasets(_datasetsEuFilePath)
+      _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
     } catch (e) {
       res.send(e.toString() || e)
     }
   }
-  if (!_ruralDataEu) {
+  if (!_ruralDataEU) {
     try {
-      _ruralDataEu = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEu)
+      _ruralDataEU = await nutsData.loadRuralData(_dataEuFilePath, _datasetsEU)
     } catch (e) {
       res.send(e.toString() || e)
     }
@@ -184,7 +184,7 @@ app.listen(3000, () => console.log('Rural attractivity WS listening on port 3000
 function renderPugReport(nuts, req, res) {
   let found = false;
 
-  _ruralDataEu.forEach(region => {
+  _ruralDataEU.forEach(region => {
     if (region.nuts == nuts) {
 
       let nutsGeoJson = helpers.loadJSON('static/NUTS3_4326.json');
@@ -198,7 +198,7 @@ function renderPugReport(nuts, req, res) {
         pilot: helpers.getPilotRegion(nuts, pilots)
       };
 
-      res.render('nuts', { region: region, datasets: _datasetsEu });
+      res.render('nuts', { region: region, datasets: _datasetsEU });
       found = true;
     }
   });
@@ -209,7 +209,7 @@ function renderPugReport(nuts, req, res) {
 
 function returnAllScores(req, res, aoi = 'eu') {
   let resData = []
-  const ruralData = aoi == 'cz' ? _ruralDataCZ : _ruralDataEu
+  const ruralData = aoi == 'cz' ? _ruralDataCZ : _ruralDataEU
   const regionIdString = aoi == 'cz' ? 'lau2' : 'nuts'
   ruralData.forEach(region => {
     //var region = _ruralData[0];
@@ -238,7 +238,7 @@ function returnRegionScores(nuts, req, res) {
   var found = false;
   res.header("Content-Type", 'application/json');
 
-  _ruralDataEu.forEach(region => {
+  _ruralDataEU.forEach(region => {
     if (region.nuts == nuts) {
       helpers.formatResponse(region, req, res);
       found = true;
@@ -276,15 +276,15 @@ function handleRCall(req, res, aoi = 'eu') {
 }
 
 function loadDatasetsIfNeeded(req, res, aoi) {
-  let datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEu
+  let datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEU
   if (!datasets) {
     try {
       if (aoi == 'cz') {
         _datasetsCZ = await nutsData.loadDatasets(_datasetsCzFilePath)
         datasets = _datasetsCZ
       } else {
-        _datasetsEu = await nutsData.loadDatasets(_datasetsEuFilePath)
-        datasets = _datasetsEu
+        _datasetsEU = await nutsData.loadDatasets(_datasetsEuFilePath)
+        datasets = _datasetsEU
       }
     } catch (e) {
       res.send(e.toString() || e)
@@ -294,16 +294,16 @@ function loadDatasetsIfNeeded(req, res, aoi) {
 }
 
 function loadRuralDataIfNeeded(req, res, aoi) {
-  let ruralData = aoi == 'cz' ? _ruralDataCZ : _ruralDataEu
-  const datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEu
+  let ruralData = aoi == 'cz' ? _ruralDataCZ : _ruralDataEU
+  const datasets = aoi == 'cz' ? _datasetsCZ : _datasetsEU
   if (!ruralData) {
     try {
       if (aoi == 'cz') {
         _ruralDataCZ = await nutsData.loadRuralData(_dataCzFilePath, datasets)
         ruralData = _ruralDataCZ
       } else {
-        _ruralDataEu = await nutsData.loadRuralData(_dataEuFilePath, datasets)
-        ruralData = _ruralDataEu
+        _ruralDataEU = await nutsData.loadRuralData(_dataEuFilePath, datasets)
+        ruralData = _ruralDataEU
       }
     } catch (e) {
       res.send(e.toString() || e)