diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 6e77f9345f7..88bded99fc2 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -132,26 +132,26 @@ importers: specifier: ^11.11.0 version: 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.61)(react@18.2.0) '@mui/base': - specifier: 5.0.0-beta.24 - version: 5.0.0-beta.24(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) + specifier: 5.0.0-beta.37 + version: 5.0.0-beta.37(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) '@mui/icons-material': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@mui/material@5.15.11)(@types/react@18.2.61)(react@18.2.0) '@mui/material': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) '@mui/styles': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@types/react@18.2.61)(react@18.2.0) '@mui/system': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react@18.2.0) '@mui/x-date-pickers': specifier: ^6.13.0 version: 6.19.5(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.11)(@mui/system@5.15.11)(@types/react@18.2.61)(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0) '@nieuwlandgeo/sldreader': specifier: ^0.3.1 - version: 0.3.1(ol@8.2.0) + version: 0.3.1(ol@9.0.0) ajv: specifier: ^8.12.0 version: 8.12.0 @@ -198,14 +198,14 @@ importers: specifier: ~7.4.0 version: 7.4.1(react@18.2.0) material-react-table: - specifier: ~2.4.1 - version: 2.4.1(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@5.15.11)(@mui/material@5.15.11)(@mui/x-date-pickers@6.19.5)(react-dom@18.2.0)(react@18.2.0) + specifier: ~2.12.1 + version: 2.12.1(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@5.15.11)(@mui/material@5.15.11)(@mui/x-date-pickers@6.19.5)(react-dom@18.2.0)(react@18.2.0) ol: - specifier: ^8.1.0 - version: 8.2.0 + specifier: ^9.0.0 + version: 9.0.0 ol-mapbox-style: - specifier: ^12.0.0 - version: 12.2.1(ol@8.2.0) + specifier: ^12.2.1 + version: 12.2.1(ol@9.0.0) proj4: specifier: ^2.7.5 version: 2.10.0 @@ -487,11 +487,11 @@ importers: ../../packages/geoview-geochart: dependencies: '@mui/material': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) geochart: specifier: Canadian-Geospatial-Platform/geochart#develop - version: github.com/Canadian-Geospatial-Platform/geochart/e549f6b624d27c998b7b43969b2e57bca4ab6c94(@types/react@18.2.61) + version: github.com/Canadian-Geospatial-Platform/geochart/b31d278747633beeafc274c4740d22665928cc45(@types/react@18.2.61) geoview-core: specifier: workspace:~0.1.0 version: link:../geoview-core @@ -645,8 +645,8 @@ importers: specifier: ^4.17.21 version: 4.17.21 ol: - specifier: ^8.1.0 - version: 8.2.0 + specifier: ^9.0.0 + version: 9.0.0 react-draggable: specifier: ^4.4.5 version: 4.4.6(react-dom@18.2.0)(react@18.2.0) @@ -712,7 +712,7 @@ importers: ../../packages/geoview-time-slider: dependencies: '@mui/material': - specifier: ^5.14.6 + specifier: ^5.15.11 version: 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) geoview-core: specifier: workspace:~0.1.0 @@ -786,12 +786,12 @@ packages: engines: {node: '>=0.10.0'} dev: true - /@ampproject/remapping@2.2.1: - resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} + /@ampproject/remapping@2.3.0: + resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} dependencies: - '@jridgewell/gen-mapping': 0.3.4 - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.24 dev: true /@babel/cli@7.23.9(@babel/core@7.24.0): @@ -802,7 +802,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.24.0 - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/trace-mapping': 0.3.24 commander: 4.1.1 convert-source-map: 2.0.0 fs-readdir-recursive: 1.1.0 @@ -830,7 +830,7 @@ packages: resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==} engines: {node: '>=6.9.0'} dependencies: - '@ampproject/remapping': 2.2.1 + '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.23.5 '@babel/generator': 7.23.6 '@babel/helper-compilation-targets': 7.23.6 @@ -868,8 +868,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.24.0 - '@jridgewell/gen-mapping': 0.3.4 - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.24 jsesc: 2.5.2 dev: true @@ -2691,13 +2691,13 @@ packages: chalk: 4.1.2 dev: true - /@jridgewell/gen-mapping@0.3.4: - resolution: {integrity: sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==} + /@jridgewell/gen-mapping@0.3.5: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} dependencies: '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/trace-mapping': 0.3.24 dev: true /@jridgewell/resolve-uri@3.1.2: @@ -2713,16 +2713,16 @@ packages: /@jridgewell/source-map@0.3.5: resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} dependencies: - '@jridgewell/gen-mapping': 0.3.4 - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.24 dev: true /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} dev: true - /@jridgewell/trace-mapping@0.3.23: - resolution: {integrity: sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==} + /@jridgewell/trace-mapping@0.3.24: + resolution: {integrity: sha512-+VaWXDa6+l6MhflBvVXjIEAzb59nQ2JUK3bwRp2zRpPtU+8TFRy9Gg/5oIcNlkEL5PGlBFGfemUVvIgLnTzq7Q==} dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 @@ -2763,29 +2763,6 @@ packages: resolution: {integrity: sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==} dev: false - /@mui/base@5.0.0-beta.24(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-bKt2pUADHGQtqWDZ8nvL2Lvg2GNJyd/ZUgZAJoYzRgmnxBL9j36MSlS3+exEdYkikcnvVafcBtD904RypFKb0w==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - dependencies: - '@babel/runtime': 7.24.0 - '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) - '@mui/types': 7.2.13(@types/react@18.2.61) - '@mui/utils': 5.15.11(@types/react@18.2.61)(react@18.2.0) - '@popperjs/core': 2.11.8 - '@types/react': 18.2.61 - clsx: 2.1.0 - prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - dev: false - /@mui/base@5.0.0-beta.37(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-/o3anbb+DeCng8jNsd3704XtmmLDZju1Fo8R2o7ugrVtPQ/QpcqddwKNzKPZwa0J5T8YNW3ZVuHyQgbTnQLisQ==} engines: {node: '>=12.0.0'} @@ -3035,7 +3012,7 @@ packages: '@babel/runtime': 7.24.0 '@emotion/react': 11.11.4(@types/react@18.2.61)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.61)(react@18.2.0) - '@mui/base': 5.0.0-beta.24(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) + '@mui/base': 5.0.0-beta.37(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) '@mui/material': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) '@mui/system': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react@18.2.0) '@mui/utils': 5.15.11(@types/react@18.2.61)(react@18.2.0) @@ -3062,12 +3039,12 @@ packages: eslint-scope: 5.1.1 dev: true - /@nieuwlandgeo/sldreader@0.3.1(ol@8.2.0): + /@nieuwlandgeo/sldreader@0.3.1(ol@9.0.0): resolution: {integrity: sha512-gP1dw7ftVT34L6nv8dDtERNIJYENwe2I37Vwdm3NQH+KKHDk7vwrTANxvgKgbNybMXHF29jvI97Z/bkZYBqdxQ==} peerDependencies: ol: '>= 5.3.0' dependencies: - ol: 8.2.0 + ol: 9.0.0 dev: false /@nodelib/fs.scandir@2.1.5: @@ -3115,43 +3092,43 @@ packages: '@sinonjs/commons': 1.8.6 dev: true - /@tanstack/match-sorter-utils@8.11.3: - resolution: {integrity: sha512-2XVYTN6fLFyeIPywDL/HGKIQce3V6oUch1FHweGwxruPKEXip6Z9qg+zWZwNE26WG6CktqJh6NqTq90a42jeEw==} + /@tanstack/match-sorter-utils@8.11.8: + resolution: {integrity: sha512-3VPh0SYMGCa5dWQEqNab87UpCMk+ANWHDP4ALs5PeEW9EpfTAbrezzaOk/OiM52IESViefkoAOYuxdoa04p6aA==} engines: {node: '>=12'} dependencies: remove-accents: 0.4.2 dev: false - /@tanstack/react-table@8.11.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Gwwm7po1MaObBguw69L+UiACkaj+eOtThQEArj/3fmUwMPiWaJcXvNG2X5Te5z2hg0HMx8h0T0Q7p5YmQlTUfw==} + /@tanstack/react-table@8.13.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-b6mR3mYkjRtJ443QZh9sc7CvGTce81J35F/XMr0OoWbx0KIM7TTTdyNP2XKObvkLpYnLpCrYDwI3CZnLezWvpg==} engines: {node: '>=12'} peerDependencies: react: '>=16' react-dom: '>=16' dependencies: - '@tanstack/table-core': 8.11.3 + '@tanstack/table-core': 8.13.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@tanstack/react-virtual@3.0.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-IFOFuRUTaiM/yibty9qQ9BfycQnYXIDHGP2+cU+0LrFFGNhVxCXSQnaY6wkX8uJVteFEBjUondX0Hmpp7TNcag==} + /@tanstack/react-virtual@3.1.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-YCzcbF/Ws/uZ0q3Z6fagH+JVhx4JLvbSflgldMgLsuvB8aXjZLLb3HvrEVxY480F9wFlBiXlvQxOyXb5ENPrNA==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@tanstack/virtual-core': 3.0.0 + '@tanstack/virtual-core': 3.1.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@tanstack/table-core@8.11.3: - resolution: {integrity: sha512-nkcFIL696wTf1QMvhGR7dEg60OIRwEZm1OqFTYYDTRc4JOWspgrsJO3IennsOJ7ptumHWLDjV8e5BjPkZcSZAQ==} + /@tanstack/table-core@8.13.2: + resolution: {integrity: sha512-/2saD1lWBUV6/uNAwrsg2tw58uvMJ07bO2F1IWMxjFRkJiXKQRuc3Oq2aufeobD3873+4oIM/DRySIw7+QsPPw==} engines: {node: '>=12'} dev: false - /@tanstack/virtual-core@3.0.0: - resolution: {integrity: sha512-SYXOBTjJb05rXa2vl55TTwO40A6wKu0R5i1qQwhJYNDIqaIGF7D0HsLw+pJAyi2OvntlEIVusx3xtbbgSUi6zg==} + /@tanstack/virtual-core@3.1.3: + resolution: {integrity: sha512-Y5B4EYyv1j9V8LzeAoOVeTg0LI7Fo5InYKgAjkY1Pu9GjtUwX/EKxNcU7ng3sKr99WEf+bPTcktAeybyMOYo+g==} dev: false /@tootallnate/once@1.1.2: @@ -7687,8 +7664,8 @@ packages: hasBin: true dev: true - /material-react-table@2.4.1(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@5.15.11)(@mui/material@5.15.11)(@mui/x-date-pickers@6.19.5)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-ftqw8kCSg4SFJArOu86dwTFUtpSBQ3pI3FD8iu6WZNQfMDkyfJkLHp5m9qYdukoFEqx356uWOKd2XrSxqvn+Wg==} + /material-react-table@2.12.1(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@5.15.11)(@mui/material@5.15.11)(@mui/x-date-pickers@6.19.5)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-nqILE26I/6/UfiILEc7mnVhIoVdG78qvkav85dcbn5BbNXkAJeA57Slut50eYytd7aQHCbaq9MoLvsVeO1yaIw==} engines: {node: '>=16'} peerDependencies: '@emotion/react': '>=11.11' @@ -7696,17 +7673,17 @@ packages: '@mui/icons-material': '>=5.11' '@mui/material': '>=5.13' '@mui/x-date-pickers': '>=6.15.0' - react: '>=18.0' - react-dom: '>=18.0' + react: '>=17.0' + react-dom: '>=17.0' dependencies: '@emotion/react': 11.11.4(@types/react@18.2.61)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.61)(react@18.2.0) '@mui/icons-material': 5.15.11(@mui/material@5.15.11)(@types/react@18.2.61)(react@18.2.0) '@mui/material': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0) '@mui/x-date-pickers': 6.19.5(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.11)(@mui/system@5.15.11)(@types/react@18.2.61)(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0) - '@tanstack/match-sorter-utils': 8.11.3 - '@tanstack/react-table': 8.11.3(react-dom@18.2.0)(react@18.2.0) - '@tanstack/react-virtual': 3.0.1(react-dom@18.2.0)(react@18.2.0) + '@tanstack/match-sorter-utils': 8.11.8 + '@tanstack/react-table': 8.13.2(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-virtual': 3.1.3(react-dom@18.2.0)(react@18.2.0) highlight-words: 1.2.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -7975,18 +7952,18 @@ packages: resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==} dev: true - /ol-mapbox-style@12.2.1(ol@8.2.0): + /ol-mapbox-style@12.2.1(ol@9.0.0): resolution: {integrity: sha512-soh8x+8CwlA+e3fd8grotA4XXnm0DSWnpzu5Ef3aEQwpM1o2OfoGPSk/hpjhXL5kFUm79pEyiONTw+kdth2FEQ==} peerDependencies: ol: '>=9.0.0 || >=9.0.0-dev.0 <9.0.0 || =9.0.0-dev || >=8.0.0 <=8.2.0 || >=7.0.0 <=7.5.2' dependencies: '@mapbox/mapbox-gl-style-spec': 13.28.0 mapbox-to-css-font: 2.4.4 - ol: 8.2.0 + ol: 9.0.0 dev: false - /ol@8.2.0: - resolution: {integrity: sha512-/m1ddd7Jsp4Kbg+l7+ozR5aKHAZNQOBAoNZ5pM9Jvh4Etkf0WGkXr9qXd7PnhmwiC1Hnc2Toz9XjCzBBvexfXw==} + /ol@9.0.0: + resolution: {integrity: sha512-+nYHZYbHrRUTDJ8ryxXPdDoAiaT6Zea02cocmGqsJXs4Oac1fYC9EbTIU2Y7803QcmG3u2MR88RxbksBvK+ZfQ==} dependencies: color-rgba: 3.0.0 color-space: 2.0.1 @@ -9449,7 +9426,7 @@ packages: uglify-js: optional: true dependencies: - '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/trace-mapping': 0.3.24 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 @@ -10292,9 +10269,9 @@ packages: react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) - github.com/Canadian-Geospatial-Platform/geochart/e549f6b624d27c998b7b43969b2e57bca4ab6c94(@types/react@18.2.61): - resolution: {tarball: https://codeload.github.com/Canadian-Geospatial-Platform/geochart/tar.gz/e549f6b624d27c998b7b43969b2e57bca4ab6c94} - id: github.com/Canadian-Geospatial-Platform/geochart/e549f6b624d27c998b7b43969b2e57bca4ab6c94 + github.com/Canadian-Geospatial-Platform/geochart/b31d278747633beeafc274c4740d22665928cc45(@types/react@18.2.61): + resolution: {tarball: https://codeload.github.com/Canadian-Geospatial-Platform/geochart/tar.gz/b31d278747633beeafc274c4740d22665928cc45} + id: github.com/Canadian-Geospatial-Platform/geochart/b31d278747633beeafc274c4740d22665928cc45 name: geoview-geochart version: 0.1.0 dependencies: diff --git a/packages/geoview-core/package.json b/packages/geoview-core/package.json index 4a68f5f9cee..db05f91af69 100644 --- a/packages/geoview-core/package.json +++ b/packages/geoview-core/package.json @@ -48,11 +48,11 @@ "dependencies": { "@emotion/react": "^11.11.0", "@emotion/styled": "^11.11.0", - "@mui/base": "5.0.0-beta.24", - "@mui/icons-material": "^5.14.6", - "@mui/material": "^5.14.6", - "@mui/styles": "^5.14.6", - "@mui/system": "^5.14.6", + "@mui/base": "5.0.0-beta.37", + "@mui/icons-material": "^5.15.11", + "@mui/material": "^5.15.11", + "@mui/styles": "^5.15.11", + "@mui/system": "^5.15.11", "@nieuwlandgeo/sldreader": "^0.3.1", "@mui/x-date-pickers": "^6.13.0", "ajv": "^8.12.0", @@ -69,9 +69,9 @@ "linkify-html": "^4.1.1", "linkifyjs": "^4.1.0", "lodash": "^4.17.21", - "material-react-table": "~2.4.1", - "ol": "^8.1.0", - "ol-mapbox-style": "^12.0.0", + "material-react-table": "~2.12.1", + "ol": "^9.0.0", + "ol-mapbox-style": "^12.2.1", "proj4": "^2.7.5", "prop-types": "^15.8.1", "query-string": "^7.1.0", @@ -116,8 +116,8 @@ "@babel/runtime-corejs3": "^7.17.0", "@emotion/react": "^11.11.0", "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.14.6", - "@mui/material": "^5.14.6", + "@mui/icons-material": "^5.15.11", + "@mui/material": "^5.15.11", "@types/create-react-class": "^15.6.3", "@types/flux": "^3.1.11", "@types/glob": "^7.2.0", diff --git a/packages/geoview-core/src/core/components/layers/left-panel/add-new-layer/add-new-layer.tsx b/packages/geoview-core/src/core/components/layers/left-panel/add-new-layer/add-new-layer.tsx index 2fc71dbddf1..5f38c6ea7c0 100644 --- a/packages/geoview-core/src/core/components/layers/left-panel/add-new-layer/add-new-layer.tsx +++ b/packages/geoview-core/src/core/components/layers/left-panel/add-new-layer/add-new-layer.tsx @@ -1116,10 +1116,10 @@ export function AddNewLayer(): JSX.Element { value={layerType} onChange={handleSelectType} label={t('layers.service')} + variant="standard" inputLabel={{ id: 'service-type-label', }} - variant="standard" menuItems={layerOptions.map(([value, label]) => ({ key: value, item: { diff --git a/packages/geoview-core/src/core/components/layers/right-panel/layer-details.tsx b/packages/geoview-core/src/core/components/layers/right-panel/layer-details.tsx index 425b47a705e..86d86638cf2 100644 --- a/packages/geoview-core/src/core/components/layers/right-panel/layer-details.tsx +++ b/packages/geoview-core/src/core/components/layers/right-panel/layer-details.tsx @@ -63,7 +63,7 @@ export function LayerDetails(props: LayerDetailsProps): JSX.Element { useEffect(() => { // Log logger.logTraceUseEffect('LAYER DETAILS', selectedLayer, layerDetails); - + // TODO: refactor - remove timer! // Reason for timer:- when layer detail component is loaded, behind the scene we send query to fetch the features. // After component is rendered and fetching features is done, eventhough store is update, it never re rendered this component // thats why we need to update the state so that layers data is fetched again from store. diff --git a/packages/geoview-core/src/core/utils/config/validationClasses/abstract-base-layer-entry-config.ts b/packages/geoview-core/src/core/utils/config/validationClasses/abstract-base-layer-entry-config.ts index ad093f774e7..717463047cb 100644 --- a/packages/geoview-core/src/core/utils/config/validationClasses/abstract-base-layer-entry-config.ts +++ b/packages/geoview-core/src/core/utils/config/validationClasses/abstract-base-layer-entry-config.ts @@ -2,6 +2,7 @@ // ? we escape all private attribute in this file import BaseLayer from 'ol/layer/Base'; import LayerGroup from 'ol/layer/Group'; + import { ConfigBaseClass, TypeBaseSourceVectorInitialConfig, @@ -72,22 +73,28 @@ export abstract class AbstractBaseLayerEntryConfig extends ConfigBaseClass { if (loadEndListenerType) { let loadErrorListener: () => void; + // TODO: Can we manage this in callback or promises? + // migration to OpenLayers 9.0.0 seems to restrict access to key elements // Definition of the load end listener functions const loadEndListener = () => { this.loadedFunction(); this.geoviewLayerInstance!.setLayerPhase('loaded', this.layerPath); this.layerStatus = 'loaded'; - this._olLayer!.get('source').un(`${loadEndListenerType}loaderror`, loadErrorListener); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (this._olLayer! as any).get('source').un(`${loadEndListenerType}loaderror`, loadErrorListener); }; loadErrorListener = () => { this.layerStatus = 'error'; - this._olLayer!.get('source').un(`${loadEndListenerType}loadend`, loadEndListener); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (this._olLayer! as any).get('source').un(`${loadEndListenerType}loadend`, loadEndListener); }; // Activation of the load end listeners - this._olLayer!.get('source').once(`${loadEndListenerType}loaderror`, loadErrorListener); - this._olLayer!.get('source').once(`${loadEndListenerType}loadend`, loadEndListener); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (this._olLayer! as any).get('source').once(`${loadEndListenerType}loaderror`, loadErrorListener); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (this._olLayer! as any).get('source').once(`${loadEndListenerType}loadend`, loadEndListener); } else logger.logError(`Provision of a load end listener type is mandatory for layer path "${this.layerPath}".`); } } diff --git a/packages/geoview-core/src/geo/layer/geometry/geometry.ts b/packages/geoview-core/src/geo/layer/geometry/geometry.ts index b1eabb843be..9debec41c85 100644 --- a/packages/geoview-core/src/geo/layer/geometry/geometry.ts +++ b/packages/geoview-core/src/geo/layer/geometry/geometry.ts @@ -449,7 +449,7 @@ export class Geometry { geometryGroupId: string, options?: { vectorLayerOptions?: VectorLayerOptions; - vectorSourceOptions?: VectorSourceOptions; + vectorSourceOptions?: VectorSourceOptions; } ): FeatureCollection { const geometryGroupOptions = options || {}; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/raster/vector-tiles.ts b/packages/geoview-core/src/geo/layer/geoview-layers/raster/vector-tiles.ts index 010d22fe2d8..6b3f619f75f 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/raster/vector-tiles.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/raster/vector-tiles.ts @@ -11,6 +11,7 @@ import { Extent } from 'ol/extent'; import olms, { applyStyle } from 'ol-mapbox-style'; +import Feature from 'ol/Feature'; import { AbstractGeoViewLayer, CONST_LAYER_TYPES } from '@/geo/layer/geoview-layers/abstract-geoview-layers'; import { AbstractGeoViewRaster, TypeBaseRasterLayer } from '@/geo/layer/geoview-layers/raster/abstract-geoview-raster'; import { @@ -156,7 +157,7 @@ export class VectorTiles extends AbstractGeoViewRaster { super.processOneLayerEntry(layerConfig); const { layerPath } = layerConfig; this.setLayerPhase('processOneLayerEntry', layerPath); - const sourceOptions: SourceOptions = { + const sourceOptions: SourceOptions = { url: getLocalizedValue(layerConfig.source.dataAccessPath, this.mapId), }; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/abstract-geoview-vector.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/abstract-geoview-vector.ts index 985dfc1cc6e..84960c99051 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/abstract-geoview-vector.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/abstract-geoview-vector.ts @@ -107,7 +107,7 @@ export abstract class AbstractGeoViewVector extends AbstractGeoViewLayer { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { const { layerPath } = layerConfig; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/csv.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/csv.ts index 3d704b21886..f00bebbc0d8 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/csv.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/csv.ts @@ -282,7 +282,7 @@ export class CSV extends AbstractGeoViewVector { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { readOptions.dataProjection = (layerConfig.source as TypeBaseSourceVectorInitialConfig).dataProjection; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/esri-feature.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/esri-feature.ts index e5e52da4df2..753a79a1c92 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/esri-feature.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/esri-feature.ts @@ -219,7 +219,7 @@ export class EsriFeature extends AbstractGeoViewVector { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { // ? The line below uses var because a var declaration has a wider scope than a let declaration. diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/geojson.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/geojson.ts index 0cb0bef8572..7bdee0dc6c1 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/geojson.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/geojson.ts @@ -206,7 +206,7 @@ export class GeoJSON extends AbstractGeoViewVector { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { readOptions.dataProjection = (layerConfig.source as TypeBaseSourceVectorInitialConfig).dataProjection; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/geopackage.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/geopackage.ts index 3d4ca7b2a89..17f8579d9b6 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/geopackage.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/geopackage.ts @@ -257,7 +257,7 @@ export class GeoPackage extends AbstractGeoViewVector { */ protected extractGeopackageData( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): Promise<[layerData[], sldsInterface]> { const promisedGeopackageData = new Promise<[layerData[], sldsInterface]>((resolve) => { diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts index 724565c1f0e..e3bf2e72468 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts @@ -300,7 +300,7 @@ export class OgcFeature extends AbstractGeoViewVector { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { readOptions.dataProjection = (layerConfig.source as TypeBaseSourceVectorInitialConfig).dataProjection; diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/wfs.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/wfs.ts index d67f7d60d94..e5f50061c90 100644 --- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/wfs.ts +++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/wfs.ts @@ -352,7 +352,7 @@ export class WFS extends AbstractGeoViewVector { */ protected createVectorSource( layerConfig: AbstractBaseLayerEntryConfig, - sourceOptions: SourceOptions = {}, + sourceOptions: SourceOptions = {}, readOptions: ReadOptions = {} ): VectorSource { readOptions.dataProjection = (layerConfig.source as TypeBaseSourceVectorInitialConfig).dataProjection; diff --git a/packages/geoview-core/src/ui/tabs/tabs.tsx b/packages/geoview-core/src/ui/tabs/tabs.tsx index ba80f59afeb..ad2b4d0699d 100644 --- a/packages/geoview-core/src/ui/tabs/tabs.tsx +++ b/packages/geoview-core/src/ui/tabs/tabs.tsx @@ -213,12 +213,12 @@ export function Tabs(props: TypeTabsProps): JSX.Element { formControlProps={{ size: 'small' }} id="footerBarDropdown" fullWidth + variant="standard" inputLabel={{ id: 'footerBarDropdownLabel' }} menuItems={mobileTabsDropdownValues} value={value} onChange={(e: SelectChangeEvent) => updateTabPanel(e.target.value as number)} MenuProps={{ container: mapElem }} - variant="outlined" /> )} diff --git a/packages/geoview-geochart/package.json b/packages/geoview-geochart/package.json index ac1afdee12e..6197b98ff23 100644 --- a/packages/geoview-geochart/package.json +++ b/packages/geoview-geochart/package.json @@ -16,7 +16,7 @@ "lodash": "^4.17.21", "geoview-core": "workspace:~0.1.0", "geochart": "Canadian-Geospatial-Platform/geochart#develop", - "@mui/material": "^5.14.6" + "@mui/material": "^5.15.11" }, "devDependencies": { "@babel/core": "^7.17.0", diff --git a/packages/geoview-swiper/package.json b/packages/geoview-swiper/package.json index dea4ef3c56d..544deaf7392 100644 --- a/packages/geoview-swiper/package.json +++ b/packages/geoview-swiper/package.json @@ -12,7 +12,7 @@ "dependencies": { "geoview-core": "workspace:~0.1.0", "lodash": "^4.17.21", - "ol": "^8.1.0", + "ol": "^9.0.0", "react-draggable": "^4.4.5" }, "devDependencies": { diff --git a/packages/geoview-time-slider/package.json b/packages/geoview-time-slider/package.json index a04eda6b3a4..82b13c77d5b 100644 --- a/packages/geoview-time-slider/package.json +++ b/packages/geoview-time-slider/package.json @@ -11,7 +11,7 @@ "license": "MIT", "dependencies": { "geoview-core": "workspace:~0.1.0", - "@mui/material": "^5.14.6" + "@mui/material": "^5.15.11" }, "devDependencies": { "@babel/core": "^7.17.0",