From ba66e4bb608f8cb99541da27e4e42878283f6777 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 15 Oct 2024 15:37:36 +1300 Subject: [PATCH 01/25] Add flatmapAPI for sidebar --- src/components/SplitFlow.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index 803fff1b..b2796d18 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -565,6 +565,7 @@ export default { PENNSIEVE_API_LOCATION: this.settingsStore.pennsieveApi, NL_LINK_PREFIX: this.settingsStore.nlLinkPrefix, ROOT_URL: this.settingsStore.rootUrl, + FLATMAPAPI_LOCATION: this.settingsStore.flatmapAPI, }; }, entries: function() { From 1ae5e77f9df52135ea8e4cfd0336deb5a930c388 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Mon, 21 Oct 2024 16:30:45 +1300 Subject: [PATCH 02/25] Show connectivity component on flatmap after clicking node on connectivity graph --- src/components/SplitFlow.vue | 4 ++++ src/components/viewers/MultiFlatmap.vue | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index b2796d18..ded5f1f5 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -36,6 +36,7 @@ @contextUpdate="contextUpdate($event)" @datalink-clicked="datalinkClicked($event)" @show-connectivity="onShowConnectivity" + @connectivity-component-click="onConnectivityComponentClick" /> { + // Connectivity component click emits an array of data, + // a combination of ids and labels. + // The first half is ids and the second half is labels. + const halfIndex = Math.ceil(data.length / 2); + const ids = data.slice(0, halfIndex); // first half + // const labels = data.slice(halfIndex); // second half + + // The search can perform with either id or label + this.search(ids[0]); + }); + EventBus.on("markerUpdate", () => { if (this.flatmapReady) { this.flatmapMarkerUpdate(this.$refs.multiflatmap.getCurrentFlatmap().mapImp); From 7df7b5a6d983610de7cd99b38c7665cbf0adb1b0 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 10:52:38 +1300 Subject: [PATCH 03/25] Update map highlight by id instead of label --- src/components/viewers/MultiFlatmap.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 9502b72e..b41f8ba5 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -454,8 +454,14 @@ export default { // a combination of ids and labels. // The first half is ids and the second half is labels. const halfIndex = Math.ceil(data.length / 2); - const ids = data.slice(0, halfIndex); // first half - // const labels = data.slice(halfIndex); // second half + + // first half | ids + // searching with id will find the exact match + const ids = data.slice(0, halfIndex); + + // second half | labels + // searching with labels will find the closest/similar term + const labels = data.slice(halfIndex); // The search can perform with either id or label this.search(ids[0]); From fe3f98d4608d0281081f125fc4cdf024c7141cd7 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 11:45:01 +1300 Subject: [PATCH 04/25] Update packages for connectivity graph --- package-lock.json | 388 ++++++++++++++++++++++++++-------------------- package.json | 6 +- 2 files changed, 221 insertions(+), 173 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c709bd2..6a3adf77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "1.5.2", "license": "Apache-2.0", "dependencies": { - "@abi-software/flatmapvuer": "^1.5.6", - "@abi-software/map-side-bar": "^2.4.2", - "@abi-software/map-utilities": "^1.1.2", + "@abi-software/flatmapvuer": "^1.5.6-beta.2", + "@abi-software/map-side-bar": "^2.4.2-beta.8", + "@abi-software/map-utilities": "^1.1.3-beta.4", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", "@abi-software/simulationvuer": "^1.0.1", @@ -72,9 +72,9 @@ } }, "node_modules/@abi-software/flatmap-viewer": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-3.1.9.tgz", - "integrity": "sha512-MlqhIQbfW4Iaov0lc+9+sOzDpDxjO6FES8RyiJh+ObCsCI88NS/VJxf2fcKi31EfCVYG0RqOEocVZ1U9j9/QSw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-3.2.2.tgz", + "integrity": "sha512-ttYasoZAho1PwHuHJ2f+EyoKanw5Zm14LqQfUkm4yHtk/tmnCb9QYcGvTbRSu4UKErpVbselfWdvd8cm3jm0sg==", "dependencies": { "@deck.gl/core": "^9.0.17", "@deck.gl/geo-layers": "^9.0.18", @@ -102,11 +102,11 @@ } }, "node_modules/@abi-software/flatmapvuer": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.5.6.tgz", - "integrity": "sha512-G7lXWVUZK99HHpkoVrdzF1YEQjYpuJ0DsPU0Pzm2eTYnb6xFCgcW9exgzVJILm9Y+3V1znu7ix66kzjYatQQ2Q==", + "version": "1.5.6-beta.2", + "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.5.6-beta.2.tgz", + "integrity": "sha512-8jgqkQpsL6BVwsxKDHuJ9CfXrCGSyrGqhrns0xpOvuGif3y1SBpFQA9/EaRLAz44rWUqOI4sdAqPxeTUbfp/FQ==", "dependencies": { - "@abi-software/flatmap-viewer": "3.1.9", + "@abi-software/flatmap-viewer": "^3.2.2", "@abi-software/map-utilities": "^1.1.2", "@abi-software/sparc-annotation": "0.3.1", "@abi-software/svg-sprite": "^1.0.1", @@ -119,6 +119,18 @@ "vue": "^3.4.21" } }, + "node_modules/@abi-software/flatmapvuer/node_modules/@abi-software/map-utilities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.2.tgz", + "integrity": "sha512-NMERIqSq6pVwy7Daq+Uip8Cm1UE2KEJoquOqVXACrMoTDHV77LPbWAtawn3f7De5HK69oqLwZ+wbnFLy5aisrQ==", + "dependencies": { + "@abi-software/svg-sprite": "^1.0.1", + "@element-plus/icons-vue": "^2.3.1", + "element-plus": "2.8.4", + "mitt": "^3.0.1", + "vue": "^3.4.21" + } + }, "node_modules/@abi-software/gallery": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@abi-software/gallery/-/gallery-1.1.2.tgz", @@ -131,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2.tgz", - "integrity": "sha512-OMTQ9wCv8I/fqJUe4l3tXaptaIshKCO/+zsHK/GGQnpdj5tNkmiPs4zDpQpOJkN06bEYrhODnVkHaISV0l5fJw==", + "version": "2.4.2-beta.8", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.8.tgz", + "integrity": "sha512-2p7uA4kxSjlq0rRXX9cio8nplyzeKKCk/nJQZ4NixvFFXpWKGPB1fBnJl7c/Ou0VEhGNxg8ZB3kK7nrPtbx2GA==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.2", + "@abi-software/map-utilities": "1.1.3-beta.5", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -148,13 +160,27 @@ "xss": "^1.0.14" } }, + "node_modules/@abi-software/map-side-bar/node_modules/@abi-software/map-utilities": { + "version": "1.1.3-beta.5", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.5.tgz", + "integrity": "sha512-Sbjy1XcP7Q/OaFI0IGVqSv7kj8I9hLUYnnXt4tNJkApa5qBOAOEcJmUaJfGAV4zjp3OAB+sSIJHYN2rwIMj3og==", + "dependencies": { + "@abi-software/svg-sprite": "^1.0.1", + "@element-plus/icons-vue": "^2.3.1", + "cytoscape": "^3.30.2", + "element-plus": "2.8.4", + "mitt": "^3.0.1", + "vue": "^3.4.21" + } + }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.2.tgz", - "integrity": "sha512-NMERIqSq6pVwy7Daq+Uip8Cm1UE2KEJoquOqVXACrMoTDHV77LPbWAtawn3f7De5HK69oqLwZ+wbnFLy5aisrQ==", + "version": "1.1.3-beta.4", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.4.tgz", + "integrity": "sha512-NZnoa0gksHr3/4UfmjaSZGAR87swjMw8iZtjGrDGRF6KrljmU9PvbdH6V+OZJLgx7siELpc3+mHyuTkJeWCxEA==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", + "cytoscape": "^3.30.2", "element-plus": "2.8.4", "mitt": "^3.0.1", "vue": "^3.4.21" @@ -198,6 +224,18 @@ "zincjs": "^1.11.4" } }, + "node_modules/@abi-software/scaffoldvuer/node_modules/@abi-software/map-utilities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.2.tgz", + "integrity": "sha512-NMERIqSq6pVwy7Daq+Uip8Cm1UE2KEJoquOqVXACrMoTDHV77LPbWAtawn3f7De5HK69oqLwZ+wbnFLy5aisrQ==", + "dependencies": { + "@abi-software/svg-sprite": "^1.0.1", + "@element-plus/icons-vue": "^2.3.1", + "element-plus": "2.8.4", + "mitt": "^3.0.1", + "vue": "^3.4.21" + } + }, "node_modules/@abi-software/scaffoldvuer/node_modules/minisearch": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-6.3.0.tgz", @@ -1539,27 +1577,27 @@ } }, "node_modules/@loaders.gl/3d-tiles": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-4.2.5.tgz", - "integrity": "sha512-X5BEuReV2i/HQbhV47UMqRD25Bf6EmlNICB5U5bsvxJL5GgBzS9XmuiHCSkhzr9128bfilwkVYclRvdhbLrlTw==", - "dependencies": { - "@loaders.gl/compression": "4.2.5", - "@loaders.gl/crypto": "4.2.5", - "@loaders.gl/draco": "4.2.5", - "@loaders.gl/gltf": "4.2.5", - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/math": "4.2.5", - "@loaders.gl/tiles": "4.2.5", - "@loaders.gl/zip": "4.2.5", - "@math.gl/core": "^4.0.1", - "@math.gl/culling": "^4.0.1", - "@math.gl/geospatial": "^4.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-4.3.1.tgz", + "integrity": "sha512-ijAMFK92PCyp/eFpWazX05EMO0a2snT7yBeaHI+wKbp50XqTGAAvOZxM79wnXbdp4pgngOtPLKHc+BNMjnJ1pw==", + "dependencies": { + "@loaders.gl/compression": "4.3.1", + "@loaders.gl/crypto": "4.3.1", + "@loaders.gl/draco": "4.3.1", + "@loaders.gl/gltf": "4.3.1", + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/math": "4.3.1", + "@loaders.gl/tiles": "4.3.1", + "@loaders.gl/zip": "4.3.1", + "@math.gl/core": "^4.1.0", + "@math.gl/culling": "^4.1.0", + "@math.gl/geospatial": "^4.1.0", "@probe.gl/log": "^4.0.4", "long": "^5.2.1" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/3d-tiles/node_modules/long": { @@ -1568,12 +1606,12 @@ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, "node_modules/@loaders.gl/compression": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/compression/-/compression-4.2.5.tgz", - "integrity": "sha512-6uDGTA+gBejLxOj70Taj80oDyTzk1tqFgYTex37A4gckV0A/HGN9tBYuUxyKXB8jhXtlsVOfD27ZvXeVAUpEYQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/compression/-/compression-4.3.1.tgz", + "integrity": "sha512-ZKAfo7VUuvgxlqZFEYJIsY+jJ876i+ubUTryWqzDl60BXOf+oYr5i5bzeQwWa6UJusffnNKFakyDveTMzuwWkg==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", "@types/brotli": "^1.3.0", "@types/pako": "^1.0.1", "fflate": "0.7.4", @@ -1587,240 +1625,242 @@ "zstd-codec": "^0.1" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/core": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-4.2.5.tgz", - "integrity": "sha512-cN0QzNvdTU0Xy8sSUoUXzPkeIQ31tLHYTxoOrVwR33dndYu8OKeDlhLWTc87PF2oXSGegdNZD453Vm+Q/UZHPA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-4.3.1.tgz", + "integrity": "sha512-kFJQKpNmpYFdZdwPG1enZz18yUaUV9Mrr87KPb4hjf69p1UJuLQ2+wPxL/Ws9Di/aekAPoG9eCeSjyva8EIH0g==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", "@probe.gl/log": "^4.0.2" } }, "node_modules/@loaders.gl/crypto": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/crypto/-/crypto-4.2.5.tgz", - "integrity": "sha512-ylu0IwJMSuEUfpVB3bFSKSMfamMOFcCgAtwwbXdmRgG9vY2MFHTNe8XgaMQXEvgdSpAsPJ6DDAhE7EMsWEueoA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/crypto/-/crypto-4.3.1.tgz", + "integrity": "sha512-+2WIIXP7p1usFHexA7EZzlmDFV0hkLQYBabkWzo43WYmG7JultqLzyzHxCdGnEEGzFesfpuv+BF9//TtGHTwxw==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", "@types/crypto-js": "^4.0.2" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/draco": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-4.2.5.tgz", - "integrity": "sha512-d0i+e162uxXZXNvPfzq+r1Oczo2lDFNvGxrnI7hg5cGDSb395K7RkNgKkTno2X42izqAsrrjXm0H0d4kpe9bng==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-4.3.1.tgz", + "integrity": "sha512-PQjeiuYf2h0rorHVqYjs5VD7DX3yZHQok1p/RQMU915TejRRxRetP+ES90fdecnJ2Z13tiaLfI2aM6jI0qwEbg==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", "draco3d": "1.5.7" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/gis": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.2.5.tgz", - "integrity": "sha512-ydRC6oEQZkxjlqec5jI3MP04Upnz4jS97q7UH4m/p3+EBb/Lp+TlC9iulLWh+ZyN4LjXRv6Rp3eQ1UpPvzXrEg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.3.1.tgz", + "integrity": "sha512-P3STq7efVFd7EoKPkeo8XoFrQ7XW+uvVZC8fousOhhicgxQJPYYFl3Hd64jpliXPW0MM3wQMmQ4J+VD8HEt1rQ==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", "@mapbox/vector-tile": "^1.3.1", - "@math.gl/polygon": "^4.0.0", + "@math.gl/polygon": "^4.1.0", "pbf": "^3.2.1" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/gltf": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-4.2.5.tgz", - "integrity": "sha512-QmWs4G11S1/hQ07hJYeDjRJOaHVE6SbCKZpawczfjMam2WVe9P1ibeafPjR5BpaAYh5OVgVEELtGgvn00UfAeQ==", - "dependencies": { - "@loaders.gl/draco": "4.2.5", - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/textures": "4.2.5", - "@math.gl/core": "^4.0.0" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-4.3.1.tgz", + "integrity": "sha512-pYGqo9HFWICMemoly7XgTbnLE7zMiKEp3VTSQiGZzXHadjMx7kv5cN91O5fqIeP6U7L4ZyGhqGHB/OK12TQQ7Q==", + "dependencies": { + "@loaders.gl/draco": "4.3.1", + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/textures": "4.3.1", + "@math.gl/core": "^4.1.0" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/images": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-4.2.5.tgz", - "integrity": "sha512-N4FakP5WT8KuSDnl3jBYHOgILV6LEDamdZaGTIzzlYfHWZoyKjc+3vTz5G5ZBxcURp2oiwAlWSbs3V4eINEVAQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-4.3.1.tgz", + "integrity": "sha512-Epd64AtEo3oWrhZlftzMYNSC9b3fOfNXpKqw0itIJcSP3eC63JnUsBoYGNZ//vYMVXOCuMGJAAjCdMlNtez20Q==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5" + "@loaders.gl/loader-utils": "4.3.1" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/loader-utils": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.2.5.tgz", - "integrity": "sha512-OxvDeaqNbj/XGSfBgUE9SFxX94v9pDlPy6yg2SoOKX5HxF51jLd4+7tYayy8Kg95Xog9hy0AOR65mjwPcYBvOA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.3.1.tgz", + "integrity": "sha512-+IGK18EHJCfw2N+x8Fqln7hea4HJ5U8ZLxOUyRDS455ActvB5FPaQox1ko2B9/kPHhVFynglS+xoWczHHzwJlQ==", "dependencies": { - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", + "@probe.gl/log": "^4.0.2", "@probe.gl/stats": "^4.0.2" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/math": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-4.2.5.tgz", - "integrity": "sha512-5XXjAhsuZogJGXtJ8zx+7VAhB6BaTIZFYAT+e6S0ZXjFAkDUBYYX2xyzyOGAjEbzbNTlMMhbTVK50VaTgHhXDQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-4.3.1.tgz", + "integrity": "sha512-BDTtXq7y3z/sbuVQfVSyVcjJVXPnD++e22CHwMgyw7PxkKDC7CX8G+p04W/Mx9heNoszsCwLxoZGsjiQruOD3g==", "dependencies": { - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@math.gl/core": "^4.0.0" + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@math.gl/core": "^4.1.0" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/mvt": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-4.2.5.tgz", - "integrity": "sha512-fqcUd2y7F580gYBNkyKGN7aDsyrJ8jL5vHUDUQxwjsNFiA3+8j/VnFJJxqSzXvBmxdz5sg5UF6Fr5lHKSCyeLA==", - "dependencies": { - "@loaders.gl/gis": "4.2.5", - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@math.gl/polygon": "^4.0.0", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-4.3.1.tgz", + "integrity": "sha512-lzFVJ5E2lkWZTfKe88xPuTogVdjhHa0Ey39bIbxAPKmWf/5Cyf3RIAbgkAGoSxytc8OGYrB6rIO9+MuHOmPMag==", + "dependencies": { + "@loaders.gl/gis": "4.3.1", + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@math.gl/polygon": "^4.1.0", + "@probe.gl/stats": "^4.0.0", "pbf": "^3.2.1" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/schema": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.2.5.tgz", - "integrity": "sha512-HzDUMApIGx/261gKIEO0Rz/5pmtUwEz27EgfAn0SRb4PCyxTBFlvS/w1DYO909AuxNtSVokUv3aml91Stb9XTA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.3.1.tgz", + "integrity": "sha512-sKhP4rL4JMMVHrZWdYL8KxO7nbbjNIbzreL7ymwNV7zCAS8JW+QjCoV1hEicl5Ma8OP5Lte/cTxpOz8MiOmMXQ==", "dependencies": { "@types/geojson": "^7946.0.7" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/terrain": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-4.2.5.tgz", - "integrity": "sha512-jdX+M/+Fs1J9gxXlUVQ0YxlTpn2PDQ9xV1UbQiDL2iZKSi0kx7ToKBgy5CxTSwOB0tyeIo7B0bmyTo8t8Isptg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-4.3.1.tgz", + "integrity": "sha512-6UyVYoyae4tajXe5dIncQ6gczZ91axYKpWoHbGvx38xr4qOQNZnGsmKnPe3m8RRdqwvJMRNveyyMfpoOMxHGEQ==", "dependencies": { - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", "@mapbox/martini": "^0.2.0" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/textures": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-4.2.5.tgz", - "integrity": "sha512-hhDhotF9BEskwabdeELKdGIpkYyhwHhJELUFcU0DPQL7LrJare83/4tdeyyp48sbt+e5HQcdKVotFFa0cfA7Tw==", - "dependencies": { - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/worker-utils": "4.2.5", - "@math.gl/types": "^4.0.1", - "ktx-parse": "^0.0.4", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-4.3.1.tgz", + "integrity": "sha512-efOg/7VTwYb5li6//6LTELhy70OpuzX8GV/Rlip8CW2pF0lr2NKqvZDwFb2Z+HvKJ0p+ZMSP+R0iNmgZynJgyA==", + "dependencies": { + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/worker-utils": "4.3.1", + "@math.gl/types": "^4.1.0", + "ktx-parse": "^0.7.0", "texture-compressor": "^1.0.2" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/tiles": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-4.2.5.tgz", - "integrity": "sha512-AyQnpI1/N8KI9xVw1LeBXLDNgdBowxOh7GJYmoG6wSzDUSxJLZ/bJLAWC2v9ovN5fz2gaW2cH3SLg5jXLn0rZg==", - "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/math": "4.2.5", - "@math.gl/core": "^4.0.0", - "@math.gl/culling": "^4.0.0", - "@math.gl/geospatial": "^4.0.0", - "@math.gl/web-mercator": "^4.0.0", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-4.3.1.tgz", + "integrity": "sha512-/1lM/5y6zdPKUH9xdhCURHfHhk9nDk0eBAlKiHZPe/WFWGlNLaaDqbElMhuwUE91r6qZfYdkMeN+/ROEVmRqNw==", + "dependencies": { + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/math": "4.3.1", + "@math.gl/core": "^4.1.0", + "@math.gl/culling": "^4.1.0", + "@math.gl/geospatial": "^4.1.0", + "@math.gl/web-mercator": "^4.1.0", "@probe.gl/stats": "^4.0.2" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/wms": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-4.2.5.tgz", - "integrity": "sha512-6/dZnOSQaVy94JSoFB15jRMo41x2E29QX58bBqR6juInYviYWUaGTa4BCj+s+M3hP0/CzkklK2zrPOX7E0xhGw==", - "dependencies": { - "@loaders.gl/images": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", - "@loaders.gl/xml": "4.2.5", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-4.3.1.tgz", + "integrity": "sha512-+bHHfdtXouSJfniCYtVPJefebrNTKQuwM7Nebq5Uas0G/e/lEiFu9KMDv9Ey2HZL7xCa7SI8mbKpSb10Dj6hGQ==", + "dependencies": { + "@loaders.gl/images": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", + "@loaders.gl/xml": "4.3.1", "@turf/rewind": "^5.1.5", "deep-strict-equal": "^0.2.0" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/worker-utils": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.2.5.tgz", - "integrity": "sha512-C8yrik+mIwd5WrnbOMQ7gIBFCTk78pm9+x7OgH6PmaRlkss1S5exvIyQ4CCjlWPp27MCygy9iLvzImP9kbELKg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.3.1.tgz", + "integrity": "sha512-WpJ5N9jMI/ZDefVjqAMBWHux8tKUTW5jtj7espddKW1Q2DQIrdXywVQO0SouUiRJlcVot5s5BlHD0JZwKfAlZw==", "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/xml": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-4.2.5.tgz", - "integrity": "sha512-2ga1ye7T5ET1IPNErYXgI8QQ5Prz3MlnClgOXBYLGDfp1LLb4HepGtNnlD+Robx5cq98ux6DdFWEXXs+wxaY8Q==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-4.3.1.tgz", + "integrity": "sha512-y05TWJA/KoU+BNjBLMVgwxwy3pvACHkJKDiqop3jcm6nHz+tfy8FotscXY5MynKvW9S7OQ0IPl4OBWWYmS87bA==", "dependencies": { - "@loaders.gl/loader-utils": "4.2.5", - "@loaders.gl/schema": "4.2.5", + "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/schema": "4.3.1", "fast-xml-parser": "^4.2.5" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/zip": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@loaders.gl/zip/-/zip-4.2.5.tgz", - "integrity": "sha512-XF+5/v5xFh+a1w9Zp8pJYC0QvRk6V2IPgUs/yFiliqKvLTNLAWDBuvKiUfLYz9QROXjqD/XRkSiMRIUGwa0UOA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@loaders.gl/zip/-/zip-4.3.1.tgz", + "integrity": "sha512-P2OYeg6u3ZgBCrUbUuG7x7PzNCR7QZlA9y5JtE49eWZtc4e30VJFPuzwck77U04/TAK5g7LfkUlMBQ+uhN2UNg==", "dependencies": { - "@loaders.gl/compression": "4.2.5", - "@loaders.gl/crypto": "4.2.5", - "@loaders.gl/loader-utils": "4.2.5", + "@loaders.gl/compression": "4.3.1", + "@loaders.gl/crypto": "4.3.1", + "@loaders.gl/loader-utils": "4.3.1", "jszip": "^3.1.5", "md5": "^2.3.0" }, "peerDependencies": { - "@loaders.gl/core": "^4.0.0" + "@loaders.gl/core": "^4.3.0" } }, "node_modules/@luma.gl/constants": { @@ -6215,6 +6255,14 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/cytoscape": { + "version": "3.30.2", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.2.tgz", + "integrity": "sha512-oICxQsjW8uSaRmn4UK/jkczKOqTrVqt5/1WL0POiJUT2EKNc9STM4hYFHv917yu55aTBMFNRzymlJhVAiWPCxw==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/d": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", @@ -10606,9 +10654,9 @@ } }, "node_modules/ktx-parse": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/ktx-parse/-/ktx-parse-0.0.4.tgz", - "integrity": "sha512-LY3nrmfXl+wZZdPxgJ3ZmLvG+wkOZZP3/dr4RbQj1Pk3Qwz44esOOSFFVQJcNWpXAtiNIC66WgXufX/SYgYz6A==" + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ktx-parse/-/ktx-parse-0.7.1.tgz", + "integrity": "sha512-FeA3g56ksdFNwjXJJsc1CCc7co+AJYDp6ipIp878zZ2bU8kWROatLYf39TQEd4/XRSUvBXovQ8gaVKWPXsCLEQ==" }, "node_modules/ky": { "version": "0.33.3", @@ -17348,9 +17396,9 @@ "integrity": "sha512-ANHlY4Rb5kHw40D0NJ6moaVfOCMrp9Gpd1R/AIQYg2ko4/jzcJ+TVXYYF6kXJqQwITvEZP4yEthjM7U6rYlljQ==" }, "node_modules/wgsl_reflect": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/wgsl_reflect/-/wgsl_reflect-1.0.12.tgz", - "integrity": "sha512-hqORu1l+ed+tylMmcP/G78+rulEpq7TMKIxX/ktEgQzyYXcZL3FMkL8/c7xLMziy6+MXfjlOFWXqIal4KHilzg==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/wgsl_reflect/-/wgsl_reflect-1.0.14.tgz", + "integrity": "sha512-VYY1+5pNm3GE2I4ADNnlNBFTiLOsh3Cq/eeiwfMhjMzUwnlJOqJrzKUd/3owxL69txUfvgcQaB8M6ElVaBaAOA==" }, "node_modules/whatwg-encoding": { "version": "1.0.5", diff --git a/package.json b/package.json index e6bbea71..66ea9755 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ "*.js" ], "dependencies": { - "@abi-software/flatmapvuer": "^1.5.6", - "@abi-software/map-side-bar": "^2.4.2", - "@abi-software/map-utilities": "^1.1.2", + "@abi-software/flatmapvuer": "^1.5.6-beta.2", + "@abi-software/map-side-bar": "^2.4.2-beta.8", + "@abi-software/map-utilities": "^1.1.3-beta.4", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", "@abi-software/simulationvuer": "^1.0.1", From a41970ba60d26760b387cba26f1c87d678d4c9fb Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 11:48:39 +1300 Subject: [PATCH 05/25] Update connectivity graph highlight feature --- src/components/viewers/MultiFlatmap.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index b41f8ba5..64283a9c 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -463,8 +463,18 @@ export default { // searching with labels will find the closest/similar term const labels = data.slice(halfIndex); - // The search can perform with either id or label - this.search(ids[0]); + // search the features on the map first + if (this.flatmapReady) { + const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); + if (flatmap.mapImp) { + const response = flatmap.mapImp.search(ids[0]); + // highlight only if the feature is found on map + if (response?.results.length) { + // The search can perform with either id or label + this.search(ids[0]); + } + } + } }); EventBus.on("markerUpdate", () => { From cc6bc138701a54381871ad77a16410dbf9669ed5 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 11:55:07 +1300 Subject: [PATCH 06/25] Update map utilities beta version for connectivity graph --- package-lock.json | 17 ++--------------- package.json | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6a3adf77..5e169bfa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", "@abi-software/map-side-bar": "^2.4.2-beta.8", - "@abi-software/map-utilities": "^1.1.3-beta.4", + "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", "@abi-software/simulationvuer": "^1.0.1", @@ -160,7 +160,7 @@ "xss": "^1.0.14" } }, - "node_modules/@abi-software/map-side-bar/node_modules/@abi-software/map-utilities": { + "node_modules/@abi-software/map-utilities": { "version": "1.1.3-beta.5", "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.5.tgz", "integrity": "sha512-Sbjy1XcP7Q/OaFI0IGVqSv7kj8I9hLUYnnXt4tNJkApa5qBOAOEcJmUaJfGAV4zjp3OAB+sSIJHYN2rwIMj3og==", @@ -173,19 +173,6 @@ "vue": "^3.4.21" } }, - "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.4", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.4.tgz", - "integrity": "sha512-NZnoa0gksHr3/4UfmjaSZGAR87swjMw8iZtjGrDGRF6KrljmU9PvbdH6V+OZJLgx7siELpc3+mHyuTkJeWCxEA==", - "dependencies": { - "@abi-software/svg-sprite": "^1.0.1", - "@element-plus/icons-vue": "^2.3.1", - "cytoscape": "^3.30.2", - "element-plus": "2.8.4", - "mitt": "^3.0.1", - "vue": "^3.4.21" - } - }, "node_modules/@abi-software/plotvuer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@abi-software/plotvuer/-/plotvuer-1.0.3.tgz", diff --git a/package.json b/package.json index 66ea9755..224a65fe 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", "@abi-software/map-side-bar": "^2.4.2-beta.8", - "@abi-software/map-utilities": "^1.1.3-beta.4", + "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", "@abi-software/simulationvuer": "^1.0.1", From da5a9c5344523b58a1f2da6ac7c2c7196c3eb879 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 12:33:43 +1300 Subject: [PATCH 07/25] Update search search suggestion for api update --- src/components/viewers/MultiFlatmap.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 64283a9c..736413a1 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -179,7 +179,8 @@ export default { const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); if (term && flatmap.mapImp) { const results = flatmap.mapImp.search(term); - results.__featureIds.forEach(id => { + const featureIds = results.__featureIds || results.featureIds; + featureIds.forEach(id => { const annotation = flatmap.mapImp.annotation(id); if (annotation && annotation.label) suggestions.push(annotation.label); From d9a25b2ee239055b4bcb7e0a23a362e887cefe62 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 13:27:08 +1300 Subject: [PATCH 08/25] Update sidebar for connectivity graph update --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5e169bfa..e3d6767c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.8", + "@abi-software/map-side-bar": "^2.4.2-beta.9", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.8", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.8.tgz", - "integrity": "sha512-2p7uA4kxSjlq0rRXX9cio8nplyzeKKCk/nJQZ4NixvFFXpWKGPB1fBnJl7c/Ou0VEhGNxg8ZB3kK7nrPtbx2GA==", + "version": "2.4.2-beta.9", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.9.tgz", + "integrity": "sha512-O25eId4cz7cXhqLS3RVaI2ztMtM3mD2Wxy8br9jWaC376ZwhR8Q7cGgZitNJOB2HZAbdw97LQxtp1wMGoX+HiQ==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "1.1.3-beta.5", + "@abi-software/map-utilities": "^1.1.3-beta.6", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.5", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.5.tgz", - "integrity": "sha512-Sbjy1XcP7Q/OaFI0IGVqSv7kj8I9hLUYnnXt4tNJkApa5qBOAOEcJmUaJfGAV4zjp3OAB+sSIJHYN2rwIMj3og==", + "version": "1.1.3-beta.6", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.6.tgz", + "integrity": "sha512-XWPss3rZGfGknoYLLrIfkpAuCB43U9menupS6o//siAo+4NZozY+LpYKw36Ex3jQ5Yn5kSn7poMfKehoz1iUwA==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index 224a65fe..6fe7f577 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.8", + "@abi-software/map-side-bar": "^2.4.2-beta.9", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From 3f8b314d8e4ac9ecb3848c8612e9bc47e2d09319 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 14:27:00 +1300 Subject: [PATCH 09/25] Fix highlighted path after connectivity graph click --- src/components/SplitFlow.vue | 5 ++++- src/components/viewers/MultiFlatmap.vue | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index ded5f1f5..a6485b0c 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -279,7 +279,10 @@ export default { }); }, onConnectivityComponentClick: function (data) { - EventBus.emit('connectivity-component-click', data); + EventBus.emit('connectivity-component-click', { + connectivityInfo: this.connectivityInfo, + data + }); }, hoverChanged: function (data) { const hoverAnatomies = data && data.anatomy ? data.anatomy : []; diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 736413a1..a3b75ddd 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -450,7 +450,9 @@ export default { } }); - EventBus.on('connectivity-component-click', (data) => { + EventBus.on('connectivity-component-click', (payload) => { + const { connectivityInfo, data } = payload; + // Connectivity component click emits an array of data, // a combination of ids and labels. // The first half is ids and the second half is labels. @@ -473,6 +475,11 @@ export default { if (response?.results.length) { // The search can perform with either id or label this.search(ids[0]); + + // to keep the highlighted path on map + if (connectivityInfo && connectivityInfo.featureId) { + flatmap.mapImp.zoomToFeatures(connectivityInfo.featureId); + } } } } From eb3688b0636224fb2b5f996958522ef612d9ec4f Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 15:06:02 +1300 Subject: [PATCH 10/25] Update connectivity graph highlight all features --- src/components/viewers/MultiFlatmap.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index a3b75ddd..a3123f78 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -478,7 +478,8 @@ export default { // to keep the highlighted path on map if (connectivityInfo && connectivityInfo.featureId) { - flatmap.mapImp.zoomToFeatures(connectivityInfo.featureId); + const allFeatures = [...ids, ...connectivityInfo.featureId]; + flatmap.mapImp.zoomToFeatures(allFeatures); } } } From 9de610ec0e3cdea990037fef59cfeb2e02ded859 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 16:44:03 +1300 Subject: [PATCH 11/25] Show all labels for connectivity graph node click --- src/components/viewers/MultiFlatmap.vue | 53 ++++++++++++++++++++----- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index a3123f78..951a1419 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -470,17 +470,52 @@ export default { if (this.flatmapReady) { const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); if (flatmap.mapImp) { - const response = flatmap.mapImp.search(ids[0]); - // highlight only if the feature is found on map - if (response?.results.length) { - // The search can perform with either id or label - this.search(ids[0]); + // create an array for all data + const features = []; - // to keep the highlighted path on map - if (connectivityInfo && connectivityInfo.featureId) { - const allFeatures = [...ids, ...connectivityInfo.featureId]; - flatmap.mapImp.zoomToFeatures(allFeatures); + ids.forEach((id, i) => { + const response = flatmap.mapImp.search(id); + if (response?.results.length) { + const featureId = response?.results[0].featureId; + features.push({ + featureId, + label: labels[i], + }); } + }); + + // combine all labels to show together + // content type must be DOM object to use HTML + const labelsContainer = document.createElement('div'); + labelsContainer.classList.add('flatmap-feature-label'); + labels.forEach((label, i) => { + labelsContainer.append(label); + + if ((i + 1) < labels.length) { + const hr = document.createElement('hr'); + labelsContainer.appendChild(hr); + } + }); + + // The search can perform with either id or label + // this.search(ids[0]); + + // show tooltip of the first item + // with all labels + flatmap.mapImp.showPopup( + features[0].featureId, + labelsContainer, + { + className: 'custom-popup', + positionAtLastClick: false, + preserveSelection: true, + } + ); + + // to keep the highlighted path on map + if (connectivityInfo && connectivityInfo.featureId) { + const allFeatures = [...ids, ...connectivityInfo.featureId]; + flatmap.mapImp.zoomToFeatures(allFeatures); } } } From 46d73675e106d13958a99b36cae84dc13a21513b Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 22 Oct 2024 17:26:32 +1300 Subject: [PATCH 12/25] Update sidebar for connectivity graph update --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3d6767c..cdd4fba2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.9", + "@abi-software/map-side-bar": "^2.4.2-beta.10", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.9", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.9.tgz", - "integrity": "sha512-O25eId4cz7cXhqLS3RVaI2ztMtM3mD2Wxy8br9jWaC376ZwhR8Q7cGgZitNJOB2HZAbdw97LQxtp1wMGoX+HiQ==", + "version": "2.4.2-beta.10", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.10.tgz", + "integrity": "sha512-XpWZmY4K+20NpEGQv4907ynUNLj1JSKqle+/9YwFdRl1FHM3unnkVvseE/5Fb/dLEyfdsYWJAhQpaXv38km/aw==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.3-beta.6", + "@abi-software/map-utilities": "^1.1.3-beta.7", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.6", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.6.tgz", - "integrity": "sha512-XWPss3rZGfGknoYLLrIfkpAuCB43U9menupS6o//siAo+4NZozY+LpYKw36Ex3jQ5Yn5kSn7poMfKehoz1iUwA==", + "version": "1.1.3-beta.7", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.7.tgz", + "integrity": "sha512-Cb3KrAeqgvIVYcTbFCtqsV27omCCUJdJN7TlZBv+ZUHkY53UfSReGM+o6IESV6Y8Kr1BRs7XkO5pEvK4SdNE+Q==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index 6fe7f577..125613c3 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.9", + "@abi-software/map-side-bar": "^2.4.2-beta.10", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From b7ae379bb88508a42fc344927d45ed3ab9c894db Mon Sep 17 00:00:00 2001 From: akhuoa Date: Wed, 23 Oct 2024 16:52:25 +1300 Subject: [PATCH 13/25] Show error message for connectivity graph when data not found on map --- src/components/SplitFlow.vue | 5 + src/components/viewers/MultiFlatmap.vue | 117 +++++++++++++++--------- 2 files changed, 79 insertions(+), 43 deletions(-) diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index a6485b0c..48a47688 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -542,6 +542,11 @@ export default { this.connectivityInfo = null; this.resetActivePathways(); }); + EventBus.on('connectivity-graph-error', payload => { + if (this.$refs.sideBar) { + this.$refs.sideBar.updateConnectivityGraphError(payload.data); + } + }); EventBus.on("OpenNewMap", type => { this.openNewMap(type); }); diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 951a1419..c2d374b2 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -452,71 +452,102 @@ export default { EventBus.on('connectivity-component-click', (payload) => { const { connectivityInfo, data } = payload; + const featuresToHighlight = []; + const connectivityData = []; + const filteredConnectivityData = []; + const errorData = []; + + // to keep the highlighted path on map + if (connectivityInfo && connectivityInfo.featureId) { + featuresToHighlight.push(...connectivityInfo.featureId); + } // Connectivity component click emits an array of data, // a combination of ids and labels. // The first half is ids and the second half is labels. - const halfIndex = Math.ceil(data.length / 2); - - // first half | ids - // searching with id will find the exact match - const ids = data.slice(0, halfIndex); - - // second half | labels - // searching with labels will find the closest/similar term - const labels = data.slice(halfIndex); + for (let i = 0; i < data.length / 2; i++) { + connectivityData.push({ + id: data[i], + label: data[i + data.length / 2] + }); + } // search the features on the map first if (this.flatmapReady) { const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); if (flatmap.mapImp) { - // create an array for all data - const features = []; - - ids.forEach((id, i) => { + connectivityData.forEach((connectivity, i) => { + const {id, label} = connectivity; const response = flatmap.mapImp.search(id); + if (response?.results.length) { const featureId = response?.results[0].featureId; - features.push({ + + filteredConnectivityData.push({ featureId, - label: labels[i], + id, + label, }); + featuresToHighlight.push(id); + } else { + errorData.push(connectivity); } }); - // combine all labels to show together - // content type must be DOM object to use HTML - const labelsContainer = document.createElement('div'); - labelsContainer.classList.add('flatmap-feature-label'); - labels.forEach((label, i) => { - labelsContainer.append(label); + // show tooltip of the first item + // with all labels + if (filteredConnectivityData.length) { + // combine all labels to show together + // content type must be DOM object to use HTML + const labelsContainer = document.createElement('div'); + labelsContainer.classList.add('flatmap-feature-label'); + + filteredConnectivityData.forEach((connectivity, i) => { + const { label } = connectivity; + labelsContainer.append(label); - if ((i + 1) < labels.length) { - const hr = document.createElement('hr'); - labelsContainer.appendChild(hr); - } - }); + if ((i + 1) < filteredConnectivityData.length) { + const hr = document.createElement('hr'); + labelsContainer.appendChild(hr); + } + }); + + flatmap.mapImp.showPopup( + filteredConnectivityData[0].featureId, + labelsContainer, + { + className: 'custom-popup', + positionAtLastClick: false, + preserveSelection: true, + } + ); + } else { + errorData.push(...connectivityData); + } - // The search can perform with either id or label - // this.search(ids[0]); + if (errorData.length) { + const errorDataToEmit = [...new Set(errorData)]; + let errorMessage = ''; - // show tooltip of the first item - // with all labels - flatmap.mapImp.showPopup( - features[0].featureId, - labelsContainer, - { - className: 'custom-popup', - positionAtLastClick: false, - preserveSelection: true, - } - ); + errorDataToEmit.forEach((connectivity, i) => { + errorMessage += connectivity.label; - // to keep the highlighted path on map - if (connectivityInfo && connectivityInfo.featureId) { - const allFeatures = [...ids, ...connectivityInfo.featureId]; - flatmap.mapImp.zoomToFeatures(allFeatures); + if (errorDataToEmit.length > 1) { + if ((i + 2) === errorDataToEmit.length) { + errorMessage += ' and '; + } else if ((i + 1) < errorDataToEmit.length) { + errorMessage += ', '; + } + } + }); + errorMessage += ' cannot be found on the map!'; + EventBus.emit('connectivity-graph-error', { + data: errorMessage + }); } + + // highlight all available features + flatmap.mapImp.zoomToFeatures(featuresToHighlight, { noZoomIn: true }); } } }); From 51bdbdb2411b58ad4ed1e4fcb2485418e27237c3 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Wed, 23 Oct 2024 17:05:37 +1300 Subject: [PATCH 14/25] Update sidebar for connectivity graph error --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdd4fba2..e36c3ecf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.10", + "@abi-software/map-side-bar": "^2.4.2-beta.11", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.10", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.10.tgz", - "integrity": "sha512-XpWZmY4K+20NpEGQv4907ynUNLj1JSKqle+/9YwFdRl1FHM3unnkVvseE/5Fb/dLEyfdsYWJAhQpaXv38km/aw==", + "version": "2.4.2-beta.11", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.11.tgz", + "integrity": "sha512-ShM34EuZboaUL3e5NAvXN2l/blj0T9KS8UdonsWQA0eqja4IccQTuPSMgXP2G+mtVQPt6B1muiMJ9bOVAKdsXQ==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.3-beta.7", + "@abi-software/map-utilities": "^1.1.3-beta.8", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.7", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.7.tgz", - "integrity": "sha512-Cb3KrAeqgvIVYcTbFCtqsV27omCCUJdJN7TlZBv+ZUHkY53UfSReGM+o6IESV6Y8Kr1BRs7XkO5pEvK4SdNE+Q==", + "version": "1.1.3-beta.8", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.8.tgz", + "integrity": "sha512-wsSd9OL7vZbbVzif3v5hR3mWz4zyNaslW+DcMIttSWBQuVWkL0J7iS/HBGWWcB21z4GHhO6sfIIy4gdc6sEFMQ==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index 125613c3..b7cc7406 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.10", + "@abi-software/map-side-bar": "^2.4.2-beta.11", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From 1b2fd8330f683e4a670880c332576e9e82b7a904 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Wed, 23 Oct 2024 17:23:32 +1300 Subject: [PATCH 15/25] Capitalise connectivity features --- src/components/viewers/MultiFlatmap.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index c2d374b2..7a103607 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -48,6 +48,7 @@ import Tagging from '../../services/tagging.js'; import ContentMixin from "../../mixins/ContentMixin"; import EventBus from "../EventBus"; import { + capitalise, availableSpecies, getBodyScaffoldInfo, transformObjToString @@ -504,7 +505,7 @@ export default { filteredConnectivityData.forEach((connectivity, i) => { const { label } = connectivity; - labelsContainer.append(label); + labelsContainer.append(capitalise(label)); if ((i + 1) < filteredConnectivityData.length) { const hr = document.createElement('hr'); @@ -516,7 +517,7 @@ export default { filteredConnectivityData[0].featureId, labelsContainer, { - className: 'custom-popup', + className: 'custom-popup flatmap-tooltip-popup', positionAtLastClick: false, preserveSelection: true, } @@ -530,7 +531,8 @@ export default { let errorMessage = ''; errorDataToEmit.forEach((connectivity, i) => { - errorMessage += connectivity.label; + const { label } = connectivity; + errorMessage += (i === 0) ? capitalise(label) : label; if (errorDataToEmit.length > 1) { if ((i + 2) === errorDataToEmit.length) { From 0c332643a848753b78e13b488bf59b0aada8ef7c Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 24 Oct 2024 11:18:54 +1300 Subject: [PATCH 16/25] Refactor code for connectivity graph --- src/components/viewers/MultiFlatmap.vue | 97 +++++++++++++------------ 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 7a103607..85ebe187 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -414,6 +414,55 @@ export default { const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); flatmap.changeViewingMode(modeName); }, + createTooltipForConnectivity: function (filteredConnectivityData, mapImp) { + // combine all labels to show together + // content type must be DOM object to use HTML + const labelsContainer = document.createElement('div'); + labelsContainer.classList.add('flatmap-feature-label'); + + filteredConnectivityData.forEach((connectivity, i) => { + const { label } = connectivity; + labelsContainer.append(capitalise(label)); + + if ((i + 1) < filteredConnectivityData.length) { + const hr = document.createElement('hr'); + labelsContainer.appendChild(hr); + } + }); + + mapImp.showPopup( + filteredConnectivityData[0].featureId, + labelsContainer, + { + className: 'custom-popup flatmap-tooltip-popup', + positionAtLastClick: false, + preserveSelection: true, + } + ); + }, + emitConnectivityGraphError: function (errorData) { + if (errorData.length) { + const errorDataToEmit = [...new Set(errorData)]; + let errorMessage = ''; + + errorDataToEmit.forEach((connectivity, i) => { + const { label } = connectivity; + errorMessage += (i === 0) ? capitalise(label) : label; + + if (errorDataToEmit.length > 1) { + if ((i + 2) === errorDataToEmit.length) { + errorMessage += ' and '; + } else if ((i + 1) < errorDataToEmit.length) { + errorMessage += ', '; + } + } + }); + errorMessage += ' cannot be found on the map!'; + EventBus.emit('connectivity-graph-error', { + data: errorMessage + }); + } + }, }, computed: { facetSpecies() { @@ -498,55 +547,13 @@ export default { // show tooltip of the first item // with all labels if (filteredConnectivityData.length) { - // combine all labels to show together - // content type must be DOM object to use HTML - const labelsContainer = document.createElement('div'); - labelsContainer.classList.add('flatmap-feature-label'); - - filteredConnectivityData.forEach((connectivity, i) => { - const { label } = connectivity; - labelsContainer.append(capitalise(label)); - - if ((i + 1) < filteredConnectivityData.length) { - const hr = document.createElement('hr'); - labelsContainer.appendChild(hr); - } - }); - - flatmap.mapImp.showPopup( - filteredConnectivityData[0].featureId, - labelsContainer, - { - className: 'custom-popup flatmap-tooltip-popup', - positionAtLastClick: false, - preserveSelection: true, - } - ); + this.createTooltipForConnectivity(filteredConnectivityData, flatmap.mapImp); } else { errorData.push(...connectivityData); } - if (errorData.length) { - const errorDataToEmit = [...new Set(errorData)]; - let errorMessage = ''; - - errorDataToEmit.forEach((connectivity, i) => { - const { label } = connectivity; - errorMessage += (i === 0) ? capitalise(label) : label; - - if (errorDataToEmit.length > 1) { - if ((i + 2) === errorDataToEmit.length) { - errorMessage += ' and '; - } else if ((i + 1) < errorDataToEmit.length) { - errorMessage += ', '; - } - } - }); - errorMessage += ' cannot be found on the map!'; - EventBus.emit('connectivity-graph-error', { - data: errorMessage - }); - } + // Emit error message for connectivity graph + this.emitConnectivityGraphError(errorData); // highlight all available features flatmap.mapImp.zoomToFeatures(featuresToHighlight, { noZoomIn: true }); From aedcb2b232cfbce755089b9e60d6ecfdec1448a8 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 24 Oct 2024 11:28:37 +1300 Subject: [PATCH 17/25] Refactor code for connectivity graph --- src/components/viewers/MultiFlatmap.vue | 83 +++++++++++++------------ 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index 85ebe187..f69d67a3 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -463,44 +463,7 @@ export default { }); } }, - }, - computed: { - facetSpecies() { - return this.settingsStore.facets.species; - }, - featuredMarkers() { - return this.settingsStore.featuredMarkers; - }, - }, - watch: { - syncMode: function (val) { - if (this.$refs.multiflatmap.getCurrentFlatmap()) - this.$refs.multiflatmap.getCurrentFlatmap().enablePanZoomEvents(val); - }, - featuredMarkers: function (markers) { - if (!this.flatmapReady) { - return; - } - - this.updateFeaturedMarkers(markers, undefined); - }, - }, - mounted: function () { - this.getFeaturedDatasets(); - EventBus.on('show-connectivity', (payload) => { - const { featureIds, offset } = payload; - if (this.flatmapReady && this.$refs.multiflatmap) { - const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap(); - if (currentFlatmap) { - currentFlatmap.moveMap(featureIds, { - offsetX: offset ? -150 : 0, - zoom: 4, - }); - } - } - }); - - EventBus.on('connectivity-component-click', (payload) => { + showConnectivityTooltips: function (payload) { const { connectivityInfo, data } = payload; const featuresToHighlight = []; const connectivityData = []; @@ -544,9 +507,9 @@ export default { } }); - // show tooltip of the first item - // with all labels if (filteredConnectivityData.length) { + // show tooltip of the first item + // with all labels this.createTooltipForConnectivity(filteredConnectivityData, flatmap.mapImp); } else { errorData.push(...connectivityData); @@ -559,6 +522,46 @@ export default { flatmap.mapImp.zoomToFeatures(featuresToHighlight, { noZoomIn: true }); } } + }, + }, + computed: { + facetSpecies() { + return this.settingsStore.facets.species; + }, + featuredMarkers() { + return this.settingsStore.featuredMarkers; + }, + }, + watch: { + syncMode: function (val) { + if (this.$refs.multiflatmap.getCurrentFlatmap()) + this.$refs.multiflatmap.getCurrentFlatmap().enablePanZoomEvents(val); + }, + featuredMarkers: function (markers) { + if (!this.flatmapReady) { + return; + } + + this.updateFeaturedMarkers(markers, undefined); + }, + }, + mounted: function () { + this.getFeaturedDatasets(); + EventBus.on('show-connectivity', (payload) => { + const { featureIds, offset } = payload; + if (this.flatmapReady && this.$refs.multiflatmap) { + const currentFlatmap = this.$refs.multiflatmap.getCurrentFlatmap(); + if (currentFlatmap) { + currentFlatmap.moveMap(featureIds, { + offsetX: offset ? -150 : 0, + zoom: 4, + }); + } + } + }); + + EventBus.on('connectivity-component-click', (payload) => { + this.showConnectivityTooltips(payload); }); EventBus.on("markerUpdate", () => { From 6ee551338cd3e774f1d9022c049e73f17e71bfc0 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 24 Oct 2024 13:44:32 +1300 Subject: [PATCH 18/25] Remove tooltips on map when user click outside connectivity graph nodes --- src/components/viewers/MultiFlatmap.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue index f69d67a3..bdab02cc 100644 --- a/src/components/viewers/MultiFlatmap.vue +++ b/src/components/viewers/MultiFlatmap.vue @@ -414,6 +414,14 @@ export default { const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); flatmap.changeViewingMode(modeName); }, + removeConnectivityTooltips: function () { + const flatmap = this.$refs.multiflatmap.getCurrentFlatmap(); + if (flatmap?.$el) { + // close all tooltips on the current flatmap element + const tooltips = flatmap.$el.querySelectorAll('.flatmap-tooltip-popup'); + tooltips.forEach(tooltip => tooltip.remove()); + } + }, createTooltipForConnectivity: function (filteredConnectivityData, mapImp) { // combine all labels to show together // content type must be DOM object to use HTML @@ -470,6 +478,10 @@ export default { const filteredConnectivityData = []; const errorData = []; + if (!data.length) { + this.removeConnectivityTooltips(); + } + // to keep the highlighted path on map if (connectivityInfo && connectivityInfo.featureId) { featuresToHighlight.push(...connectivityInfo.featureId); @@ -513,6 +525,7 @@ export default { this.createTooltipForConnectivity(filteredConnectivityData, flatmap.mapImp); } else { errorData.push(...connectivityData); + this.removeConnectivityTooltips(); } // Emit error message for connectivity graph From ad570893e66d9867fc8d32e8c32a11745b701c15 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 24 Oct 2024 13:57:29 +1300 Subject: [PATCH 19/25] Update map sidebar and utilities for connectivity graph updates --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index e36c3ecf..f5c23def 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.11", + "@abi-software/map-side-bar": "^2.4.2-beta.12", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.11", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.11.tgz", - "integrity": "sha512-ShM34EuZboaUL3e5NAvXN2l/blj0T9KS8UdonsWQA0eqja4IccQTuPSMgXP2G+mtVQPt6B1muiMJ9bOVAKdsXQ==", + "version": "2.4.2-beta.12", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.12.tgz", + "integrity": "sha512-J7bT6Iz0GnCNHF+tg2CWp+Se4J8t+sdmBHQzVM0VaCzyaPmK+ko68K4WjxFco2fqzemFVEkNokDkzrV4O06c+g==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.3-beta.8", + "@abi-software/map-utilities": "^1.1.3-beta.9", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.8", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.8.tgz", - "integrity": "sha512-wsSd9OL7vZbbVzif3v5hR3mWz4zyNaslW+DcMIttSWBQuVWkL0J7iS/HBGWWcB21z4GHhO6sfIIy4gdc6sEFMQ==", + "version": "1.1.3-beta.9", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.9.tgz", + "integrity": "sha512-vJtBjHXTiWvA2MirXi5AWWXcq/t1wE5TPkXmvCIxHvAIaj32iMYFue5+GU1uLpPDLsuY6iGeeY+nV2fUAEw5dQ==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index b7cc7406..e3356826 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.11", + "@abi-software/map-side-bar": "^2.4.2-beta.12", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From 4f8e5873aeb2b90f3837bd85733f78f7e9434271 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Fri, 1 Nov 2024 13:07:32 +1300 Subject: [PATCH 20/25] Update sidebar and utilities for connectivity graph updates --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5c23def..5fd9a14a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.12", + "@abi-software/map-side-bar": "^2.4.2-beta.13", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.12", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.12.tgz", - "integrity": "sha512-J7bT6Iz0GnCNHF+tg2CWp+Se4J8t+sdmBHQzVM0VaCzyaPmK+ko68K4WjxFco2fqzemFVEkNokDkzrV4O06c+g==", + "version": "2.4.2-beta.13", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.13.tgz", + "integrity": "sha512-zDj34hzoLlmmR4jsaBdhGtKW5eQKysnNGd8xEv80XDuGw+dpFR2FKIvp116TvYQ+7BosVgTBgDkNxEDvgACz+g==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.3-beta.9", + "@abi-software/map-utilities": "^1.1.3-beta.10", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.9", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.9.tgz", - "integrity": "sha512-vJtBjHXTiWvA2MirXi5AWWXcq/t1wE5TPkXmvCIxHvAIaj32iMYFue5+GU1uLpPDLsuY6iGeeY+nV2fUAEw5dQ==", + "version": "1.1.3-beta.10", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.10.tgz", + "integrity": "sha512-RHnd9MJbmklv2YvAkPfhYqWQ1Tb7MMNyLuCy7zFPaBuwDyKYni+srzKaIA+npfoasLYZ2bNXHtkpx5A097xQWw==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index e3356826..1a6cfa84 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.12", + "@abi-software/map-side-bar": "^2.4.2-beta.13", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From 0a14e2c5bf579e4dcd23108eab32808f459aeaf7 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Mon, 4 Nov 2024 13:06:40 +1300 Subject: [PATCH 21/25] Update map sidebar for connectivity graph and list view --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5fd9a14a..83f77c19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.13", + "@abi-software/map-side-bar": "^2.4.2-beta.14", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,9 +143,9 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.13", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.13.tgz", - "integrity": "sha512-zDj34hzoLlmmR4jsaBdhGtKW5eQKysnNGd8xEv80XDuGw+dpFR2FKIvp116TvYQ+7BosVgTBgDkNxEDvgACz+g==", + "version": "2.4.2-beta.14", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.14.tgz", + "integrity": "sha512-71DxtwDCE8jCduAB8K5xbM+ZGVWMa0h36hWPYWpuL4MctCbNsPdHT2aiWyxDQ/xduKFMUiTR4AbuQYujLGWEyg==", "dependencies": { "@abi-software/gallery": "^1.1.2", "@abi-software/map-utilities": "^1.1.3-beta.10", diff --git a/package.json b/package.json index 1a6cfa84..9462ee98 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.13", + "@abi-software/map-side-bar": "^2.4.2-beta.14", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From efd0f8edf13bfbc9e831fb225f1cea2890bac836 Mon Sep 17 00:00:00 2001 From: akhuoa Date: Tue, 5 Nov 2024 11:20:25 +1300 Subject: [PATCH 22/25] Update sidebar for connectivity graph updates --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83f77c19..4f3355d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.14", + "@abi-software/map-side-bar": "^2.4.2-beta.15", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", @@ -143,12 +143,12 @@ } }, "node_modules/@abi-software/map-side-bar": { - "version": "2.4.2-beta.14", - "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.14.tgz", - "integrity": "sha512-71DxtwDCE8jCduAB8K5xbM+ZGVWMa0h36hWPYWpuL4MctCbNsPdHT2aiWyxDQ/xduKFMUiTR4AbuQYujLGWEyg==", + "version": "2.4.2-beta.15", + "resolved": "https://registry.npmjs.org/@abi-software/map-side-bar/-/map-side-bar-2.4.2-beta.15.tgz", + "integrity": "sha512-YvCUQ53AddV9DxibBn+dkprBwKc/npjZ8RauT8APReQjR5MxBYkuFH/Di5+sNDl47BsB6Vs4DN++mh4Iw10dCA==", "dependencies": { "@abi-software/gallery": "^1.1.2", - "@abi-software/map-utilities": "^1.1.3-beta.10", + "@abi-software/map-utilities": "^1.1.3-beta.11", "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", "algoliasearch": "^4.10.5", @@ -161,9 +161,9 @@ } }, "node_modules/@abi-software/map-utilities": { - "version": "1.1.3-beta.10", - "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.10.tgz", - "integrity": "sha512-RHnd9MJbmklv2YvAkPfhYqWQ1Tb7MMNyLuCy7zFPaBuwDyKYni+srzKaIA+npfoasLYZ2bNXHtkpx5A097xQWw==", + "version": "1.1.3-beta.11", + "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.3-beta.11.tgz", + "integrity": "sha512-t/BSMpaYIwIi4YykMkg6on/32/9ug9yk0m0y9wYyu8YZjNBuDewwy9GIA8bOhA1mZ9ei9WHD109IQdXnWZYuHw==", "dependencies": { "@abi-software/svg-sprite": "^1.0.1", "@element-plus/icons-vue": "^2.3.1", diff --git a/package.json b/package.json index 9462ee98..9a24d459 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@abi-software/flatmapvuer": "^1.5.6-beta.2", - "@abi-software/map-side-bar": "^2.4.2-beta.14", + "@abi-software/map-side-bar": "^2.4.2-beta.15", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", "@abi-software/scaffoldvuer": "^1.5.1", From a91dc754b45a7c598413b46cf8496ec37b78fb2f Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 14 Nov 2024 11:28:50 +1300 Subject: [PATCH 23/25] [temp] Use different API for flatmap and connectivity graph --- src/components/SplitFlow.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index 48a47688..c0e2b433 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -577,7 +577,7 @@ export default { PENNSIEVE_API_LOCATION: this.settingsStore.pennsieveApi, NL_LINK_PREFIX: this.settingsStore.nlLinkPrefix, ROOT_URL: this.settingsStore.rootUrl, - FLATMAPAPI_LOCATION: this.settingsStore.flatmapAPI, + FLATMAPAPI_LOCATION: import.meta.env.VITE_FLATMAPAPI_LOCATION2 || this.settingsStore.flatmapAPI, // temporary }; }, entries: function() { From 6d3921a50cd498bf453bc01755215c4bbe23173b Mon Sep 17 00:00:00 2001 From: akhuoa Date: Thu, 14 Nov 2024 11:29:40 +1300 Subject: [PATCH 24/25] Update flatmapvuer version --- package-lock.json | 288 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f3355d7..7aae52b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.5.2", "license": "Apache-2.0", "dependencies": { - "@abi-software/flatmapvuer": "^1.5.6-beta.2", + "@abi-software/flatmapvuer": "^1.5.6-beta.6", "@abi-software/map-side-bar": "^2.4.2-beta.15", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", @@ -72,9 +72,9 @@ } }, "node_modules/@abi-software/flatmap-viewer": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-3.2.2.tgz", - "integrity": "sha512-ttYasoZAho1PwHuHJ2f+EyoKanw5Zm14LqQfUkm4yHtk/tmnCb9QYcGvTbRSu4UKErpVbselfWdvd8cm3jm0sg==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@abi-software/flatmap-viewer/-/flatmap-viewer-3.2.5.tgz", + "integrity": "sha512-mnuJXwke2rF/9qEKPPDJdHPqTimgN5CRf9+gyZwM0zPh3A/p4VHzPeFK3NFSdQ++4RwY0zDhEE/xhdifHf0coQ==", "dependencies": { "@deck.gl/core": "^9.0.17", "@deck.gl/geo-layers": "^9.0.18", @@ -102,11 +102,11 @@ } }, "node_modules/@abi-software/flatmapvuer": { - "version": "1.5.6-beta.2", - "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.5.6-beta.2.tgz", - "integrity": "sha512-8jgqkQpsL6BVwsxKDHuJ9CfXrCGSyrGqhrns0xpOvuGif3y1SBpFQA9/EaRLAz44rWUqOI4sdAqPxeTUbfp/FQ==", + "version": "1.5.6-beta.6", + "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.5.6-beta.6.tgz", + "integrity": "sha512-7PAPEhoWImzmcZArJNKEtK7JkbgjAor09vwYlBXIyDFOv6iqxWUbitjMnh9WUShdWi4BSGLNpYpNchUwevmqyw==", "dependencies": { - "@abi-software/flatmap-viewer": "^3.2.2", + "@abi-software/flatmap-viewer": "^3.2.5", "@abi-software/map-utilities": "^1.1.2", "@abi-software/sparc-annotation": "0.3.1", "@abi-software/svg-sprite": "^1.0.1", @@ -742,9 +742,9 @@ } }, "node_modules/@deck.gl/core": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-9.0.33.tgz", - "integrity": "sha512-KTfanNfb0b/JKV6BFSzQ8uMC07Yy5zvzLnnfHLV4l4ostHdEaPHdBEr5IDhsSRMBgcYSfsML3NpTFncVom+IyA==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-9.0.35.tgz", + "integrity": "sha512-xS+S4NdC2udYCkY/I4FjLFwWnJf2BsWOEkjfjbc3YRJWpEBiii0O3XGEGDNQK7roaeySAiLu/1Sb8Co3Hiuslg==", "dependencies": { "@loaders.gl/core": "^4.2.0", "@loaders.gl/images": "^4.2.0", @@ -765,9 +765,9 @@ } }, "node_modules/@deck.gl/extensions": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-9.0.33.tgz", - "integrity": "sha512-rxfz3/I4mf0WKW6EvntMmsn9F7rkkWYUweadUZSw12FQ50fm8GVDJ7k/2Mkzn1WJEocJW2Pv5mBRqsSWtUdyQQ==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-9.0.35.tgz", + "integrity": "sha512-lGyAS+tRXSV2IFYKEPFQ9j1jT9bw8fkA4TOIrru3dX+Wl1a97z5UjhwV3Hgr3q/gTAE3Yn5N607hv84X4G+9PA==", "peer": true, "dependencies": { "@luma.gl/constants": "~9.0.27", @@ -781,9 +781,9 @@ } }, "node_modules/@deck.gl/geo-layers": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-9.0.33.tgz", - "integrity": "sha512-OmKfeliZclDIi24EfX/1geNR4gADKzRrF7M10oesREvTygkHdUxzeyEPpWqp0XS38qn80qfd3zttUN63+Vc0Bg==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-9.0.35.tgz", + "integrity": "sha512-sNsZGiavw+Ea4cFU8X79P0YKDciEepHt6mmnDvdilvaA35FOkfWJmOE2Eeft/6LZ+X1GKD6Tmz5rQdF/iU4q7Q==", "dependencies": { "@loaders.gl/3d-tiles": "^4.2.0", "@loaders.gl/gis": "^4.2.0", @@ -813,9 +813,9 @@ } }, "node_modules/@deck.gl/layers": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-9.0.33.tgz", - "integrity": "sha512-PBtxOuSq5QmlQ1N27FUIC3sC5iLFqAsdyEXUkjzWMPdLGjeow5xx32j3E0iag//ShgW4jiffS1dqgYywbjwYhg==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-9.0.35.tgz", + "integrity": "sha512-chSnK29Cez0JeAkqNTI0pFIL6yx19wT2nPdOpyG2rNtwemYOqubRQsuHCRNR7cTLVRVYD8SWU7V5pBqRK5vdWA==", "dependencies": { "@loaders.gl/images": "^4.2.0", "@loaders.gl/schema": "^4.2.0", @@ -833,9 +833,9 @@ } }, "node_modules/@deck.gl/mapbox": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-9.0.33.tgz", - "integrity": "sha512-8C4xOghijVnH0nHEAmt/QK8JUOIE5fg6rN/dmYuVe/QyLFsgh27l3MxY6EgWv1nnSTRCCnyX1i3tjxsdCKRPmw==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-9.0.35.tgz", + "integrity": "sha512-W8JU8JmiBSxdLpsMzXRT0z+ZPhrFeHinZ4l1nh71HwOFn70gGLwlVJGLS3qy0drvou2YwcKx6ZiRq+CCL9NxBQ==", "dependencies": { "@luma.gl/constants": "~9.0.27", "@math.gl/web-mercator": "^4.0.0" @@ -846,9 +846,9 @@ } }, "node_modules/@deck.gl/mesh-layers": { - "version": "9.0.33", - "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-9.0.33.tgz", - "integrity": "sha512-iN57iZ4Vq+/8polkVuJ7PsIOUpJbUVrRYywTGQgm8PaJ4WrN3wigo0fcrKfDzts7O2fluh37qg8aGNRBLuqMFQ==", + "version": "9.0.35", + "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-9.0.35.tgz", + "integrity": "sha512-QIEnreJpK7szMOp+u5KxytL3TQQCfa7DYOeXyP7Z87qI5RFqvu+kG8C8TdiUZqWZ273urjMjc8oQK7O5/yurAg==", "peer": true, "dependencies": { "@loaders.gl/gltf": "^4.2.0", @@ -1564,19 +1564,19 @@ } }, "node_modules/@loaders.gl/3d-tiles": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-4.3.1.tgz", - "integrity": "sha512-ijAMFK92PCyp/eFpWazX05EMO0a2snT7yBeaHI+wKbp50XqTGAAvOZxM79wnXbdp4pgngOtPLKHc+BNMjnJ1pw==", - "dependencies": { - "@loaders.gl/compression": "4.3.1", - "@loaders.gl/crypto": "4.3.1", - "@loaders.gl/draco": "4.3.1", - "@loaders.gl/gltf": "4.3.1", - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/math": "4.3.1", - "@loaders.gl/tiles": "4.3.1", - "@loaders.gl/zip": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-4.3.2.tgz", + "integrity": "sha512-J108y+sDNrzLoZ5kPSwoG2C25RoPwSpMUMAlVcg6h+8gxlEaOn+TBpVxmleOe9qFkp0c8Ys+5YDfNpdPpbn6ZA==", + "dependencies": { + "@loaders.gl/compression": "4.3.2", + "@loaders.gl/crypto": "4.3.2", + "@loaders.gl/draco": "4.3.2", + "@loaders.gl/gltf": "4.3.2", + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/math": "4.3.2", + "@loaders.gl/tiles": "4.3.2", + "@loaders.gl/zip": "4.3.2", "@math.gl/core": "^4.1.0", "@math.gl/culling": "^4.1.0", "@math.gl/geospatial": "^4.1.0", @@ -1593,12 +1593,12 @@ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, "node_modules/@loaders.gl/compression": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/compression/-/compression-4.3.1.tgz", - "integrity": "sha512-ZKAfo7VUuvgxlqZFEYJIsY+jJ876i+ubUTryWqzDl60BXOf+oYr5i5bzeQwWa6UJusffnNKFakyDveTMzuwWkg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/compression/-/compression-4.3.2.tgz", + "integrity": "sha512-EC279vaMETMd/ZtN9BFkjSd/TsmJLmNPYBqRwONYPhIebcvc4l2oNsUHlN/6uWMLFQ4soRdDqNHu4YR2Vb1P1A==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "@types/brotli": "^1.3.0", "@types/pako": "^1.0.1", "fflate": "0.7.4", @@ -1616,23 +1616,23 @@ } }, "node_modules/@loaders.gl/core": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-4.3.1.tgz", - "integrity": "sha512-kFJQKpNmpYFdZdwPG1enZz18yUaUV9Mrr87KPb4hjf69p1UJuLQ2+wPxL/Ws9Di/aekAPoG9eCeSjyva8EIH0g==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-4.3.2.tgz", + "integrity": "sha512-oIM/0k59j5WN4D6h0IIErC1/LrAS5VL3mS0jClr0nfc+NqJaXugfn17rneUMTQjT6QREhezXUtwkofYFI35htA==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "@probe.gl/log": "^4.0.2" } }, "node_modules/@loaders.gl/crypto": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/crypto/-/crypto-4.3.1.tgz", - "integrity": "sha512-+2WIIXP7p1usFHexA7EZzlmDFV0hkLQYBabkWzo43WYmG7JultqLzyzHxCdGnEEGzFesfpuv+BF9//TtGHTwxw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/crypto/-/crypto-4.3.2.tgz", + "integrity": "sha512-r2TNvmGVNzIMgCGHf/Y7Po9BZGXhPGvZD3iNnRKfmQNGHDjWTp+CpHPXFhHMcaqMDnNmrqmmu3guP03lCVEqow==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "@types/crypto-js": "^4.0.2" }, "peerDependencies": { @@ -1640,13 +1640,13 @@ } }, "node_modules/@loaders.gl/draco": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-4.3.1.tgz", - "integrity": "sha512-PQjeiuYf2h0rorHVqYjs5VD7DX3yZHQok1p/RQMU915TejRRxRetP+ES90fdecnJ2Z13tiaLfI2aM6jI0qwEbg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-4.3.2.tgz", + "integrity": "sha512-uvbW3enewaCdb7Kqc4sKfDbyQhOusG4YbHnU+7rgQiGnUyz7FelOj+2Fa5h/WPg+AiHmzI4yTjRhiFqzd3DjTQ==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "draco3d": "1.5.7" }, "peerDependencies": { @@ -1654,12 +1654,12 @@ } }, "node_modules/@loaders.gl/gis": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.3.1.tgz", - "integrity": "sha512-P3STq7efVFd7EoKPkeo8XoFrQ7XW+uvVZC8fousOhhicgxQJPYYFl3Hd64jpliXPW0MM3wQMmQ4J+VD8HEt1rQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.3.2.tgz", + "integrity": "sha512-sYrsodIJiH8yAPEkbRXQUULgM8d9o78OzaloDJIJY7E82NgEj1ippETK7y6z4/Av16Rn51N8N07jHSdHrTqnRQ==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", "@mapbox/vector-tile": "^1.3.1", "@math.gl/polygon": "^4.1.0", "pbf": "^3.2.1" @@ -1669,15 +1669,15 @@ } }, "node_modules/@loaders.gl/gltf": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-4.3.1.tgz", - "integrity": "sha512-pYGqo9HFWICMemoly7XgTbnLE7zMiKEp3VTSQiGZzXHadjMx7kv5cN91O5fqIeP6U7L4ZyGhqGHB/OK12TQQ7Q==", - "dependencies": { - "@loaders.gl/draco": "4.3.1", - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/textures": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-4.3.2.tgz", + "integrity": "sha512-VnjbM3lYrO4zKO+DZevx7WZybxkXNAbYEWWcdP5qwj61nTWyplxjLdCUQlcPhzUDqmFf9dwYxMXIcm/L62WgRQ==", + "dependencies": { + "@loaders.gl/draco": "4.3.2", + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/textures": "4.3.2", "@math.gl/core": "^4.1.0" }, "peerDependencies": { @@ -1685,23 +1685,23 @@ } }, "node_modules/@loaders.gl/images": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-4.3.1.tgz", - "integrity": "sha512-Epd64AtEo3oWrhZlftzMYNSC9b3fOfNXpKqw0itIJcSP3eC63JnUsBoYGNZ//vYMVXOCuMGJAAjCdMlNtez20Q==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-4.3.2.tgz", + "integrity": "sha512-jGDCweUL/GvmtzSAdYlwe6RZk6zV9wQM++narjj0Q1LdeWdlChFfw3ZAKDHzpHB+PVzlfPgzvYLKjMLLHTUb4A==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1" + "@loaders.gl/loader-utils": "4.3.2" }, "peerDependencies": { "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/loader-utils": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.3.1.tgz", - "integrity": "sha512-+IGK18EHJCfw2N+x8Fqln7hea4HJ5U8ZLxOUyRDS455ActvB5FPaQox1ko2B9/kPHhVFynglS+xoWczHHzwJlQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.3.2.tgz", + "integrity": "sha512-W7eg0Eg0pAsqgHwJ7wZ8J+8b/IoL+ZBWBqIqOcMi66QlJ5GR+dtd+86ihccm9+kKgCRxZN+tfTGhheQgG8czUw==", "dependencies": { - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "@probe.gl/log": "^4.0.2", "@probe.gl/stats": "^4.0.2" }, @@ -1710,12 +1710,12 @@ } }, "node_modules/@loaders.gl/math": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-4.3.1.tgz", - "integrity": "sha512-BDTtXq7y3z/sbuVQfVSyVcjJVXPnD++e22CHwMgyw7PxkKDC7CX8G+p04W/Mx9heNoszsCwLxoZGsjiQruOD3g==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-4.3.2.tgz", + "integrity": "sha512-2FdAinMjlb9xdfnJ7NTGZx3TsUpHIMW/SSh2u47R0MvfMh6KQ9a9lx8APc8YI8kNwk5GPHYDQDB6WdW6HuvMhA==", "dependencies": { - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", "@math.gl/core": "^4.1.0" }, "peerDependencies": { @@ -1723,14 +1723,14 @@ } }, "node_modules/@loaders.gl/mvt": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-4.3.1.tgz", - "integrity": "sha512-lzFVJ5E2lkWZTfKe88xPuTogVdjhHa0Ey39bIbxAPKmWf/5Cyf3RIAbgkAGoSxytc8OGYrB6rIO9+MuHOmPMag==", - "dependencies": { - "@loaders.gl/gis": "4.3.1", - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-4.3.2.tgz", + "integrity": "sha512-t7IaLfBqIhLmE4etvNwk6B959gnzwoTcTZwzIrPJLOinbii/pcue7X7IeKzQm9sF1oJ/7GZNO3n4TsnhXSMUug==", + "dependencies": { + "@loaders.gl/gis": "4.3.2", + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", "@math.gl/polygon": "^4.1.0", "@probe.gl/stats": "^4.0.0", "pbf": "^3.2.1" @@ -1740,9 +1740,9 @@ } }, "node_modules/@loaders.gl/schema": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.3.1.tgz", - "integrity": "sha512-sKhP4rL4JMMVHrZWdYL8KxO7nbbjNIbzreL7ymwNV7zCAS8JW+QjCoV1hEicl5Ma8OP5Lte/cTxpOz8MiOmMXQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.3.2.tgz", + "integrity": "sha512-/GWvJ5Cx82BUBihCHoo5obeETdPljg1vnlDynOkuAT3T+n6A1sJYFauMNeDiLlQuM29Up6Vi4WndpfNp94QJuw==", "dependencies": { "@types/geojson": "^7946.0.7" }, @@ -1751,13 +1751,13 @@ } }, "node_modules/@loaders.gl/terrain": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-4.3.1.tgz", - "integrity": "sha512-6UyVYoyae4tajXe5dIncQ6gczZ91axYKpWoHbGvx38xr4qOQNZnGsmKnPe3m8RRdqwvJMRNveyyMfpoOMxHGEQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-4.3.2.tgz", + "integrity": "sha512-aWPkcuQQegekkphauLFxOasPGkYyI06DDmOcexmOg1IGfZaXpVP6eB+nCeEi8KEZnaGt6IRexp/sDQei4o4djw==", "dependencies": { - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", "@mapbox/martini": "^0.2.0" }, "peerDependencies": { @@ -1765,14 +1765,14 @@ } }, "node_modules/@loaders.gl/textures": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-4.3.1.tgz", - "integrity": "sha512-efOg/7VTwYb5li6//6LTELhy70OpuzX8GV/Rlip8CW2pF0lr2NKqvZDwFb2Z+HvKJ0p+ZMSP+R0iNmgZynJgyA==", - "dependencies": { - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/worker-utils": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/textures/-/textures-4.3.2.tgz", + "integrity": "sha512-I36SIOyRSHLEbOMedH4oiDEOSd9EEGYypj2yU7VNOhK6sVu4FZFU37JtrETjupnVU3h0Igex/ukpZGgk75HIgA==", + "dependencies": { + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/worker-utils": "4.3.2", "@math.gl/types": "^4.1.0", "ktx-parse": "^0.7.0", "texture-compressor": "^1.0.2" @@ -1782,12 +1782,12 @@ } }, "node_modules/@loaders.gl/tiles": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-4.3.1.tgz", - "integrity": "sha512-/1lM/5y6zdPKUH9xdhCURHfHhk9nDk0eBAlKiHZPe/WFWGlNLaaDqbElMhuwUE91r6qZfYdkMeN+/ROEVmRqNw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-4.3.2.tgz", + "integrity": "sha512-9ybuQQBk+z78ZEScl5kvWKbeQCHqcZQlI235yVlpqzCEfzgiJqBoYORIOmdJ8h/vwNcwsK6T8YLQVte8pGKUhw==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/math": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/math": "4.3.2", "@math.gl/core": "^4.1.0", "@math.gl/culling": "^4.1.0", "@math.gl/geospatial": "^4.1.0", @@ -1799,14 +1799,14 @@ } }, "node_modules/@loaders.gl/wms": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-4.3.1.tgz", - "integrity": "sha512-+bHHfdtXouSJfniCYtVPJefebrNTKQuwM7Nebq5Uas0G/e/lEiFu9KMDv9Ey2HZL7xCa7SI8mbKpSb10Dj6hGQ==", - "dependencies": { - "@loaders.gl/images": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", - "@loaders.gl/xml": "4.3.1", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/wms/-/wms-4.3.2.tgz", + "integrity": "sha512-6kkgWbPvxG/StsFYpKkS6aNtNi0yFpXMOXQ2lDbSkNZq1rA6EmXb/Ih82W/KDa/3g4ebshrGo39TmM0cSHe3Bw==", + "dependencies": { + "@loaders.gl/images": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", + "@loaders.gl/xml": "4.3.2", "@turf/rewind": "^5.1.5", "deep-strict-equal": "^0.2.0" }, @@ -1815,20 +1815,20 @@ } }, "node_modules/@loaders.gl/worker-utils": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.3.1.tgz", - "integrity": "sha512-WpJ5N9jMI/ZDefVjqAMBWHux8tKUTW5jtj7espddKW1Q2DQIrdXywVQO0SouUiRJlcVot5s5BlHD0JZwKfAlZw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.3.2.tgz", + "integrity": "sha512-3nPmShAbr1bCkC1Xxmn+b7S53SSHgWvRXOkinzeJ4C3J7Ac4QiCU6SV9CRH08/30SDcxz+mPvWnQjhj0Z24TYg==", "peerDependencies": { "@loaders.gl/core": "^4.3.0" } }, "node_modules/@loaders.gl/xml": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-4.3.1.tgz", - "integrity": "sha512-y05TWJA/KoU+BNjBLMVgwxwy3pvACHkJKDiqop3jcm6nHz+tfy8FotscXY5MynKvW9S7OQ0IPl4OBWWYmS87bA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/xml/-/xml-4.3.2.tgz", + "integrity": "sha512-LNSfRcKIMWYPggKTWx178zxkDoXmAv5mtM8Vm35HGcajhwmTRTQFkZlPpWmUaKFcf7ug+L/3VnaMMvYfn/EsjQ==", "dependencies": { - "@loaders.gl/loader-utils": "4.3.1", - "@loaders.gl/schema": "4.3.1", + "@loaders.gl/loader-utils": "4.3.2", + "@loaders.gl/schema": "4.3.2", "fast-xml-parser": "^4.2.5" }, "peerDependencies": { @@ -1836,13 +1836,13 @@ } }, "node_modules/@loaders.gl/zip": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@loaders.gl/zip/-/zip-4.3.1.tgz", - "integrity": "sha512-P2OYeg6u3ZgBCrUbUuG7x7PzNCR7QZlA9y5JtE49eWZtc4e30VJFPuzwck77U04/TAK5g7LfkUlMBQ+uhN2UNg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@loaders.gl/zip/-/zip-4.3.2.tgz", + "integrity": "sha512-0nr+logEtJw7NCZled+EcuL1HHDcJAzp5SnMYrUQXsekCF+9slGiRpAYeQKsQ7rdW+9eAZVjgP4cPsJbpKMMig==", "dependencies": { - "@loaders.gl/compression": "4.3.1", - "@loaders.gl/crypto": "4.3.1", - "@loaders.gl/loader-utils": "4.3.1", + "@loaders.gl/compression": "4.3.2", + "@loaders.gl/crypto": "4.3.2", + "@loaders.gl/loader-utils": "4.3.2", "jszip": "^3.1.5", "md5": "^2.3.0" }, @@ -17383,9 +17383,9 @@ "integrity": "sha512-ANHlY4Rb5kHw40D0NJ6moaVfOCMrp9Gpd1R/AIQYg2ko4/jzcJ+TVXYYF6kXJqQwITvEZP4yEthjM7U6rYlljQ==" }, "node_modules/wgsl_reflect": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/wgsl_reflect/-/wgsl_reflect-1.0.14.tgz", - "integrity": "sha512-VYY1+5pNm3GE2I4ADNnlNBFTiLOsh3Cq/eeiwfMhjMzUwnlJOqJrzKUd/3owxL69txUfvgcQaB8M6ElVaBaAOA==" + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/wgsl_reflect/-/wgsl_reflect-1.0.16.tgz", + "integrity": "sha512-OE3urfXXbHMD5lhKZwxOxC9SFYynEGEkWXQmvi7B1gzzr5jb9+drh9A8MeBvVqKqznCoBuh8WOzVuSGSZs4CkQ==" }, "node_modules/whatwg-encoding": { "version": "1.0.5", diff --git a/package.json b/package.json index 9a24d459..2590cb65 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "*.js" ], "dependencies": { - "@abi-software/flatmapvuer": "^1.5.6-beta.2", + "@abi-software/flatmapvuer": "^1.5.6-beta.6", "@abi-software/map-side-bar": "^2.4.2-beta.15", "@abi-software/map-utilities": "^1.1.3-beta.5", "@abi-software/plotvuer": "^1.0.3", From cc85fcaca94e85fc6987b536d0045b902372fc4c Mon Sep 17 00:00:00 2001 From: alan-wu Date: Thu, 14 Nov 2024 14:37:10 +1300 Subject: [PATCH 25/25] Change the way flatmap api location is set for connectivity. --- package-lock.json | 12 ++++++------ src/App.vue | 1 + src/components/MapContent.vue | 1 + src/components/SplitFlow.vue | 2 +- src/stores/settings.js | 4 ++++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7aae52b8..a4b469c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6915,9 +6915,9 @@ } }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -9226,9 +9226,9 @@ } }, "node_modules/happy-dom": { - "version": "13.3.8", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-13.3.8.tgz", - "integrity": "sha512-RAbq4oYfJNkVan1m1F3jfA4YEyRY0/ASoNvZsNJbuX85jIypidmsz9jQZD7Tqz0VXA2MhAGfcsh5oshwmwNYSg==", + "version": "13.10.1", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-13.10.1.tgz", + "integrity": "sha512-9GZLEFvQL5EgfJX2zcBgu1nsPUn98JF/EiJnSfQbdxI6YEQGqpd09lXXxOmYonRBIEFz9JlGCOiPflDzgS1p8w==", "dev": true, "dependencies": { "entities": "^4.5.0", diff --git a/src/App.vue b/src/App.vue index 56191d45..a6ed69be 100644 --- a/src/App.vue +++ b/src/App.vue @@ -96,6 +96,7 @@ export default { flatmapAPI: import.meta.env.VITE_FLATMAPAPI_LOCATION, nlLinkPrefix: import.meta.env.VITE_NL_LINK_PREFIX, rootUrl: import.meta.env.VITE_ROOT_URL, + flatmapAPI2: import.meta.env.VITE_FLATMAPAPI_LOCATION2, } } }, diff --git a/src/components/MapContent.vue b/src/components/MapContent.vue index 847a8c88..37c802fb 100644 --- a/src/components/MapContent.vue +++ b/src/components/MapContent.vue @@ -305,6 +305,7 @@ export default { this.options.algoliaId ? this.settingsStore.updateAlgoliaId(this.options.algoliaId) : null this.options.pennsieveApi ? this.settingsStore.updatePennsieveApi(this.options.pennsieveApi) : null this.options.flatmapAPI ? this.settingsStore.updateFlatmapAPI(this.options.flatmapAPI) : null, + this.options.flatmapAPI2 ? this.settingsStore.updateFlatmapAPI2(this.options.flatmapAPI2) : null, this.options.nlLinkPrefix ? this.settingsStore.updateNLLinkPrefix(this.options.nlLinkPrefix) : null this.options.rootUrl ? this.settingsStore.updateRootUrl(this.options.rootUrl) : null } diff --git a/src/components/SplitFlow.vue b/src/components/SplitFlow.vue index c0e2b433..45aa0c7a 100644 --- a/src/components/SplitFlow.vue +++ b/src/components/SplitFlow.vue @@ -577,7 +577,7 @@ export default { PENNSIEVE_API_LOCATION: this.settingsStore.pennsieveApi, NL_LINK_PREFIX: this.settingsStore.nlLinkPrefix, ROOT_URL: this.settingsStore.rootUrl, - FLATMAPAPI_LOCATION: import.meta.env.VITE_FLATMAPAPI_LOCATION2 || this.settingsStore.flatmapAPI, // temporary + FLATMAPAPI_LOCATION: this.settingsStore.flatmapAPI2, // temporary }; }, entries: function() { diff --git a/src/stores/settings.js b/src/stores/settings.js index 39896c3c..bd42ebda 100644 --- a/src/stores/settings.js +++ b/src/stores/settings.js @@ -13,6 +13,7 @@ export const useSettingsStore = defineStore('settings', { pennsieveApi: undefined, flatmapAPI: undefined, nlLinkPrefix: undefined, + flatmapAPI2: "https://mapcore-demo.org/curation/flatmap/", rootUrl: undefined, facets: { species: [], gender: [], organ: [] }, numberOfDatasetsForFacets: [], @@ -62,6 +63,9 @@ export const useSettingsStore = defineStore('settings', { updateFlatmapAPI(flatmapAPI) { this.flatmapAPI = flatmapAPI; }, + updateFlatmapAPI2(flatmapAPI2) { + this.flatmapAPI2 = flatmapAPI2; + }, updateNLLinkPrefix(nlLinkPrefix) { this.nlLinkPrefix = nlLinkPrefix; },