Merge branch 'fix-popup' of luccerny/senslog-dashboard into develop

package-lock.json

@@ -34,7 +34,7 @@
         "geostyler-sld-parser": "^3.0.1",
         "geostyler-style": "^5.0.0",
         "geotiff": "^1.0.8",
-        "hslayers-ng": "8.1.0",
+        "hslayers-ng": "c:/Projects/hslayers-ng/dist/hslayers/",
         "jquery": "^3.6.0",
         "lodash": "^4.17.21",
         "moment": "^2.29.1",
@@ -86,6 +86,49 @@
         "typescript": "4.4.4"
       }
     },
+    "../hslayers-ng/dist/hslayers": {
+      "name": "hslayers-ng",
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/cdk": "^13.0.0",
+        "@angular/common": "^13.0.0",
+        "@angular/compiler": "^13.0.0",
+        "@angular/core": "^13.0.0",
+        "@angular/forms": "^13.0.0",
+        "@angular/localize": "^13.0.0",
+        "@angular/platform-browser-dynamic": "^13.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^11.0.0, ^12.0.0",
+        "@ngx-translate/core": "^14.0.0",
+        "@ngx-translate/http-loader": "^7.0.0",
+        "@popperjs/core": "^2.0.0",
+        "bootstrap": "^5.0.0",
+        "dayjs": "^1.0.0",
+        "deepmerge": "^4.0.0",
+        "geostyler-legend": "^2.1.0",
+        "geostyler-openlayers-parser": "^3.0.0",
+        "geostyler-qgis-parser": "^1.0.0",
+        "geostyler-sld-parser": "^3.0.0",
+        "geostyler-style": "^5.0.0",
+        "jszip": "^3.7.1",
+        "ngx-color": "^7.0.0",
+        "ngx-cookie-service": "^13.0.0",
+        "ol": "~6.9.0, || >=6.14.1",
+        "ol-popup": "^4.0.0",
+        "polygon-clipping": "^0.15.3",
+        "polygon-splitter": "^0.0.5",
+        "proj4": "^2.6.0",
+        "queue": "^6.0.0",
+        "resumablejs": "^1.1.0",
+        "rxjs": "^7.0.0",
+        "share-api-polyfill": "^1.0.0",
+        "xml-js": "^1.0.0",
+        "zone.js": "^0.10.2 || ^0.11.3"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-1.1.1.tgz",
@@ -6330,7 +6373,8 @@
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -9277,46 +9321,8 @@
       }
     },
     "node_modules/hslayers-ng": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/hslayers-ng/-/hslayers-ng-8.1.0.tgz",
