Merge branch 'develop' of jmacura/polirural-attractiveness-clustering into master

package.json

@@ -30,34 +30,34 @@
     "http-server": "^0.12.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.1",
+    "@babel/core": "^7.11.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "babel-loader": "^8.1.0",
     "babel-plugin-angularjs-annotate": "^0.10.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.6.0",
-    "eslint": "^7.6.0",
+    "eslint": "^7.10.0",
     "eslint-config-angular": "^0.5.0",
     "eslint-config-openlayers": "^14.0.0",
     "eslint-plugin-angular": "^4.0.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "extract-loader": "^5.1.0",
-    "file-loader": "^6.0.0",
-    "html-loader": "^1.1.0",
-    "html-webpack-plugin": "^4.3.0",
-    "mini-css-extract-plugin": "^0.9.0",
+    "file-loader": "^6.1.0",
+    "html-loader": "^1.3.1",
+    "html-webpack-plugin": "^4.5.0",
+    "mini-css-extract-plugin": "^0.11.3",
     "ng-cache-loader": "0.0.26",
     "npm-run-all": "^4.1.5",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "postcss": "^7.0.32",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "postcss": "^8.1.1",
     "postcss-prefix-selector": "^1.7.1",
-    "style-loader": "^1.2.1",
+    "style-loader": "^1.3.0",
     "url-loader": "^4.1.0",
-    "webpack": "^4.44.1",
+    "webpack": "^4.44.2",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^5.1.4"
   }
 }

src/adjuster/adjuster.service.js

@@ -44,6 +44,7 @@ export class AdjusterService {
       })
         .then((response) => {
           const clusterData = response.data.response;
+          console.log(clusterData);
           /*let max = 0;
         this.clusters.forEach((a) => {
           if (a.aggregate > max) {
@@ -62,6 +63,11 @@ export class AdjusterService {
             const featureData = clusterData.find(
               (item) => item['nuts_id'] === feature.get('NUTS_ID')
             );
+            if (!featureData) {
+              console.error(`No data for feature ${feature.get('NUTS_ID')}`);
+              console.log(feature);
+              return;
+            }
             Object.keys(featureData).forEach(function (key, index) {
               if (key !== 'nuts_id') {
                 feature.set(key, featureData[key]);

webpack.dev.js

@@ -7,7 +7,7 @@
  * - Allow Load css files (import './myCssFile.css') -> Css rules will be automatically added to index.html into a <style></style> tag.
  * - Allow to load fonts and images (import './myFont.eot'; import './someImage.jpg')
  */
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const common = require('./webpack.common');
 const path = require('path');
 const env = process.env;

webpack.prod.js

@@ -12,7 +12,7 @@
  * - Allow to load html angularjs partials (i.e all html files under src folder) as url ->
  *
  */
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const common = require('./webpack.common');
 const path = require('path');
 const webpack = require('webpack');