From f6bf918b0f7c214e1a40a5d6dbdeba183d8cc0ac Mon Sep 17 00:00:00 2001 From: Damon Ulmi <63123585+DamonU2@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:36:13 -0800 Subject: [PATCH] feat(demo): new page for OSDP integration Closes #2675 Closes #2676 Also fixes rendering issue with multiple style types --- common/config/rush/pnpm-lock.yaml | 267 +++++++++--------- .../configs/navigator/16-esri-dynamic.json | 30 +- .../public/templates/config-sandbox.html | 2 +- .../demos/demo-osdp-integration.html | 200 +++++++++++++ .../public/templates/demos/demos.html | 1 + .../layer-sets/all-feature-info-layer-set.ts | 2 +- .../geo/utils/renderer/geoview-renderer.ts | 6 +- 7 files changed, 369 insertions(+), 139 deletions(-) create mode 100644 packages/geoview-core/public/templates/demos/demo-osdp-integration.html diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 0b0eb1a8e46..297f5e903f0 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -18,10 +18,10 @@ importers: version: 7.25.9(@babel/core@7.26.0)(eslint@8.57.1) '@typescript-eslint/eslint-plugin': specifier: ~8.9.0 - version: 8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.2) + version: 8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.3) '@typescript-eslint/parser': specifier: ~8.13.0 - version: 8.13.0(eslint@8.57.1)(typescript@5.7.2) + version: 8.13.0(eslint@8.57.1)(typescript@5.7.3) eslint: specifier: ^8.2.0 version: 8.57.1 @@ -36,7 +36,7 @@ importers: version: 2.31.0(eslint@8.57.1) eslint-plugin-jest: specifier: ^28.8.3 - version: 28.10.0(@typescript-eslint/eslint-plugin@8.9.0)(eslint@8.57.1)(typescript@5.7.2) + version: 28.10.0(@typescript-eslint/eslint-plugin@8.9.0)(eslint@8.57.1)(typescript@5.7.3) eslint-plugin-jsx-a11y: specifier: ^6.10.0 version: 6.10.2(eslint@8.57.1) @@ -54,7 +54,7 @@ importers: version: 3.4.2 typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 ../../packages/geoview-aoi-panel: dependencies: @@ -82,7 +82,7 @@ importers: version: 18.3.1(react@18.3.1) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 ../../packages/geoview-basemap-panel: dependencies: @@ -110,7 +110,7 @@ importers: version: 18.3.1(react@18.3.1) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 ../../packages/geoview-core: dependencies: @@ -242,7 +242,7 @@ importers: version: 3.21.7(react-dom@18.3.1)(react@18.3.1) zustand: specifier: ~5.0.0 - version: 5.0.2(@types/react@18.3.18)(react@18.3.1) + version: 5.0.3(@types/react@18.3.18)(react@18.3.1) devDependencies: '@babel/cli': specifier: ^7.25.7 @@ -402,7 +402,7 @@ importers: version: 8.0.0(webpack@5.97.1) simple-zustand-devtools: specifier: ^1.1.0 - version: 1.1.0(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)(zustand@5.0.2) + version: 1.1.0(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)(zustand@5.0.3) style-loader: specifier: ^4.0.0 version: 4.0.0(webpack@5.97.1) @@ -411,10 +411,10 @@ importers: version: 5.3.11(webpack@5.97.1) typedoc: specifier: ^0.26.9 - version: 0.26.11(typescript@5.7.2) + version: 0.26.11(typescript@5.7.3) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 webpack: specifier: ^5.95.0 version: 5.97.1(webpack-cli@5.1.4) @@ -475,7 +475,7 @@ importers: version: 18.3.1(react@18.3.1) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 ../../packages/geoview-swiper: dependencies: @@ -509,7 +509,7 @@ importers: version: 18.3.1(react@18.3.1) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 ../../packages/geoview-time-slider: dependencies: @@ -543,7 +543,7 @@ importers: version: 18.3.1(react@18.3.1) typescript: specifier: ^5.6.3 - version: 5.7.2 + version: 5.7.3 packages: @@ -648,7 +648,7 @@ packages: dependencies: '@babel/compat-data': 7.26.3 '@babel/helper-validator-option': 7.25.9 - browserslist: 4.24.3 + browserslist: 4.24.4 lru-cache: 5.1.1 semver: 6.3.1 dev: true @@ -1901,7 +1901,7 @@ packages: babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.0) babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0) babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.0) - core-js-compat: 3.39.0 + core-js-compat: 3.40.0 semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -1955,7 +1955,7 @@ packages: resolution: {integrity: sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w==} engines: {node: '>=6.9.0'} dependencies: - core-js-pure: 3.39.0 + core-js-pure: 3.40.0 regenerator-runtime: 0.14.1 dev: true @@ -2162,17 +2162,17 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@floating-ui/core@1.6.8: - resolution: {integrity: sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==} + /@floating-ui/core@1.6.9: + resolution: {integrity: sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==} dependencies: - '@floating-ui/utils': 0.2.8 + '@floating-ui/utils': 0.2.9 dev: false - /@floating-ui/dom@1.6.12: - resolution: {integrity: sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==} + /@floating-ui/dom@1.6.13: + resolution: {integrity: sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==} dependencies: - '@floating-ui/core': 1.6.8 - '@floating-ui/utils': 0.2.8 + '@floating-ui/core': 1.6.9 + '@floating-ui/utils': 0.2.9 dev: false /@floating-ui/react-dom@2.1.2(react-dom@18.3.1)(react@18.3.1): @@ -2181,13 +2181,13 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.6.12 + '@floating-ui/dom': 1.6.13 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) dev: false - /@floating-ui/utils@0.2.8: - resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==} + /@floating-ui/utils@0.2.9: + resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false /@fontsource/roboto@5.1.1: @@ -2567,16 +2567,16 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/core-downloads-tracker@5.16.13: - resolution: {integrity: sha512-xe5RwI0Q2O709Bd2Y7l1W1NIwNmln0y+xaGk5VgX3vDJbkQEqzdfTFZ73e0CkEZgJwyiWgk5HY0l8R4nysOxjw==} + /@mui/core-downloads-tracker@5.16.14: + resolution: {integrity: sha512-sbjXW+BBSvmzn61XyTMun899E7nGPTXwqD9drm1jBUAvWEhJpPFIRxwQQiATWZnd9rvdxtnhhdsDxEGWI0jxqA==} dev: false /@mui/core-downloads-tracker@6.3.1: resolution: {integrity: sha512-2OmnEyoHpj5//dJJpMuxOeLItCCHdf99pjMFfUFdBteCunAK9jW+PwEo4mtdGcLs7P+IgZ+85ypd52eY4AigoQ==} dev: false - /@mui/icons-material@5.16.13(@mui/material@5.16.13)(@types/react@18.3.18)(react@18.3.1): - resolution: {integrity: sha512-aWyOgGDEqj37m3K4F6qUfn7JrEccwiDynJtGQMFbxp94EqyGwO13TKcZ4O8aHdwW3tG63hpbION8KyUoBWI4JQ==} + /@mui/icons-material@5.16.14(@mui/material@5.16.14)(@types/react@18.3.18)(react@18.3.1): + resolution: {integrity: sha512-heL4S+EawrP61xMXBm59QH6HODsu0gxtZi5JtnXF2r+rghzyU/3Uftlt1ij8rmJh+cFdKTQug1L9KkZB5JgpMQ==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 @@ -2587,7 +2587,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.26.0 - '@mui/material': 5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@mui/material': 5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) '@types/react': 18.3.18 react: 18.3.1 dev: false @@ -2645,8 +2645,8 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@mui/material@5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-FhLDkDPYDzvrWCHFsdXzRArhS4AdYufU8d69rmLL+bwhodPcbm2C7cS8Gq5VR32PsW6aKZb58gvAgvEVaiiJbA==} + /@mui/material@5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-eSXQVCMKU2xc7EcTxe/X/rC9QsV2jUe8eLM3MUCPYbo6V52eCE436akRIvELq/AqZpxx2bwkq7HC0cRhLB+yaw==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -2665,10 +2665,10 @@ packages: '@babel/runtime': 7.26.0 '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@emotion/styled': 11.14.0(@emotion/react@11.14.0)(@types/react@18.3.18)(react@18.3.1) - '@mui/core-downloads-tracker': 5.16.13 - '@mui/system': 5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react@18.3.1) + '@mui/core-downloads-tracker': 5.16.14 + '@mui/system': 5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react@18.3.1) '@mui/types': 7.2.21(@types/react@18.3.18) - '@mui/utils': 5.16.13(@types/react@18.3.18)(react@18.3.1) + '@mui/utils': 5.16.14(@types/react@18.3.18)(react@18.3.1) '@popperjs/core': 2.11.8 '@types/react': 18.3.18 '@types/react-transition-group': 4.4.12(@types/react@18.3.18) @@ -2720,8 +2720,8 @@ packages: react-transition-group: 4.4.5(react-dom@18.3.1)(react@18.3.1) dev: false - /@mui/private-theming@5.16.13(@types/react@18.3.18)(react@18.3.1): - resolution: {integrity: sha512-+s0FklvDvO7j0yBZn19DIIT3rLfub2fWvXGtMX49rG/xHfDFcP7fbWbZKHZMMP/2/IoTRDrZCbY1iP0xZlmuJA==} + /@mui/private-theming@5.16.14(@types/react@18.3.18)(react@18.3.1): + resolution: {integrity: sha512-12t7NKzvYi819IO5IapW2BcR33wP/KAVrU8d7gLhGHoAmhDxyXlRoKiRij3TOD8+uzk0B6R9wHUNKi4baJcRNg==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2731,7 +2731,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.26.0 - '@mui/utils': 5.16.13(@types/react@18.3.18)(react@18.3.1) + '@mui/utils': 5.16.14(@types/react@18.3.18)(react@18.3.1) '@types/react': 18.3.18 prop-types: 15.8.1 react: 18.3.1 @@ -2754,8 +2754,8 @@ packages: react: 18.3.1 dev: false - /@mui/styled-engine@5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(react@18.3.1): - resolution: {integrity: sha512-2XNHEG8/o1ucSLhTA9J+HIIXjzlnEc0OV7kneeUQ5JukErPYT2zc6KYBDLjlKWrzQyvnQzbiffjjspgHUColZg==} + /@mui/styled-engine@5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(react@18.3.1): + resolution: {integrity: sha512-UAiMPZABZ7p8mUW4akDV6O7N3+4DatStpXMZwPlt+H/dA0lt67qawN021MNND+4QTpjaiMYxbhKZeQcyWCbuKw==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -2831,8 +2831,8 @@ packages: react: 18.3.1 dev: false - /@mui/system@5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react@18.3.1): - resolution: {integrity: sha512-JnO3VH3yNoAmgyr44/2jiS1tcNwshwAqAaG5fTEEjHQbkuZT/mvPYj2GC1cON0zEQ5V03xrCNl/D+gU9AXibpw==} + /@mui/system@5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react@18.3.1): + resolution: {integrity: sha512-KBxMwCb8mSIABnKvoGbvM33XHyT+sN0BzEBG+rsSc0lLQGzs7127KWkCA6/H8h6LZ00XpBEME5MAj8mZLiQ1tw==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -2850,10 +2850,10 @@ packages: '@babel/runtime': 7.26.0 '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@emotion/styled': 11.14.0(@emotion/react@11.14.0)(@types/react@18.3.18)(react@18.3.1) - '@mui/private-theming': 5.16.13(@types/react@18.3.18)(react@18.3.1) - '@mui/styled-engine': 5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(react@18.3.1) + '@mui/private-theming': 5.16.14(@types/react@18.3.18)(react@18.3.1) + '@mui/styled-engine': 5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(react@18.3.1) '@mui/types': 7.2.21(@types/react@18.3.18) - '@mui/utils': 5.16.13(@types/react@18.3.18)(react@18.3.1) + '@mui/utils': 5.16.14(@types/react@18.3.18)(react@18.3.1) '@types/react': 18.3.18 clsx: 2.1.1 csstype: 3.1.3 @@ -2902,8 +2902,8 @@ packages: '@types/react': 18.3.18 dev: false - /@mui/utils@5.16.13(@types/react@18.3.18)(react@18.3.1): - resolution: {integrity: sha512-35kLiShnDPByk57Mz4PP66fQUodCFiOD92HfpW6dK9lc7kjhZsKHRKeYPgWuwEHeXwYsCSFtBCW4RZh/8WT+TQ==} + /@mui/utils@5.16.14(@types/react@18.3.18)(react@18.3.1): + resolution: {integrity: sha512-wn1QZkRzSmeXD1IguBVvJJHV3s6rxJrfb6YuC9Kk6Noh9f8Fb54nUs5JRkKm+BOerRhj5fLg05Dhx/H3Ofb8Mg==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -3299,7 +3299,7 @@ packages: /@types/connect-history-api-fallback@1.5.4: resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==} dependencies: - '@types/express-serve-static-core': 5.0.3 + '@types/express-serve-static-core': 5.0.4 '@types/node': 22.10.5 dev: true @@ -3346,8 +3346,8 @@ packages: '@types/send': 0.17.4 dev: true - /@types/express-serve-static-core@5.0.3: - resolution: {integrity: sha512-JEhMNwUJt7bw728CydvYzntD0XJeTmDnvwLlbfbAhE7Tbslm/ax6bdIiUwTgeVlZTsJQPwZwKpAkyDtIjsvx3g==} + /@types/express-serve-static-core@5.0.4: + resolution: {integrity: sha512-5kz9ScmzBdzTgB/3susoCgfqNDzBjvLL4taparufgSvlwjdLy6UyUy9T/tCpYd2GIdIilCatC4iSQS0QSYHt0w==} dependencies: '@types/node': 22.10.5 '@types/qs': 6.9.17 @@ -3640,7 +3640,7 @@ packages: '@types/yargs-parser': 21.0.3 dev: true - /@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.2): + /@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.3): resolution: {integrity: sha512-Y1n621OCy4m7/vTXNlCbMVp87zSd7NH0L9cXD8aIpOaNlzeWxIK4+Q19A68gSmTNRZn92UjocVUWDthGxtqHFg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3652,22 +3652,22 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 8.13.0(eslint@8.57.1)(typescript@5.7.3) '@typescript-eslint/scope-manager': 8.9.0 - '@typescript-eslint/type-utils': 8.9.0(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/utils': 8.9.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/type-utils': 8.9.0(eslint@8.57.1)(typescript@5.7.3) + '@typescript-eslint/utils': 8.9.0(eslint@8.57.1)(typescript@5.7.3) '@typescript-eslint/visitor-keys': 8.9.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.4.3(typescript@5.7.2) - typescript: 5.7.2 + ts-api-utils: 1.4.3(typescript@5.7.3) + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@8.13.0(eslint@8.57.1)(typescript@5.7.2): + /@typescript-eslint/parser@8.13.0(eslint@8.57.1)(typescript@5.7.3): resolution: {integrity: sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3679,11 +3679,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 8.13.0 '@typescript-eslint/types': 8.13.0 - '@typescript-eslint/typescript-estree': 8.13.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.13.0(typescript@5.7.3) '@typescript-eslint/visitor-keys': 8.13.0 debug: 4.4.0 eslint: 8.57.1 - typescript: 5.7.2 + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true @@ -3696,12 +3696,12 @@ packages: '@typescript-eslint/visitor-keys': 8.13.0 dev: true - /@typescript-eslint/scope-manager@8.19.0: - resolution: {integrity: sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==} + /@typescript-eslint/scope-manager@8.19.1: + resolution: {integrity: sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dependencies: - '@typescript-eslint/types': 8.19.0 - '@typescript-eslint/visitor-keys': 8.19.0 + '@typescript-eslint/types': 8.19.1 + '@typescript-eslint/visitor-keys': 8.19.1 dev: true /@typescript-eslint/scope-manager@8.9.0: @@ -3712,7 +3712,7 @@ packages: '@typescript-eslint/visitor-keys': 8.9.0 dev: true - /@typescript-eslint/type-utils@8.9.0(eslint@8.57.1)(typescript@5.7.2): + /@typescript-eslint/type-utils@8.9.0(eslint@8.57.1)(typescript@5.7.3): resolution: {integrity: sha512-JD+/pCqlKqAk5961vxCluK+clkppHY07IbV3vett97KOV+8C6l+CPEPwpUuiMwgbOz/qrN3Ke4zzjqbT+ls+1Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3721,11 +3721,11 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.7.2) - '@typescript-eslint/utils': 8.9.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.7.3) + '@typescript-eslint/utils': 8.9.0(eslint@8.57.1)(typescript@5.7.3) debug: 4.4.0 - ts-api-utils: 1.4.3(typescript@5.7.2) - typescript: 5.7.2 + ts-api-utils: 1.4.3(typescript@5.7.3) + typescript: 5.7.3 transitivePeerDependencies: - eslint - supports-color @@ -3736,8 +3736,8 @@ packages: engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dev: true - /@typescript-eslint/types@8.19.0: - resolution: {integrity: sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==} + /@typescript-eslint/types@8.19.1: + resolution: {integrity: sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dev: true @@ -3746,7 +3746,7 @@ packages: engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dev: true - /@typescript-eslint/typescript-estree@8.13.0(typescript@5.7.2): + /@typescript-eslint/typescript-estree@8.13.0(typescript@5.7.3): resolution: {integrity: sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3762,32 +3762,32 @@ packages: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.3(typescript@5.7.2) - typescript: 5.7.2 + ts-api-utils: 1.4.3(typescript@5.7.3) + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@8.19.0(typescript@5.7.2): - resolution: {integrity: sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==} + /@typescript-eslint/typescript-estree@8.19.1(typescript@5.7.3): + resolution: {integrity: sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <5.8.0' dependencies: - '@typescript-eslint/types': 8.19.0 - '@typescript-eslint/visitor-keys': 8.19.0 + '@typescript-eslint/types': 8.19.1 + '@typescript-eslint/visitor-keys': 8.19.1 debug: 4.4.0 fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.3(typescript@5.7.2) - typescript: 5.7.2 + ts-api-utils: 2.0.0(typescript@5.7.3) + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@8.9.0(typescript@5.7.2): + /@typescript-eslint/typescript-estree@8.9.0(typescript@5.7.3): resolution: {integrity: sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3803,30 +3803,30 @@ packages: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.3(typescript@5.7.2) - typescript: 5.7.2 + ts-api-utils: 1.4.3(typescript@5.7.3) + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@8.19.0(eslint@8.57.1)(typescript@5.7.2): - resolution: {integrity: sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==} + /@typescript-eslint/utils@8.19.1(eslint@8.57.1)(typescript@5.7.3): + resolution: {integrity: sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) - '@typescript-eslint/scope-manager': 8.19.0 - '@typescript-eslint/types': 8.19.0 - '@typescript-eslint/typescript-estree': 8.19.0(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.19.1 + '@typescript-eslint/types': 8.19.1 + '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.7.3) eslint: 8.57.1 - typescript: 5.7.2 + typescript: 5.7.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@8.9.0(eslint@8.57.1)(typescript@5.7.2): + /@typescript-eslint/utils@8.9.0(eslint@8.57.1)(typescript@5.7.3): resolution: {integrity: sha512-PKgMmaSo/Yg/F7kIZvrgrWa1+Vwn036CdNUvYFEkYbPwOH4i8xvkaRlu148W3vtheWK9ckKRIz7PBP5oUlkrvQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: @@ -3835,7 +3835,7 @@ packages: '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) '@typescript-eslint/scope-manager': 8.9.0 '@typescript-eslint/types': 8.9.0 - '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.7.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -3850,11 +3850,11 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typescript-eslint/visitor-keys@8.19.0: - resolution: {integrity: sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==} + /@typescript-eslint/visitor-keys@8.19.1: + resolution: {integrity: sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dependencies: - '@typescript-eslint/types': 8.19.0 + '@typescript-eslint/types': 8.19.1 eslint-visitor-keys: 4.2.0 dev: true @@ -4395,7 +4395,7 @@ packages: dependencies: '@babel/core': 7.26.0 '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) - core-js-compat: 3.39.0 + core-js-compat: 3.40.0 transitivePeerDependencies: - supports-color dev: true @@ -4512,15 +4512,15 @@ packages: fill-range: 7.1.1 dev: true - /browserslist@4.24.3: - resolution: {integrity: sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==} + /browserslist@4.24.4: + resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: caniuse-lite: 1.0.30001690 - electron-to-chromium: 1.5.76 + electron-to-chromium: 1.5.79 node-releases: 2.0.19 - update-browserslist-db: 1.1.1(browserslist@4.24.3) + update-browserslist-db: 1.1.2(browserslist@4.24.4) dev: true /bser@2.1.1: @@ -4888,14 +4888,14 @@ packages: webpack: 5.97.1(webpack-cli@5.1.4) dev: true - /core-js-compat@3.39.0: - resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==} + /core-js-compat@3.40.0: + resolution: {integrity: sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==} dependencies: - browserslist: 4.24.3 + browserslist: 4.24.4 dev: true - /core-js-pure@3.39.0: - resolution: {integrity: sha512-7fEcWwKI4rJinnK+wLTezeg2smbFFdSBP6E2kQZNbnzM2s1rpKQ6aaRteZSSg7FLU3P0HGGVo/gbpfanU36urg==} + /core-js-pure@3.40.0: + resolution: {integrity: sha512-AtDzVIgRrmRKQai62yuSIN5vNiQjcJakJb4fbhVw3ehxx7Lohphvw9SGNWKhLFqSxC4ilD0g/L1huAYFQU3Q6A==} requiresBuild: true dev: true @@ -5253,8 +5253,8 @@ packages: domhandler: 4.3.1 dev: true - /domutils@3.2.1: - resolution: {integrity: sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==} + /domutils@3.2.2: + resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} dependencies: dom-serializer: 2.0.0 domelementtype: 2.3.0 @@ -5288,8 +5288,8 @@ packages: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} dev: true - /electron-to-chromium@1.5.76: - resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==} + /electron-to-chromium@1.5.79: + resolution: {integrity: sha512-nYOxJNxQ9Om4EC88BE4pPoNI8xwSFf8pU/BAeOl4Hh/b/i6V4biTAzwV7pXi3ARKeoYO5JZKMIXTryXSVer5RA==} dev: true /email-addresses@5.0.0: @@ -5601,7 +5601,7 @@ packages: tsconfig-paths: 3.15.0 dev: true - /eslint-plugin-jest@28.10.0(@typescript-eslint/eslint-plugin@8.9.0)(eslint@8.57.1)(typescript@5.7.2): + /eslint-plugin-jest@28.10.0(@typescript-eslint/eslint-plugin@8.9.0)(eslint@8.57.1)(typescript@5.7.3): resolution: {integrity: sha512-hyMWUxkBH99HpXT3p8hc7REbEZK3D+nk8vHXGgpB+XXsi0gO4PxMSP+pjfUzb67GnV9yawV9a53eUmcde1CCZA==} engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0} peerDependencies: @@ -5614,8 +5614,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/utils': 8.19.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/eslint-plugin': 8.9.0(@typescript-eslint/parser@8.13.0)(eslint@8.57.1)(typescript@5.7.3) + '@typescript-eslint/utils': 8.19.1(eslint@8.57.1)(typescript@5.7.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -6548,7 +6548,7 @@ packages: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 - domutils: 3.2.1 + domutils: 3.2.2 entities: 6.0.0 dev: false @@ -6566,7 +6566,7 @@ packages: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 - domutils: 3.2.1 + domutils: 3.2.2 entities: 4.5.0 /http-deceiver@1.2.7: @@ -9344,7 +9344,7 @@ packages: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} dev: true - /simple-zustand-devtools@1.1.0(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)(zustand@5.0.2): + /simple-zustand-devtools@1.1.0(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1)(zustand@5.0.3): resolution: {integrity: sha512-Axfcfr9L3YL3kto7aschCQLY2VUlXXMnIVtaTe9Y0qWbNmPsX/y7KsNprmxBZoB0pww5ZGs1u/ohcrvQ3tE6jA==} peerDependencies: '@types/react': '>=18.0.0' @@ -9357,7 +9357,7 @@ packages: '@types/react-dom': 18.3.5(@types/react@18.3.18) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - zustand: 5.0.2(@types/react@18.3.18)(react@18.3.1) + zustand: 5.0.3(@types/react@18.3.18)(react@18.3.1) dev: true /sirv@2.0.4: @@ -9811,13 +9811,22 @@ packages: escape-string-regexp: 1.0.5 dev: true - /ts-api-utils@1.4.3(typescript@5.7.2): + /ts-api-utils@1.4.3(typescript@5.7.3): resolution: {integrity: sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.7.2 + typescript: 5.7.3 + dev: true + + /ts-api-utils@2.0.0(typescript@5.7.3): + resolution: {integrity: sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==} + engines: {node: '>=18.12'} + peerDependencies: + typescript: '>=4.8.4' + dependencies: + typescript: 5.7.3 dev: true /tsconfig-paths@3.15.0: @@ -9907,7 +9916,7 @@ packages: reflect.getprototypeof: 1.0.10 dev: true - /typedoc@0.26.11(typescript@5.7.2): + /typedoc@0.26.11(typescript@5.7.3): resolution: {integrity: sha512-sFEgRRtrcDl2FxVP58Ze++ZK2UQAEvtvvH8rRlig1Ja3o7dDaMHmaBfvJmdGnNEFaLTpQsN8dpvZaTqJSu/Ugw==} engines: {node: '>= 18'} hasBin: true @@ -9918,12 +9927,12 @@ packages: markdown-it: 14.1.0 minimatch: 9.0.5 shiki: 1.26.1 - typescript: 5.7.2 + typescript: 5.7.3 yaml: 2.7.0 dev: true - /typescript@5.7.2: - resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} + /typescript@5.7.3: + resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -10017,13 +10026,13 @@ packages: engines: {node: '>= 0.8'} dev: true - /update-browserslist-db@1.1.1(browserslist@4.24.3): - resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} + /update-browserslist-db@1.1.2(browserslist@4.24.4): + resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.24.3 + browserslist: 4.24.4 escalade: 3.2.0 picocolors: 1.1.1 dev: true @@ -10285,7 +10294,7 @@ packages: '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 acorn: 8.14.0 - browserslist: 4.24.3 + browserslist: 4.24.4 chrome-trace-event: 1.0.4 enhanced-resolve: 5.18.0 es-module-lexer: 1.6.0 @@ -10517,8 +10526,8 @@ packages: resolution: {integrity: sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==} dev: false - /zustand@5.0.2(@types/react@18.3.18)(react@18.3.1): - resolution: {integrity: sha512-8qNdnJVJlHlrKXi50LDqqUNmUbuBjoKLrYQBnoChIbVph7vni+sY+YpvdjXG9YLd/Bxr6scMcR+rm5H3aSqPaw==} + /zustand@5.0.3(@types/react@18.3.18)(react@18.3.1): + resolution: {integrity: sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg==} engines: {node: '>=12.20.0'} peerDependencies: '@types/react': '>=18.0.0' @@ -10550,8 +10559,8 @@ packages: dependencies: '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@emotion/styled': 11.14.0(@emotion/react@11.14.0)(@types/react@18.3.18)(react@18.3.1) - '@mui/icons-material': 5.16.13(@mui/material@5.16.13)(@types/react@18.3.18)(react@18.3.1) - '@mui/material': 5.16.13(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@mui/icons-material': 5.16.14(@mui/material@5.16.14)(@types/react@18.3.18)(react@18.3.1) + '@mui/material': 5.16.14(@emotion/react@11.14.0)(@emotion/styled@11.14.0)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) ajv: 8.17.1 ajv-formats: 2.1.1 chart.js: 4.4.7 diff --git a/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json b/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json index ad588e9238a..09d95c9ba7f 100644 --- a/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json +++ b/packages/geoview-core/public/configs/navigator/16-esri-dynamic.json @@ -10,10 +10,6 @@ "labeled": true }, "listOfGeoviewLayerConfig": [ - { - "geoviewLayerId": "472ef86d-7f7c-423b-a7d2-b6f92b79fd6d", - "geoviewLayerType": "geoCore" - }, { "geoviewLayerId": "historical-flood", "geoviewLayerName": "Historical Flood Events (HFE)", @@ -85,7 +81,7 @@ ], "opacity": 1, "rotation": 0, - "src": "iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAcdJREFUKJFjYSATsCBz/v//z/Tt++fwZ6/v2X359lGckZHxHx+34BNJMZVdnOyc27Bq/P//v8iDZzcm7Tg+yev915v8yIokhMzCn768v1FKTKGYkZHxK1zj////me8+vjx99YHikP///2I468W7UxJLd11NjXTtZ2FgYEiBa3zz4WnaluO9/tg0wcCff1+Zdp+aFfLpy/stfDyCG1gYGBgYnry46/Xtx2NWZIW6CmEMP39/Y7j1dAvC5vdn+J+8uh3EwMAA0fjl+0cVZE1mGqkMzmYRDAwMDAxr9zKgaP785Z0Skh//siNrZGPhgLPZWblRnPz3/z92uEZ2Ns6XDAwMijDJo9dmMTAyMjH8/vOD4fKDlSgaOdm5X8M1CvJKnGBl4bf4/ecjAwMDA8P/fz8ZDl+eiBFAAtyqDIK84gfgGiWElKrs9TJ99pzrUMFQDQWMjMwMNnpx5+Sl1HvgGvn4+L7ffnA50tmwbO3hK7Plfv1+j6KJi0OawV4v+bogr2ggIyPjP7hGBgYGBlUF3TNX7x3QczMtnvTh82vb37+/STEwMv7jYOV+KMArtusbN1OJrKTab5h6lLSqreTwkYGBIR6Xc5EBAG+8pa3DWR79AAAAAElFTkSuQmCC", + "src": "iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABw0lEQVQ4jWNhoBJgGRoG/f//n+nry8fhzy4ft/v2/pU4IxPDPx5RmSfSBva7OPiFthFl0P///0UeHNk86fSCFq/vH97wI8vxSsiFPzl3cKO0oV0xIyPjV5wG/f//n/nOgXXTj00tC2H4/x/D1s8vHkns70hNdSidxsLAwJCC06BXN8+mnZnX5I/NEBj49/cP06l5LSGfnt3ZwielsgGrQc8vHfX69e0zK7KYlL4tw5+f3xhe3TgLF/vy6hH/k7NHgxgYGLAb9P39GxVkvqKNL4NtwQQGBgYGhh01YSiGfX37RAmn1/7//cuOIsnBjZUN9SKqWmQOGzfvSwYGBkUY/86+1QyMTEwMf35+Z3h24RCKQRy8gq9xGsQvpXiCmZXd4u/vnxAX/vvLcGvXMgZ0wMEvzMAnrXIAp0EqGtZVn7zjfa5smIUSViiAkZFByyf5nIKVZw9OgxhlZb/f3bUmUss3ee3NnUvl/v76gWIGGxcvg5ZP0nUuOelARkbGfzgNYmBgYFB2CzlzZtVMPYPwgkmfXz60/fP9mxQDI8M/Vi6+h7wS8ru+S/4uUTbx/Y2uD2teMwlL/8jAwBCP03tYwOArRgCKzaW6FXcnxAAAAABJRU5ErkJggg==", "type": "iconSymbol" } }, @@ -249,6 +245,26 @@ "type": "iconSymbol" } }, + { + "visible": false, + "label": "Regulated, Yearly, Low", + "values": [ + "Regulated", + "Yearly", + "Low" + ], + "settings": { + "mimeType": "image/png", + "offset": [ + 0, + 0 + ], + "opacity": 1, + "rotation": 0, + "src": "iVBORw0KGgoAAAANSUhEUgAAABQAAAATCAYAAACQjC21AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABTklEQVQ4jWNhoDJgGTADV4Vq84StvvqFKgYuDFYx/P7vWz0DA0MAVQxkZPjb95+B0WFBkKJdwrr7hygycHGwcsA/hv8OEIMZuxkYGMzJNnBmmjHrv7fvu5CcarYoRDE0bs391WQZyP72fQ4DA4Mqstj//4xtM9OMN6TPOvubJAPnhMoIMf5jqMUipcLx9l06AwPDFJIMZP3P2sDAwCCIXZaxbq6f+sLkTTc/E2Xg4lBF9X//GDNwWcbAwCDKzPqnnIGBoYYoA//9Y+xhYGBgxWMgAyPD/8LFQfJTY9c9fI7XwAUhSs4M/xl88BkGBVz/GFiaGBgYUnEa2NDAwMR4maGXCMOgzvyfuChQvi9u/cPrWA1UvKKYxMDAoE+0gQwMzP+YmDsZGBj8MAxcFarN8/3f92YSDIM4koHBFzlLwg2EliSSpBqIDgauPCQWAAAl/F2MVoc3hAAAAABJRU5ErkJggg==", + "type": "iconSymbol" + } + }, { "visible": true, "label": "Regulated, Yearly, Normal", @@ -293,6 +309,10 @@ "layerFilter": "Total_CSO_Volume > 5000000" } ] + }, + { + "geoviewLayerId": "472ef86d-7f7c-423b-a7d2-b6f92b79fd6d", + "geoviewLayerType": "geoCore" } ] }, diff --git a/packages/geoview-core/public/templates/config-sandbox.html b/packages/geoview-core/public/templates/config-sandbox.html index 9e1a912044f..cbc20e2a729 100644 --- a/packages/geoview-core/public/templates/config-sandbox.html +++ b/packages/geoview-core/public/templates/config-sandbox.html @@ -398,7 +398,7 @@

