Merge branch 'master' of https://github.com/leonardomathon/2IMV20

Author: jorgbekelaar

package-lock.json

@@ -1,13 +1,13 @@
 import * as d3 from 'd3';
-import countriesOfTheWorld from '../../datasets/countries-of-the-world.json';
+import countriesOfTheWorld from '../../../datasets/countries-of-the-world.json';
 
 // Import the necessary globe functions
 import {
     hoveredCountry,
     clickedCountry,
     setClickedCountry,
     resetClickedCountry,
-} from './webgl/globe/globe.js';
+} from '../webgl/globe/globe.js';
 
 // Variable that contains the svg frame
 var graph;

src/js/chart.js src/js/graphs/chart.jssrc/js/chart.js renamed to src/js/graphs/chart.js

@@ -24,9 +24,17 @@ import { isCountryDrawn } from './utils/geo.js';
 import { toggleSoblePass, toggleFilmPass } from './fx/postprocessing.js';
 
 // Import charts
-import { initBarChart, removeBarChart, updateBarChartData } from './chart.js';
-import { initScatter, countryFocusOff, countryFocusOn } from './scatter.js';
-import { initLineChart, removeLineChart } from './linechart';
+import {
+    initBarChart,
+    removeBarChart,
+    updateBarChartData,
+} from './graphs/chart.js';
+import {
+    initScatter,
+    countryFocusOff,
+    countryFocusOn,
+} from './graphs/scatter.js';
+import { initLineChart, removeLineChart } from './graphs/linechart';
 
 // Import data sets
 import worldHappiness from '../../datasets/world-happiness.json';
@@ -129,7 +137,7 @@ let renderingOptions = {
 // Object that holds the world happiness data from the selected year as yearWorldHappiness.data
 let yearWorldHappiness = {
     dataInteral: worldHappiness[yearSliderValue],
-    dataListener: function (val) { },
+    dataListener: function (val) {},
     set data(val) {
         this.dataInteral = val;
         this.dataListener(val);
@@ -240,14 +248,18 @@ searchMatch.addEventListener('click', function (e) {
     // Check if country has alpha 3
     if (fuzzySearch && isCountryDrawn(fuzzySearch.alpha3)) {
         console.log('test');
-        console.log('Fuzzy: ', fuzzySearch.name)
+        console.log('Fuzzy: ', fuzzySearch.name);
         searchedCountry.data = {
             id: fuzzySearch.alpha3,
             name: fuzzySearch.name,
             index: null,
         };
-        barChartPanel.setHeaderTitle(`Bar chart of ${hoveredCountry.data.name}`);
-        lineChartPanel.setHeaderTitle(`Line chart of ${hoveredCountry.data.name}`);
+        barChartPanel.setHeaderTitle(
+            `Bar chart of ${hoveredCountry.data.name}`
+        );
+        lineChartPanel.setHeaderTitle(
+            `Line chart of ${hoveredCountry.data.name}`
+        );
     } else {
         createErrorPanel(
             'Country not found',
@@ -276,13 +288,13 @@ hoveredCountry.registerListener(function (val) {
                 countriesOfTheWorld[hoveredCountry.data.id]['Population'];
             countryDensityTag.innerHTML =
                 countriesOfTheWorld[hoveredCountry.data.id][
-                'Pop. Density (per sq. mi.)'
+                    'Pop. Density (per sq. mi.)'
                 ];
             countryAreaTag.innerHTML =
                 countriesOfTheWorld[hoveredCountry.data.id]['Area (sq. mi.)'];
             countyGDPTag.innerHTML =
                 countriesOfTheWorld[hoveredCountry.data.id][
-                'GDP ($ per capita)'
+                    'GDP ($ per capita)'
                 ];
         }
     } else {

src/js/linechart.js src/js/graphs/linechart.jssrc/js/linechart.js renamed to src/js/graphs/linechart.js

@@ -1,7 +1,6 @@
 import { jsPanel } from 'jspanel4/es6module/jspanel.js';
 import 'jspanel4/es6module/extensions/hint/jspanel.hint.js';
 import 'jspanel4/es6module/extensions/modal/jspanel.modal.js';
-import { initChart } from '../chart.js';
 
 const panelTheme = {
     bgPanel: '#10224D',

src/js/scatter.js src/js/graphs/scatter.jssrc/js/scatter.js renamed to src/js/graphs/scatter.js

@@ -19,7 +19,6 @@ import { composer } from '../../fx/postprocessing.js';
 
 // Import texture file
 import { createWorldTexture, createCountryTexture } from '../texture.js';
-import { initChart } from '../../chart.js';
 
 let worldContainer = document.getElementById('worldContainer');
 worldContainer.addEventListener('dblclick', clickedOnCountry);