-      "integrity": "sha512-YTMnBOOb+r+CaY8RKKlSK+paC9bT3ajwflPeAfpDJMRrF8HZTpfVdG61tSeeO0VvoTH90XpeqbsJqEd2klgLYQ==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/cdk": "^13.0.0",
-        "@angular/common": "^13.0.0",
-        "@angular/compiler": "^13.0.0",
-        "@angular/core": "^13.0.0",
-        "@angular/forms": "^13.0.0",
-        "@angular/localize": "^13.0.0",
-        "@angular/platform-browser-dynamic": "^13.0.0",
-        "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-        "@ngx-translate/core": "^14.0.0",
-        "@ngx-translate/http-loader": "^7.0.0",
-        "bootstrap": "^5.0.0",
-        "dayjs": "^1.0.0",
-        "deepmerge": "^4.0.0",
-        "geostyler-legend": "^2.1.0",
-        "geostyler-openlayers-parser": "^3.0.0",
-        "geostyler-qgis-parser": "^1.0.0",
-        "geostyler-sld-parser": "^3.0.0",
-        "geostyler-style": "^5.0.0",
-        "jszip": "^3.7.1",
-        "ngx-color": "^7.0.0",
-        "ngx-cookie-service": "^13.0.0",
-        "ol": "~6.9.0",
-        "ol-popup": "^4.0.0",
-        "polygon-clipping": "^0.15.3",
-        "polygon-splitter": "^0.0.5",
-        "proj4": "^2.6.0",
-        "queue": "^6.0.0",
-        "resumablejs": "^1.1.0",
-        "rxjs": "^7.0.0",
-        "share-api-polyfill": "^1.0.0",
-        "xml-js": "^1.0.0",
-        "zone.js": "^0.10.2 || ^0.11.3"
-      }
+      "resolved": "../hslayers-ng/dist/hslayers",
+      "link": true
     },
     "node_modules/html-entities": {
       "version": "2.3.3",
@@ -9541,7 +9547,8 @@
     "node_modules/immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
     },
     "node_modules/immutable": {
       "version": "4.0.0",
@@ -9996,7 +10003,8 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "node_modules/isbinaryfile": {
       "version": "4.0.10",
@@ -10531,6 +10539,7 @@
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
       "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+      "dev": true,
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -10541,7 +10550,8 @@
     "node_modules/jszip/node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
     },
     "node_modules/karma": {
       "version": "6.3.17",
@@ -10899,6 +10909,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -13321,7 +13332,8 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "node_modules/proj4": {
       "version": "2.8.0",
@@ -13780,6 +13792,7 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -13794,6 +13807,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -14593,6 +14607,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15780,7 +15795,8 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
@@ -21968,7 +21984,8 @@
     "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
     "cors": {
       "version": "2.8.5",
@@ -24197,9 +24214,7 @@
       }
     },
     "hslayers-ng": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/hslayers-ng/-/hslayers-ng-8.1.0.tgz",
-      "integrity": "sha512-YTMnBOOb+r+CaY8RKKlSK+paC9bT3ajwflPeAfpDJMRrF8HZTpfVdG61tSeeO0VvoTH90XpeqbsJqEd2klgLYQ==",
+      "version": "file:../hslayers-ng/dist/hslayers",
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -24363,7 +24378,8 @@
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
     },
     "immutable": {
       "version": "4.0.0",
@@ -24690,7 +24706,8 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isbinaryfile": {
       "version": "4.0.10",
@@ -25108,6 +25125,7 @@
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
       "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+      "dev": true,
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -25118,7 +25136,8 @@
         "pako": {
           "version": "1.0.11",
           "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+          "dev": true
         }
       }
     },
@@ -25394,6 +25413,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
       "requires": {
         "immediate": "~3.0.5"
       }
@@ -27199,7 +27219,8 @@
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "proj4": {
       "version": "2.8.0",
@@ -27563,6 +27584,7 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -27577,6 +27599,7 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -28213,7 +28236,8 @@
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
     },
     "setprototypeof": {
       "version": "1.2.0",
@@ -29092,7 +29116,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "utils-merge": {
       "version": "1.0.1",

package.json

@@ -25,7 +25,7 @@
     "@fortawesome/angular-fontawesome": "^0.10.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
     "bootstrap": "^5.0.0",
@@ -38,7 +38,7 @@
     "geostyler-sld-parser": "^3.0.1",
     "geostyler-style": "^5.0.0",
     "geotiff": "^1.0.8",
-    "hslayers-ng": "8.1.0",
+    "hslayers-ng": "9.0.0",
     "jquery": "^3.6.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",

src/app/dashboard/components/map/map.component.ts

@@ -84,7 +84,7 @@ export class MapComponent implements OnInit, OnDestroy, OnChanges {
       ],
       //default_layers: this.loadLayers(),
       componentsEnabled: {
-        sidebar: false,
+        sidebar: true,
         toolbar: false,
         guiOverlay: true,
         drawToolbar: false,
@@ -98,7 +98,7 @@ export class MapComponent implements OnInit, OnDestroy, OnChanges {
         basemapGallery: true
       },
       panelsEnabled: {
-        info: false, //(true by default),
+        info: true, //(true by default),
         layermanager: false
       },
       sidebarPosition: 'invisible',