From 9df90485dc31946c06042cb785a8bd748e9c9f5c Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Wed, 3 Jul 2024 08:01:22 +0200 Subject: [PATCH 01/48] Feat: add draw circle --- .../arlas-wui-root/arlas-wui-root.component.html | 3 +++ .../arlas-wui-root/arlas-wui-root.component.ts | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index c7ab2eff..3dd36dc0 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -66,6 +66,9 @@
+
+ +
diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index b0bf073b..4f03aad9 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -608,6 +608,9 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // eslint-disable-next-line max-len this.iconRegistry.addSvgIconLiteral('draw_polygon', this.domSanitizer.bypassSecurityTrustHtml(' image/svg+xml ')); + // eslint-disable-next-line max-len + this.iconRegistry.addSvgIconLiteral('draw_circle', this.domSanitizer.bypassSecurityTrustHtml('')); + // eslint-disable-next-line max-len this.iconRegistry.addSvgIconLiteral('remove_polygon', this.domSanitizer.bypassSecurityTrustHtml(' image/svg+xml ')); @@ -616,6 +619,8 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // eslint-disable-next-line max-len this.iconRegistry.addSvgIconLiteral('map_settings', this.domSanitizer.bypassSecurityTrustHtml('')); + + } public isElementInViewport(el) { @@ -1238,6 +1243,10 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } } + public drawCircle() { + this.mapglComponent.switchToDrawMode('draw_radius_circle', { isFixedRadius: false, steps: 12 }); + } + protected goToLocation(event: GeocodingResult) { const bbox = this.visualizeService.getBbox(event.geojson); this.visualizeService.handleGeojsonPreview(event.geojson); From 1d36b86c9deed56834512d5c4fc504151c05287f Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Tue, 16 Jul 2024 15:22:45 +0200 Subject: [PATCH 02/48] build(deps): bump toolkit to 25.1.1 --- package-lock.json | 529 ++++++++++++------ package.json | 2 +- .../arlas-wui-root.component.ts | 30 +- 3 files changed, 374 insertions(+), 187 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11bc0320..0d0d4ee8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~25.0.3", + "arlas-wui-toolkit": "~25.1.2", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -3742,6 +3742,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/bearing/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/boolean-contains": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz", @@ -3757,6 +3768,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/boolean-contains/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/boolean-point-in-polygon": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", @@ -3769,6 +3791,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/boolean-point-in-polygon/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/boolean-point-on-line": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-6.5.0.tgz", @@ -3781,6 +3814,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/boolean-point-on-line/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/center": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/center/-/center-6.5.0.tgz", @@ -3817,6 +3861,31 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/clean-coords": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", + "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "dependencies": { + "@turf/helpers": "^7.0.0", + "@turf/invariant": "^7.0.0", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clean-coords/node_modules/@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "dependencies": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/clone": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz", @@ -3840,6 +3909,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/destination/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/distance": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-6.5.0.tgz", @@ -3852,6 +3932,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/distance/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/helpers": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz", @@ -3861,11 +3952,24 @@ } }, "node_modules/@turf/invariant": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", - "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", + "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", "dependencies": { - "@turf/helpers": "^6.5.0" + "@turf/helpers": "^7.0.0", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/invariant/node_modules/@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "dependencies": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" }, "funding": { "url": "https://opencollective.com/turf" @@ -3921,6 +4025,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/rhumb-bearing/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/rhumb-destination": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/rhumb-destination/-/rhumb-destination-6.5.0.tgz", @@ -3933,6 +4048,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/rhumb-destination/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/rhumb-distance": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/rhumb-distance/-/rhumb-distance-6.5.0.tgz", @@ -3945,6 +4071,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/rhumb-distance/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/transform-rotate": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/transform-rotate/-/transform-rotate-6.5.0.tgz", @@ -3963,6 +4100,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/transform-rotate/node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", @@ -5384,18 +5532,18 @@ } }, "node_modules/arlas-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.0.0.tgz", - "integrity": "sha512-GbRDO/7279i20DtGv8XO8VTakICsJrwPNk6FtGzmchkgNwmlXTk1RxrH7/X1z9hqbZ0VjfoFdzdfMCviNr24Xw==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.1.0.tgz", + "integrity": "sha512-5ZSbgqUkCW7/n7PBljCTpI0ewCf3zi5H+Jm/PRUIPcQJgyedbKZ/K/yxYu8kKbeEnMWHaSKhOTPMRoCwN1C02w==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-d3": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.1.1.tgz", - "integrity": "sha512-GzCta0gGJeOB6o4QiyxY5wNvAPLRPppXcwolK1ZmAVk5oh9hoCQqR2frJ+0f7Zz2DXmW0S9Rt/m7rL8FecGS9Q==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", + "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -5463,9 +5611,9 @@ } }, "node_modules/arlas-web-components": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.0.2.tgz", - "integrity": "sha512-+XBPvftKKHvB3P8qVPFhTtLMxe1nRy0KrcD6QrIpyBGF5Ir6YtPRb63FgCp3GV8iugWOqm10EXVT7jlxG2cI5g==", + "version": "25.1.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.1.2.tgz", + "integrity": "sha512-EmQRSikKbeggxpyeWbJjOeo/J6eYYFHzj+OrtFRNlO204f+eA+htfinJj+dt1U9rD5ctaQubRstrCxqy3fCaZw==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5475,6 +5623,7 @@ "@turf/center": "^6.5.0", "@turf/centroid": "^6.5.0", "@turf/circle": "^6.5.0", + "@turf/clean-coords": "^7.0.0", "@turf/helpers": "^6.5.0", "@turf/length": "^6.5.0", "@turf/midpoint": "^6.5.0", @@ -5482,7 +5631,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.1.0", + "arlas-d3": "~11.2.2", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -5520,9 +5669,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.0.2.tgz", - "integrity": "sha512-gD9rhlL68xp236FvHjgPkA9b2wSFeRV29tqtnoZqXNB4XiO7GdvcWjBETqUmdqdRtUOypdQeCUG1bEZBHPT+EA==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.1.0.tgz", + "integrity": "sha512-Ba/p7/rImBES7ZtoQfzZyv66l1/SSNRI9xkR4Ma7CvqP0xqtwVNvtb5Lp8NWhNtcUXWNj0xFSyk98vYBz6rzGA==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -5532,7 +5681,7 @@ "@types/file-saver": "^2.0.1", "@types/jsonpath": "^0.2.0", "@types/tinycolor2": "^1.4.0", - "arlas-web-core": "~25.0.1", + "arlas-web-core": "~25.1.0", "file-saver": "^2.0.2", "jsonpath": "^1.0.0", "moment": "^2.29.4", @@ -5543,18 +5692,18 @@ } }, "node_modules/arlas-web-core": { - "version": "25.0.1", - "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.0.1.tgz", - "integrity": "sha512-j4/y1GKNddIm10HgZHjr/NCacEfNjIZYlj8CNkC+fiNW/pFyM15rLJcamWsLNjO+ieXHDLFuCFsXvxOWpcrHrA==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.1.0.tgz", + "integrity": "sha512-w61laKLmf2dgFjX8HQjtA4tlCaj4bUQUX46/DtBvOckibVbO+MBZCfll5pmPaq+gQX2DMrTwzSHVanWWf0BuRw==", "dependencies": { - "arlas-api": "25.0.0", + "arlas-api": "25.1.0", "rxjs": "~7.4.0" } }, "node_modules/arlas-wui-toolkit": { - "version": "25.0.3", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.0.3.tgz", - "integrity": "sha512-Dx3cOv/9Gv3Vhj4iVDZy6K6bd3f2otUGdjJZqK/YMqsLEr4DpZdSh956yufWAgdJD99dbGLL+MtBMVzNm1Smvw==", + "version": "25.1.2", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.1.2.tgz", + "integrity": "sha512-iMy4wxmjAfeYmm94LZg7ZiHnN8GRR9oZBre6SWmgE8zyj8CjDKbKaFo6R3t63VuQSqsIHyABMKrnLRSg3yKzLw==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -5566,8 +5715,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.0.2", - "arlas-web-contributors": "~25.0.2", + "arlas-web-components": "~25.1.2", + "arlas-web-contributors": "~25.1.0", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -5618,7 +5767,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", - "dev": true, "dependencies": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -5746,7 +5894,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", - "dev": true, "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -6325,7 +6472,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -7803,7 +7949,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -7871,7 +8016,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -7897,7 +8041,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -8380,7 +8523,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -8392,7 +8534,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -8401,7 +8542,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -9870,7 +10010,6 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, "dependencies": { "is-callable": "^1.1.3" } @@ -9995,7 +10134,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10085,7 +10223,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -10220,7 +10357,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -10319,7 +10455,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10336,7 +10471,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0" }, @@ -10348,7 +10482,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -10360,7 +10493,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -10372,7 +10504,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -10975,7 +11106,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.0", @@ -11025,7 +11155,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11041,7 +11170,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -11063,7 +11191,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, "dependencies": { "has-bigints": "^1.0.1" }, @@ -11086,7 +11213,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11116,7 +11242,6 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11150,7 +11275,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11220,7 +11344,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11245,7 +11368,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11331,7 +11453,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11347,7 +11468,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11359,7 +11479,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", - "dev": true, "dependencies": { "call-bind": "^1.0.7" }, @@ -11386,7 +11505,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11401,7 +11519,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -11433,7 +11550,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11445,7 +11561,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -11476,8 +11591,7 @@ "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" }, "node_modules/isbinaryfile": { "version": "4.0.10", @@ -13558,7 +13672,6 @@ "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13567,7 +13680,6 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -13583,7 +13695,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -13592,7 +13703,6 @@ "version": "4.1.5", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -14310,9 +14420,9 @@ } }, "node_modules/pbf": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", - "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.3.0.tgz", + "integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==", "dependencies": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -14410,7 +14520,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -15801,7 +15910,6 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", - "dev": true, "dependencies": { "call-bind": "^1.0.6", "define-properties": "^1.2.1", @@ -16679,7 +16787,6 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -16696,7 +16803,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", - "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -16772,7 +16878,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -17092,7 +17197,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, "dependencies": { "internal-slot": "^1.0.4" }, @@ -18916,7 +19020,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -18932,7 +19035,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -18956,7 +19058,6 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", - "dev": true, "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", @@ -21808,6 +21909,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/boolean-contains": { @@ -21820,6 +21931,16 @@ "@turf/boolean-point-on-line": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/boolean-point-in-polygon": { @@ -21829,6 +21950,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/boolean-point-on-line": { @@ -21838,6 +21969,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/center": { @@ -21867,6 +22008,27 @@ "@turf/helpers": "^6.5.0" } }, + "@turf/clean-coords": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", + "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "requires": { + "@turf/helpers": "^7.0.0", + "@turf/invariant": "^7.0.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "requires": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" + } + } + } + }, "@turf/clone": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz", @@ -21882,6 +22044,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/distance": { @@ -21891,6 +22063,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/helpers": { @@ -21899,11 +22081,23 @@ "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==" }, "@turf/invariant": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", - "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", + "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", "requires": { - "@turf/helpers": "^6.5.0" + "@turf/helpers": "^7.0.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "requires": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" + } + } } }, "@turf/length": { @@ -21942,6 +22136,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/rhumb-destination": { @@ -21951,6 +22155,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/rhumb-distance": { @@ -21960,6 +22174,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/transform-rotate": { @@ -21975,6 +22199,16 @@ "@turf/rhumb-bearing": "^6.5.0", "@turf/rhumb-destination": "^6.5.0", "@turf/rhumb-distance": "^6.5.0" + }, + "dependencies": { + "@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@types/body-parser": { @@ -23095,18 +23329,18 @@ } }, "arlas-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.0.0.tgz", - "integrity": "sha512-GbRDO/7279i20DtGv8XO8VTakICsJrwPNk6FtGzmchkgNwmlXTk1RxrH7/X1z9hqbZ0VjfoFdzdfMCviNr24Xw==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.1.0.tgz", + "integrity": "sha512-5ZSbgqUkCW7/n7PBljCTpI0ewCf3zi5H+Jm/PRUIPcQJgyedbKZ/K/yxYu8kKbeEnMWHaSKhOTPMRoCwN1C02w==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-d3": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.1.1.tgz", - "integrity": "sha512-GzCta0gGJeOB6o4QiyxY5wNvAPLRPppXcwolK1ZmAVk5oh9hoCQqR2frJ+0f7Zz2DXmW0S9Rt/m7rL8FecGS9Q==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", + "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", "requires": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -23174,9 +23408,9 @@ } }, "arlas-web-components": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.0.2.tgz", - "integrity": "sha512-+XBPvftKKHvB3P8qVPFhTtLMxe1nRy0KrcD6QrIpyBGF5Ir6YtPRb63FgCp3GV8iugWOqm10EXVT7jlxG2cI5g==", + "version": "25.1.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.1.2.tgz", + "integrity": "sha512-EmQRSikKbeggxpyeWbJjOeo/J6eYYFHzj+OrtFRNlO204f+eA+htfinJj+dt1U9rD5ctaQubRstrCxqy3fCaZw==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -23186,6 +23420,7 @@ "@turf/center": "^6.5.0", "@turf/centroid": "^6.5.0", "@turf/circle": "^6.5.0", + "@turf/clean-coords": "^7.0.0", "@turf/helpers": "^6.5.0", "@turf/length": "^6.5.0", "@turf/midpoint": "^6.5.0", @@ -23193,7 +23428,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.1.0", + "arlas-d3": "~11.2.2", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -23212,9 +23447,9 @@ } }, "arlas-web-contributors": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.0.2.tgz", - "integrity": "sha512-gD9rhlL68xp236FvHjgPkA9b2wSFeRV29tqtnoZqXNB4XiO7GdvcWjBETqUmdqdRtUOypdQeCUG1bEZBHPT+EA==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.1.0.tgz", + "integrity": "sha512-Ba/p7/rImBES7ZtoQfzZyv66l1/SSNRI9xkR4Ma7CvqP0xqtwVNvtb5Lp8NWhNtcUXWNj0xFSyk98vYBz6rzGA==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -23224,7 +23459,7 @@ "@types/file-saver": "^2.0.1", "@types/jsonpath": "^0.2.0", "@types/tinycolor2": "^1.4.0", - "arlas-web-core": "~25.0.1", + "arlas-web-core": "~25.1.0", "file-saver": "^2.0.2", "jsonpath": "^1.0.0", "moment": "^2.29.4", @@ -23235,18 +23470,18 @@ } }, "arlas-web-core": { - "version": "25.0.1", - "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.0.1.tgz", - "integrity": "sha512-j4/y1GKNddIm10HgZHjr/NCacEfNjIZYlj8CNkC+fiNW/pFyM15rLJcamWsLNjO+ieXHDLFuCFsXvxOWpcrHrA==", + "version": "25.1.0", + "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.1.0.tgz", + "integrity": "sha512-w61laKLmf2dgFjX8HQjtA4tlCaj4bUQUX46/DtBvOckibVbO+MBZCfll5pmPaq+gQX2DMrTwzSHVanWWf0BuRw==", "requires": { - "arlas-api": "25.0.0", + "arlas-api": "25.1.0", "rxjs": "~7.4.0" } }, "arlas-wui-toolkit": { - "version": "25.0.3", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.0.3.tgz", - "integrity": "sha512-Dx3cOv/9Gv3Vhj4iVDZy6K6bd3f2otUGdjJZqK/YMqsLEr4DpZdSh956yufWAgdJD99dbGLL+MtBMVzNm1Smvw==", + "version": "25.1.2", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.1.2.tgz", + "integrity": "sha512-iMy4wxmjAfeYmm94LZg7ZiHnN8GRR9oZBre6SWmgE8zyj8CjDKbKaFo6R3t63VuQSqsIHyABMKrnLRSg3yKzLw==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -23258,8 +23493,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.0.2", - "arlas-web-contributors": "~25.0.2", + "arlas-web-components": "~25.1.2", + "arlas-web-contributors": "~25.1.0", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -23287,7 +23522,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", - "dev": true, "requires": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -23365,7 +23599,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", - "dev": true, "requires": { "possible-typed-array-names": "^1.0.0" } @@ -23792,7 +24025,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, "requires": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -24879,7 +25111,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -24932,7 +25163,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, "requires": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -24949,7 +25179,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, "requires": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -25339,7 +25568,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, "requires": { "get-intrinsic": "^1.2.4" } @@ -25347,14 +25575,12 @@ "es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" }, "es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -26370,7 +26596,6 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, "requires": { "is-callable": "^1.1.3" } @@ -26459,8 +26684,7 @@ "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" }, "gauge": { "version": "4.0.4", @@ -26534,7 +26758,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, "requires": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -26636,7 +26859,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "requires": { "get-intrinsic": "^1.1.3" } @@ -26716,8 +26938,7 @@ "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" }, "has-flag": { "version": "3.0.0", @@ -26728,7 +26949,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, "requires": { "es-define-property": "^1.0.0" } @@ -26736,20 +26956,17 @@ "has-proto": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "has-tostringtag": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "requires": { "has-symbols": "^1.0.3" } @@ -27216,7 +27433,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", - "dev": true, "requires": { "es-errors": "^1.3.0", "hasown": "^2.0.0", @@ -27256,7 +27472,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27266,7 +27481,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -27282,7 +27496,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, "requires": { "has-bigints": "^1.0.1" } @@ -27299,7 +27512,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27316,8 +27528,7 @@ "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" }, "is-ci": { "version": "2.0.0", @@ -27339,7 +27550,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -27381,8 +27591,7 @@ "is-map": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==" }, "is-module": { "version": "1.0.0", @@ -27398,7 +27607,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -27459,7 +27667,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27468,14 +27675,12 @@ "is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==" }, "is-shared-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", - "dev": true, "requires": { "call-bind": "^1.0.7" } @@ -27490,7 +27695,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -27499,7 +27703,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -27518,14 +27721,12 @@ "is-weakmap": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==" }, "is-weakset": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "requires": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -27547,8 +27748,7 @@ "isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" }, "isbinaryfile": { "version": "4.0.10", @@ -29156,14 +29356,12 @@ "object-inspect": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", - "dev": true + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" }, "object-is": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, "requires": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -29172,14 +29370,12 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object.assign": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", - "dev": true, "requires": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -29724,9 +29920,9 @@ "dev": true }, "pbf": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", - "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.3.0.tgz", + "integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==", "requires": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -29800,8 +29996,7 @@ "possible-typed-array-names": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==" }, "postcss": { "version": "8.4.31", @@ -30737,7 +30932,6 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", - "dev": true, "requires": { "call-bind": "^1.0.6", "define-properties": "^1.2.1", @@ -31399,7 +31593,6 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, "requires": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -31413,7 +31606,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", - "dev": true, "requires": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -31479,7 +31671,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dev": true, "requires": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -31739,7 +31930,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, "requires": { "internal-slot": "^1.0.4" } @@ -33084,7 +33274,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, "requires": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -33097,7 +33286,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "requires": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -33115,7 +33303,6 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", - "dev": true, "requires": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", diff --git a/package.json b/package.json index 825a8fb2..0808ce41 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~25.0.3", + "arlas-wui-toolkit": "~25.1.2", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index b3c81245..06331628 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -32,10 +32,13 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTabGroup } from '@angular/material/tabs'; import { DomSanitizer, Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; +import { marker } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; +import { ResultlistService } from 'app/services/resultlist.service'; import { CollectionReferenceParameters } from 'arlas-api'; import { AoiEdition, + ArlasAnyLayer, ArlasColorService, BboxGeneratorComponent, CellBackgroundStyleEnum, @@ -85,11 +88,9 @@ import { debounceTime, finalize, mergeMap, takeUntil } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { ContributorService } from '../../services/contributors.service'; import { DynamicComponentService } from '../../services/dynamicComponent.service'; +import { GeocodingResult } from '../../services/geocoding.service'; import { VisualizeService } from '../../services/visualize.service'; import { MenuState } from '../left-menu/left-menu.component'; -import { GeocodingResult } from '../../services/geocoding.service'; -import { ResultlistService } from 'app/services/resultlist.service'; -import { marker } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ selector: 'arlas-wui-root', @@ -737,20 +738,19 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // use always this.previewListContrib because it's the current resultlist contributor if (!!this.mapComponentConfig.mapLayers.events.onHover) { this.mapComponentConfig.mapLayers.events.onHover.forEach(l => { - const layer = this.mapglComponent.map.getLayer(l); - if (ids && ids.length > 0) { - if (!!layer && layer.source.indexOf(collection) >= 0 && ids.length > 0 && + const layer = this.mapglComponent.map.getLayer(l) as ArlasAnyLayer; + if (!!layer && typeof(layer.source) === 'string' && layer.source.indexOf(collection) >= 0) { + if (ids && ids.length > 0) { // Tests value in camel and kebab case due to an unknown issue on other projects - (layer.metadata.isScrollableLayer || layer.metadata['is-scrollable-layer'])) { - this.mapglComponent.map.setFilter(l, this.getVisibleElementLayerFilter(l, ids)); - const strokeLayerId = l.replace('_id:', '-fill_stroke-'); - const strokeLayer = this.mapglComponent.map.getLayer(strokeLayerId); - if (!!strokeLayer) { - this.mapglComponent.map.setFilter(strokeLayerId, this.getVisibleElementLayerFilter(strokeLayerId, ids)); + if (layer.metadata.isScrollableLayer || layer.metadata['is-scrollable-layer']) { + this.mapglComponent.map.setFilter(l, this.getVisibleElementLayerFilter(l, ids)); + const strokeLayerId = l.replace('_id:', '-fill_stroke-'); + const strokeLayer = this.mapglComponent.map.getLayer(strokeLayerId); + if (!!strokeLayer) { + this.mapglComponent.map.setFilter(strokeLayerId, this.getVisibleElementLayerFilter(strokeLayerId, ids)); + } } - } - } else { - if (!!layer && layer.source.indexOf(collection) >= 0) { + } else { this.mapglComponent.map.setFilter(l, this.mapglComponent.layersMap.get(l).filter); const strokeLayerId = l.replace('_id:', '-fill_stroke-'); const strokeLayer = this.mapglComponent.map.getLayer(strokeLayerId); From 83c4154c64080a21416ae33d1448cf55174b80fa Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Thu, 18 Jul 2024 11:28:42 +0200 Subject: [PATCH 03/48] prod automatic release 25.1.0 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/package.json | 2 +- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8669b4e6..e9caf595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Change Log +## [v25.1.0](https://github.com/gisaia/ARLAS-WUI/tree/v25.1.0) (2024-07-18) + +[Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v24.3.9...v25.1.0) + +**New stuff:** + +- Display start value and end value of a timeline bucket. [\#816](https://github.com/gisaia/ARLAS-wui/issues/816) +- Improve property window on feature click [\#673](https://github.com/gisaia/ARLAS-wui/issues/673) +- \[map\] filter data with a circle [\#545](https://github.com/gisaia/ARLAS-wui/issues/545) +- Handle multi-collection for powerbars [\#390](https://github.com/gisaia/ARLAS-wui/issues/390) + +**Fixed bugs:** + +- Dashboards that don't have tabs attribute are not displayed on arlas-wui [\#833](https://github.com/gisaia/ARLAS-wui/issues/833) +- Layers disappear when we are zoomed in [\#817](https://github.com/gisaia/ARLAS-wui/issues/817) +- Features layers are not displayed on the map if the collection has a date field that has not a format [\#804](https://github.com/gisaia/ARLAS-wui/issues/804) +- Export / Import dashboard : circle heatmaps configurations are lost [\#797](https://github.com/gisaia/ARLAS-wui/issues/797) +- Histogram filter: Cross for closing a selection among multi-selection is partially hidden [\#787](https://github.com/gisaia/ARLAS-wui/issues/787) +- Tour of ARLAS breaks the layout when the step is on the timeline [\#765](https://github.com/gisaia/ARLAS-wui/issues/765) +- Histogram : NaN values instead of negative values [\#728](https://github.com/gisaia/ARLAS-wui/issues/728) +- Label layer with average metric displays abnormal values [\#646](https://github.com/gisaia/ARLAS-wui/issues/646) +- Research does not work with space character [\#533](https://github.com/gisaia/ARLAS-wui/issues/533) +- Histogram and timeline selection moves when ARLAS is loading [\#513](https://github.com/gisaia/ARLAS-wui/issues/513) +- Changing tabs triggers map style update after hard coded 500ms [\#360](https://github.com/gisaia/ARLAS-wui/issues/360) + +## [v24.3.9](https://github.com/gisaia/ARLAS-WUI/tree/v24.3.9) (2024-07-01) + +[Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v25.0.1-beta.4...v24.3.9) + ## [v25.0.1-beta.4](https://github.com/gisaia/ARLAS-WUI/tree/v25.0.1-beta.4) (2024-06-26) [Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v25.0.1-beta.3...v25.0.1-beta.4) diff --git a/package-lock.json b/package-lock.json index 0d0d4ee8..9872316f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui", - "version": "25.0.1-beta.4", + "version": "25.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui", - "version": "25.0.1-beta.4", + "version": "25.1.0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 0808ce41..c0634ba8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "25.0.1-beta.4", + "version": "25.1.0", "author": "gisaia", "license": "Apache-2.0", "scripts": { diff --git a/src/package.json b/src/package.json index d015914b..aa0b4f42 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "25.0.1-beta.4", + "version": "25.1.0", "author": "gisaia", "license": "Apache-2.0" } From 542302fbea1257da9aa43a2c2ad509351c35df17 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Mon, 22 Jul 2024 18:06:03 +0200 Subject: [PATCH 04/48] wip: have to find the moment where the list is really updated --- .../arlas-wui-root.component.html | 1 + .../arlas-wui-root.component.ts | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index 985ad376..03960b5a 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -223,6 +223,7 @@ [currentSortedColumn]="sortOutput.get(list.identifier)" [isGeoSortActivated]="isGeoSortActivated.get(list.identifier)" (setFiltersEvent)="list.setFilters($event)" + (clickOnTile)="storeItemIdentifier($event)" (paginationEvent)="getBoardEvents({ origin: list.identifier, event: 'paginationEvent', data: $event })" (geoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoSortEvent', data: $event })" (geoAutoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoAutoSortEvent', data: $event })" diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 06331628..fa8c20fb 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -252,6 +252,10 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { /** Destroy subscriptions */ private _onDestroy$ = new Subject(); + /** store last identifier selected **/ + private _lastTileIdentifier: string; + private detailedGridOpen: boolean; + public constructor( private configService: ArlasConfigService, protected settingsService: ArlasSettingsService, @@ -385,6 +389,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } public ngOnInit() { + this.mapService if (!this.version) { this.version = environment.VERSION; @@ -698,6 +703,15 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (this.allowMapExtend) { this.mapEventListener.next(null); } + // wrong place because fire before result list opened + if(this.detailedGridOpen && this._lastTileIdentifier){ + const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); + + setTimeout(() => { + console.log(item) + this.resultListComponent.setSelectedGridItem(item); + }, 1000); + } }); this.adjustMapOffset(); this.adjustCoordinates(); @@ -878,6 +892,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } public clickOnTile(item: Item) { + this.storeItemIdentifier(item); this.tabsList.realignInkBar(); const config = this.resultListConfigPerContId.get(this.previewListContrib.identifier); config.defautMode = this.modeEnum.grid; @@ -1417,7 +1432,13 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { switch (data.action.id) { case 'zoomToFeature': if (!!mapContributor) { - mapContributor.getBoundsToFit(data.elementidentifier, collection) + // if detailed menu is not open when zoom to feature we reset identifer + this.detailedGridOpen = this.resultListComponent.isDetailledGridOpen; + if(!this.detailedGridOpen) { + this._lastTileIdentifier = null; + } + mapContributor + .getBoundsToFit(data.elementidentifier, collection) .subscribe(bounds => this.visualizeService.fitbounds = bounds); } break; @@ -1490,5 +1511,11 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } }, 100); } + + storeItemIdentifier($event: Item) { + if($event.identifier) { + this._lastTileIdentifier = ($event).identifier; + } + } } From 5a6224cec6dece1902c6aaebeb72d034a4702117 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 23 Jul 2024 12:37:05 +0200 Subject: [PATCH 05/48] fix: do not close grid when zoom in --- .../arlas-wui-root.component.html | 2 +- .../arlas-wui-root.component.ts | 27 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index 03960b5a..c519a2e8 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -223,7 +223,7 @@ [currentSortedColumn]="sortOutput.get(list.identifier)" [isGeoSortActivated]="isGeoSortActivated.get(list.identifier)" (setFiltersEvent)="list.setFilters($event)" - (clickOnTile)="storeItemIdentifier($event)" + (clickOnTile)="storeItemIdentifier($event)" (onResultListUpdate)="reactToUpdateList()" (paginationEvent)="getBoardEvents({ origin: list.identifier, event: 'paginationEvent', data: $event })" (geoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoSortEvent', data: $event })" (geoAutoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoAutoSortEvent', data: $event })" diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index fa8c20fb..0cd523b1 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -389,7 +389,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } public ngOnInit() { - this.mapService if (!this.version) { this.version = environment.VERSION; @@ -594,6 +593,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } } ); + // this.retrieveOpenedGridItem(); } }); } @@ -677,6 +677,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { const queryParams = Object.assign({}, this.activatedRoute.snapshot.queryParams); queryParams[this.MAP_EXTEND_PARAM] = extend; this.router.navigate([], { replaceUrl: true, queryParams: queryParams }); + }); this.cdr.detectChanges(); @@ -703,15 +704,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (this.allowMapExtend) { this.mapEventListener.next(null); } - // wrong place because fire before result list opened - if(this.detailedGridOpen && this._lastTileIdentifier){ - const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); - - setTimeout(() => { - console.log(item) - this.resultListComponent.setSelectedGridItem(item); - }, 1000); - } }); this.adjustMapOffset(); this.adjustCoordinates(); @@ -806,6 +798,15 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.mapSettings.openDialog(this.mapSettingsService); } + private retrieveOpenedGridItem(){ + // wrong place because fire before result list opened + if(this.detailedGridOpen && this._lastTileIdentifier){ + const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); + if(item) { + this.resultListComponent.setSelectedGridItem(item); + } + } + } /** * Applies the selected geo query @@ -1512,10 +1513,14 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { }, 100); } - storeItemIdentifier($event: Item) { + public storeItemIdentifier($event: Item) { if($event.identifier) { this._lastTileIdentifier = ($event).identifier; } } + + public reactToUpdateList() { + this.retrieveOpenedGridItem(); + } } From a13df6b678e83df3ae8d83c101e705b45c53f558 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Wed, 24 Jul 2024 09:04:36 +0200 Subject: [PATCH 06/48] fix: add feedback --- .../components/arlas-wui-root/arlas-wui-root.component.html | 2 +- .../components/arlas-wui-root/arlas-wui-root.component.ts | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index c519a2e8..82d1164b 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -223,7 +223,7 @@ [currentSortedColumn]="sortOutput.get(list.identifier)" [isGeoSortActivated]="isGeoSortActivated.get(list.identifier)" (setFiltersEvent)="list.setFilters($event)" - (clickOnTile)="storeItemIdentifier($event)" (onResultListUpdate)="reactToUpdateList()" + (clickOnTile)="storeItemIdentifier($event)" (onResultListUpdate)="retrieveOpenedGridItem()" (paginationEvent)="getBoardEvents({ origin: list.identifier, event: 'paginationEvent', data: $event })" (geoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoSortEvent', data: $event })" (geoAutoSortEvent)="getBoardEvents({ origin: list.identifier, event: 'geoAutoSortEvent', data: $event })" diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 0cd523b1..de16103d 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -593,7 +593,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } } ); - // this.retrieveOpenedGridItem(); } }); } @@ -799,7 +798,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } private retrieveOpenedGridItem(){ - // wrong place because fire before result list opened if(this.detailedGridOpen && this._lastTileIdentifier){ const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); if(item) { @@ -1518,9 +1516,5 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this._lastTileIdentifier = ($event).identifier; } } - - public reactToUpdateList() { - this.retrieveOpenedGridItem(); - } } From 8704b9cf4f16e4010c2663786df133027f769c3b Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Fri, 2 Aug 2024 15:13:46 +0200 Subject: [PATCH 07/48] ci: add license check --- .github/workflows/main.yml | 2 + LICENCE.txt | 202 ------- LICENSE | 16 + license-check-and-add.json | 14 + package-lock.json | 531 ++++++++++++++++++ package.json | 4 +- src/app/app-routing.module.ts | 19 + src/app/app.component.ts | 5 +- .../arlas-wui-root.component.ts | 5 +- .../configs-list/configs-list.component.scss | 19 + .../configs-list/configs-list.component.ts | 4 +- .../geocoding/geocoding.component.scss | 19 + .../geocoding/geocoding.component.ts | 5 +- .../left-menu/left-menu.component.scss | 19 + .../left-menu/left-menu.component.ts | 19 + .../aoi-dimensions.component.ts | 4 +- .../aoi-dimensions/aoi-dimensions.pipes.ts | 32 +- src/app/index.ts | 19 + src/app/services/dynamicComponent.service.ts | 5 +- src/app/services/geocoding.service.ts | 11 +- src/app/services/resultlist.service.ts | 19 + src/app/services/visualize.service.ts | 30 +- src/app/tools/customLoader.ts | 9 +- src/app/tools/download.interface.ts | 19 + .../browser-compatibility.component.css | 18 + src/assets/styles/custom-style.css | 18 + src/environments/environment.prod.ts | 19 +- src/environments/environment.ts | 18 + src/polyfills.ts | 18 + src/public-api.ts | 19 + src/styles.scss | 20 +- src/styles/hopscotch/hopscotch.css | 18 + src/typings.d.ts | 19 + tools/inline-resources.js | 60 +- 34 files changed, 978 insertions(+), 280 deletions(-) delete mode 100644 LICENCE.txt create mode 100644 LICENSE create mode 100644 license-check-and-add.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0e9b5c1..5ed5947b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,8 @@ jobs: run: npm ci - name: Lint run: npm run lint + - name: License check + run: npm run license-check - name: Test run: npm run test - name: Build diff --git a/LICENCE.txt b/LICENCE.txt deleted file mode 100644 index 3082d664..00000000 --- a/LICENCE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2017 and onwards Gisaïa - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..d6392b4e --- /dev/null +++ b/LICENSE @@ -0,0 +1,16 @@ +Licensed to Gisaïa under one or more contributor +license agreements. See the NOTICE.txt file distributed with +this work for additional information regarding copyright +ownership. Gisaïa licenses this file to you under +the Apache License, Version 2.0 (the "License"); you may +not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. \ No newline at end of file diff --git a/license-check-and-add.json b/license-check-and-add.json new file mode 100644 index 00000000..3c97a772 --- /dev/null +++ b/license-check-and-add.json @@ -0,0 +1,14 @@ +{ + "ignore": [".github/**", ".git/**", "e2e/**", "*", "**/*.sh", "*.yml", "**/*.yaml", "**/*.conf", "**/*.md", "**/*.svg", "**/*.spec.ts", "**/*.html", "**/*.woff2", "src/test.ts", "**/.DS_Store", "**/.gitkeep", "patches/*", "**/*.xml", "**/*.csv"], + "license": "LICENSE", + "trailingWhitespace": "TRIM", + "licenseFormats": { + "ts|js|css|scss": { + "prepend": "/*", + "append": " */", + "eachLine": { + "prepend": " * " + } + } + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9872316f..47877ab1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "karma-chrome-launcher": "~3.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "~1.7.0", + "license-check-and-add": "^4.0.5", "node": "^16.3.0", "protractor": "~7.0.0", "ts-node": "~10.4.0", @@ -4314,6 +4315,16 @@ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, "node_modules/@types/http-errors": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", @@ -4374,6 +4385,12 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, + "node_modules/@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true + }, "node_modules/@types/node": { "version": "16.11.20", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.20.tgz", @@ -10277,6 +10294,15 @@ "safe-buffer": "^5.2.1" } }, + "node_modules/gitignore-to-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/gitignore-to-glob/-/gitignore-to-glob-0.3.0.tgz", + "integrity": "sha512-mk74BdnK7lIwDHnotHddx1wsjMOFIThpLY3cPNniJ/2fA/tlLzHnFxIdR+4sLOu5KGgQJdij4kjJ2RoUNnCNMA==", + "dev": true, + "engines": { + "node": ">=4.4 <5 || >=6.9" + } + }, "node_modules/gl-matrix": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", @@ -12390,6 +12416,271 @@ "node": ">= 0.8.0" } }, + "node_modules/license-check-and-add": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/license-check-and-add/-/license-check-and-add-4.0.5.tgz", + "integrity": "sha512-FySnMi3Kf/vO5jka8tcbVF1FhDFb8PWsQ8pg5Y7U/zkQgta+fIrJGcGHO58WFjfKlgvhneG1uQ00Fpxzhau3QA==", + "dev": true, + "dependencies": { + "fs-extra": "^8.1.0", + "gitignore-to-glob": "^0.3.0", + "globby": "^10.0.1", + "ignore": "^5.1.2", + "yargs": "^13.3.0" + }, + "bin": { + "license-check-and-add": "dist/src/cli.js" + } + }, + "node_modules/license-check-and-add/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/license-check-and-add/node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/license-check-and-add/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/license-check-and-add/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/license-check-and-add/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/license-check-and-add/node_modules/globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "dependencies": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/license-check-and-add/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/license-check-and-add/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/license-check-and-add/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/license-check-and-add/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/license-check-and-add/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/license-check-and-add/node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/license-check-and-add/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/license-check-and-add/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/license-check-and-add/node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, "node_modules/license-webpack-plugin": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", @@ -22414,6 +22705,16 @@ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, + "@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "requires": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, "@types/http-errors": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", @@ -22474,6 +22775,12 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, + "@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true + }, "@types/node": { "version": "16.11.20", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.20.tgz", @@ -26797,6 +27104,12 @@ "safe-buffer": "^5.2.1" } }, + "gitignore-to-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/gitignore-to-glob/-/gitignore-to-glob-0.3.0.tgz", + "integrity": "sha512-mk74BdnK7lIwDHnotHddx1wsjMOFIThpLY3cPNniJ/2fA/tlLzHnFxIdR+4sLOu5KGgQJdij4kjJ2RoUNnCNMA==", + "dev": true + }, "gl-matrix": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", @@ -28385,6 +28698,224 @@ "type-check": "~0.4.0" } }, + "license-check-and-add": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/license-check-and-add/-/license-check-and-add-4.0.5.tgz", + "integrity": "sha512-FySnMi3Kf/vO5jka8tcbVF1FhDFb8PWsQ8pg5Y7U/zkQgta+fIrJGcGHO58WFjfKlgvhneG1uQ00Fpxzhau3QA==", + "dev": true, + "requires": { + "fs-extra": "^8.1.0", + "gitignore-to-glob": "^0.3.0", + "globby": "^10.0.1", + "ignore": "^5.1.2", + "yargs": "^13.3.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "license-webpack-plugin": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", diff --git a/package.json b/package.json index c0634ba8..c7607a3d 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "lint": "ng lint", "e2e": "ng e2e", "i18n:init": "ngx-translate-extract --input ./src --output ./src/assets/i18n/template.json --key-as-default-value --replace --format json", - "i18n:extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/{en,fr,es}.json --format json" + "i18n:extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/{en,fr,es}.json --format json", + "license-check": "license-check-and-add check -f license-check-and-add.json" }, "peerDependencies": { "@angular/animations": "^14.2.12", @@ -63,6 +64,7 @@ "karma-chrome-launcher": "~3.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "~1.7.0", + "license-check-and-add": "^4.0.5", "node": "^16.3.0", "protractor": "~7.0.0", "ts-node": "~10.4.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5d849b4d..355b3088 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ForgotComponent, LoginComponent, RegisterComponent, ResetComponent, VerifyComponent } from 'arlas-wui-toolkit'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 077a3c32..2a216e28 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,11 +11,12 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ + import { Component, OnInit } from '@angular/core'; @Component({ diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 06331628..83ceb55d 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,11 +11,12 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ + import { AfterViewInit, ChangeDetectorRef, diff --git a/src/app/components/configs-list/configs-list.component.scss b/src/app/components/configs-list/configs-list.component.scss index 2b90841e..602c6661 100644 --- a/src/app/components/configs-list/configs-list.component.scss +++ b/src/app/components/configs-list/configs-list.component.scss @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + .configs-list_all_app { position: absolute; height: 100%; diff --git a/src/app/components/configs-list/configs-list.component.ts b/src/app/components/configs-list/configs-list.component.ts index c3297b41..d0272f1b 100644 --- a/src/app/components/configs-list/configs-list.component.ts +++ b/src/app/components/configs-list/configs-list.component.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,7 +11,7 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. diff --git a/src/app/components/geocoding/geocoding.component.scss b/src/app/components/geocoding/geocoding.component.scss index 4a2f0afe..791b32c4 100644 --- a/src/app/components/geocoding/geocoding.component.scss +++ b/src/app/components/geocoding/geocoding.component.scss @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + @import "../../../styles/variables.scss"; @import "../../../styles/app/sizes.scss"; @import "../../../styles/app/mixin.scss"; diff --git a/src/app/components/geocoding/geocoding.component.ts b/src/app/components/geocoding/geocoding.component.ts index 78efdfda..4ba7bec8 100644 --- a/src/app/components/geocoding/geocoding.component.ts +++ b/src/app/components/geocoding/geocoding.component.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,11 +11,12 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ + import { AfterViewInit, ChangeDetectorRef, diff --git a/src/app/components/left-menu/left-menu.component.scss b/src/app/components/left-menu/left-menu.component.scss index fb17ff87..5e7c6d58 100644 --- a/src/app/components/left-menu/left-menu.component.scss +++ b/src/app/components/left-menu/left-menu.component.scss @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + @import '../../../styles/variables.scss'; .menu_container { diff --git a/src/app/components/left-menu/left-menu.component.ts b/src/app/components/left-menu/left-menu.component.ts index c6ae2a5e..31995c5b 100644 --- a/src/app/components/left-menu/left-menu.component.ts +++ b/src/app/components/left-menu/left-menu.component.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { Component, Input, OnInit, Output, ViewChild } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { diff --git a/src/app/components/map/aoi-dimensions/aoi-dimensions.component.ts b/src/app/components/map/aoi-dimensions/aoi-dimensions.component.ts index 698672d2..af4522d4 100644 --- a/src/app/components/map/aoi-dimensions/aoi-dimensions.component.ts +++ b/src/app/components/map/aoi-dimensions/aoi-dimensions.component.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,7 +11,7 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. diff --git a/src/app/components/map/aoi-dimensions/aoi-dimensions.pipes.ts b/src/app/components/map/aoi-dimensions/aoi-dimensions.pipes.ts index 1362582f..59ef5c67 100644 --- a/src/app/components/map/aoi-dimensions/aoi-dimensions.pipes.ts +++ b/src/app/components/map/aoi-dimensions/aoi-dimensions.pipes.ts @@ -1,19 +1,21 @@ /* -Licensed to Gisaïa under one or more contributor -license agreements. See the NOTICE.txt file distributed with -this work for additional information regarding copyright -ownership. Gisaïa licenses this file to you under -the Apache License, Version 2.0 (the "License"); you may -not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. -*/ + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import { Pipe, PipeTransform } from '@angular/core'; diff --git a/src/app/index.ts b/src/app/index.ts index 510929af..e48b4ce9 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -1 +1,20 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + export { ArlasWuiModule } from './app.module'; diff --git a/src/app/services/dynamicComponent.service.ts b/src/app/services/dynamicComponent.service.ts index a1c7bf5a..fdff67f3 100644 --- a/src/app/services/dynamicComponent.service.ts +++ b/src/app/services/dynamicComponent.service.ts @@ -3,7 +3,7 @@ * license agreements. See the NOTICE.txt file distributed with * this work for additional information regarding copyright * ownership. Gisaïa licenses this file to you under - * the Apache License, Version 2.0 (the 'License'); you may + * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -11,11 +11,12 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ + import { Injectable, Injector, ApplicationRef, ComponentFactoryResolver, ComponentRef, Type } from '@angular/core'; @Injectable() diff --git a/src/app/services/geocoding.service.ts b/src/app/services/geocoding.service.ts index a34f3b3a..c8cd2469 100644 --- a/src/app/services/geocoding.service.ts +++ b/src/app/services/geocoding.service.ts @@ -17,12 +17,11 @@ * under the License. */ - -import {Injectable} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; -import {Observable} from 'rxjs'; -import {map} from 'rxjs/operators'; -import {ArlasSettingsService} from 'arlas-wui-toolkit'; +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { ArlasSettingsService } from 'arlas-wui-toolkit'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; export interface GeocodingQueryParams { q: string; diff --git a/src/app/services/resultlist.service.ts b/src/app/services/resultlist.service.ts index bf4236f1..433e2fa7 100644 --- a/src/app/services/resultlist.service.ts +++ b/src/app/services/resultlist.service.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { Injectable } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { CellBackgroundStyleEnum } from 'arlas-web-components'; diff --git a/src/app/services/visualize.service.ts b/src/app/services/visualize.service.ts index 01cc85a6..cbffc7ef 100644 --- a/src/app/services/visualize.service.ts +++ b/src/app/services/visualize.service.ts @@ -17,22 +17,22 @@ * under the License. */ -import {Injectable} from '@angular/core'; -import {MatSnackBar} from '@angular/material/snack-bar'; -import {TranslateService} from '@ngx-translate/core'; +import { Injectable } from '@angular/core'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { TranslateService } from '@ngx-translate/core'; import bbox from '@turf/bbox'; -import {BBox} from '@turf/helpers'; -import {Expression, Filter, Search} from 'arlas-api'; -import {CROSS_LAYER_PREFIX} from 'arlas-web-components'; -import {ElementIdentifier} from 'arlas-web-contributors'; -import {getElementFromJsonObject} from 'arlas-web-contributors/utils/utils'; -import {projType} from 'arlas-web-core'; -import {ArlasCollaborativesearchService} from 'arlas-wui-toolkit'; -import {Popup} from 'mapbox-gl'; -import {Observable} from 'rxjs'; -import {map} from 'rxjs/operators'; -import {parse} from 'wellknown'; -import {BBox2d} from '@turf/helpers/dist/js/lib/geojson'; +import { BBox } from '@turf/helpers'; +import { BBox2d } from '@turf/helpers/dist/js/lib/geojson'; +import { Expression, Filter, Search } from 'arlas-api'; +import { CROSS_LAYER_PREFIX } from 'arlas-web-components'; +import { ElementIdentifier } from 'arlas-web-contributors'; +import { getElementFromJsonObject } from 'arlas-web-contributors/utils/utils'; +import { projType } from 'arlas-web-core'; +import { ArlasCollaborativesearchService } from 'arlas-wui-toolkit'; +import { Popup } from 'mapbox-gl'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { parse } from 'wellknown'; const GEOCODING_PREVIEW_ID = 'geojson-geocoding-preview'; diff --git a/src/app/tools/customLoader.ts b/src/app/tools/customLoader.ts index dd1b8267..89c56ec8 100644 --- a/src/app/tools/customLoader.ts +++ b/src/app/tools/customLoader.ts @@ -16,27 +16,28 @@ * specific language governing permissions and limitations * under the License. */ + import { HttpClient } from '@angular/common/http'; import { TranslateLoader, TranslateService } from '@ngx-translate/core'; +import { DataWithLinks } from 'arlas-persistence-api'; import enComponents from 'arlas-web-components/assets/i18n/en.json'; -import frComponents from 'arlas-web-components/assets/i18n/fr.json'; import esComponents from 'arlas-web-components/assets/i18n/es.json'; +import frComponents from 'arlas-web-components/assets/i18n/fr.json'; import { ArlasConfigService, ArlasSettingsService, CONFIG_ID_QUERY_PARAM, NOT_CONFIGURED, PersistenceService, WalkthroughLoader } from 'arlas-wui-toolkit'; import enToolkit from 'arlas-wui-toolkit/assets/i18n/en.json'; -import frToolkit from 'arlas-wui-toolkit/assets/i18n/fr.json'; import esToolkit from 'arlas-wui-toolkit/assets/i18n/es.json'; +import frToolkit from 'arlas-wui-toolkit/assets/i18n/fr.json'; import { timeFormatDefaultLocale } from 'd3-time-format'; import enD3TimeLocal from 'd3-time-format/locale/en-US.json'; -import frD3TimeLocal from 'd3-time-format/locale/fr-FR.json'; import esD3TimeLocal from 'd3-time-format/locale/es-ES.json'; +import frD3TimeLocal from 'd3-time-format/locale/fr-FR.json'; import { forkJoin, Observable, of } from 'rxjs'; import { catchError } from 'rxjs/internal/operators/catchError'; import { map } from 'rxjs/internal/operators/map'; import { mergeMap } from 'rxjs/internal/operators/mergeMap'; -import { DataWithLinks } from 'arlas-persistence-api'; export class ArlasWalkthroughLoader implements WalkthroughLoader { diff --git a/src/app/tools/download.interface.ts b/src/app/tools/download.interface.ts index 9e49612e..264b5034 100644 --- a/src/app/tools/download.interface.ts +++ b/src/app/tools/download.interface.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + export interface DownloadSettings { id?: string; version?: string; diff --git a/src/assets/browser-compatibility/browser-compatibility.component.css b/src/assets/browser-compatibility/browser-compatibility.component.css index 72f2338e..f92ff8c8 100644 --- a/src/assets/browser-compatibility/browser-compatibility.component.css +++ b/src/assets/browser-compatibility/browser-compatibility.component.css @@ -1,3 +1,21 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ body, html { height: 100%; diff --git a/src/assets/styles/custom-style.css b/src/assets/styles/custom-style.css index e69de29b..44f56da6 100644 --- a/src/assets/styles/custom-style.css +++ b/src/assets/styles/custom-style.css @@ -0,0 +1,18 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index df8bcf3b..4d9006de 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,4 +1,21 @@ - +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import version from '../package.json'; export const environment = { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ca94c019..3f1fa49a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,3 +1,21 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // The file contents for the current environment will overwrite these during build. // The build system defaults to the dev environment which uses `environment.ts`, but if you do // `ng build --env=prod` then `environment.prod.ts` will be used instead. diff --git a/src/polyfills.ts b/src/polyfills.ts index ed77e75f..3d95d702 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -1,3 +1,21 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ /** * This file includes polyfills needed by Angular and is loaded before the app. * You can add your own extra polyfills to this file. diff --git a/src/public-api.ts b/src/public-api.ts index 3991865a..4574d686 100644 --- a/src/public-api.ts +++ b/src/public-api.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + export { ContributorService } from './app/services/contributors.service'; export { ArlasWuiModule} from './app/app.module'; export { ArlasWuiRootComponent} from './app/components/arlas-wui-root/arlas-wui-root.component'; diff --git a/src/styles.scss b/src/styles.scss index 9072f646..5681ef3b 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,5 +1,23 @@ -/* You can add global styles to this file, and also import other style files */ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/* You can add global styles to this file, and also import other style files */ @import '../node_modules/prismjs/themes/prism.css'; @import "../node_modules/@danielmoncada/angular-datetime-picker/assets/style/picker.min.css"; @import 'styles/timeline.scss'; diff --git a/src/styles/hopscotch/hopscotch.css b/src/styles/hopscotch/hopscotch.css index 079ccd3b..5207a386 100644 --- a/src/styles/hopscotch/hopscotch.css +++ b/src/styles/hopscotch/hopscotch.css @@ -1,3 +1,21 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ /**! hopscotch - v0.3.1 * * Copyright 2017 LinkedIn Corp. All rights reserved. diff --git a/src/typings.d.ts b/src/typings.d.ts index 5db32761..0c942344 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -1,3 +1,22 @@ +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /* SystemJS module definition */ // eslint-disable-next-line no-var declare var module: NodeModule; diff --git a/tools/inline-resources.js b/tools/inline-resources.js index 6dcee312..415051e7 100644 --- a/tools/inline-resources.js +++ b/tools/inline-resources.js @@ -1,4 +1,22 @@ #!/usr/bin/env node +/* + * Licensed to Gisaïa under one or more contributor + * license agreements. See the NOTICE.txt file distributed with + * this work for additional information regarding copyright + * ownership. Gisaïa licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ 'use strict'; const fs = require('fs'); @@ -31,7 +49,7 @@ const writeFile = promiseify(fs.writeFile); function inlineResources(globs) { - console.log("globs : " + globs); + console.log('globs : ' + globs); if (typeof globs == 'string') { globs = [globs]; } @@ -40,7 +58,7 @@ function inlineResources(globs) { * For every argument, inline the templates and styles under it and write the new file. */ return Promise.all(globs.map(pattern => { - console.log("globs.map : pattern " + pattern); + console.log('globs.map : pattern ' + pattern); if (pattern.indexOf('*') < 0) { // Argument is a directory target, add glob patterns to include every files. pattern = path.join(pattern, '**', '*'); @@ -48,19 +66,15 @@ function inlineResources(globs) { const files = glob.sync(pattern, {}) .filter(name => /\.js$/.test(name)); // Matches only JavaScript files. - console.log("files : " + files); + console.log('files : ' + files); // Generate all files content with inlined templates. - return Promise.all(files.map(filePath => { - return readFile(filePath, 'utf-8') - .then(content => inlineResourcesFromString(content, url => { - return path.join(path.dirname(filePath), url); - })) - .then(content => writeFile(filePath, content)) - .then(content => console.log("done", filePath)) - .catch(err => { - console.error('An error occured: ', err); - }); - })); + return Promise.all(files.map(filePath => readFile(filePath, 'utf-8') + .then(content => inlineResourcesFromString(content, url => path.join(path.dirname(filePath), url))) + .then(content => writeFile(filePath, content)) + .then(content => console.log('done', filePath)) + .catch(err => { + console.error('An error occured: ', err); + }))); })); } @@ -94,7 +108,7 @@ if (require.main === module) { */ function inlineTemplate(content, urlResolver) { return content.replace(/templateUrl:\s*'([^']+?\.html)'/g, function(m, templateUrl) { - console.log("template", templateUrl); + console.log('template', templateUrl); const templateFile = urlResolver(templateUrl); const templateContent = fs.readFileSync(templateFile, 'utf-8'); const shortenedTemplate = templateContent @@ -118,13 +132,13 @@ function inlineStyle(content, urlResolver) { return 'styles: [' + urls.map(styleUrl => { const extension = path.extname(styleUrl); - if(extension == '.scss'){ - console.log("extension sass trouvé", styleUrl); - const style = sassExtract.renderSync({ file: urlResolver(styleUrl)}); - const shortenedStyle = style.css.toString() - .replace(/([\n\r]\s*)+/gm, ' ') - .replace(/"/g, '\\"'); - return `"${shortenedStyle}"`; + if(extension === '.scss'){ + console.log('extension sass trouvé', styleUrl); + const style = sassExtract.renderSync({ file: urlResolver(styleUrl)}); + const shortenedStyle = style.css.toString() + .replace(/([\n\r]\s*)+/gm, ' ') + .replace(/"/g, '\\"'); + return `"${shortenedStyle}"`; }else{ const styleFile = urlResolver(styleUrl); @@ -153,4 +167,4 @@ function removeModuleId(content) { module.exports = inlineResources; -module.exports.inlineResourcesFromString = inlineResourcesFromString; \ No newline at end of file +module.exports.inlineResourcesFromString = inlineResourcesFromString; From 2f3edeb9db5d2bb692f3c142b96adf695c1e40e9 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Wed, 21 Aug 2024 10:23:45 +0200 Subject: [PATCH 08/48] feat : reset lastidentifer to null when no item found --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index de16103d..de67da37 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -802,6 +802,8 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); if(item) { this.resultListComponent.setSelectedGridItem(item); + } else { + this._lastTileIdentifier = null; } } } From f76d877867b44667659f4d068a16e91ba71d5775 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Wed, 21 Aug 2024 11:30:33 +0200 Subject: [PATCH 09/48] fix : change private to public --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 92f34e2a..faf177d4 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -798,7 +798,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.mapSettings.openDialog(this.mapSettingsService); } - private retrieveOpenedGridItem(){ + public retrieveOpenedGridItem(){ if(this.detailedGridOpen && this._lastTileIdentifier){ const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); if(item) { From 3f80abe9f6a026933ea5e64a855e2f39da0a2ccd Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 16 Jul 2024 16:30:30 +0200 Subject: [PATCH 10/48] feat: change update component --- .../arlas-wui-root.component.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 92f34e2a..3db0ede6 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -68,6 +68,7 @@ import { } from 'arlas-web-contributors'; import { LegendData } from 'arlas-web-contributors/contributors/MapContributor'; import { + AiasDownloadComponent, AnalyticsService, ArlasCollaborativesearchService, ArlasConfigService, @@ -79,7 +80,6 @@ import { CollectionUnit, FilterShortcutConfiguration, NOT_CONFIGURED, - ProcessComponent, ProcessService, TimelineComponent } from 'arlas-wui-toolkit'; @@ -1483,12 +1483,18 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { collection ).subscribe({ next: (item: any) => { - this.downloadDialogRef = this.dialog.open(ProcessComponent, { minWidth: '520px', maxWidth: '60vw' }); - this.downloadDialogRef.componentInstance.nbProducts = ids.length; - this.downloadDialogRef.componentInstance.matchingAdditionalParams = item as Map; - this.downloadDialogRef.componentInstance.wktAoi = this.mapglComponent.getAllPolygon('wkt'); - this.downloadDialogRef.componentInstance.ids = ids; - this.downloadDialogRef.componentInstance.collection = collection; + this.downloadDialogRef = this.dialog + .open(AiasDownloadComponent, { + minWidth: '520px', + maxWidth: '60vw', + data: { + ids, + collection, + nbProducts: ids.length, + itemDetail: item, + wktAoi: this.mapglComponent.getAllPolygon('wkt') + } + }); } }); } From 8754393854783a7c017d5330a434d405a883c378 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 23 Jul 2024 17:22:21 +0200 Subject: [PATCH 11/48] fix: remove additional params --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 3db0ede6..cfb53762 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -1479,7 +1479,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.processService.getItemsDetail( this.collectionToDescription.get(collection).id_path, ids, - this.processService.getProcessDescription().additionalParameters?.parameters, collection ).subscribe({ next: (item: any) => { From abe4c4b9b7ad8de0b4ddc6ef559174e5619d0bb8 Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Thu, 25 Jul 2024 16:14:53 +0200 Subject: [PATCH 12/48] Fix: typo --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index cfb53762..a2f67a0e 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -248,7 +248,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { protected enableGeocodingFeature = !!this.arlasSettingsService.getGeocodingSettings()?.enabled; /* Process */ - private downloadDialogRef: MatDialogRef; + private downloadDialogRef: MatDialogRef; /** Destroy subscriptions */ private _onDestroy$ = new Subject(); From 98bc0b8dc89e31f7dcb3279907cb86f5257f1c21 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Thu, 22 Aug 2024 16:18:22 +0200 Subject: [PATCH 13/48] fix: add type --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index a2f67a0e..97e34863 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -615,8 +615,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // eslint-disable-next-line max-len this.iconRegistry.addSvgIconLiteral('map_settings', this.domSanitizer.bypassSecurityTrustHtml('')); - - } public isElementInViewport(el) { From 063e44453b5d85be66234944f80b0444b347fead Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Thu, 22 Aug 2024 17:31:26 +0200 Subject: [PATCH 14/48] fix: update toolkit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7607a3d..e9c2a408 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~25.1.2", + "arlas-wui-toolkit": "~26.0.0-rc.1", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", From 4513ac184dae26ceb88d8d51af628f1ad6c1f3f1 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Thu, 22 Aug 2024 17:33:37 +0200 Subject: [PATCH 15/48] fix: update lock file --- package-lock.json | 851 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 719 insertions(+), 132 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47877ab1..23ee70ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~25.1.2", + "arlas-wui-toolkit": "~26.0.0-rc.1", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -3708,6 +3708,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/area/node_modules/@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/bbox": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz", @@ -3721,9 +3732,36 @@ } }, "node_modules/@turf/bbox-polygon": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-7.1.0.tgz", + "integrity": "sha512-fvZB09ErCZOVlWVDop836hmpKaGUmfXnR9naMhS73A/8nn4M3hELbQtMv2R8gXj7UakXCuxS/i9erdpDFZ2O+g==", + "peer": true, + "dependencies": { + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/bbox-polygon/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/bbox/node_modules/@turf/meta": { "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz", - "integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", "dependencies": { "@turf/helpers": "^6.5.0" }, @@ -3769,6 +3807,18 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/boolean-contains/node_modules/@turf/boolean-point-in-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", + "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/boolean-contains/node_modules/@turf/invariant": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", @@ -3780,24 +3830,90 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/boolean-disjoint": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-disjoint/-/boolean-disjoint-7.1.0.tgz", + "integrity": "sha512-JapOG03kOCoGeYMWgTQjEifhr1nUoK4Os2cX0iC5X9kvZF4qCHeruX8/rffBQDx7PDKQKusSTXq8B1ISFi0hOw==", + "peer": true, + "dependencies": { + "@turf/boolean-point-in-polygon": "^7.1.0", + "@turf/helpers": "^7.1.0", + "@turf/line-intersect": "^7.1.0", + "@turf/meta": "^7.1.0", + "@turf/polygon-to-line": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-disjoint/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-intersects": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-intersects/-/boolean-intersects-7.1.0.tgz", + "integrity": "sha512-gpksWbb0RT+Z3nfqRfoACY3KEFyv2BPaxJ3L76PH67DhHZviq3Nfg85KYbpuhS64FSm+9tXe4IaKn6EjbHo20g==", + "peer": true, + "dependencies": { + "@turf/boolean-disjoint": "^7.1.0", + "@turf/helpers": "^7.1.0", + "@turf/meta": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-intersects/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/boolean-point-in-polygon": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", - "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-7.1.0.tgz", + "integrity": "sha512-mprVsyIQ+ijWTZwbnO4Jhxu94ZW2M2CheqLiRTsGJy0Ooay9v6Av5/Nl3/Gst7ZVXxPqMeMaFYkSzcTc87AKew==", + "peer": true, "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", + "point-in-polygon-hao": "^1.1.0", + "tslib": "^2.6.2" }, "funding": { "url": "https://opencollective.com/turf" } }, - "node_modules/@turf/boolean-point-in-polygon/node_modules/@turf/invariant": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", - "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "node_modules/@turf/boolean-point-in-polygon/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, "dependencies": { - "@turf/helpers": "^6.5.0" + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" }, "funding": { "url": "https://opencollective.com/turf" @@ -3850,6 +3966,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/centroid/node_modules/@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/circle": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/circle/-/circle-6.5.0.tgz", @@ -3863,12 +3990,13 @@ } }, "node_modules/@turf/clean-coords": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", - "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.1.0.tgz", + "integrity": "sha512-q1U8UbRVL5cRdwOlNjD8mad8pWjFGe0s4ihg1pSiVNq7i47WASJ3k20yZiUFvuAkyNjV0rZ/A7Jd7WzjcierFg==", "dependencies": { - "@turf/helpers": "^7.0.0", - "@turf/invariant": "^7.0.0", + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "funding": { @@ -3876,11 +4004,11 @@ } }, "node_modules/@turf/clean-coords/node_modules/@turf/helpers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", - "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", "dependencies": { - "deep-equal": "^2.2.3", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "funding": { @@ -3953,11 +4081,12 @@ } }, "node_modules/@turf/invariant": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", - "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.1.0.tgz", + "integrity": "sha512-OCLNqkItBYIP1nE9lJGuIUatWGtQ4rhBKAyTfFu0z8npVzGEYzvguEeof8/6LkKmTTEHW53tCjoEhSSzdRh08Q==", "dependencies": { - "@turf/helpers": "^7.0.0", + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "funding": { @@ -3965,11 +4094,11 @@ } }, "node_modules/@turf/invariant/node_modules/@turf/helpers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", - "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", "dependencies": { - "deep-equal": "^2.2.3", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "funding": { @@ -3989,7 +4118,7 @@ "url": "https://opencollective.com/turf" } }, - "node_modules/@turf/meta": { + "node_modules/@turf/length/node_modules/@turf/meta": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", @@ -4000,6 +4129,60 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/line-intersect": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-7.1.0.tgz", + "integrity": "sha512-JI3dvOsAoCqd4vUJ134FIzgcC42QpC/tBs+b4OJoxWmwDek3REv4qGaZY6wCg9X4hFSlCKFcnhMIQQZ/n720Qg==", + "peer": true, + "dependencies": { + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", + "sweepline-intersections": "^1.5.0", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-intersect/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/meta": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-7.1.0.tgz", + "integrity": "sha512-ZgGpWWiKz797Fe8lfRj7HKCkGR+nSJ/5aKXMyofCvLSc2PuYJs/qyyifDPWjASQQCzseJ7AlF2Pc/XQ/3XkkuA==", + "peer": true, + "dependencies": { + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/meta/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/midpoint": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/midpoint/-/midpoint-6.5.0.tgz", @@ -4014,6 +4197,34 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/polygon-to-line": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/polygon-to-line/-/polygon-to-line-7.1.0.tgz", + "integrity": "sha512-FBlfyBWNQZCTVGqlJH7LR2VXmvj8AydxrA8zegqek/5oPGtQDeUgIppKmvmuNClqbglhv59QtCUVaDK4bOuCTA==", + "peer": true, + "dependencies": { + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/polygon-to-line/node_modules/@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "dependencies": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/rhumb-bearing": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz", @@ -4112,6 +4323,17 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/transform-rotate/node_modules/@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", @@ -5591,9 +5813,9 @@ } }, "node_modules/arlas-iam-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-25.0.0.tgz", - "integrity": "sha512-N01YAyfS/mB0Qbh9txUfcYWjjLUC89p80f4Hw6lFguCs2fbMlxE1HhX18HfLzlfwkDYc5OSrZlJRgt1moS+FWQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", + "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", "dependencies": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -5601,18 +5823,18 @@ } }, "node_modules/arlas-permissions-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-25.0.0.tgz", - "integrity": "sha512-4IXW1ttu4m0hHOJfaap91hG6/bQXbJHZZBfXRJo63KQ5pBbuT2LQQ33t4UY2dP+M99TkoD1CCXmgh/vBnndLWg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", + "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-persistence-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-25.0.0.tgz", - "integrity": "sha512-Q8dI0hDSqSfpvg2pMG+ViDUSWY1NF69yvjbIVb4q7hxt6t04NPO91o4BnoARQ+Znhe2XMGD/5RRvfEQ6Amc7gQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", + "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" @@ -5628,9 +5850,9 @@ } }, "node_modules/arlas-web-components": { - "version": "25.1.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.1.2.tgz", - "integrity": "sha512-EmQRSikKbeggxpyeWbJjOeo/J6eYYFHzj+OrtFRNlO204f+eA+htfinJj+dt1U9rD5ctaQubRstrCxqy3fCaZw==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", + "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5686,9 +5908,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.1.0.tgz", - "integrity": "sha512-Ba/p7/rImBES7ZtoQfzZyv66l1/SSNRI9xkR4Ma7CvqP0xqtwVNvtb5Lp8NWhNtcUXWNj0xFSyk98vYBz6rzGA==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", + "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -5708,6 +5930,28 @@ "wellknown": "^0.5.0" } }, + "node_modules/arlas-web-contributors/node_modules/@turf/bbox-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz", + "integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/arlas-web-contributors/node_modules/@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/arlas-web-core": { "version": "25.1.0", "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.1.0.tgz", @@ -5718,9 +5962,9 @@ } }, "node_modules/arlas-wui-toolkit": { - "version": "25.1.2", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.1.2.tgz", - "integrity": "sha512-iMy4wxmjAfeYmm94LZg7ZiHnN8GRR9oZBre6SWmgE8zyj8CjDKbKaFo6R3t63VuQSqsIHyABMKrnLRSg3yKzLw==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.1.tgz", + "integrity": "sha512-VeEnP01eM+A3P6TSUY21oks+XRGnOFtF8ZYk06v+TC2Xb3MXYTViqRC/rbCqt7fWMzBye50LDRFBjanj+2D0uw==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -5728,12 +5972,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "25.0.0", - "arlas-permissions-api": "25.0.0", - "arlas-persistence-api": "25.0.0", + "arlas-iam-api": "26.0.0-rc.1", + "arlas-permissions-api": "26.0.0-rc.1", + "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.1.2", - "arlas-web-contributors": "~25.1.0", + "arlas-web-components": "26.0.0-rc.2", + "arlas-web-contributors": "26.0.0-rc.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -5758,10 +6002,15 @@ "@gisaia/ngx-translate-extract": "^8.1.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", + "@turf/bbox-polygon": "^7.0.0", + "@turf/boolean-intersects": "^7.0.0", + "@turf/clean-coords": "^7.0.0", + "@turf/helpers": "^6.5.0", "core-js": "~3.26.1", "moment": "^2.24.0", "rxjs": "~7.4.0", "stream": "0.0.2", + "wellknown": "0.5.0", "zone.js": "^0.11.4" } }, @@ -5784,6 +6033,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, "dependencies": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -5911,6 +6161,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -6489,6 +6740,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -7966,6 +8218,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", + "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -8033,6 +8286,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -8058,6 +8312,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -8540,6 +8795,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -8551,6 +8807,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, "engines": { "node": ">= 0.4" } @@ -8559,6 +8816,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -10027,6 +10285,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, "dependencies": { "is-callable": "^1.1.3" } @@ -10151,6 +10410,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10240,6 +10500,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -10383,6 +10644,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -10481,6 +10743,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10497,6 +10760,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, "dependencies": { "es-define-property": "^1.0.0" }, @@ -10508,6 +10772,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -10519,6 +10784,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -10530,6 +10796,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -11132,6 +11399,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.0", @@ -11181,6 +11449,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11196,6 +11465,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -11217,6 +11487,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, "dependencies": { "has-bigints": "^1.0.1" }, @@ -11239,6 +11510,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11268,6 +11540,7 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -11301,6 +11574,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11370,6 +11644,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -11394,6 +11669,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11479,6 +11755,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11494,6 +11771,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -11505,6 +11783,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, "dependencies": { "call-bind": "^1.0.7" }, @@ -11531,6 +11810,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -11545,6 +11825,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -11576,6 +11857,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -11587,6 +11869,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, "dependencies": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -11617,7 +11900,8 @@ "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true }, "node_modules/isbinaryfile": { "version": "4.0.10", @@ -13963,6 +14247,7 @@ "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13971,6 +14256,7 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "dev": true, "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -13986,6 +14272,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, "engines": { "node": ">= 0.4" } @@ -13994,6 +14281,7 @@ "version": "4.1.5", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -14807,10 +15095,17 @@ "fflate": "^0.8.0" } }, + "node_modules/point-in-polygon-hao": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/point-in-polygon-hao/-/point-in-polygon-hao-1.1.0.tgz", + "integrity": "sha512-3hTIM2j/v9Lio+wOyur3kckD4NxruZhpowUbEgmyikW+a2Kppjtu1eN+AhnMQtoHW46zld88JiYWv6fxpsDrTQ==", + "peer": true + }, "node_modules/possible-typed-array-names": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, "engines": { "node": ">= 0.4" } @@ -15565,9 +15860,9 @@ "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" }, "node_modules/proj4": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz", - "integrity": "sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.0.tgz", + "integrity": "sha512-cQJxcVX7+fmAhOxoazKgk76GkGYQ5HcLod4rdy2MizhPvLdrZQJThxsHoz/TjjdxUvTm/rbozMgE0q9mdXKWIw==", "dependencies": { "mgrs": "1.0.0", "wkt-parser": "^1.3.3" @@ -16201,6 +16496,7 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, "dependencies": { "call-bind": "^1.0.6", "define-properties": "^1.2.1", @@ -17078,6 +17374,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -17094,6 +17391,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -17169,6 +17467,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -17488,6 +17787,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, "dependencies": { "internal-slot": "^1.0.4" }, @@ -17792,6 +18092,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/sweepline-intersections": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sweepline-intersections/-/sweepline-intersections-1.5.0.tgz", + "integrity": "sha512-AoVmx72QHpKtItPu72TzFL+kcYjd67BPLDoR0LarIk+xyaRg+pDTMFXndIEvZf9xEKnJv6JdhgRMnocoG0D3AQ==", + "peer": true, + "dependencies": { + "tinyqueue": "^2.0.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -19311,6 +19620,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -19326,6 +19636,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -19349,6 +19660,7 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", @@ -22174,6 +22486,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/meta": "^6.5.0" + }, + "dependencies": { + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/bbox": { @@ -22183,14 +22505,39 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/meta": "^6.5.0" + }, + "dependencies": { + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/bbox-polygon": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz", - "integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-7.1.0.tgz", + "integrity": "sha512-fvZB09ErCZOVlWVDop836hmpKaGUmfXnR9naMhS73A/8nn4M3hELbQtMv2R8gXj7UakXCuxS/i9erdpDFZ2O+g==", + "peer": true, "requires": { - "@turf/helpers": "^6.5.0" + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } } }, "@turf/bearing": { @@ -22224,6 +22571,15 @@ "@turf/invariant": "^6.5.0" }, "dependencies": { + "@turf/boolean-point-in-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", + "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", + "requires": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + } + }, "@turf/invariant": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", @@ -22234,21 +22590,79 @@ } } }, + "@turf/boolean-disjoint": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-disjoint/-/boolean-disjoint-7.1.0.tgz", + "integrity": "sha512-JapOG03kOCoGeYMWgTQjEifhr1nUoK4Os2cX0iC5X9kvZF4qCHeruX8/rffBQDx7PDKQKusSTXq8B1ISFi0hOw==", + "peer": true, + "requires": { + "@turf/boolean-point-in-polygon": "^7.1.0", + "@turf/helpers": "^7.1.0", + "@turf/line-intersect": "^7.1.0", + "@turf/meta": "^7.1.0", + "@turf/polygon-to-line": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } + } + }, + "@turf/boolean-intersects": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-intersects/-/boolean-intersects-7.1.0.tgz", + "integrity": "sha512-gpksWbb0RT+Z3nfqRfoACY3KEFyv2BPaxJ3L76PH67DhHZviq3Nfg85KYbpuhS64FSm+9tXe4IaKn6EjbHo20g==", + "peer": true, + "requires": { + "@turf/boolean-disjoint": "^7.1.0", + "@turf/helpers": "^7.1.0", + "@turf/meta": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } + } + }, "@turf/boolean-point-in-polygon": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", - "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-7.1.0.tgz", + "integrity": "sha512-mprVsyIQ+ijWTZwbnO4Jhxu94ZW2M2CheqLiRTsGJy0Ooay9v6Av5/Nl3/Gst7ZVXxPqMeMaFYkSzcTc87AKew==", + "peer": true, "requires": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", + "point-in-polygon-hao": "^1.1.0", + "tslib": "^2.6.2" }, "dependencies": { - "@turf/invariant": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", - "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, "requires": { - "@turf/helpers": "^6.5.0" + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" } } } @@ -22288,6 +22702,16 @@ "requires": { "@turf/helpers": "^6.5.0", "@turf/meta": "^6.5.0" + }, + "dependencies": { + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "@turf/circle": { @@ -22300,21 +22724,22 @@ } }, "@turf/clean-coords": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", - "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.1.0.tgz", + "integrity": "sha512-q1U8UbRVL5cRdwOlNjD8mad8pWjFGe0s4ihg1pSiVNq7i47WASJ3k20yZiUFvuAkyNjV0rZ/A7Jd7WzjcierFg==", "requires": { - "@turf/helpers": "^7.0.0", - "@turf/invariant": "^7.0.0", + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "dependencies": { "@turf/helpers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", - "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", "requires": { - "deep-equal": "^2.2.3", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" } } @@ -22372,20 +22797,21 @@ "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==" }, "@turf/invariant": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", - "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.1.0.tgz", + "integrity": "sha512-OCLNqkItBYIP1nE9lJGuIUatWGtQ4rhBKAyTfFu0z8npVzGEYzvguEeof8/6LkKmTTEHW53tCjoEhSSzdRh08Q==", "requires": { - "@turf/helpers": "^7.0.0", + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" }, "dependencies": { "@turf/helpers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", - "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", "requires": { - "deep-equal": "^2.2.3", + "@types/geojson": "^7946.0.10", "tslib": "^2.6.2" } } @@ -22399,14 +22825,62 @@ "@turf/distance": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/meta": "^6.5.0" + }, + "dependencies": { + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } + } + }, + "@turf/line-intersect": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-7.1.0.tgz", + "integrity": "sha512-JI3dvOsAoCqd4vUJ134FIzgcC42QpC/tBs+b4OJoxWmwDek3REv4qGaZY6wCg9X4hFSlCKFcnhMIQQZ/n720Qg==", + "peer": true, + "requires": { + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10", + "sweepline-intersections": "^1.5.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } } }, "@turf/meta": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", - "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-7.1.0.tgz", + "integrity": "sha512-ZgGpWWiKz797Fe8lfRj7HKCkGR+nSJ/5aKXMyofCvLSc2PuYJs/qyyifDPWjASQQCzseJ7AlF2Pc/XQ/3XkkuA==", + "peer": true, "requires": { - "@turf/helpers": "^6.5.0" + "@turf/helpers": "^7.1.0", + "@types/geojson": "^7946.0.10" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } } }, "@turf/midpoint": { @@ -22420,6 +22894,30 @@ "@turf/helpers": "^6.5.0" } }, + "@turf/polygon-to-line": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/polygon-to-line/-/polygon-to-line-7.1.0.tgz", + "integrity": "sha512-FBlfyBWNQZCTVGqlJH7LR2VXmvj8AydxrA8zegqek/5oPGtQDeUgIppKmvmuNClqbglhv59QtCUVaDK4bOuCTA==", + "peer": true, + "requires": { + "@turf/helpers": "^7.1.0", + "@turf/invariant": "^7.1.0", + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.1.0.tgz", + "integrity": "sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==", + "peer": true, + "requires": { + "@types/geojson": "^7946.0.10", + "tslib": "^2.6.2" + } + } + } + }, "@turf/rhumb-bearing": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz", @@ -22499,6 +22997,14 @@ "requires": { "@turf/helpers": "^6.5.0" } + }, + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } } } }, @@ -23678,9 +24184,9 @@ } }, "arlas-iam-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-25.0.0.tgz", - "integrity": "sha512-N01YAyfS/mB0Qbh9txUfcYWjjLUC89p80f4Hw6lFguCs2fbMlxE1HhX18HfLzlfwkDYc5OSrZlJRgt1moS+FWQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", + "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", "requires": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -23688,18 +24194,18 @@ } }, "arlas-permissions-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-25.0.0.tgz", - "integrity": "sha512-4IXW1ttu4m0hHOJfaap91hG6/bQXbJHZZBfXRJo63KQ5pBbuT2LQQ33t4UY2dP+M99TkoD1CCXmgh/vBnndLWg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", + "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-persistence-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-25.0.0.tgz", - "integrity": "sha512-Q8dI0hDSqSfpvg2pMG+ViDUSWY1NF69yvjbIVb4q7hxt6t04NPO91o4BnoARQ+Znhe2XMGD/5RRvfEQ6Amc7gQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", + "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" @@ -23715,9 +24221,9 @@ } }, "arlas-web-components": { - "version": "25.1.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.1.2.tgz", - "integrity": "sha512-EmQRSikKbeggxpyeWbJjOeo/J6eYYFHzj+OrtFRNlO204f+eA+htfinJj+dt1U9rD5ctaQubRstrCxqy3fCaZw==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", + "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -23754,9 +24260,9 @@ } }, "arlas-web-contributors": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.1.0.tgz", - "integrity": "sha512-Ba/p7/rImBES7ZtoQfzZyv66l1/SSNRI9xkR4Ma7CvqP0xqtwVNvtb5Lp8NWhNtcUXWNj0xFSyk98vYBz6rzGA==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", + "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -23774,6 +24280,24 @@ "rxjs": "~7.4.0", "tinycolor2": "~1.4.1", "wellknown": "^0.5.0" + }, + "dependencies": { + "@turf/bbox-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz", + "integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==", + "requires": { + "@turf/helpers": "^6.5.0" + } + }, + "@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "requires": { + "@turf/helpers": "^6.5.0" + } + } } }, "arlas-web-core": { @@ -23786,9 +24310,9 @@ } }, "arlas-wui-toolkit": { - "version": "25.1.2", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-25.1.2.tgz", - "integrity": "sha512-iMy4wxmjAfeYmm94LZg7ZiHnN8GRR9oZBre6SWmgE8zyj8CjDKbKaFo6R3t63VuQSqsIHyABMKrnLRSg3yKzLw==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.1.tgz", + "integrity": "sha512-VeEnP01eM+A3P6TSUY21oks+XRGnOFtF8ZYk06v+TC2Xb3MXYTViqRC/rbCqt7fWMzBye50LDRFBjanj+2D0uw==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -23796,12 +24320,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "25.0.0", - "arlas-permissions-api": "25.0.0", - "arlas-persistence-api": "25.0.0", + "arlas-iam-api": "26.0.0-rc.1", + "arlas-permissions-api": "26.0.0-rc.1", + "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.1.2", - "arlas-web-contributors": "~25.1.0", + "arlas-web-components": "26.0.0-rc.2", + "arlas-web-contributors": "26.0.0-rc.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -23829,6 +24353,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, "requires": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -23906,6 +24431,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, "requires": { "possible-typed-array-names": "^1.0.0" } @@ -24332,6 +24858,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, "requires": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -25418,6 +25945,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", + "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -25470,6 +25998,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, "requires": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -25486,6 +26015,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, "requires": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -25875,6 +26405,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, "requires": { "get-intrinsic": "^1.2.4" } @@ -25882,12 +26413,14 @@ "es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true }, "es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -26903,6 +27436,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, "requires": { "is-callable": "^1.1.3" } @@ -26991,7 +27525,8 @@ "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true }, "gauge": { "version": "4.0.4", @@ -27065,6 +27600,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, "requires": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -27172,6 +27708,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, "requires": { "get-intrinsic": "^1.1.3" } @@ -27251,7 +27788,8 @@ "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true }, "has-flag": { "version": "3.0.0", @@ -27262,6 +27800,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, "requires": { "es-define-property": "^1.0.0" } @@ -27269,17 +27808,20 @@ "has-proto": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true }, "has-tostringtag": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, "requires": { "has-symbols": "^1.0.3" } @@ -27746,6 +28288,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, "requires": { "es-errors": "^1.3.0", "hasown": "^2.0.0", @@ -27785,6 +28328,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27794,6 +28338,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -27809,6 +28354,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, "requires": { "has-bigints": "^1.0.1" } @@ -27825,6 +28371,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27841,7 +28388,8 @@ "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true }, "is-ci": { "version": "2.0.0", @@ -27863,6 +28411,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -27904,7 +28453,8 @@ "is-map": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==" + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true }, "is-module": { "version": "1.0.0", @@ -27920,6 +28470,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -27980,6 +28531,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27988,12 +28540,14 @@ "is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==" + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true }, "is-shared-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, "requires": { "call-bind": "^1.0.7" } @@ -28008,6 +28562,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -28016,6 +28571,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -28034,12 +28590,14 @@ "is-weakmap": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==" + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true }, "is-weakset": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, "requires": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -28061,7 +28619,8 @@ "isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true }, "isbinaryfile": { "version": "4.0.10", @@ -29887,12 +30446,14 @@ "object-inspect": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "dev": true }, "object-is": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "dev": true, "requires": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -29901,12 +30462,14 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object.assign": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, "requires": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -30524,10 +31087,17 @@ "fflate": "^0.8.0" } }, + "point-in-polygon-hao": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/point-in-polygon-hao/-/point-in-polygon-hao-1.1.0.tgz", + "integrity": "sha512-3hTIM2j/v9Lio+wOyur3kckD4NxruZhpowUbEgmyikW+a2Kppjtu1eN+AhnMQtoHW46zld88JiYWv6fxpsDrTQ==", + "peer": true + }, "possible-typed-array-names": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==" + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true }, "postcss": { "version": "8.4.31", @@ -30952,9 +31522,9 @@ "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" }, "proj4": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz", - "integrity": "sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.0.tgz", + "integrity": "sha512-cQJxcVX7+fmAhOxoazKgk76GkGYQ5HcLod4rdy2MizhPvLdrZQJThxsHoz/TjjdxUvTm/rbozMgE0q9mdXKWIw==", "requires": { "mgrs": "1.0.0", "wkt-parser": "^1.3.3" @@ -31463,6 +32033,7 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, "requires": { "call-bind": "^1.0.6", "define-properties": "^1.2.1", @@ -32124,6 +32695,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, "requires": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -32137,6 +32709,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, "requires": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -32202,6 +32775,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, "requires": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -32461,6 +33035,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, "requires": { "internal-slot": "^1.0.4" } @@ -32683,6 +33258,15 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, + "sweepline-intersections": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sweepline-intersections/-/sweepline-intersections-1.5.0.tgz", + "integrity": "sha512-AoVmx72QHpKtItPu72TzFL+kcYjd67BPLDoR0LarIk+xyaRg+pDTMFXndIEvZf9xEKnJv6JdhgRMnocoG0D3AQ==", + "peer": true, + "requires": { + "tinyqueue": "^2.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -33805,6 +34389,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, "requires": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -33817,6 +34402,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, "requires": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -33834,6 +34420,7 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, "requires": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", From 52f5295f13136c2d0bcbb6d3cf4fed4030dad09a Mon Sep 17 00:00:00 2001 From: Sebastien Bousquet Date: Mon, 19 Aug 2024 10:24:29 +0200 Subject: [PATCH 16/48] feat: implements zoom to strategy - Fix #810 --- .../arlas-wui-root.component.html | 2 +- .../arlas-wui-root.component.ts | 30 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index 82d1164b..28a0be8a 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -5,7 +5,7 @@ - diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 891a8fc8..ac49d37c 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -81,7 +81,8 @@ import { FilterShortcutConfiguration, NOT_CONFIGURED, ProcessService, - TimelineComponent + TimelineComponent, + ZoomToDataStrategy } from 'arlas-wui-toolkit'; import * as mapboxgl from 'mapbox-gl'; import { BehaviorSubject, fromEvent, merge, Observable, of, Subject, zip } from 'rxjs'; @@ -161,6 +162,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { /* Options */ public spinner: { show: boolean; diameter: string; color: string; strokeWidth: number; } = { show: false, diameter: '60', color: 'accent', strokeWidth: 5 }; + public zoomToStrategy = ZoomToDataStrategy.NONE; public showZoomToData = false; public showIndicators = false; public onSideNavChange: boolean; @@ -321,6 +323,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.nbVerticesLimit = this.configService.getValue('arlas.web.components.mapgl.nbVerticesLimit'); this.timelineComponentConfig = this.configService.getValue('arlas.web.components.timeline'); this.detailedTimelineComponentConfig = this.configService.getValue('arlas.web.components.detailedTimeline'); + this.zoomToStrategy = this.configService.getValue('arlas.web.options.zoom_to_strategy'); this.mainCollection = this.configService.getValue('arlas.server.collection.name'); this.defaultBaseMap = !!this.mapComponentConfig.defaultBasemapStyle ? this.mapComponentConfig.defaultBasemapStyle : @@ -332,7 +335,10 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (this.configService.getValue('arlas.web.options.spinner')) { this.spinner = Object.assign(this.spinner, this.configService.getValue('arlas.web.options.spinner')); } - if (this.configService.getValue('arlas.web.options.zoom_to_data')) { + if ( + (!!this.zoomToStrategy && this.zoomToStrategy !== ZoomToDataStrategy.NONE) + || this.configService.getValue('arlas.web.options.zoom_to_data') // for backward compatibility + ) { this.showZoomToData = true; } if (this.configService.getValue('arlas.web.options.indicators')) { @@ -713,7 +719,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // If there is a list displayed, sync window layers' data if (!!this.previewListContrib && this.previewListContrib.data.length > 0 && - this.mapComponentConfig.mapLayers.events.onHover.filter(l => this.mapglComponent.map.getLayer(l)).length > 0) { + this.mapComponentConfig.mapLayers.events.onHover.filter(l => this.mapglComponent.map.getLayer(l)).length > 0) { this.updateVisibleItems(); } } @@ -743,7 +749,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (!!this.mapComponentConfig.mapLayers.events.onHover) { this.mapComponentConfig.mapLayers.events.onHover.forEach(l => { const layer = this.mapglComponent.map.getLayer(l) as ArlasAnyLayer; - if (!!layer && typeof(layer.source) === 'string' && layer.source.indexOf(collection) >= 0) { + if (!!layer && typeof (layer.source) === 'string' && layer.source.indexOf(collection) >= 0) { if (ids && ids.length > 0) { // Tests value in camel and kebab case due to an unknown issue on other projects if (layer.metadata.isScrollableLayer || layer.metadata['is-scrollable-layer']) { @@ -839,8 +845,16 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (!this.mapSettingsService.mapContributors || this.mapSettingsService.mapContributors.length === 0) { this.mapSettingsService.mapContributors = this.mapglContributors; } - const centroidPath = this.collectionToDescription.get(collection).centroid_path; - this.mapService.zoomToData(collection, centroidPath, this.mapglComponent.map, 0.2); + let fieldPath; + if ( + this.zoomToStrategy === ZoomToDataStrategy.CENTROID + || this.configService.getValue('arlas.web.options.zoom_to_data') // for backward compatibility + ) { + fieldPath = this.collectionToDescription.get(collection).centroid_path; + } else if (this.zoomToStrategy === ZoomToDataStrategy.GEOMETRY) { + fieldPath = this.collectionToDescription.get(collection).geometry_path; + } + this.mapService.zoomToData(collection, fieldPath, this.mapglComponent.map, 0.2); } @@ -1136,9 +1150,9 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { // Select the good tab if we have several // No tabs case if (this.resultlistContributors.length === 1) { - this.waitFor(this.resultListComponent,() => this.openDetail(id)); + this.waitFor(this.resultListComponent, () => this.openDetail(id)); } else { - this.waitFor(this.resultListComponent,() => { + this.waitFor(this.resultListComponent, () => { // retrieve list const tab = document.querySelector('[aria-label="' + resultListContributor.identifier + '"]') as any; tab.click(); From 27e452c1514b3e71180ba3f93f0238e7a5cea678 Mon Sep 17 00:00:00 2001 From: Sebastien Bousquet Date: Fri, 23 Aug 2024 18:08:31 +0200 Subject: [PATCH 17/48] feat: update toolkit to 26.0.0-rc.2 --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23ee70ef..3da91f06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~26.0.0-rc.1", + "arlas-wui-toolkit": "26.0.0-rc.2", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -5780,9 +5780,9 @@ } }, "node_modules/arlas-d3": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", - "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", + "version": "11.2.3", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.3.tgz", + "integrity": "sha512-A5Hyjy1ensxDors5lTBDNqi9/gAhSgVvoFJk4rRPu535N5ON5+MArFeLuMRZa0TNKJ6G8LVCVlCTjuN5VKkqtg==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -5908,9 +5908,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", - "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.2.tgz", + "integrity": "sha512-64BJCVFb3SU+03pX9jGhppHsEh7c8A3qkxPRbybfwDhV6OKqGZ+jc5qGnOVGWMG5g6lJEPTdoVxayJe8TQ9j1Q==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -5962,9 +5962,9 @@ } }, "node_modules/arlas-wui-toolkit": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.1.tgz", - "integrity": "sha512-VeEnP01eM+A3P6TSUY21oks+XRGnOFtF8ZYk06v+TC2Xb3MXYTViqRC/rbCqt7fWMzBye50LDRFBjanj+2D0uw==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.2.tgz", + "integrity": "sha512-0Cw9EV+phdU2EvCUsldVlQ5HF23ytuJ+8WoTEIm63ML8NmHmkLTMC5+VizPlVvfLRBGmm34scon94h/JyTib4w==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -5977,7 +5977,7 @@ "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", "arlas-web-components": "26.0.0-rc.2", - "arlas-web-contributors": "26.0.0-rc.1", + "arlas-web-contributors": "26.0.0-rc.2", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -24151,9 +24151,9 @@ } }, "arlas-d3": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", - "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", + "version": "11.2.3", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.3.tgz", + "integrity": "sha512-A5Hyjy1ensxDors5lTBDNqi9/gAhSgVvoFJk4rRPu535N5ON5+MArFeLuMRZa0TNKJ6G8LVCVlCTjuN5VKkqtg==", "requires": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -24260,9 +24260,9 @@ } }, "arlas-web-contributors": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", - "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.2.tgz", + "integrity": "sha512-64BJCVFb3SU+03pX9jGhppHsEh7c8A3qkxPRbybfwDhV6OKqGZ+jc5qGnOVGWMG5g6lJEPTdoVxayJe8TQ9j1Q==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -24310,9 +24310,9 @@ } }, "arlas-wui-toolkit": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.1.tgz", - "integrity": "sha512-VeEnP01eM+A3P6TSUY21oks+XRGnOFtF8ZYk06v+TC2Xb3MXYTViqRC/rbCqt7fWMzBye50LDRFBjanj+2D0uw==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.2.tgz", + "integrity": "sha512-0Cw9EV+phdU2EvCUsldVlQ5HF23ytuJ+8WoTEIm63ML8NmHmkLTMC5+VizPlVvfLRBGmm34scon94h/JyTib4w==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -24325,7 +24325,7 @@ "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", "arlas-web-components": "26.0.0-rc.2", - "arlas-web-contributors": "26.0.0-rc.1", + "arlas-web-contributors": "26.0.0-rc.2", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", diff --git a/package.json b/package.json index e9c2a408..27d81632 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~26.0.0-rc.1", + "arlas-wui-toolkit": "26.0.0-rc.2", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", From da6094fd97b947b37ab1eb8edf2e8f1074e88d5f Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Thu, 29 Aug 2024 16:28:34 +0200 Subject: [PATCH 18/48] feat: use collection service for display name --- package-lock.json | 14 ++++---- package.json | 2 +- src/app/app.module.ts | 4 ++- .../arlas-wui-root.component.html | 7 ++-- .../arlas-wui-root.component.ts | 33 ++++++------------- src/assets/i18n/en.json | 5 +-- src/assets/i18n/es.json | 5 +-- src/assets/i18n/fr.json | 5 +-- src/assets/i18n/template.json | 5 +-- 9 files changed, 35 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3da91f06..bf1733b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "26.0.0-rc.2", + "arlas-wui-toolkit": "26.0.0-rc.3", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -5962,9 +5962,9 @@ } }, "node_modules/arlas-wui-toolkit": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.2.tgz", - "integrity": "sha512-0Cw9EV+phdU2EvCUsldVlQ5HF23ytuJ+8WoTEIm63ML8NmHmkLTMC5+VizPlVvfLRBGmm34scon94h/JyTib4w==", + "version": "26.0.0-rc.3", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.3.tgz", + "integrity": "sha512-9Y33wLOOUa3+nI+7TWcsfrtTOuXHhqkYosUwb74Eb8Wpey2B15wIQ8200HDnxEX+VAd2nFXGjAkALQXuyfQzfg==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -24310,9 +24310,9 @@ } }, "arlas-wui-toolkit": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.2.tgz", - "integrity": "sha512-0Cw9EV+phdU2EvCUsldVlQ5HF23ytuJ+8WoTEIm63ML8NmHmkLTMC5+VizPlVvfLRBGmm34scon94h/JyTib4w==", + "version": "26.0.0-rc.3", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.3.tgz", + "integrity": "sha512-9Y33wLOOUa3+nI+7TWcsfrtTOuXHhqkYosUwb74Eb8Wpey2B15wIQ8200HDnxEX+VAd2nFXGjAkALQXuyfQzfg==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", diff --git a/package.json b/package.json index 27d81632..1723e984 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "26.0.0-rc.2", + "arlas-wui-toolkit": "26.0.0-rc.3", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bf89c5d9..5b39c766 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -48,6 +48,7 @@ import { ResultsModule, FormatNumberModule, BboxGeneratorModule } from 'arlas-web-components'; import { + ArlasCollectionService, ArlasConfigService, ArlasIamService, ArlasSettingsService, @@ -166,7 +167,8 @@ import { LAZYLOAD_IMAGE_HOOKS, LazyLoadImageModule } from 'ng-lazyload-image'; useClass: JwtInterceptor, deps: [AuthentificationService, ArlasIamService, ArlasSettingsService], multi: true - } + }, + ArlasCollectionService ], bootstrap: [ArlasWuiComponent], entryComponents: [] diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index 28a0be8a..32739a6e 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -6,9 +6,7 @@ [searchContributor]="chipsSearchContributor" [dialogPositionLeft]="42" [dialogPositionTop]="-2"> + [collectionToDescription]="collectionToDescription" (zoomEvent)="zoomToData($event)" [availableSpace]="availableSpaceCounts" [spacing]="spacing"> @@ -243,8 +241,7 @@ class="arlas-timeline-toolkit" [class.timeline-hidden]="!isTimelineOpen" [isDisplayHistogram]="isTimelineOpen" (isDisplayHistogramChange)="toggleTimeline()" [activeDatePicker]="true" [timelineComponent]="timelineComponentConfig" - [detailedTimelineComponent]="detailedTimelineComponentConfig" - [units]="appUnits"> + [detailedTimelineComponent]="detailedTimelineComponentConfig"> = new Map(); public mainMapContributor: MapContributor; - public mainCollection; + public mainCollection: string; public geojsondraw: { type: string; features: Array; } = { 'type': 'FeatureCollection', 'features': [] @@ -284,7 +282,8 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { private generateAoiDialog: MatDialog, private processService: ProcessService, private resultlistService: ResultlistService, - private exportService: ArlasExportCsvService + private exportService: ArlasExportCsvService, + private collectionService: ArlasCollectionService ) { this.menuState = { configs: false @@ -301,20 +300,6 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.appName = this.configService.appName ?? (this.configService.getValue('arlas-wui.web.app.name') ?? 'ARLAS'); - this.appUnits = this.configService.getValue('arlas-wui.web.app.units') ? - this.configService.getValue('arlas-wui.web.app.units') : []; - /** retrocompatibility code for unit*/ - const appUnit = this.configService.getValue('arlas-wui.web.app.unit'); - if (appUnit || this.appUnits.length === 0) { - this.appUnits.push({ - collection: this.collaborativeService.defaultCollection, - unit: !!appUnit ? appUnit : this.collaborativeService.defaultCollection, - ignored: false - }); - } - /** end of retrocompatibility code */ - this.appNameBackgroundColor = this.configService.getValue('arlas-wui.web.app.name_background_color') ? - this.configService.getValue('arlas-wui.web.app.name_background_color') : '#FF4081'; this.analyticsContributor = this.arlasStartUpService.contributorRegistry.get('analytics') as AnalyticsContributor; this.mapComponentConfig = this.configService.getValue('arlas.web.components.mapgl.input'); const mapExtendTimer = this.configService.getValue('arlas.web.components.mapgl.mapExtendTimer'); @@ -827,7 +812,8 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { changedMapContributors[i].setGeoQueryOperation(geoQuery.operation); changedMapContributors[i].setGeoQueryField(geoQuery.geometry_path); changedMapContributors[i].onChangeGeoQuery(); - this.snackbar.open(this.translate.instant('Updating Geo-query of') + ' ' + changedMapContributors[i].collection); + this.snackbar.open(this.translate.instant('Updating Geo-query of ', + { collection: this.translate.instant(this.collectionService.getDisplayName(changedMapContributors[i].collection))})); if (i === changedMapContributors.length - 1) { setTimeout(() => this.snackbar.dismiss(), 1000); } @@ -845,7 +831,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (!this.mapSettingsService.mapContributors || this.mapSettingsService.mapContributors.length === 0) { this.mapSettingsService.mapContributors = this.mapglContributors; } - let fieldPath; + let fieldPath: string; if ( this.zoomToStrategy === ZoomToDataStrategy.CENTROID || this.configService.getValue('arlas.web.options.zoom_to_data') // for backward compatibility @@ -1026,7 +1012,8 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { const debounceDuration = configDebounceTime !== undefined ? configDebounceTime : 750; for (let i = 0; i < this.mapglContributors.length; i++) { setTimeout(() => { - this.snackbar.open(this.translate.instant('Loading data of') + ' ' + this.mapglContributors[i].collection); + this.snackbar.open(this.translate.instant('Loading data of ', + { collection: this.translate.instant(this.collectionService.getDisplayName(this.mapglContributors[i].collection))})); this.mapglContributors[i].onChangeAoi(event); if (i === this.mapglContributors.length - 1) { setTimeout(() => this.snackbar.dismiss(), 1000); @@ -1442,7 +1429,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { return paramValue; } - private actionOnItemEvent(data, mapContributor, listContributor, collection) { + private actionOnItemEvent(data, mapContributor: MapContributor, listContributor: ResultListContributor, collection: string) { switch (data.action.id) { case 'zoomToFeature': if (!!mapContributor) { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ac9fa2b4..766f89a7 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -5,6 +5,7 @@ "Search a place": "Search a place, an address", "Add bbox": "Add bbox", "Draw a polygon": "Draw a polygon", + "Draw a circle": "Draw a circle", "Import polygon": "Import polygon", "Edit drawings": "Edit drawings", "Remove drawings": "Remove drawings", @@ -38,8 +39,8 @@ "Width": "Width", "envelope": "envelope", "Height": "Height", - "Updating Geo-query of": "Updating Geo-query of", - "Loading data of": "Loading collection", + "Updating Geo-query of ": "Updating Geo-query of {{collection}}", + "Loading data of ": "Loading collection {{collection}}", "You have exceeded the number of products authorised for a single download": "You have exceeded the number of products authorised for a single download", "An error occured exporting the list": "An error occured exporting the list", "reduce": "Reduce", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 03a5ac14..1d157722 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -5,6 +5,7 @@ "Search a place": "Buscar un lugar", "Add bbox": "Añadir un cuadro delimitador", "Draw a polygon": "Dibujar un polígono", + "Draw a circle": "Dibujar un circulo", "Import polygon": "Importar un polígono", "Edit drawings": "Editar polígonos y cuadro delimitador", "Remove drawings": "Quitar polígonos y cuadro delimitador", @@ -38,8 +39,8 @@ "Width": "Anchura", "envelope": "cuadro delimitador ", "Height": "Altura", - "Updating Geo-query of": "Carga de la petición geográfica de", - "Loading data of": "Carga de la collección", + "Updating Geo-query of ": "Carga de la petición geográfica de {{collection}}", + "Loading data of ": "Carga de la collección {{collection}}", "You have exceeded the number of products authorised for a single download": "Ha superado el número de productos autorizados para una sola descarga", "An error occured exporting the list": "Se ha producido un error al exportar la lista", "reduce": "Reducir", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 763ff00d..4095a1a7 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -5,6 +5,7 @@ "Search a place": "Chercher un lieu, une addresse", "Add bbox": "Ajouter bbox", "Draw a polygon": "Dessiner un polygone", + "Draw a circle": "Dessiner un cercle", "Import polygon": "Importer un polygone", "Edit drawings": "Editer les polygones et bbox", "Remove drawings": "Effacer les polygones et bbox", @@ -38,8 +39,8 @@ "Width": "Largeur", "envelope": "enveloppe", "Height": "Hauteur", - "Updating Geo-query of": "Chargement de la requête géographique de", - "Loading data of": "Chargement de la collection", + "Updating Geo-query of ": "Chargement de la requête géographique de {{collection}}", + "Loading data of ": "Chargement de la collection {{collection}}", "You have exceeded the number of products authorised for a single download": "Vous avez dépassé le nombre de produits autorisés pour un téléchargement unique", "An error occured exporting the list": "Une erreur s'est produite lors de l'exportation de la liste", "reduce": "Réduire", diff --git a/src/assets/i18n/template.json b/src/assets/i18n/template.json index 0ef17e1b..58d90025 100644 --- a/src/assets/i18n/template.json +++ b/src/assets/i18n/template.json @@ -5,6 +5,7 @@ "Search a place": "Search a place", "Add bbox": "Add bbox", "Draw a polygon": "Draw a polygon", + "Draw a circle": "Draw a circle", "Import polygon": "Import polygon", "Edit drawings": "Edit drawings", "Remove drawings": "Remove drawings", @@ -38,8 +39,8 @@ "Width": "Width", "envelope": "envelope", "Height": "Height", - "Updating Geo-query of": "Updating Geo-query of", - "Loading data of": "Loading data of", + "Updating Geo-query of ": "Updating Geo-query of ", + "Loading data of ": "Loading data of ", "You have exceeded the number of products authorised for a single download": "You have exceeded the number of products authorised for a single download", "An error occured exporting the list": "An error occured exporting the list", "reduce": "reduce", From d1f95c097a5a16c3fd1e8157cb235e388a3cbb9d Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 2 Sep 2024 16:10:58 +0200 Subject: [PATCH 19/48] Bump to toolkit 26.0.0 --- package-lock.json | 158 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf1733b7..192b2886 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "26.0.0-rc.3", + "arlas-wui-toolkit": "~26.0.0", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -5771,18 +5771,18 @@ } }, "node_modules/arlas-api": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.1.0.tgz", - "integrity": "sha512-5ZSbgqUkCW7/n7PBljCTpI0ewCf3zi5H+Jm/PRUIPcQJgyedbKZ/K/yxYu8kKbeEnMWHaSKhOTPMRoCwN1C02w==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-26.0.0.tgz", + "integrity": "sha512-K9qsMS2WPvuGV1vGFs4h/hEjK5rIj9bbSv6hMA6AkJ/ThzuCghXuoWXMk0llFyNpYg3F7VSZMlE1jAzPEpyQwA==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-d3": { - "version": "11.2.3", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.3.tgz", - "integrity": "sha512-A5Hyjy1ensxDors5lTBDNqi9/gAhSgVvoFJk4rRPu535N5ON5+MArFeLuMRZa0TNKJ6G8LVCVlCTjuN5VKkqtg==", + "version": "11.2.4", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.4.tgz", + "integrity": "sha512-XxQHLabDNfZy3QvRpNzRvogStcLQKwr5Qvhkn2VUlsEGv/V/lIbhAar/AfwQTTEqxmgIuk8Fg7yts1Eb4Pm9cg==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -5813,9 +5813,9 @@ } }, "node_modules/arlas-iam-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", - "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0.tgz", + "integrity": "sha512-R2W4Eq48UcrWcmKo7TM+1w8QCmu/eF+5061Zx8a6VTm8kgxaqQrfEXG+pM/uz5k60KHryRPXIf3ZnaQdsG41aA==", "dependencies": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -5823,36 +5823,36 @@ } }, "node_modules/arlas-permissions-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", - "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0.tgz", + "integrity": "sha512-Z5OQe/te5JTIgXqb7VGI+GFJeVLb1jdSU+EsLCkx+Cg6HjVSKzFQZEMFrycgLj+mwuX3R621mzvSb7AXawk2Ag==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-persistence-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", - "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0.tgz", + "integrity": "sha512-DkiTEdRZO+/M0io1PdB/mL+vrsFMtvhfiJkUY77MmVx8jLyFn+AqtB4vAqaRqrxmAMTErX+1aWdTUfF/2jzT/w==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-tagger-api": { - "version": "25.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-tagger-api/-/arlas-tagger-api-25.0.0-beta.2.tgz", - "integrity": "sha512-DA+CvuNPDrA+XM1EE7kCwHY4wY3Vtdh8MAgIjocztZ2D2Hfr3j/7XM/1PI1CxjrMP80LnINKpGBUDK2rdn1SYw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-tagger-api/-/arlas-tagger-api-26.0.0.tgz", + "integrity": "sha512-Z03PXuaCMrRzMJyog99d6v3xUxpuhmJGziqfC7Oa7nEC9fAXld8jcmeqRMwiqwCDLz2qjJB0+37TPGzJoJz53w==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-web-components": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", - "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0.tgz", + "integrity": "sha512-1zkeBbF73stRMo6Vy+Fn0tGT1Dc6DKhoAvbVLjhEUYtDxq9YsrnzexzyyqAVfY3G8p3R0a6NYoOBPM8oPdTEqQ==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5870,7 +5870,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.2.2", + "arlas-d3": "~11.2.4", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -5908,9 +5908,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.2.tgz", - "integrity": "sha512-64BJCVFb3SU+03pX9jGhppHsEh7c8A3qkxPRbybfwDhV6OKqGZ+jc5qGnOVGWMG5g6lJEPTdoVxayJe8TQ9j1Q==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0.tgz", + "integrity": "sha512-r7QvIPr01cVHsKnj4tpcoBjtExPN9rvah5XEmTB8VWz8rK4w1+NEP+SYcJSI1pM6SCL46ZI7LSQLnLxUmgFbgA==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -5920,7 +5920,7 @@ "@types/file-saver": "^2.0.1", "@types/jsonpath": "^0.2.0", "@types/tinycolor2": "^1.4.0", - "arlas-web-core": "~25.1.0", + "arlas-web-core": "~26.0.0", "file-saver": "^2.0.2", "jsonpath": "^1.0.0", "moment": "^2.29.4", @@ -5953,18 +5953,18 @@ } }, "node_modules/arlas-web-core": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.1.0.tgz", - "integrity": "sha512-w61laKLmf2dgFjX8HQjtA4tlCaj4bUQUX46/DtBvOckibVbO+MBZCfll5pmPaq+gQX2DMrTwzSHVanWWf0BuRw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-26.0.0.tgz", + "integrity": "sha512-ey5Uk5Zyde2mTI/S//cjY3sNCQdX93mQS8F0yWhJc+NUdNNufMUme60l0aADZXV4hSfxLXzxLt2qZ8vDqxqkAQ==", "dependencies": { - "arlas-api": "25.1.0", + "arlas-api": "26.0.0", "rxjs": "~7.4.0" } }, "node_modules/arlas-wui-toolkit": { - "version": "26.0.0-rc.3", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.3.tgz", - "integrity": "sha512-9Y33wLOOUa3+nI+7TWcsfrtTOuXHhqkYosUwb74Eb8Wpey2B15wIQ8200HDnxEX+VAd2nFXGjAkALQXuyfQzfg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0.tgz", + "integrity": "sha512-cYXYcQ5aKpDhdbagnvTFPM1C6Lxah/Ibn7iK1T6t+8JyK+ziLu1CHKCuHgmiOKZzHBCeWa7vEAS20GosyMUULA==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -5972,12 +5972,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "26.0.0-rc.1", - "arlas-permissions-api": "26.0.0-rc.1", - "arlas-persistence-api": "26.0.0-rc.1", - "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-rc.2", - "arlas-web-contributors": "26.0.0-rc.2", + "arlas-iam-api": "26.0.0", + "arlas-permissions-api": "26.0.0", + "arlas-persistence-api": "26.0.0", + "arlas-tagger-api": "26.0.0", + "arlas-web-components": "~26.0.0", + "arlas-web-contributors": "~26.0.0", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -24142,18 +24142,18 @@ } }, "arlas-api": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-25.1.0.tgz", - "integrity": "sha512-5ZSbgqUkCW7/n7PBljCTpI0ewCf3zi5H+Jm/PRUIPcQJgyedbKZ/K/yxYu8kKbeEnMWHaSKhOTPMRoCwN1C02w==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-api/-/arlas-api-26.0.0.tgz", + "integrity": "sha512-K9qsMS2WPvuGV1vGFs4h/hEjK5rIj9bbSv6hMA6AkJ/ThzuCghXuoWXMk0llFyNpYg3F7VSZMlE1jAzPEpyQwA==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-d3": { - "version": "11.2.3", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.3.tgz", - "integrity": "sha512-A5Hyjy1ensxDors5lTBDNqi9/gAhSgVvoFJk4rRPu535N5ON5+MArFeLuMRZa0TNKJ6G8LVCVlCTjuN5VKkqtg==", + "version": "11.2.4", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.4.tgz", + "integrity": "sha512-XxQHLabDNfZy3QvRpNzRvogStcLQKwr5Qvhkn2VUlsEGv/V/lIbhAar/AfwQTTEqxmgIuk8Fg7yts1Eb4Pm9cg==", "requires": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -24184,9 +24184,9 @@ } }, "arlas-iam-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", - "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0.tgz", + "integrity": "sha512-R2W4Eq48UcrWcmKo7TM+1w8QCmu/eF+5061Zx8a6VTm8kgxaqQrfEXG+pM/uz5k60KHryRPXIf3ZnaQdsG41aA==", "requires": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -24194,36 +24194,36 @@ } }, "arlas-permissions-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", - "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0.tgz", + "integrity": "sha512-Z5OQe/te5JTIgXqb7VGI+GFJeVLb1jdSU+EsLCkx+Cg6HjVSKzFQZEMFrycgLj+mwuX3R621mzvSb7AXawk2Ag==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-persistence-api": { - "version": "26.0.0-rc.1", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", - "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0.tgz", + "integrity": "sha512-DkiTEdRZO+/M0io1PdB/mL+vrsFMtvhfiJkUY77MmVx8jLyFn+AqtB4vAqaRqrxmAMTErX+1aWdTUfF/2jzT/w==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-tagger-api": { - "version": "25.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-tagger-api/-/arlas-tagger-api-25.0.0-beta.2.tgz", - "integrity": "sha512-DA+CvuNPDrA+XM1EE7kCwHY4wY3Vtdh8MAgIjocztZ2D2Hfr3j/7XM/1PI1CxjrMP80LnINKpGBUDK2rdn1SYw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-tagger-api/-/arlas-tagger-api-26.0.0.tgz", + "integrity": "sha512-Z03PXuaCMrRzMJyog99d6v3xUxpuhmJGziqfC7Oa7nEC9fAXld8jcmeqRMwiqwCDLz2qjJB0+37TPGzJoJz53w==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-web-components": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", - "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0.tgz", + "integrity": "sha512-1zkeBbF73stRMo6Vy+Fn0tGT1Dc6DKhoAvbVLjhEUYtDxq9YsrnzexzyyqAVfY3G8p3R0a6NYoOBPM8oPdTEqQ==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -24241,7 +24241,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.2.2", + "arlas-d3": "~11.2.4", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -24260,9 +24260,9 @@ } }, "arlas-web-contributors": { - "version": "26.0.0-rc.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.2.tgz", - "integrity": "sha512-64BJCVFb3SU+03pX9jGhppHsEh7c8A3qkxPRbybfwDhV6OKqGZ+jc5qGnOVGWMG5g6lJEPTdoVxayJe8TQ9j1Q==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0.tgz", + "integrity": "sha512-r7QvIPr01cVHsKnj4tpcoBjtExPN9rvah5XEmTB8VWz8rK4w1+NEP+SYcJSI1pM6SCL46ZI7LSQLnLxUmgFbgA==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -24272,7 +24272,7 @@ "@types/file-saver": "^2.0.1", "@types/jsonpath": "^0.2.0", "@types/tinycolor2": "^1.4.0", - "arlas-web-core": "~25.1.0", + "arlas-web-core": "~26.0.0", "file-saver": "^2.0.2", "jsonpath": "^1.0.0", "moment": "^2.29.4", @@ -24301,18 +24301,18 @@ } }, "arlas-web-core": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-25.1.0.tgz", - "integrity": "sha512-w61laKLmf2dgFjX8HQjtA4tlCaj4bUQUX46/DtBvOckibVbO+MBZCfll5pmPaq+gQX2DMrTwzSHVanWWf0BuRw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-web-core/-/arlas-web-core-26.0.0.tgz", + "integrity": "sha512-ey5Uk5Zyde2mTI/S//cjY3sNCQdX93mQS8F0yWhJc+NUdNNufMUme60l0aADZXV4hSfxLXzxLt2qZ8vDqxqkAQ==", "requires": { - "arlas-api": "25.1.0", + "arlas-api": "26.0.0", "rxjs": "~7.4.0" } }, "arlas-wui-toolkit": { - "version": "26.0.0-rc.3", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0-rc.3.tgz", - "integrity": "sha512-9Y33wLOOUa3+nI+7TWcsfrtTOuXHhqkYosUwb74Eb8Wpey2B15wIQ8200HDnxEX+VAd2nFXGjAkALQXuyfQzfg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0.tgz", + "integrity": "sha512-cYXYcQ5aKpDhdbagnvTFPM1C6Lxah/Ibn7iK1T6t+8JyK+ziLu1CHKCuHgmiOKZzHBCeWa7vEAS20GosyMUULA==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -24320,12 +24320,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "26.0.0-rc.1", - "arlas-permissions-api": "26.0.0-rc.1", - "arlas-persistence-api": "26.0.0-rc.1", - "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-rc.2", - "arlas-web-contributors": "26.0.0-rc.2", + "arlas-iam-api": "26.0.0", + "arlas-permissions-api": "26.0.0", + "arlas-persistence-api": "26.0.0", + "arlas-tagger-api": "26.0.0", + "arlas-web-components": "~26.0.0", + "arlas-web-contributors": "~26.0.0", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", diff --git a/package.json b/package.json index 1723e984..f79243df 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "26.0.0-rc.3", + "arlas-wui-toolkit": "~26.0.0", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", From 98e1b7cae2e3dd5ce2e43c36d2b0c9d15b6831ca Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 2 Sep 2024 16:28:00 +0200 Subject: [PATCH 20/48] prod automatic release 26.0.0-rc.1 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/package.json | 2 +- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9caf595..3a434d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Change Log +## [v26.0.0-rc.1](https://github.com/gisaia/ARLAS-WUI/tree/v26.0.0-rc.1) (2024-09-02) + +[Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v25.1.0...v26.0.0-rc.1) + +**New stuff:** + +- Create a Collection Service that provides the display name and the unit of a given collection. [\#841](https://github.com/gisaia/ARLAS-wui/issues/841) +- Add a new Metric Table component [\#824](https://github.com/gisaia/ARLAS-wui/issues/824) +- Implement a multi-collection powerbar [\#818](https://github.com/gisaia/ARLAS-wui/issues/818) +- Highlight the item whose detail is displayed on the list [\#813](https://github.com/gisaia/ARLAS-wui/issues/813) +- 'Zoom to' button next to count should zoom to feature geometry [\#810](https://github.com/gisaia/ARLAS-wui/issues/810) +- Add an option to deactivate 'Sign up' button [\#806](https://github.com/gisaia/ARLAS-wui/issues/806) +- Display Unit instead of collection name in timeline and histogram having a count [\#755](https://github.com/gisaia/ARLAS-wui/issues/755) +- Add a legend for x / y in a histogram [\#688](https://github.com/gisaia/ARLAS-wui/issues/688) +- \[legend\] refactor how the legend is displayed [\#554](https://github.com/gisaia/ARLAS-wui/issues/554) +- \[metrics\] organize metrics in a datatable [\#544](https://github.com/gisaia/ARLAS-wui/issues/544) +- Rescale the x-axis domain to include selection that goes beyond the data domain [\#411](https://github.com/gisaia/ARLAS-wui/issues/411) +- Handle Multi-collection fulltext search [\#382](https://github.com/gisaia/ARLAS-wui/issues/382) +- Support H3 grids [\#315](https://github.com/gisaia/ARLAS-wui/issues/315) + +**Fixed bugs:** + +- Hilighting layer when cursor is over result list no longer work [\#854](https://github.com/gisaia/ARLAS-wui/issues/854) +- Multiline values "outlined" colored cells rendering in result list could be improved [\#852](https://github.com/gisaia/ARLAS-wui/issues/852) +- Missing geo sort in datatable \(result list\) [\#849](https://github.com/gisaia/ARLAS-wui/issues/849) +- Drag and drop of layers within a group doesn't work anymore in arlas wui [\#848](https://github.com/gisaia/ARLAS-wui/issues/848) +- \[Timeline\] Incohérence d'affichage de date dans le cas de un seul produit [\#847](https://github.com/gisaia/ARLAS-wui/issues/847) +- Logout action must redirect to login instead of alert message [\#837](https://github.com/gisaia/ARLAS-wui/issues/837) +- User can create a dashboard on an organisation where he is only user [\#836](https://github.com/gisaia/ARLAS-wui/issues/836) +- Map tilt cannot be reset [\#808](https://github.com/gisaia/ARLAS-wui/issues/808) +- Search input placeholder persists on focus [\#807](https://github.com/gisaia/ARLAS-wui/issues/807) + ## [v25.1.0](https://github.com/gisaia/ARLAS-WUI/tree/v25.1.0) (2024-07-18) [Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v24.3.9...v25.1.0) @@ -14,6 +46,7 @@ **Fixed bugs:** - Dashboards that don't have tabs attribute are not displayed on arlas-wui [\#833](https://github.com/gisaia/ARLAS-wui/issues/833) +- Paginator of bookmarks list doesn't show the right lenght of the table [\#819](https://github.com/gisaia/ARLAS-wui/issues/819) - Layers disappear when we are zoomed in [\#817](https://github.com/gisaia/ARLAS-wui/issues/817) - Features layers are not displayed on the map if the collection has a date field that has not a format [\#804](https://github.com/gisaia/ARLAS-wui/issues/804) - Export / Import dashboard : circle heatmaps configurations are lost [\#797](https://github.com/gisaia/ARLAS-wui/issues/797) diff --git a/package-lock.json b/package-lock.json index 192b2886..2702e113 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui", - "version": "25.1.0", + "version": "26.0.0-rc.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui", - "version": "25.1.0", + "version": "26.0.0-rc.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index f79243df..0e0af6f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "25.1.0", + "version": "26.0.0-rc.1", "author": "gisaia", "license": "Apache-2.0", "scripts": { diff --git a/src/package.json b/src/package.json index aa0b4f42..cafcc1b5 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "25.1.0", + "version": "26.0.0-rc.1", "author": "gisaia", "license": "Apache-2.0" } From 34c20f08a8f750fd47f32f0265266983a10d58dd Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Tue, 3 Sep 2024 10:56:58 +0200 Subject: [PATCH 21/48] Feat: use new search contributor --- .../arlas-wui-root.component.html | 6 ++-- .../arlas-wui-root.component.ts | 8 ++--- src/app/services/contributors.service.ts | 31 +++++++++++++------ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html index 32739a6e..6eb7ad12 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html @@ -2,9 +2,9 @@
'ARLAS-wui logo' | translate - - + + diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 2505e711..53d45be0 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -60,11 +60,11 @@ import { } from 'arlas-web-components'; import { AnalyticsContributor, - ChipsSearchContributor, ElementIdentifier, FeatureRenderMode, MapContributor, - ResultListContributor + ResultListContributor, + SearchContributor } from 'arlas-web-contributors'; import { LegendData } from 'arlas-web-contributors/contributors/MapContributor'; import { @@ -116,7 +116,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { public coordinatesHaveSpace = true; public modeEnum = ModeEnum; public mapglContributors: Array = new Array(); - public chipsSearchContributor: ChipsSearchContributor; + public searchContributors: SearchContributor[]; public resultlistContributors: Array = new Array(); public analyticsContributor: AnalyticsContributor; @@ -429,7 +429,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { }; })); - this.chipsSearchContributor = this.contributorService.getChipSearchContributor(); + this.searchContributors = this.contributorService.getSearchContributors(); const ids = new Set(this.resultListsConfig.map(c => c.contributorId)); this.arlasStartUpService.contributorRegistry.forEach((v, k) => { if (v instanceof ResultListContributor) { diff --git a/src/app/services/contributors.service.ts b/src/app/services/contributors.service.ts index 814ba0fd..a7e3b706 100644 --- a/src/app/services/contributors.service.ts +++ b/src/app/services/contributors.service.ts @@ -18,7 +18,7 @@ */ import { Injectable } from '@angular/core'; -import { ChipsSearchContributor, MapContributor } from 'arlas-web-contributors'; +import { SearchContributor, MapContributor } from 'arlas-web-contributors'; import { Contributor } from 'arlas-web-core'; import { ArlasCollaborativesearchService, @@ -36,7 +36,7 @@ export class ContributorService { public ID_PATH = 'arlas-wui.web.app.idFieldName'; public DEFAULT_CHART_HEIGHT = 70; public MAPCONTRIBUTOR_ID = 'mapbox'; - public CHIPSSEARCH_ID = 'chipssearch'; + public SEARCH_TYPE = 'search'; public constructor( private configService: ArlasConfigService, @@ -72,15 +72,20 @@ export class ContributorService { return mapcontributors; } - public getChipSearchContributor(): ChipsSearchContributor { - const chipssearchContributorConfig = this.getContributorConfig(this.CHIPSSEARCH_ID); - let chipsSearchContributor: ChipsSearchContributor; - if (chipssearchContributorConfig !== undefined) { - chipsSearchContributor = this.arlasStartupService.contributorRegistry.get(this.CHIPSSEARCH_ID) as ChipsSearchContributor; - this.arlasContributors.set(this.CHIPSSEARCH_ID, chipsSearchContributor); - this.contributorsIcons.set(this.CHIPSSEARCH_ID, chipssearchContributorConfig.icon); + public getSearchContributors(): Array { + const searchContributorsConfig = this.getSearchContributorsConfigs(); + const searchContributors = new Array(); + if (searchContributorsConfig !== undefined) { + searchContributorsConfig + .forEach((config: { identifier: string; icon: string; }) => { + const contrib = this.arlasStartupService.contributorRegistry.get(config.identifier) as SearchContributor; + + this.arlasContributors.set(config.identifier, contrib); + this.contributorsIcons.set(config.identifier, config.icon); + searchContributors.push(contrib); + }); } - return chipsSearchContributor; + return searchContributors; } public getArlasContributors(): Map { @@ -114,4 +119,10 @@ export class ContributorService { contrib => (contrib.type === 'map') ); } + + private getSearchContributorsConfigs() { + return this.arlasStartupService.emptyMode ? undefined : !!this.configService.getValue('arlas') ? + this.configService.getValue('arlas')['web']['contributors'].filter( + (contrib: { type: string; }) => (contrib.type === this.SEARCH_TYPE || contrib.type === 'chipssearch')) : undefined; + } } From ef06c02879d85a162c79a2f246f285e0e6dd84f2 Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Thu, 5 Sep 2024 15:16:29 +0200 Subject: [PATCH 22/48] Feat: ingore collab in getFilterForCount --- src/app/components/arlas-wui-root/arlas-wui-root.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 53d45be0..e49ea2cd 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -1054,7 +1054,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { const centroidPath = this.collectionToDescription.get(c.collection).centroid_path; const mapContrib = this.mapglContributors.find(mc => mc.collection === c.collection); if (!!mapContrib) { - c.filter = mapContrib.getFilterForCount(pwithinRaw, pwithin, centroidPath); + c.filter = mapContrib.getFilterForCount(pwithinRaw, pwithin, centroidPath, true); } else { MapContributor.getFilterFromExtent(pwithinRaw, pwithin, centroidPath); } From a54bab435163ec6ce66a892b78eb307d67e7c4e1 Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Thu, 5 Sep 2024 16:07:42 +0200 Subject: [PATCH 23/48] Feat: wait for dom element before getBoudingClientRect --- .../arlas-wui-root.component.ts | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 53d45be0..5d283e0b 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -787,10 +787,10 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.mapSettings.openDialog(this.mapSettingsService); } - public retrieveOpenedGridItem(){ - if(this.detailedGridOpen && this._lastTileIdentifier){ + public retrieveOpenedGridItem() { + if (this.detailedGridOpen && this._lastTileIdentifier) { const item = this.resultListComponent.items.find(item => item.identifier === this._lastTileIdentifier); - if(item) { + if (item) { this.resultListComponent.setSelectedGridItem(item); } else { this._lastTileIdentifier = null; @@ -813,7 +813,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { changedMapContributors[i].setGeoQueryField(geoQuery.geometry_path); changedMapContributors[i].onChangeGeoQuery(); this.snackbar.open(this.translate.instant('Updating Geo-query of ', - { collection: this.translate.instant(this.collectionService.getDisplayName(changedMapContributors[i].collection))})); + { collection: this.translate.instant(this.collectionService.getDisplayName(changedMapContributors[i].collection)) })); if (i === changedMapContributors.length - 1) { setTimeout(() => this.snackbar.dismiss(), 1000); } @@ -1013,7 +1013,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { for (let i = 0; i < this.mapglContributors.length; i++) { setTimeout(() => { this.snackbar.open(this.translate.instant('Loading data of ', - { collection: this.translate.instant(this.collectionService.getDisplayName(this.mapglContributors[i].collection))})); + { collection: this.translate.instant(this.collectionService.getDisplayName(this.mapglContributors[i].collection)) })); this.mapglContributors[i].onChangeAoi(event); if (i === this.mapglContributors.length - 1) { setTimeout(() => this.snackbar.dismiss(), 1000); @@ -1280,10 +1280,18 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { * Compute the space available between the divider after the search and the title of the application */ private resizeCollectionCounts() { - // Add padding to the left of the divider and right of the title - const start = document.getElementById('menuDivider').getBoundingClientRect().right + this.spacing; - const end = document.getElementById('title').getBoundingClientRect().left - this.spacing; - this.availableSpaceCounts = end - start; + const checkElement = async selector => { + while (document.getElementById(selector) === null) { + await new Promise(resolve => requestAnimationFrame(resolve)); + } + return document.getElementById(selector); + }; + Promise.all([checkElement('menuDivider'), checkElement('title'),]).then((valArray) => { + // Add padding to the left of the divider and right of the title + const start = valArray[0].getBoundingClientRect().right + this.spacing; + const end = valArray[1].getBoundingClientRect().left - this.spacing; + this.availableSpaceCounts = end - start; + }); } private adjustGrids() { @@ -1315,7 +1323,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { this.adjustCoordinates(); this.updateVisibleItems(); - }, 0); + }, 100); } private adjustCoordinates(): void { @@ -1435,7 +1443,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { if (!!mapContributor) { // if detailed menu is not open when zoom to feature we reset identifer this.detailedGridOpen = this.resultListComponent.isDetailledGridOpen; - if(!this.detailedGridOpen) { + if (!this.detailedGridOpen) { this._lastTileIdentifier = null; } mapContributor @@ -1519,7 +1527,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy { } public storeItemIdentifier($event: Item) { - if($event.identifier) { + if ($event.identifier) { this._lastTileIdentifier = ($event).identifier; } } From 12dbfe2882a1ee2123fe2705b9f6abaf0e158858 Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Fri, 6 Sep 2024 14:15:27 +0200 Subject: [PATCH 24/48] build(deps): bump toolkit to 26.0.1 --- package-lock.json | 46 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2702e113..06a8baf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~26.0.0", + "arlas-wui-toolkit": "~26.0.1", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", @@ -5850,9 +5850,9 @@ } }, "node_modules/arlas-web-components": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0.tgz", - "integrity": "sha512-1zkeBbF73stRMo6Vy+Fn0tGT1Dc6DKhoAvbVLjhEUYtDxq9YsrnzexzyyqAVfY3G8p3R0a6NYoOBPM8oPdTEqQ==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.1.tgz", + "integrity": "sha512-Wk8uySbgvv7Se4H0X4MH40oDl29/4G8KOY/YAmqo8AOB2CTW2FayCbWjZV7SEFV8zGwsJZF1kgKebPx5D3deLQ==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5908,9 +5908,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0.tgz", - "integrity": "sha512-r7QvIPr01cVHsKnj4tpcoBjtExPN9rvah5XEmTB8VWz8rK4w1+NEP+SYcJSI1pM6SCL46ZI7LSQLnLxUmgFbgA==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.1.tgz", + "integrity": "sha512-VuGGTjLBVIHNvhGD/ei6lTXIaKDu/3rT7F0CbekEs58LZUIw6aBSs6JcDp+wbCxFAfFg3MBVG3NzWVQdhz7x3g==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -5962,9 +5962,9 @@ } }, "node_modules/arlas-wui-toolkit": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0.tgz", - "integrity": "sha512-cYXYcQ5aKpDhdbagnvTFPM1C6Lxah/Ibn7iK1T6t+8JyK+ziLu1CHKCuHgmiOKZzHBCeWa7vEAS20GosyMUULA==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.1.tgz", + "integrity": "sha512-iuaiHeR7RUcDEGUyYz4U7QWkX8hvJuZqqmqEMCyF54XcyveFMaBAzZBNHTvM/zEztD5xamRSeNz/L47DpLyPCw==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -5976,8 +5976,8 @@ "arlas-permissions-api": "26.0.0", "arlas-persistence-api": "26.0.0", "arlas-tagger-api": "26.0.0", - "arlas-web-components": "~26.0.0", - "arlas-web-contributors": "~26.0.0", + "arlas-web-components": "~26.0.1", + "arlas-web-contributors": "~26.0.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", @@ -24221,9 +24221,9 @@ } }, "arlas-web-components": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0.tgz", - "integrity": "sha512-1zkeBbF73stRMo6Vy+Fn0tGT1Dc6DKhoAvbVLjhEUYtDxq9YsrnzexzyyqAVfY3G8p3R0a6NYoOBPM8oPdTEqQ==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.1.tgz", + "integrity": "sha512-Wk8uySbgvv7Se4H0X4MH40oDl29/4G8KOY/YAmqo8AOB2CTW2FayCbWjZV7SEFV8zGwsJZF1kgKebPx5D3deLQ==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -24260,9 +24260,9 @@ } }, "arlas-web-contributors": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0.tgz", - "integrity": "sha512-r7QvIPr01cVHsKnj4tpcoBjtExPN9rvah5XEmTB8VWz8rK4w1+NEP+SYcJSI1pM6SCL46ZI7LSQLnLxUmgFbgA==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.1.tgz", + "integrity": "sha512-VuGGTjLBVIHNvhGD/ei6lTXIaKDu/3rT7F0CbekEs58LZUIw6aBSs6JcDp+wbCxFAfFg3MBVG3NzWVQdhz7x3g==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -24310,9 +24310,9 @@ } }, "arlas-wui-toolkit": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.0.tgz", - "integrity": "sha512-cYXYcQ5aKpDhdbagnvTFPM1C6Lxah/Ibn7iK1T6t+8JyK+ziLu1CHKCuHgmiOKZzHBCeWa7vEAS20GosyMUULA==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.1.tgz", + "integrity": "sha512-iuaiHeR7RUcDEGUyYz4U7QWkX8hvJuZqqmqEMCyF54XcyveFMaBAzZBNHTvM/zEztD5xamRSeNz/L47DpLyPCw==", "requires": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -24324,8 +24324,8 @@ "arlas-permissions-api": "26.0.0", "arlas-persistence-api": "26.0.0", "arlas-tagger-api": "26.0.0", - "arlas-web-components": "~26.0.0", - "arlas-web-contributors": "~26.0.0", + "arlas-web-components": "~26.0.1", + "arlas-web-contributors": "~26.0.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", diff --git a/package.json b/package.json index 0e0af6f8..f6906540 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@ngx-translate/core": "14.0.0", - "arlas-wui-toolkit": "~26.0.0", + "arlas-wui-toolkit": "~26.0.1", "hammerjs": "^2.0.8", "ng-packagr": "^14.2.2", "ngx-markdown": "14.0.1", From 3bd7fe5ed2409f9b81ff9a240c07c0fae7c222b2 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Fri, 6 Sep 2024 14:39:31 +0200 Subject: [PATCH 25/48] prod automatic release 26.0.0-rc.2 --- CHANGELOG.md | 16 ++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/package.json | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a434d88..e5c16776 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [v26.0.0-rc.2](https://github.com/gisaia/ARLAS-WUI/tree/v26.0.0-rc.2) (2024-09-06) + +[Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v26.0.0-rc.1...v26.0.0-rc.2) + +**New stuff:** + +- change icon when selecting an item [\#870](https://github.com/gisaia/ARLAS-wui/issues/870) +- Pass the new searchContributors input to arlas-search component [\#865](https://github.com/gisaia/ARLAS-wui/issues/865) +- \[bookmark\] rename bookmarks [\#543](https://github.com/gisaia/ARLAS-wui/issues/543) + +**Fixed bugs:** + +- errors related to bounding box + resizehistogram at init [\#871](https://github.com/gisaia/ARLAS-wui/issues/871) +- The information icon 'i' stays on the item after closing the detail in the resultlist [\#866](https://github.com/gisaia/ARLAS-wui/issues/866) +- When I log out, a blank page is displayed [\#864](https://github.com/gisaia/ARLAS-wui/issues/864) + ## [v26.0.0-rc.1](https://github.com/gisaia/ARLAS-WUI/tree/v26.0.0-rc.1) (2024-09-02) [Full Changelog](https://github.com/gisaia/ARLAS-WUI/compare/v25.1.0...v26.0.0-rc.1) diff --git a/package-lock.json b/package-lock.json index 06a8baf3..4bca4175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui", - "version": "26.0.0-rc.1", + "version": "26.0.0-rc.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui", - "version": "26.0.0-rc.1", + "version": "26.0.0-rc.2", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index f6906540..045295ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "26.0.0-rc.1", + "version": "26.0.0-rc.2", "author": "gisaia", "license": "Apache-2.0", "scripts": { diff --git a/src/package.json b/src/package.json index cafcc1b5..b40793b7 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui", - "version": "26.0.0-rc.1", + "version": "26.0.0-rc.2", "author": "gisaia", "license": "Apache-2.0" } From 6fdc4b422e47b69a14ef9c57b37f158e004cfd61 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 9 Sep 2024 13:32:17 +0200 Subject: [PATCH 26/48] Add a new image of arlas-wui that doesn't embark analytics --- angular.json | 43 ++++++++++++++ docker/Dockerfile-production | 48 ++++++++++++++++ docker/Dockerfile-production-no-analytics | 48 ++++++++++++++++ release.sh | 7 ++- src/index-without-analytics.html | 69 +++++++++++++++++++++++ 5 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile-production create mode 100644 docker/Dockerfile-production-no-analytics create mode 100644 src/index-without-analytics.html diff --git a/angular.json b/angular.json index bd0e07e8..8c24bbe6 100644 --- a/angular.json +++ b/angular.json @@ -98,6 +98,46 @@ "output": "/assets/rotate/" } ] + }, + "production-no-analytics": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "index": { + "input": "src/index-without-analytics", + "output": "index.html" + }, + "fileReplacements": [ + { + "src": "src/environments/environment.ts", + "replaceWith": "src/environments/environment.prod.ts" + } + ], + "assets": [ + { + "input": "src/environments/prod/", + "output": "/", + "glob": "*.yaml" + }, + "src/assets", + "src/silent-refresh.html", + "src/favicon.ico", + { + "glob": "**/*", + "input": "./node_modules/arlas-web-components/assets/resize", + "output": "/assets/resize/" + }, + { + "glob": "**/*", + "input": "./node_modules/arlas-web-components/assets/rotate", + "output": "/assets/rotate/" + } + ] } } }, @@ -112,6 +152,9 @@ }, "production": { "browserTarget": "arlas-wui:build:production" + }, + "production-no-analytics": { + "browserTarget": "arlas-wui:build:production-no-analytics" } }, "defaultConfiguration": "development" diff --git a/docker/Dockerfile-production b/docker/Dockerfile-production new file mode 100644 index 00000000..a694a2e4 --- /dev/null +++ b/docker/Dockerfile-production @@ -0,0 +1,48 @@ +### STAGE 1: Build ### + +# We label our stage as 'builder' +FROM node:16.19.0 as builder + +COPY ./package.json ./ +COPY ./package-lock.json ./ + +RUN npm set progress=false && npm config set depth 0 && npm cache clean --force + +## Storing node modules on a separate layer will prevent unnecessary npm installs at each build +RUN export NODE_OPTIONS=--max_old_space_size=8192 && npm i && mkdir /ng-app && cp -R ./node_modules ./ng-app + +COPY ./scripts/start.sh ./ng-app +COPY ./scripts/fetch-conf-by-http.sh ./ng-app + +WORKDIR /ng-app + +COPY . . + +## Build the angular app in production mode and store the artifacts in dist folder +RUN export NODE_OPTIONS=--max_old_space_size=8192 && $(npm bin)/ng build --configuration production --aot --base-href='$ARLAS_WUI_BASE_HREF/' + +### STAGE 2: Setup ### + +FROM nginx:1.25.3-alpine3.18-slim +ARG version="latest" + +LABEL io.arlas.wui.version=${version} +LABEL vendor="Gisaïa" +LABEL description="This container build and serve the ARLAS-wui app" + +RUN apk add --update bash jq netcat-openbsd curl && rm -rf /var/cache/apk/* + +## Copy our default nginx config +COPY nginx/default.conf /etc/nginx/conf.d/ + +## Remove default nginx website +RUN rm -rf /usr/share/nginx/html/* + +## From 'builder' stage copy over the artifacts in dist folder to default nginx public folder +COPY --from=builder /ng-app/dist /usr/share/nginx/html +COPY --from=builder /ng-app/start.sh /usr/share/nginx/ +COPY --from=builder /ng-app/fetch-conf-by-http.sh /usr/share/nginx/ + +HEALTHCHECK CMD curl --fail http://localhost:80/ || exit 1 + +CMD /usr/share/nginx/start.sh diff --git a/docker/Dockerfile-production-no-analytics b/docker/Dockerfile-production-no-analytics new file mode 100644 index 00000000..b8636232 --- /dev/null +++ b/docker/Dockerfile-production-no-analytics @@ -0,0 +1,48 @@ +### STAGE 1: Build ### + +# We label our stage as 'builder' +FROM node:16.19.0 as builder + +COPY ./package.json ./ +COPY ./package-lock.json ./ + +RUN npm set progress=false && npm config set depth 0 && npm cache clean --force + +## Storing node modules on a separate layer will prevent unnecessary npm installs at each build +RUN export NODE_OPTIONS=--max_old_space_size=8192 && npm i && mkdir /ng-app && cp -R ./node_modules ./ng-app + +COPY ./scripts/start.sh ./ng-app +COPY ./scripts/fetch-conf-by-http.sh ./ng-app + +WORKDIR /ng-app + +COPY . . + +## Build the angular app in production mode and store the artifacts in dist folder +RUN export NODE_OPTIONS=--max_old_space_size=8192 && $(npm bin)/ng build --configuration production-no-analytics --aot --base-href='$ARLAS_WUI_BASE_HREF/' + +### STAGE 2: Setup ### + +FROM nginx:1.25.3-alpine3.18-slim +ARG version="latest" + +LABEL io.arlas.wui.version=${version} +LABEL vendor="Gisaïa" +LABEL description="This container build and serve the ARLAS-wui app" + +RUN apk add --update bash jq netcat-openbsd curl && rm -rf /var/cache/apk/* + +## Copy our default nginx config +COPY nginx/default.conf /etc/nginx/conf.d/ + +## Remove default nginx website +RUN rm -rf /usr/share/nginx/html/* + +## From 'builder' stage copy over the artifacts in dist folder to default nginx public folder +COPY --from=builder /ng-app/dist /usr/share/nginx/html +COPY --from=builder /ng-app/start.sh /usr/share/nginx/ +COPY --from=builder /ng-app/fetch-conf-by-http.sh /usr/share/nginx/ + +HEALTHCHECK CMD curl --fail http://localhost:80/ || exit 1 + +CMD /usr/share/nginx/start.sh diff --git a/release.sh b/release.sh index b6038e66..1dfcc611 100755 --- a/release.sh +++ b/release.sh @@ -171,13 +171,18 @@ npm cache clean --force rm -rf node_modules/ echo "==> Docker" -docker build --no-cache --build-arg version=${VERSION} --tag gisaia/arlas-wui:${VERSION} . +docker build -f docker/Dockerfile-production --no-cache --build-arg version=${VERSION} --tag gisaia/arlas-wui:${VERSION} . +docker build -f docker/Dockerfile-production-no-analytics --no-cache --build-arg version=${VERSION} --tag gisaia/arlas-wui-no-analytics:${VERSION} . docker push gisaia/arlas-wui:${VERSION} +docker push gisaia/arlas-wui-no-analytics:${VERSION} if [ "${STAGE}" == "stable" ] && [ "${IS_LATEST_VERSION}" == "YES" ]; then docker tag gisaia/arlas-wui:${VERSION} gisaia/arlas-wui:latest docker push gisaia/arlas-wui:latest + + docker tag gisaia/arlas-wui-no-analytics:${VERSION} gisaia/arlas-wui-no-analytics:latest + docker push gisaia/arlas-wui-no-analytics:latest fi echo "==> Build arlas-wui library" diff --git a/src/index-without-analytics.html b/src/index-without-analytics.html new file mode 100644 index 00000000..2731281d --- /dev/null +++ b/src/index-without-analytics.html @@ -0,0 +1,69 @@ + + + + + + + ARLAS + + + + + + + + + From a276008d145de664487c6d271fe2295047d42438 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 9 Sep 2024 13:34:23 +0200 Subject: [PATCH 27/48] Ignore docker files from licence adding --- license-check-and-add.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license-check-and-add.json b/license-check-and-add.json index 3c97a772..da4b4ea5 100644 --- a/license-check-and-add.json +++ b/license-check-and-add.json @@ -1,5 +1,5 @@ { - "ignore": [".github/**", ".git/**", "e2e/**", "*", "**/*.sh", "*.yml", "**/*.yaml", "**/*.conf", "**/*.md", "**/*.svg", "**/*.spec.ts", "**/*.html", "**/*.woff2", "src/test.ts", "**/.DS_Store", "**/.gitkeep", "patches/*", "**/*.xml", "**/*.csv"], + "ignore": [".github/**", ".git/**", "e2e/**", "*", "**/*.sh", "*.yml", "**/*.yaml", "**/*.conf", "**/*.md", "**/*.svg", "**/*.spec.ts", "**/*.html", "**/*.woff2", "src/test.ts", "**/.DS_Store", "**/.gitkeep", "patches/*", "**/*.xml", "**/*.csv", "docker/*"], "license": "LICENSE", "trailingWhitespace": "TRIM", "licenseFormats": { From b7044a9d20cf8c95dbd72774801725da466723bc Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 9 Sep 2024 13:47:30 +0200 Subject: [PATCH 28/48] Add nonce for browser compatibility script --- src/index-without-analytics.html | 2 +- src/index.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index-without-analytics.html b/src/index-without-analytics.html index 2731281d..c85455ea 100644 --- a/src/index-without-analytics.html +++ b/src/index-without-analytics.html @@ -1,7 +1,7 @@ - - - +