From 6a1ca4d31ee5da3566fa0481e6f3b181398d1c4f Mon Sep 17 00:00:00 2001 From: Pascal Roehling Date: Thu, 30 Jan 2025 11:04:41 +0100 Subject: [PATCH 1/2] Update @masterportal/masterportalapi to v2.45.0 and thus ol to v10.3.1 Also, fix all type and dependency issues introduced by the ol update. --- jest.config.ts | 2 +- package-lock.json | 205 ++++++++++++------ package.json | 6 +- packages/clients/dish/CHANGELOG.md | 2 +- packages/clients/dish/package.json | 2 +- .../clients/meldemichel/src/polar-client.ts | 2 +- packages/clients/textLocator/CHANGELOG.md | 1 + packages/clients/textLocator/package.json | 3 + .../GeometrySearch/utils/vectorDisplay.ts | 3 +- packages/core/CHANGELOG.md | 4 + packages/core/package.json | 4 +- packages/core/src/utils/setupStyling.ts | 17 +- .../index.ts | 6 +- .../setLayerId.ts | 2 +- packages/lib/getCluster/CHANGELOG.md | 4 + packages/lib/getCluster/package.json | 2 +- packages/lib/getFeatures/CHANGELOG.md | 4 + packages/lib/getFeatures/package.json | 2 +- packages/lib/invisibleStyle/CHANGELOG.md | 4 + packages/lib/invisibleStyle/package.json | 2 +- packages/lib/passesBoundaryCheck/CHANGELOG.md | 4 + packages/lib/passesBoundaryCheck/index.ts | 6 +- packages/lib/passesBoundaryCheck/package.json | 2 +- packages/plugins/AddressSearch/CHANGELOG.md | 4 + packages/plugins/AddressSearch/package.json | 4 +- packages/plugins/Attributions/CHANGELOG.md | 4 + packages/plugins/Attributions/package.json | 2 +- packages/plugins/Draw/CHANGELOG.md | 4 + packages/plugins/Draw/package.json | 2 +- .../createDeleteInteractions.ts | 3 +- packages/plugins/Draw/src/types.ts | 2 +- packages/plugins/Filter/CHANGELOG.md | 4 + packages/plugins/Filter/package.json | 2 +- packages/plugins/GeoLocation/CHANGELOG.md | 4 + packages/plugins/GeoLocation/package.json | 2 +- packages/plugins/GeoLocation/src/types.ts | 8 +- packages/plugins/Gfi/CHANGELOG.md | 4 + packages/plugins/Gfi/package.json | 4 +- .../src/store/actions/debouncedGfiRequest.ts | 10 +- .../Gfi/src/utils/displayFeatureLayer.ts | 7 +- .../plugins/Gfi/src/utils/renderFeatures.ts | 4 +- .../Gfi/src/utils/requestGfiGeoJson.ts | 2 +- packages/plugins/LayerChooser/CHANGELOG.md | 4 + packages/plugins/LayerChooser/package.json | 4 +- packages/plugins/Pins/CHANGELOG.md | 4 + packages/plugins/Pins/package.json | 2 +- packages/plugins/Pins/src/store/index.ts | 2 +- packages/plugins/ReverseGeocoder/CHANGELOG.md | 4 + packages/plugins/ReverseGeocoder/package.json | 2 +- packages/plugins/Scale/CHANGELOG.md | 4 + packages/plugins/Scale/package.json | 2 +- 51 files changed, 259 insertions(+), 134 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index ba7fcead..cc090f02 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -23,7 +23,7 @@ const config: Config.InitialOptions = { setupFiles: ['jest-canvas-mock'], setupFilesAfterEnv: ['./__mocks__/jest.setup.js'], transformIgnorePatterns: [ - '/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|geotiff|quick-lru|color-(space|parse|rgba|name))/)', + '/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|pbf|earcut|geotiff|rbush|quickselect|quick-lru|color-(space|parse|rgba|name))/)', ], } diff --git a/package-lock.json b/package-lock.json index fb6a64e9..5e85d227 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@actions/github": "^6.0.0", "@babel/core": "^7.24.8", "@babel/preset-env": "^7.24.8", - "@cesium/engine": "^9.2.0", + "@cesium/engine": "^13.0.0", "@jest/types": "^29.3.1", "@nx/js": "^19.8.2", "@playwright/test": "^1.47.2", @@ -35,6 +35,7 @@ "@vue/test-utils": "^1.2.2", "@vue/vue2-jest": "^28.1.0", "babel-core": "^7.0.0-bridge.0", + "cesium": "^1.125.0", "copyfiles": "^2.4.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", @@ -1960,29 +1961,29 @@ "license": "MIT" }, "node_modules/@cesium/engine": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/@cesium/engine/-/engine-9.2.0.tgz", - "integrity": "sha512-vFVITo7UwIY1H8zK53etljv1w0CVaFSzOcLyItrM88r47zyPL7/RgooVKqZXnM5V8prs33S5TO/JSqJmvpyMTQ==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/@cesium/engine/-/engine-13.1.0.tgz", + "integrity": "sha512-1PX7sMhtgBgaSOtyQ0lTPvG35bMfR1ngtgBZqzNnR67lp+tVv9lNyAg/byBSnijL2b2NJNC2Iec6A6Z/Rj12OA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@tweenjs/tween.js": "^23.1.1", + "@tweenjs/tween.js": "^25.0.0", "@zip.js/zip.js": "^2.7.34", "autolinker": "^4.0.0", "bitmap-sdf": "^1.0.3", "dompurify": "^3.0.2", "draco3d": "^1.5.1", - "earcut": "^2.2.4", + "earcut": "^3.0.0", "grapheme-splitter": "^1.0.4", "jsep": "^1.3.8", "kdbush": "^4.0.1", "ktx-parse": "^0.7.0", "lerc": "^2.0.0", "mersenne-twister": "^1.1.0", - "meshoptimizer": "^0.20.0", + "meshoptimizer": "^0.22.0", "pako": "^2.0.4", "protobufjs": "^7.1.0", - "rbush": "^3.0.1", + "rbush": "3.0.1", "topojson-client": "^3.1.0", "urijs": "^1.19.7" }, @@ -1990,6 +1991,20 @@ "node": ">=14.0.0" } }, + "node_modules/@cesium/widgets": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@cesium/widgets/-/widgets-10.1.0.tgz", + "integrity": "sha512-IWT+8cCsnJo1Mtr+xrkdVEZrP88/UqF5oDyDPVmlOJ47MPjUauu93k6LeAwxQQ2CYqqgpFIZbIX19mMfQMwSfA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@cesium/engine": "^13.1.0", + "nosleep.js": "^0.12.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -3241,16 +3256,16 @@ "license": "BSD-2-Clause" }, "node_modules/@masterportal/masterportalapi": { - "version": "2.40.0", - "resolved": "https://registry.npmjs.org/@masterportal/masterportalapi/-/masterportalapi-2.40.0.tgz", - "integrity": "sha512-1NuoV2a4X4XOyK61ViRDDyXDNzQYUOAopL65Sj23OpJNCr9fQ3NSAuhdOsb43Wj9nBMR4FECa62wjyVEyVNIZg==", + "version": "2.45.0", + "resolved": "https://registry.npmjs.org/@masterportal/masterportalapi/-/masterportalapi-2.45.0.tgz", + "integrity": "sha512-DU/rwoJXr/BH38AUDmQPCJPz+giWMwaYAECCneII4pWnESW6r8kwG8gsYMbZAKstXqLOqbc+osWyiQ9ilNxTPQ==", "license": "MIT", "dependencies": { "core-js": "^3.33.1", "dayjs": "^1.11.10", - "ol": "9.2.4", - "ol-mapbox-style": "12.2.1", - "olcs": "2.20.0", + "ol": "^10.3.1", + "ol-mapbox-style": "^12.3.5", + "olcs": "^2.22.1", "proj4": "^2.10.0", "xml2js": "^0.6.2" }, @@ -3259,7 +3274,7 @@ "npm": "^8.1.2 || ^9.3.1 || ^10.5.0" }, "peerDependencies": { - "@cesium/engine": "^9.2.0" + "@cesium/engine": "^13.0.0" } }, "node_modules/@microsoft/tsdoc": { @@ -4492,9 +4507,9 @@ } }, "node_modules/@petamoriken/float16": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.9.0.tgz", - "integrity": "sha512-rYUZ+VFjPHD0NT2JYKj64NxXxrV642IiyaUxxorTEj0S3hT7B5Ixezyc9Fn+XvSk0ETEBp5VWjGIErzh0ug0Xw==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.9.1.tgz", + "integrity": "sha512-j+ejhYwY6PeB+v1kn7lZFACUIG97u90WxMuGosILFsl9d4Ovi0sjk0GlPfoEcx+FzvXZDAfioD+NGnnPamXgMA==", "license": "MIT" }, "node_modules/@pkgjs/parseargs": { @@ -5440,9 +5455,9 @@ } }, "node_modules/@tweenjs/tween.js": { - "version": "23.1.3", - "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz", - "integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==", + "version": "25.0.0", + "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-25.0.0.tgz", + "integrity": "sha512-XKLA6syeBUaPzx4j3qwMqzzq+V4uo72BnlbOjmuljLrRqdsd3qnzvZZoxvMHZ23ndsRS4aufU6JOZYpCbU6T1A==", "dev": true, "license": "MIT" }, @@ -5620,6 +5635,12 @@ "license": "MIT", "optional": true }, + "node_modules/@types/rbush": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-4.0.0.tgz", + "integrity": "sha512-+N+2H39P8X+Hy1I5mC6awlTX54k3FhiUmvt7HWzGJZvF+syUAAxP/stwppS8JE84YHqFgRMv6fCy31202CMFxQ==", + "license": "MIT" + }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", @@ -7184,6 +7205,24 @@ "license": "MIT", "optional": true }, + "node_modules/cesium": { + "version": "1.125.0", + "resolved": "https://registry.npmjs.org/cesium/-/cesium-1.125.0.tgz", + "integrity": "sha512-T6V1xKFQOxydJJtG6ammyDOwKMerkGLdxQJLJSLHhhh6VKqpUyp+GXSKjnzlAmpLDjQLF1UkhbJ98WC59am/fA==", + "dev": true, + "license": "Apache-2.0", + "workspaces": [ + "packages/engine", + "packages/widgets" + ], + "dependencies": { + "@cesium/engine": "^13.1.0", + "@cesium/widgets": "^10.1.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -7368,9 +7407,9 @@ } }, "node_modules/color-space": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-space/-/color-space-2.0.1.tgz", - "integrity": "sha512-nKqUYlo0vZATVOFHY810BSYjmCARrG7e5R3UE3CQlyjJTvv5kSSmPG1kzm/oDyyqjehM+lW1RnEt9It9GNa5JA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/color-space/-/color-space-2.1.0.tgz", + "integrity": "sha512-zVS/1YXvFB4AoYqpKzcQ694s7dOKXHtSbQfcfuxeuTr4oE1U40zkrqvyEsu8OD9e2pTuGjfRFNUR2Ii4XkoE9w==", "license": "MIT" }, "node_modules/colorette": { @@ -8079,9 +8118,9 @@ "license": "MIT" }, "node_modules/earcut": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", - "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.1.tgz", + "integrity": "sha512-0l1/0gOjESMeQyYaK5IDiPNvFeu93Z/cO0TjZh9eZ1vyCtZnA7KMZ8rQggpsJHIbGSdrqYq9OhuveadOVHCshw==", "license": "ISC" }, "node_modules/eastasianwidth": { @@ -10371,6 +10410,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -12425,9 +12465,9 @@ "license": "MIT" }, "node_modules/meshoptimizer": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.20.0.tgz", - "integrity": "sha512-olcJ1q+YVnjroRJpCL1Dj5aZxr2JMr2hRutMUwhuHZvpAL7SIZgOT6eMlFF4TbBGSR89tawE/gqB79J/LrW/Nw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.22.0.tgz", + "integrity": "sha512-IebiK79sqIy+E4EgOr+CAw+Ke8hAspXKzBd0JdgEmPHiAwmvEj2S4h1rfvo+o/BnfEYd/jAOg5IeeIjzlzSnDg==", "dev": true, "license": "MIT" }, @@ -12660,6 +12700,13 @@ "node": ">=0.10.0" } }, + "node_modules/nosleep.js": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz", + "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==", + "dev": true, + "license": "MIT" + }, "node_modules/npm-package-arg": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz", @@ -12921,17 +12968,18 @@ } }, "node_modules/ol": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/ol/-/ol-9.2.4.tgz", - "integrity": "sha512-bsbu4ObaAlbELMIZWnYEvX4Z9jO+OyCBshtODhDKmqYTPEfnKOX3RieCr97tpJkqWTZvyV4tS9UQDvHoCdxS+A==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/ol/-/ol-10.3.1.tgz", + "integrity": "sha512-D1nRQVLOBCRempVqBFV8pSI5H13BtnhuLDjGl+3NKdMOFyjx/UqRX/tcMspEw3LhFOSPWn1Ev+1KIRV8AlHM7A==", "license": "BSD-2-Clause", "dependencies": { + "@types/rbush": "4.0.0", "color-rgba": "^3.0.0", "color-space": "^2.0.1", - "earcut": "^2.2.3", - "geotiff": "^2.0.7", - "pbf": "3.2.1", - "rbush": "^3.0.1" + "earcut": "^3.0.0", + "geotiff": "^2.1.3", + "pbf": "4.0.1", + "rbush": "^4.0.0" }, "funding": { "type": "opencollective", @@ -12939,26 +12987,41 @@ } }, "node_modules/ol-mapbox-style": { - "version": "12.2.1", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-12.2.1.tgz", - "integrity": "sha512-soh8x+8CwlA+e3fd8grotA4XXnm0DSWnpzu5Ef3aEQwpM1o2OfoGPSk/hpjhXL5kFUm79pEyiONTw+kdth2FEQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-12.4.0.tgz", + "integrity": "sha512-P8Jg9AXSG6FpUNrADejpwMG0HbmHTZOJQQocACzaDL0QrU4kzmCvj06xUIKhTxT5mtC413pCVAbyXJ4mx0XFnQ==", "license": "BSD-2-Clause", "dependencies": { "@mapbox/mapbox-gl-style-spec": "^13.23.1", "mapbox-to-css-font": "^2.4.1" }, "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" + "ol": "*" + } + }, + "node_modules/ol/node_modules/quickselect": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz", + "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==", + "license": "ISC" + }, + "node_modules/ol/node_modules/rbush": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/rbush/-/rbush-4.0.1.tgz", + "integrity": "sha512-IP0UpfeWQujYC8Jg162rMNc01Rf0gWMMAb2Uxus/Q0qOFw4lCcq6ZnQEZwUoJqWyUGJ9th7JjwI4yIWo+uvoAQ==", + "license": "MIT", + "dependencies": { + "quickselect": "^3.0.0" } }, "node_modules/olcs": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/olcs/-/olcs-2.20.0.tgz", - "integrity": "sha512-VNjjfIbO/dzQxKbVv2IS4WbM/CRlQ5T5xnMIlOoOA3HnAZUPK6cajxYoxDDxKnJ+3I+XJNNdBybNFAX1U4ADqw==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/olcs/-/olcs-2.22.1.tgz", + "integrity": "sha512-QWpFA84km7bOZFh0PDrKa35HkvI+mud9fcRZ4NHbRMFtBIQnY8l9oba+WocimIhXer4hIybc4nx0q60sEngLKg==", "license": "BSD-2-Clause", "peerDependencies": { "cesium": ">= 1.90.0", - "ol": "7 || 8 || 9" + "ol": ">= 9.2, >= 10" } }, "node_modules/once": { @@ -13241,12 +13304,11 @@ } }, "node_modules/pbf": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", - "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz", + "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==", "license": "BSD-3-Clause", "dependencies": { - "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" }, "bin": { @@ -13805,6 +13867,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==", + "dev": true, "license": "ISC" }, "node_modules/raf": { @@ -13821,6 +13884,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz", "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==", + "dev": true, "license": "MIT", "dependencies": { "quickselect": "^2.0.0" @@ -16479,7 +16543,7 @@ "version": "1.1.1", "license": "EUPL-1.2", "devDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@polar/core": "^2.0.0", "@polar/lib-custom-types": "^1.5.0", "@polar/lib-get-features": "^2.0.0", @@ -16596,6 +16660,9 @@ "@turf/union": "^7.1.0", "js-levenshtein": "^1.1.6", "lodash.debounce": "^4.0.8" + }, + "peerDependencies": { + "ol": "^10.3.1" } }, "packages/components": { @@ -16615,7 +16682,7 @@ "license": "EUPL-1.2", "dependencies": { "@fortawesome/fontawesome-free": "^6.5.2", - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@polar/components": "^2.2.0", "@polar/lib-get-cluster": "^2.0.0", "@polar/lib-idx": "^1.0.0", @@ -16637,7 +16704,7 @@ "@polar/lib-custom-types": "^1.4.0" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/lib/getCluster": { @@ -16645,7 +16712,7 @@ "version": "2.0.0", "license": "EUPL-1.2", "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/lib/getFeatures": { @@ -16656,7 +16723,7 @@ "@polar/lib-custom-types": "^1.5.0" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/lib/idx": { @@ -16669,7 +16736,7 @@ "version": "2.0.0", "license": "EUPL-1.2", "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/lib/passesBoundaryCheck": { @@ -16678,7 +16745,7 @@ "license": "EUPL-1.2", "devDependencies": { "@polar/lib-custom-types": "^1.1.0", - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/lib/testMountParameters": { @@ -16710,9 +16777,9 @@ "@polar/lib-custom-types": "^1.5.0" }, "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16724,7 +16791,7 @@ "devDependencies": { "@polar/lib-custom-types": "^1.5.0", "@polar/lib-test-mount-parameters": "^1.3.0", - "ol": "^9.2.4" + "ol": "^10.3.1" }, "peerDependencies": { "@repositoryname/noop": "^1.0.6", @@ -16742,7 +16809,7 @@ }, "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16773,7 +16840,7 @@ }, "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16798,7 +16865,7 @@ "@polar/lib-tooltip": "^1.0.0" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } }, "packages/plugins/Gfi": { @@ -16817,9 +16884,9 @@ "@polar/lib-tooltip": "^1.0.0" }, "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16847,9 +16914,9 @@ "@polar/lib-test-mount-parameters": "^1.3.0" }, "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16889,7 +16956,7 @@ }, "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } @@ -16903,7 +16970,7 @@ "lodash.mapvalues": "^4.6.0" }, "peerDependencies": { - "ol": "^9.2.4", + "ol": "^10.3.1", "xml2js": "^0.4.23" } }, @@ -16918,7 +16985,7 @@ "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", "i18next": "^23.x", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" } diff --git a/package.json b/package.json index 89d2e1f2..14c561f0 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@actions/github": "^6.0.0", "@babel/core": "^7.24.8", "@babel/preset-env": "^7.24.8", - "@cesium/engine": "^9.2.0", + "@cesium/engine": "^13.0.0", "@jest/types": "^29.3.1", "@nx/js": "^19.8.2", "@playwright/test": "^1.47.2", @@ -73,6 +73,7 @@ "@vue/test-utils": "^1.2.2", "@vue/vue2-jest": "^28.1.0", "babel-core": "^7.0.0-bridge.0", + "cesium": "^1.125.0", "copyfiles": "^2.4.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", @@ -106,6 +107,5 @@ "vite": "^5.4.8", "vite-plugin-commonjs": "^0.6.2", "vue-template-compiler": "^2.7.16" - }, - "dependencies": {} + } } diff --git a/packages/clients/dish/CHANGELOG.md b/packages/clients/dish/CHANGELOG.md index 360c579f..48aee808 100644 --- a/packages/clients/dish/CHANGELOG.md +++ b/packages/clients/dish/CHANGELOG.md @@ -7,7 +7,7 @@ - Fix: Import types `AddressSearchState` and `AddressSearchGetters` from correct position. - Fix: Import enum `SearchResultSymbols` from correct position. - Chore: Change value of `pins.movable` configuration to `'drag'` as using a boolean has been deprecated in a future release. -- Chore: Upgrade `@masterportal/masterportalapi` from `2.8.0` to `2.40.0` and subsequently `ol` from `^7.1.0` to `^9.2.4`. +- Chore: Upgrade `@masterportal/masterportalapi` from `2.8.0` to `2.45.0` and subsequently `ol` from `^7.1.0` to `^10.3.1`. - Chore: Update `@polar`-dependencies to the latest versions. ## 1.1.1 diff --git a/packages/clients/dish/package.json b/packages/clients/dish/package.json index b49363cc..f227e48a 100644 --- a/packages/clients/dish/package.json +++ b/packages/clients/dish/package.json @@ -22,7 +22,7 @@ "dev": "vite --host" }, "devDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@polar/core": "^2.0.0", "@polar/lib-custom-types": "^1.5.0", "@polar/lib-get-features": "^2.0.0", diff --git a/packages/clients/meldemichel/src/polar-client.ts b/packages/clients/meldemichel/src/polar-client.ts index 00a0bfdb..dd0bf2af 100644 --- a/packages/clients/meldemichel/src/polar-client.ts +++ b/packages/clients/meldemichel/src/polar-client.ts @@ -26,7 +26,7 @@ const hideHamburgBorder = (map: Map) => { map .getLayers() .getArray() - .find((layer) => layer.get('id') === hamburgBorder) as Vector + .find((layer) => layer.get('id') === hamburgBorder) as Vector ).setStyle(null) } diff --git a/packages/clients/textLocator/CHANGELOG.md b/packages/clients/textLocator/CHANGELOG.md index 2d13cc6f..82058da6 100644 --- a/packages/clients/textLocator/CHANGELOG.md +++ b/packages/clients/textLocator/CHANGELOG.md @@ -3,6 +3,7 @@ ## unpublished - Chore: Update `@polar`-dependencies to the latest versions. +- Chore: Add missing `ol` peerDependency. ## 1.0.0 diff --git a/packages/clients/textLocator/package.json b/packages/clients/textLocator/package.json index 8a3cc656..d0c0c6f3 100644 --- a/packages/clients/textLocator/package.json +++ b/packages/clients/textLocator/package.json @@ -40,6 +40,9 @@ "js-levenshtein": "^1.1.6", "lodash.debounce": "^4.0.8" }, + "peerDependencies": { + "ol": "^10.3.1" + }, "nx": { "includedScripts": ["build", "dev"] } diff --git a/packages/clients/textLocator/src/plugins/GeometrySearch/utils/vectorDisplay.ts b/packages/clients/textLocator/src/plugins/GeometrySearch/utils/vectorDisplay.ts index b9cb21b7..a64eda9e 100644 --- a/packages/clients/textLocator/src/plugins/GeometrySearch/utils/vectorDisplay.ts +++ b/packages/clients/textLocator/src/plugins/GeometrySearch/utils/vectorDisplay.ts @@ -56,7 +56,8 @@ export const updateVectorLayer = ( ) => { vectorSource.clear() const preparedFeatures = features.map((feature) => { - const olFeature = geoJson.readFeature(feature) + // Since ol@10, readFeature may also return a Feature[]? + const olFeature = geoJson.readFeature(feature) as OlFeature olFeature.set('featureType', getFeatureType(olFeature)) return olFeature }) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index e8cad442..243753ef 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade `@masterportal/masterportalapi` from `2.40.0` to `2.45.0` and subsequently `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.1 - Fix: Add `crossOrigin` differently to layer sources that are an instance of `ImageWMS` as they require it being set as `crossOrigin_` to be recognized. diff --git a/packages/core/package.json b/packages/core/package.json index addb977f..d4f0e0cc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^6.5.2", - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@polar/components": "^2.2.0", "@polar/lib-idx": "^1.0.0", "@polar/lib-get-cluster": "^2.0.0", @@ -39,7 +39,7 @@ "vuex": "^3.6.2" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" }, "devDependencies": { "@polar/lib-custom-types": "^1.4.0" diff --git a/packages/core/src/utils/setupStyling.ts b/packages/core/src/utils/setupStyling.ts index 348457a1..3e7629c5 100644 --- a/packages/core/src/utils/setupStyling.ts +++ b/packages/core/src/utils/setupStyling.ts @@ -36,15 +36,14 @@ export async function setupStyling(mapConfiguration: MapConfig, map: Map) { } const styleObject = styleList.returnStyleObject(layer.get('styleId')) if (styleObject) { - ;(layer as VectorLayer).setStyle( - (feature: Feature | FeatureLike) => - createStyle.createStyle( - styleObject, - feature, - feature.get('features') !== undefined, - // NOTE: This field may be implemented in the future to be able to style points with graphics - '' - ) + ;(layer as VectorLayer).setStyle((feature: Feature | FeatureLike) => + createStyle.createStyle( + styleObject, + feature, + feature.get('features') !== undefined, + // NOTE: This field may be implemented in the future to be able to style points with graphics + '' + ) ) } }) diff --git a/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/index.ts b/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/index.ts index 12bf015b..b85a668f 100644 --- a/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/index.ts +++ b/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/index.ts @@ -102,7 +102,7 @@ export function useExtendedMasterportalapiMarkers( .filter(layerFilter) .forEach((layer) => { // only vector layers reach this - const source = (layer as VectorLayer).getSource() + const source = (layer as VectorLayer).getSource() if (source !== null) { // @ts-expect-error | Undocumented hook. source.geometryFunction = @@ -110,8 +110,8 @@ export function useExtendedMasterportalapiMarkers( (feature: Feature) => isVisible(feature) ? feature.getGeometry() : null } - const originalStyleFunction = (layer as VectorLayer).getStyle() - ;(layer as VectorLayer).setStyle((feature) => { + const originalStyleFunction = (layer as VectorLayer).getStyle() + ;(layer as VectorLayer).setStyle((feature) => { if ( typeof isSelectable === 'undefined' || isSelectable(feature as Feature) diff --git a/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/setLayerId.ts b/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/setLayerId.ts index a3fc7b87..d8f4d097 100644 --- a/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/setLayerId.ts +++ b/packages/core/src/vuePlugins/actions/useExtendedMasterportalapiMarkers/setLayerId.ts @@ -13,7 +13,7 @@ export const setLayerId = (map: Map, feature: Feature): void => { .getArray() .find((layer) => { if (layer instanceof VectorLayer) { - let step: VectorLayer | VectorSource | Cluster = layer + let step: VectorLayer | VectorSource | Cluster = layer while (step instanceof VectorLayer || step instanceof Cluster) { // @ts-expect-error | Clusters in masterportalapi always have a source. step = step.getSource() diff --git a/packages/lib/getCluster/CHANGELOG.md b/packages/lib/getCluster/CHANGELOG.md index b21d6d0e..fcb92dff 100644 --- a/packages/lib/getCluster/CHANGELOG.md +++ b/packages/lib/getCluster/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency of `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/lib/getCluster/package.json b/packages/lib/getCluster/package.json index 30c473d0..dc0cff2d 100644 --- a/packages/lib/getCluster/package.json +++ b/packages/lib/getCluster/package.json @@ -19,6 +19,6 @@ "directory": "packages/lib/getCluster" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } } diff --git a/packages/lib/getFeatures/CHANGELOG.md b/packages/lib/getFeatures/CHANGELOG.md index e2bf36a1..5a8405cf 100644 --- a/packages/lib/getFeatures/CHANGELOG.md +++ b/packages/lib/getFeatures/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency of `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/lib/getFeatures/package.json b/packages/lib/getFeatures/package.json index cd96415d..d7b7ca61 100644 --- a/packages/lib/getFeatures/package.json +++ b/packages/lib/getFeatures/package.json @@ -20,7 +20,7 @@ "directory": "packages/lib/getFeatures" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" }, "devDependencies": { "@polar/lib-custom-types": "^1.5.0" diff --git a/packages/lib/invisibleStyle/CHANGELOG.md b/packages/lib/invisibleStyle/CHANGELOG.md index 7f002cbc..bcde7f26 100644 --- a/packages/lib/invisibleStyle/CHANGELOG.md +++ b/packages/lib/invisibleStyle/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/lib/invisibleStyle/package.json b/packages/lib/invisibleStyle/package.json index 680df54d..af3cfcab 100644 --- a/packages/lib/invisibleStyle/package.json +++ b/packages/lib/invisibleStyle/package.json @@ -20,6 +20,6 @@ "directory": "packages/lib/invisibleStyle" }, "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" } } diff --git a/packages/lib/passesBoundaryCheck/CHANGELOG.md b/packages/lib/passesBoundaryCheck/CHANGELOG.md index 8a100a82..be2f0f5b 100644 --- a/packages/lib/passesBoundaryCheck/CHANGELOG.md +++ b/packages/lib/passesBoundaryCheck/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Chore: Upgrade devDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: `passesBoundaryCheck` now only resolves true or false when the result is indicative of the true-ness of the coordinate being contained within the boundary, and symbols indicative of occurring errors in other scenarios. (Previously: Errors resolved false.) It is now up to using plugins to decide how to respond to errors. diff --git a/packages/lib/passesBoundaryCheck/index.ts b/packages/lib/passesBoundaryCheck/index.ts index a5f69dc4..d1cf2d27 100644 --- a/packages/lib/passesBoundaryCheck/index.ts +++ b/packages/lib/passesBoundaryCheck/index.ts @@ -1,4 +1,4 @@ -import { Feature, Map } from 'ol' +import { Map } from 'ol' import { Coordinate } from 'ol/coordinate' import VectorLayer from 'ol/layer/Vector' import VectorSource from 'ol/source/Vector' @@ -50,9 +50,7 @@ export const passesBoundaryCheck = async ( const boundaryLayer = map .getLayers() .getArray() - .find( - (layer) => layer.get('id') === boundaryLayerId - ) as VectorLayer + .find((layer) => layer.get('id') === boundaryLayerId) as VectorLayer if (!boundaryLayer) { console.error( diff --git a/packages/lib/passesBoundaryCheck/package.json b/packages/lib/passesBoundaryCheck/package.json index 162f1177..b349e26c 100644 --- a/packages/lib/passesBoundaryCheck/package.json +++ b/packages/lib/passesBoundaryCheck/package.json @@ -14,6 +14,6 @@ }, "devDependencies": { "@polar/lib-custom-types": "^1.1.0", - "ol": "^9.2.4" + "ol": "^10.3.1" } } diff --git a/packages/plugins/AddressSearch/CHANGELOG.md b/packages/plugins/AddressSearch/CHANGELOG.md index bc207861..0b22e626 100644 --- a/packages/plugins/AddressSearch/CHANGELOG.md +++ b/packages/plugins/AddressSearch/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade `@masterportal/masterportalapi` from `2.40.0` to `2.45.0` and subsequently `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade `@masterportal/masterportalapi` from `2.8.0` to `2.40.0` and subsequently `ol` from `7.1.0` to `^9.2.4`. diff --git a/packages/plugins/AddressSearch/package.json b/packages/plugins/AddressSearch/package.json index a06a2ebd..461e31ec 100644 --- a/packages/plugins/AddressSearch/package.json +++ b/packages/plugins/AddressSearch/package.json @@ -26,9 +26,9 @@ "CHANGELOG.md" ], "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/Attributions/CHANGELOG.md b/packages/plugins/Attributions/CHANGELOG.md index 164edbff..38a68014 100644 --- a/packages/plugins/Attributions/CHANGELOG.md +++ b/packages/plugins/Attributions/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Chore: Upgrade `ol` from `^9.2.4` to `^10.3.1`. + ## 1.3.0 - Feature: Add new option `'footer'` to configuration parameter `renderType` that changes the attributions to be displayed as a small version of the information box that is always visible. diff --git a/packages/plugins/Attributions/package.json b/packages/plugins/Attributions/package.json index e9cdc451..f387a476 100644 --- a/packages/plugins/Attributions/package.json +++ b/packages/plugins/Attributions/package.json @@ -32,6 +32,6 @@ "devDependencies": { "@polar/lib-custom-types": "^1.5.0", "@polar/lib-test-mount-parameters": "^1.3.0", - "ol": "^9.2.4" + "ol": "^10.3.1" } } diff --git a/packages/plugins/Draw/CHANGELOG.md b/packages/plugins/Draw/CHANGELOG.md index 605bc40e..9d3b19e4 100644 --- a/packages/plugins/Draw/CHANGELOG.md +++ b/packages/plugins/Draw/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/plugins/Draw/package.json b/packages/plugins/Draw/package.json index fc31d2c6..f73c8496 100644 --- a/packages/plugins/Draw/package.json +++ b/packages/plugins/Draw/package.json @@ -25,7 +25,7 @@ ], "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/Draw/src/store/createInteractions/createDeleteInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createDeleteInteractions.ts index 999a754a..409a71b0 100644 --- a/packages/plugins/Draw/src/store/createInteractions/createDeleteInteractions.ts +++ b/packages/plugins/Draw/src/store/createInteractions/createDeleteInteractions.ts @@ -3,11 +3,10 @@ import VectorLayer from 'ol/layer/Vector' import Interaction from 'ol/interaction/Interaction' import { DragBox, Select } from 'ol/interaction' import { platformModifierKeyOnly } from 'ol/events/condition' -import { Feature } from 'ol' export default function ( drawSource: VectorSource, - drawLayer: VectorLayer + drawLayer: VectorLayer ): Interaction[] { const selectInteraction = new Select({ layers: [drawLayer] }) const selectedFeatures = selectInteraction.getFeatures() diff --git a/packages/plugins/Draw/src/types.ts b/packages/plugins/Draw/src/types.ts index 654697c7..167a5660 100644 --- a/packages/plugins/Draw/src/types.ts +++ b/packages/plugins/Draw/src/types.ts @@ -17,7 +17,7 @@ export type Mode = 'none' | 'draw' | 'edit' | 'delete' export interface CreateInteractionsPayload { drawSource: VectorSource - drawLayer: VectorLayer + drawLayer: VectorLayer } export interface DrawState { diff --git a/packages/plugins/Filter/CHANGELOG.md b/packages/plugins/Filter/CHANGELOG.md index ad3afcf3..9e6daa3e 100644 --- a/packages/plugins/Filter/CHANGELOG.md +++ b/packages/plugins/Filter/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/plugins/Filter/package.json b/packages/plugins/Filter/package.json index 64893896..edc3d9a8 100644 --- a/packages/plugins/Filter/package.json +++ b/packages/plugins/Filter/package.json @@ -19,7 +19,7 @@ ], "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/GeoLocation/CHANGELOG.md b/packages/plugins/GeoLocation/CHANGELOG.md index fa646633..0d674fd5 100644 --- a/packages/plugins/GeoLocation/CHANGELOG.md +++ b/packages/plugins/GeoLocation/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 1.4.0 - Feature: Position is now tracked when user is outside of the boundary layer but inside the map extent. diff --git a/packages/plugins/GeoLocation/package.json b/packages/plugins/GeoLocation/package.json index 15f00b71..d5138324 100644 --- a/packages/plugins/GeoLocation/package.json +++ b/packages/plugins/GeoLocation/package.json @@ -24,7 +24,7 @@ "CHANGELOG.md" ], "peerDependencies": { - "ol": "^9.2.4" + "ol": "^10.3.1" }, "devDependencies": { "@polar/lib-passes-boundary-check": "^2.0.0", diff --git a/packages/plugins/GeoLocation/src/types.ts b/packages/plugins/GeoLocation/src/types.ts index 53cd10cd..76f54d89 100644 --- a/packages/plugins/GeoLocation/src/types.ts +++ b/packages/plugins/GeoLocation/src/types.ts @@ -1,7 +1,7 @@ -import Geolocation from 'ol/Geolocation.js' -import VectorLayer from 'ol/layer/Vector' -import Feature from 'ol/Feature' import { GeoLocationConfiguration } from '@polar/lib-custom-types' +import Feature from 'ol/Feature' +import Geolocation from 'ol/Geolocation' +import VectorLayer from 'ol/layer/Vector' export interface GeoLocationState { geolocation: Geolocation | null @@ -17,7 +17,7 @@ export interface GeoLocationGetters extends GeoLocationState { toastAction: string | undefined configuredEpsg: string checkLocationInitially: boolean - geoLocationMarkerLayer: VectorLayer + geoLocationMarkerLayer: VectorLayer keepCentered: boolean markerFeature: Feature renderType: string diff --git a/packages/plugins/Gfi/CHANGELOG.md b/packages/plugins/Gfi/CHANGELOG.md index 6d9c6e85..a1f04bc4 100644 --- a/packages/plugins/Gfi/CHANGELOG.md +++ b/packages/plugins/Gfi/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade `@masterportal/masterportalapi` from `2.40.0` to `2.45.0` and subsequently `ol` from `^9.2.4` to `^10.3.1`. + ## 2.1.0 - Feature: Add new action `setFeatureInformation` to be able to set feature information in the store and trigger all relevant processes so that the information displayed to the user is as if he has selected the features himself. diff --git a/packages/plugins/Gfi/package.json b/packages/plugins/Gfi/package.json index fc6192af..e5fd95c3 100644 --- a/packages/plugins/Gfi/package.json +++ b/packages/plugins/Gfi/package.json @@ -24,9 +24,9 @@ "CHANGELOG.md" ], "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts b/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts index 286e6797..2f6813a6 100644 --- a/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts +++ b/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts @@ -6,8 +6,7 @@ import { MapConfig, PolarActionContext, } from '@polar/lib-custom-types' -import { Map, Feature } from 'ol' -import { Geometry } from 'ol/geom' +import { Map } from 'ol' import VectorLayer from 'ol/layer/Vector' import compare from 'just-compare' import { filterFeatures } from '../../utils/filterFeatures' @@ -125,7 +124,7 @@ const errorSymbol = (err) => Symbol(err) */ // eslint-disable-next-line max-lines-per-function const gfiRequest = - (featureDisplayLayer: VectorLayer>) => + (featureDisplayLayer: VectorLayer) => async ( { commit, @@ -173,6 +172,5 @@ const gfiRequest = ) } -export const debouncedGfiRequest = ( - featureDisplayLayer: VectorLayer> -) => debounce(gfiRequest(featureDisplayLayer), 50) +export const debouncedGfiRequest = (featureDisplayLayer: VectorLayer) => + debounce(gfiRequest(featureDisplayLayer), 50) diff --git a/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts b/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts index 08b9edbb..88b75608 100644 --- a/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts +++ b/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts @@ -26,7 +26,7 @@ function isVectorSource(source): source is Vector { /** * reset feature layer's features. */ -export function clear(featureDisplayLayer: VectorLayer): void { +export function clear(featureDisplayLayer: VectorLayer): void { const source = featureDisplayLayer.getSource() if (isVectorSource(source)) { source.clear() @@ -38,10 +38,11 @@ export function clear(featureDisplayLayer: VectorLayer): void { */ export function addFeature( feature: GeoJsonFeature, - featureDisplayLayer: VectorLayer + featureDisplayLayer: VectorLayer ): void { const source = featureDisplayLayer.getSource() if (isVectorSource(source)) { - source.addFeature(new GeoJSON().readFeature(feature)) + // Since ol@10, readFeature may also return a Feature[]? + source.addFeature(new GeoJSON().readFeature(feature) as Feature) } } diff --git a/packages/plugins/Gfi/src/utils/renderFeatures.ts b/packages/plugins/Gfi/src/utils/renderFeatures.ts index 0f0f8ad4..cba31f8b 100644 --- a/packages/plugins/Gfi/src/utils/renderFeatures.ts +++ b/packages/plugins/Gfi/src/utils/renderFeatures.ts @@ -1,12 +1,10 @@ import VectorLayer from 'ol/layer/Vector' -import { Feature } from 'ol' -import { Geometry } from 'ol/geom' import { FeaturesByLayerId } from '../types' import { addFeature } from './displayFeatureLayer' import { filterFeatures } from './filterFeatures' export function renderFeatures( - featureDisplayLayer: VectorLayer>, + featureDisplayLayer: VectorLayer, geometryLayerKeys: string[], features: FeaturesByLayerId ) { diff --git a/packages/plugins/Gfi/src/utils/requestGfiGeoJson.ts b/packages/plugins/Gfi/src/utils/requestGfiGeoJson.ts index 2ff091bf..9088c7b2 100644 --- a/packages/plugins/Gfi/src/utils/requestGfiGeoJson.ts +++ b/packages/plugins/Gfi/src/utils/requestGfiGeoJson.ts @@ -25,7 +25,7 @@ export default ({ }: { map: Map coordinateOrExtent: [number, number] | [number, number, number, number] - layer: VectorLayer + layer: VectorLayer }): Promise => Promise.resolve( (coordinateOrExtent.length === 2 diff --git a/packages/plugins/LayerChooser/CHANGELOG.md b/packages/plugins/LayerChooser/CHANGELOG.md index c93f8f8d..bb4827c6 100644 --- a/packages/plugins/LayerChooser/CHANGELOG.md +++ b/packages/plugins/LayerChooser/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade `@masterportal/masterportalapi` from `2.40.0` to `2.45.0` and subsequently `ol` from `^9.2.4` to `^10.3.1`. + ## 1.2.1 - Fix: Move relevant documentation of `layers` to `@polar/core`. diff --git a/packages/plugins/LayerChooser/package.json b/packages/plugins/LayerChooser/package.json index 8fd0fae3..21d790c3 100644 --- a/packages/plugins/LayerChooser/package.json +++ b/packages/plugins/LayerChooser/package.json @@ -24,9 +24,9 @@ "CHANGELOG.md" ], "peerDependencies": { - "@masterportal/masterportalapi": "2.40.0", + "@masterportal/masterportalapi": "2.45.0", "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/Pins/CHANGELOG.md b/packages/plugins/Pins/CHANGELOG.md index 1bb54945..61177731 100644 --- a/packages/plugins/Pins/CHANGELOG.md +++ b/packages/plugins/Pins/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/plugins/Pins/package.json b/packages/plugins/Pins/package.json index f5a672c5..1a9e82b9 100644 --- a/packages/plugins/Pins/package.json +++ b/packages/plugins/Pins/package.json @@ -25,7 +25,7 @@ ], "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, diff --git a/packages/plugins/Pins/src/store/index.ts b/packages/plugins/Pins/src/store/index.ts index 6cea4486..e5a6a892 100644 --- a/packages/plugins/Pins/src/store/index.ts +++ b/packages/plugins/Pins/src/store/index.ts @@ -18,7 +18,7 @@ import getters from './getters' // OK for module creation // eslint-disable-next-line max-lines-per-function export const makeStoreModule = () => { - let pinsLayer: VectorLayer> + let pinsLayer: VectorLayer const move = new Select({ layers: (l) => l === pinsLayer, style: null, diff --git a/packages/plugins/ReverseGeocoder/CHANGELOG.md b/packages/plugins/ReverseGeocoder/CHANGELOG.md index 9f039022..88e74700 100644 --- a/packages/plugins/ReverseGeocoder/CHANGELOG.md +++ b/packages/plugins/ReverseGeocoder/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.0 - Breaking: Upgrade peerDependency `ol` from `^7.1.0` to `^9.2.4`. diff --git a/packages/plugins/ReverseGeocoder/package.json b/packages/plugins/ReverseGeocoder/package.json index ebaec4a0..c856460f 100644 --- a/packages/plugins/ReverseGeocoder/package.json +++ b/packages/plugins/ReverseGeocoder/package.json @@ -23,7 +23,7 @@ "CHANGELOG.md" ], "peerDependencies": { - "ol": "^9.2.4", + "ol": "^10.3.1", "xml2js": "^0.4.23" }, "devDependencies": { diff --git a/packages/plugins/Scale/CHANGELOG.md b/packages/plugins/Scale/CHANGELOG.md index d9a34591..18be5802 100644 --- a/packages/plugins/Scale/CHANGELOG.md +++ b/packages/plugins/Scale/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`. + ## 2.0.1 - Fix: Add missing translations for scale switcher. diff --git a/packages/plugins/Scale/package.json b/packages/plugins/Scale/package.json index d331904c..4d324863 100644 --- a/packages/plugins/Scale/package.json +++ b/packages/plugins/Scale/package.json @@ -25,7 +25,7 @@ "peerDependencies": { "@repositoryname/vuex-generators": "^1.1.2", "i18next": "^23.x", - "ol": "^9.2.4", + "ol": "^10.3.1", "vue": "^2.6.14", "vuex": "^3.6.2" }, From 86eb35174f5c6e002db1dfe2522e55bc5da1fae6 Mon Sep 17 00:00:00 2001 From: Pascal Roehling Date: Thu, 30 Jan 2025 16:24:19 +0100 Subject: [PATCH 2/2] Remove unused import --- packages/clients/meldemichel/src/polar-client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clients/meldemichel/src/polar-client.ts b/packages/clients/meldemichel/src/polar-client.ts index dd0bf2af..13f73b9d 100644 --- a/packages/clients/meldemichel/src/polar-client.ts +++ b/packages/clients/meldemichel/src/polar-client.ts @@ -1,7 +1,7 @@ import core, { NineLayoutTag } from '@polar/core' import merge from 'lodash.merge' import { Vector } from 'ol/layer' -import { Feature, Map } from 'ol' +import { Map } from 'ol' import { MapInstance } from '@polar/core/src/types' import packageInfo from '../package.json' import { MODE } from './enums'