Update HSL

Update hslayers-ng @ 1.23.0
Update JS files and webpack config accordingly

package-lock.json

@@ -3588,6 +3588,11 @@
         "stream-shift": "^1.0.0"
       }
     },
+    "dynamic-pub-path-plugin": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/dynamic-pub-path-plugin/-/dynamic-pub-path-plugin-0.0.4.tgz",
+      "integrity": "sha512-Kq2GDgkyl/2V+8mp14ouDIgKVXv+CbgvOJUcDIrg/uZovifDDk3KVH2NAz3h+ap/786X3fkjP79Bog0Bmgs13g=="
+    },
     "ecstatic": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz",
@@ -5254,9 +5259,9 @@
       "dev": true
     },
     "hslayers-ng": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/hslayers-ng/-/hslayers-ng-1.20.2.tgz",
-      "integrity": "sha512-Fck6MWK2ohR/LyND6tSiCec/nQQ/ksh4DyiyTr32pUw0NoMz49s7LA0dfJywGCH3Mr6zndGlV4AhoYD1Eab9RQ==",
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/hslayers-ng/-/hslayers-ng-1.23.0.tgz",
+      "integrity": "sha512-FmaLQHLqcV4IKOO1/VtubrwohW7/tPsVyw0IZ5SYJQqfg9RwfSWaztux6I9ERUNn2COjiQ8HFgjLIdHseSjmoA==",
       "requires": {
         "angular": "^1.7.9",
         "angular-animate": "^1.7.9",
@@ -5277,6 +5282,7 @@
         "bootstrap": ">=4.4.1",
         "clipboard": "^2.0.4",
         "cors-anywhere": "^0.4.1",
+        "dynamic-pub-path-plugin": "0.0.4",
         "gyronorm": "^2.0.6",
         "hammerjs": "^2.0.8",
         "hoek": "6.1.3",
@@ -5293,7 +5299,6 @@
         "ol-popup": "^4.0.0",
         "ol-popup-umd": "^1.3.1",
         "proj4": "^2.6.0",
-        "requirejs": "^2.3.6",
         "tinycolor2": "^1.4.1",
         "ttf2eot": "^2.0.0"
       }
@@ -6686,9 +6691,9 @@
       }
     },
     "moment": {
-      "version": "2.25.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz",
-      "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz",
+      "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="
     },
     "moment-interval": {
       "version": "0.2.1",
@@ -8051,9 +8056,9 @@
       "dev": true
     },
     "proj4": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.6.1.tgz",
-      "integrity": "sha512-RP5EcrfrLcARy+Zjjz1wIeqZzZdPtQNl685asHcwdU/MQ/dvydmf1XWM4mgok6wPaNsXZ8IFrM4qadO3g46PiQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.6.2.tgz",
+      "integrity": "sha512-Pn0+HZtXb4JzuN8RR0VM7yyseegiYHbXkF+2FOdGpzRojcZ1BTjWxOh7qfp2vH0EyLu8pvcrhLxidwzgyUy/Gw==",
       "requires": {
         "mgrs": "1.0.0",
         "wkt-parser": "^1.2.4"
@@ -8525,11 +8530,6 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
-    "requirejs": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
-      "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",

package.json

@@ -25,7 +25,7 @@
   "license": "MIT",
   "dependencies": {
     "csvtojson": "^2.0.10",
-    "hslayers-ng": "^1.20.2",
+    "hslayers-ng": "^1.23.0",
     "http-server": "^0.12.3"
   },
   "devDependencies": {

src/adjuster/adjuster.component.js

@@ -1,6 +1,6 @@
 export default {
   template: require('./adjuster.directive.html'),
-  controller: ['$scope', 'hs.map.service', 'Core', 'config', 'pra.adjuster.service', 'hs.utils.service',
+  controller: ['$scope', 'HsMapService', 'HsCore', 'HsConfig', 'pra.adjuster.service', 'HsUtilsService',
     function ($scope, OlMap, Core, config, adjusterService, utils) {
       $scope.loading = false;
       $scope.utils = utils;

src/adjuster/adjuster.service.js

@@ -1,7 +1,7 @@
 // import attractivity from '../Attractivity.json';
 import nuts from '../nuts';
 
-export default ['Core', 'hs.utils.service', '$rootScope', '$http',
+export default ['HsCore', 'HsUtilsService', '$rootScope', '$http',
   function (Core, utils, $rootScope, $http) {
     const me = {
       factors: [

src/app.js

@@ -34,7 +34,7 @@ const module = angular.module('hs', [
   'pra.adjuster'
 ]);
 
-module.directive('hs', ['config', 'Core', function (config, Core) {
+module.directive('hs', ['HsConfig', 'HsCore', function (config, Core) {
   return {
     template: Core.hslayersNgTemplate,
     /* link: function (scope, element) {
@@ -104,7 +104,7 @@ const nuts3Layer = new VectorLayer({
 nuts3Layer.set('hoveredKeys', ['NUTS_NAME', 'totalForHumans', 'Social & Human', 'Anthropic', 'Institutional', 'Economical', 'Natural', 'Cultural']);
 nuts3Layer.set('hoveredKeysTranslations', { NUTS_NAME: 'Name', totalForHumans: 'Calculated score' });
 
-module.value('config', {
+module.value('HsConfig', {
   proxyPrefix: '../8085/',
   default_layers: [
     new Tile({
@@ -150,7 +150,7 @@ module.value('config', {
   sizeMode: 'fullscreen'
 });
 
-module.controller('Main', ['$scope', 'Core', '$compile', 'hs.layout.service', 'pra.adjuster.service',
+module.controller('Main', ['$scope', 'HsCore', '$compile', 'HsLayoutService', 'pra.adjuster.service',
   function ($scope, Core, $compile, layoutService, adjusterService) {
     $scope.Core = Core;
     $scope.panelVisible = layoutService.panelVisible;

webpack.common.js

@@ -48,7 +48,7 @@ module.exports = {
       // or commented with /**@ngInject */
       {
         test: /\.js$/,
-        exclude: /node_modules/,
+        exclude: /node_modules\/(?!(hslayers-ng)\/).*/,
         use: [
           {
             loader: 'babel-loader',