Sanbox Map

+ + + \ No newline at end of file diff --git a/packages/geoview-core/public/templates/demos/demos.html b/packages/geoview-core/public/templates/demos/demos.html index 6f69abb9cc8..e75151eae15 100644 --- a/packages/geoview-core/public/templates/demos/demos.html +++ b/packages/geoview-core/public/templates/demos/demos.html @@ -30,6 +30,7 @@

Canadian Geospatial Platform (CGP) - GeoV

Canada's Spatial Data Infrastructure

Water Starter Kit

Open Science Data Portal

+ Geoview Integration
Air Quality
Biodiversity
Climate
diff --git a/packages/geoview-core/src/geo/layer/layer-sets/all-feature-info-layer-set.ts b/packages/geoview-core/src/geo/layer/layer-sets/all-feature-info-layer-set.ts index 8998b329f9c..626c1526183 100644 --- a/packages/geoview-core/src/geo/layer/layer-sets/all-feature-info-layer-set.ts +++ b/packages/geoview-core/src/geo/layer/layer-sets/all-feature-info-layer-set.ts @@ -90,7 +90,7 @@ export class AllFeatureInfoLayerSet extends AbstractLayerSet { * @param {QueryType} queryType - The query's type to perform * @returns {Promise} A promise which will hold the result of the query */ - // TODO: (futur development) The queryType is a door opened to allow the triggering using a bounding box or a polygon. + // TODO: (future development) The queryType is a door opened to allow the triggering using a bounding box or a polygon. async queryLayer(layerPath: string, queryType: QueryType = 'all'): Promise { // FIXME: Watch out for code reentrancy between queries! // FIX.MECONT: Consider using a LIFO pattern, per layer path, as the race condition resolution diff --git a/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts b/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts index dea415558b5..b4dac7a21da 100644 --- a/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts +++ b/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts @@ -1584,9 +1584,9 @@ export async function getFeatureCanvas( if (featureStyle) { if (geometryType === 'Point') { if ( - (styleSettings.type === 'simple' && styleSettings.info[0].settings.type === 'simpleSymbol') || - (styleSettings.type === 'uniqueValue' && styleSettings.info[0].settings.type === 'simpleSymbol') || - (styleSettings.type === 'classBreaks' && isSimpleSymbolVectorConfig(styleSettings.info[0].settings)) + (styleSettings.type === 'simple' && !(featureStyle.getImage() instanceof Icon)) || + (styleSettings.type === 'uniqueValue' && !(featureStyle.getImage() instanceof Icon)) || + (styleSettings.type === 'classBreaks' && !(featureStyle.getImage() instanceof Icon)) ) { canvas = createPointCanvas(featureStyle); } else {