public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Geomap: Upgrade Open Layers (#107598)

Browse Source 
* Geomap: Upgrade Open Layers

* Fix TypeScript errors

* Fix possibly null errors

* Fix pointer events

* Simplify webgl implementation for markers

* Improve types

* Fix offset expression

* Improve layers types

* Improve types for tooltip

* Improve types for frameVectorSource

* For regular shapes convert size to radius

* Update import format for new version of ol

* Fix ESM syntax errors

* Fix more e2e stuff

* Fix tooltip test

* Simplify redundant keys
This commit is contained in:
Drew Slobodnjak
2025-07-15 17:04:41 -07:00
committed by GitHub
parent b691b3288d
commit 1143cf130e
36 changed files with 332 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+49 -133
View File
@@ -3094,7 +3094,7 @@ __metadata:
marked-mangle: "npm:1.1.11"
moment: "npm:2.30.1"
moment-timezone: "npm:0.5.47"
ol: "npm:7.4.0"
ol: "npm:10.6.0"
papaparse: "npm:5.5.3"
react: "npm:18.3.1"
react-dom: "npm:18.3.1"
@@ -3771,7 +3771,7 @@ __metadata:
monaco-editor: "npm:0.34.1"
msw: "npm:^2.10.2"
msw-storybook-addon: "npm:^2.0.5"
ol: "npm:7.4.0"
ol: "npm:10.6.0"
prismjs: "npm:1.30.0"
process: "npm:^0.11.10"
rc-cascader: "npm:3.34.0"
@@ -5010,48 +5010,6 @@ __metadata:
languageName: node
linkType: hard
"@mapbox/jsonlint-lines-primitives@github:mapbox/jsonlint#commit=e31b7289baedf3e1000d7ae7edd42268212c9954":
version: 2.0.2
resolution: "@mapbox/jsonlint-lines-primitives@https://github.com/mapbox/jsonlint.git#commit=e31b7289baedf3e1000d7ae7edd42268212c9954"
checksum: 10/660bd93beac97f0f4bdcfbbded3282efaf2ab4debb99da55f7fb7b27250e0dfa7dd572a9040802fdc008c71d0bb5ff7e565a7426177fda6c3d17e9bf1598bbaf
languageName: node
linkType: hard
"@mapbox/mapbox-gl-style-spec@npm:^13.23.1":
version: 13.25.0
resolution: "@mapbox/mapbox-gl-style-spec@npm:13.25.0"
dependencies:
"@mapbox/jsonlint-lines-primitives": "npm:~2.0.2"
"@mapbox/point-geometry": "npm:^0.1.0"
"@mapbox/unitbezier": "npm:^0.0.0"
csscolorparser: "npm:~1.0.2"
json-stringify-pretty-compact: "npm:^2.0.0"
minimist: "npm:^1.2.5"
rw: "npm:^1.3.3"
sort-object: "npm:^0.3.2"
bin:
gl-style-composite: bin/gl-style-composite.js
gl-style-format: bin/gl-style-format.js
gl-style-migrate: bin/gl-style-migrate.js
gl-style-validate: bin/gl-style-validate.js
checksum: 10/cabd9629bde72fe961f9a9d957534f75eb74bddb10068bf7b43fa73868eeb857a31196a12dc2a4532ab732bc7d38392e9bd4582fa9021ef9a5c3465e964201d2
languageName: node
linkType: hard
"@mapbox/point-geometry@npm:^0.1.0":
version: 0.1.0
resolution: "@mapbox/point-geometry@npm:0.1.0"
checksum: 10/f6f78ac8a7f798efb19db6eb1a9e05da7ba942102f5347c1a673d94202d0c606ec3f522efa3e76d583cdca46fb96dde52c3d37234f162d21df42f9e8c4f182bd
languageName: node
linkType: hard
"@mapbox/unitbezier@npm:^0.0.0":
version: 0.0.0
resolution: "@mapbox/unitbezier@npm:0.0.0"
checksum: 10/211fc5b0a40fafa0127baf87938a6a00535b22b51bec95df2f6141cf1dd50339bca2a9729c7a9803cdee5c2b4e0e3323a882655c74f1a86e557096684196e1ff
languageName: node
linkType: hard
"@mdx-js/react@npm:^3.0.0":
version: 3.0.1
resolution: "@mdx-js/react@npm:3.0.1"
@@ -9867,6 +9825,13 @@ __metadata:
languageName: node
linkType: hard
"@types/rbush@npm:4.0.0":
version: 4.0.0
resolution: "@types/rbush@npm:4.0.0"
checksum: 10/ee37c7fa322a83af4e754180022253b7e2bbbb853c9a6d8ffce1ea1e59bbb0eef3a347e2f37934bb1afa4d40ea2ea44409d7cee751cb8ac8dbded13dc9160a64
languageName: node
linkType: hard
"@types/react-color@npm:3.0.13":
version: 3.0.13
resolution: "@types/react-color@npm:3.0.13"
@@ -14083,13 +14048,6 @@ __metadata:
languageName: node
linkType: hard
"csscolorparser@npm:~1.0.2":
version: 1.0.3
resolution: "csscolorparser@npm:1.0.3"
checksum: 10/b46b9032eaace69e5bb151bb64473547d8e48813b45395c1923cde1c87674bbd030c99536f44373e092de6afdca1a8134933a1503e779aaeb703b7c7897f5eca
languageName: node
linkType: hard
"cssesc@npm:^3.0.0":
version: 3.0.0
resolution: "cssesc@npm:3.0.0"
@@ -15357,10 +15315,10 @@ __metadata:
languageName: node
linkType: hard
"earcut@npm:^2.2.3":
version: 2.2.4
resolution: "earcut@npm:2.2.4"
checksum: 10/ca8b24714cc2fa67f98fbca6ddcf64bb42ee8d75d0b4f1a81486b3282b0f7f1bf9ec49ad4d02149985886a0c8a03a173463f2acb1f51fa0bb7ba2e1d4aa1254d
"earcut@npm:^3.0.0":
version: 3.0.1
resolution: "earcut@npm:3.0.1"
checksum: 10/92786b5a35276a099eb2545bd7183e31a8ddd34f0d24d26eb26a280bcf7d35dcf5a01cd8712343bfbe504849229d01ff4771aa4ed0d8d900083afaa01d732b5c
languageName: node
linkType: hard
@@ -17582,9 +17540,9 @@ __metadata:
languageName: node
linkType: hard
"geotiff@npm:^2.0.7":
version: 2.0.7
resolution: "geotiff@npm:2.0.7"
"geotiff@npm:^2.1.3":
version: 2.1.3
resolution: "geotiff@npm:2.1.3"
dependencies:
"@petamoriken/float16": "npm:^3.4.7"
lerc: "npm:^3.0.0"
@@ -17593,7 +17551,8 @@ __metadata:
quick-lru: "npm:^6.1.1"
web-worker: "npm:^1.2.0"
xml-utils: "npm:^1.0.2"
checksum: 10/7d309ef9e7fee0aef39117ef045cf35d30be91621e0df643cd86d363519907706bdc6e0f6f4dc2ebcc0ce085eab18fd5801aca9c162606cdd293c7b616070d1a
zstddec: "npm:^0.1.0"
checksum: 10/91475680b882c11e6c28b4538c8703da03a13fa1b3f8f9d456aa3b274cb71fb01f04aadb29006c3a607c20b724b936a95899ad8ef65d26a11eed59ba9f81c61f
languageName: node
linkType: hard
@@ -18376,7 +18335,7 @@ __metadata:
node-forge: "npm:^1.3.1"
node-notifier: "npm:10.0.1"
nx: "npm:20.7.1"
ol: "npm:7.4.0"
ol: "npm:10.6.0"
ol-ext: "npm:4.0.33"
openapi-types: "npm:^12.1.3"
pa11y-ci: "npm:^3.1.0"
@@ -19304,7 +19263,7 @@ __metadata:
languageName: node
linkType: hard
"ieee754@npm:^1.1.12, ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
version: 1.2.1
resolution: "ieee754@npm:1.2.1"
checksum: 10/d9f2557a59036f16c282aaeb107832dc957a93d73397d89bbad4eb1130560560eb695060145e8e6b3b498b15ab95510226649a0b8f52ae06583575419fe10fc4
@@ -21347,13 +21306,6 @@ __metadata:
languageName: node
linkType: hard
"json-stringify-pretty-compact@npm:^2.0.0":
version: 2.0.0
resolution: "json-stringify-pretty-compact@npm:2.0.0"
checksum: 10/08f2725eef0a37bfd554aaa1ce551bc973e13f2c3dc86dd40b10ae6c08b3851b84946db672877e994e1fd1d904a578941c176609864e4f1a48b6d8f51fc2ac5f
languageName: node
linkType: hard
"json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1":
version: 5.0.1
resolution: "json-stringify-safe@npm:5.0.1"
@@ -22413,13 +22365,6 @@ __metadata:
languageName: node
linkType: hard
"mapbox-to-css-font@npm:^2.4.1":
version: 2.4.1
resolution: "mapbox-to-css-font@npm:2.4.1"
checksum: 10/224fc0f39a2f546bbe5b69a67a4e8c54928606cac44490650ee711723747edb393b4936c0005bcc72cb12f70b31fab50078a65e3e27e0f3e7d65f1ab8a3a253b
languageName: node
linkType: hard
"marked-mangle@npm:1.1.11":
version: 1.1.11
resolution: "marked-mangle@npm:1.1.11"
@@ -24164,27 +24109,16 @@ __metadata:
languageName: node
linkType: hard
"ol-mapbox-style@npm:^10.1.0":
"ol@npm:10.6.0":
version: 10.6.0
resolution: "ol-mapbox-style@npm:10.6.0"
resolution: "ol@npm:10.6.0"
dependencies:
"@mapbox/mapbox-gl-style-spec": "npm:^13.23.1"
mapbox-to-css-font: "npm:^2.4.1"
ol: "npm:^7.3.0"
checksum: 10/069421f5260b6d7b02e6f753eef5e9e10d3a86df8fe425aab1317b5e3d75684709b4b506e4c47e9840abeb503066c64a73dd29ec4a1cf65a8cbc484e91c70bfb
languageName: node
linkType: hard
"ol@npm:7.4.0, ol@npm:^7.3.0":
version: 7.4.0
resolution: "ol@npm:7.4.0"
dependencies:
earcut: "npm:^2.2.3"
geotiff: "npm:^2.0.7"
ol-mapbox-style: "npm:^10.1.0"
pbf: "npm:3.2.1"
rbush: "npm:^3.0.1"
checksum: 10/c83698fddd02fdd497e92bffee7ca7d4059f64d28a0be7a7781981f129b6636cacbee894aed331a572f066fe1e56a4cf22861c51e1efddb7fbb58c4bf5606ece
"@types/rbush": "npm:4.0.0"
earcut: "npm:^3.0.0"
geotiff: "npm:^2.1.3"
pbf: "npm:4.0.1"
rbush: "npm:^4.0.0"
checksum: 10/942fe6c0b55b24a6b1538d78ad221962476bfcba5b1316f427235d50aa817ca5ed805e8d3b5c6129b5da245ba0b66cd8bf359403230bb939648a1a78bffb0ca3
languageName: node
linkType: hard
@@ -25090,15 +25024,14 @@ __metadata:
languageName: node
linkType: hard
"pbf@npm:3.2.1":
version: 3.2.1
resolution: "pbf@npm:3.2.1"
"pbf@npm:4.0.1":
version: 4.0.1
resolution: "pbf@npm:4.0.1"
dependencies:
ieee754: "npm:^1.1.12"
resolve-protobuf-schema: "npm:^2.1.0"
bin:
pbf: bin/pbf
checksum: 10/566a64424063b07f46d3e2cb2288094a60b0a45efea48fd4030f527143b0e9c611399ebd3a6fd56db51908f2006defef5e09a1b2a027db9481a59a41156a540c
checksum: 10/9e2821fec1511cdaacf205c1279a33991119a2b8469208071d22e6204162dc8a4d216f647ce92759601e3d685fa913d4739278a86aa9ac126d04a1a3ac66bf12
languageName: node
linkType: hard
@@ -26222,10 +26155,10 @@ __metadata:
languageName: node
linkType: hard
"quickselect@npm:^2.0.0":
version: 2.0.0
resolution: "quickselect@npm:2.0.0"
checksum: 10/ed2e78431050d223fb75da20ee98011aef1a03f7cb04e1a32ee893402e640be3cfb76d72e9dbe01edf3bb457ff6a62e5c2d85748424d1aa531f6ba50daef098c
"quickselect@npm:^3.0.0":
version: 3.0.0
resolution: "quickselect@npm:3.0.0"
checksum: 10/8f72bedb8bb14bce5c3767c55f567bc296fa3ca9d98ba385e3867e434463bc633feee1eddf3dfec17914b7e88feeb08c7b313cf47114a8ff11bf964f77f51cfc
languageName: node
linkType: hard
@@ -26321,12 +26254,12 @@ __metadata:
languageName: node
linkType: hard
"rbush@npm:^3.0.1":
version: 3.0.1
resolution: "rbush@npm:3.0.1"
"rbush@npm:^4.0.0":
version: 4.0.1
resolution: "rbush@npm:4.0.1"
dependencies:
quickselect: "npm:^2.0.0"
checksum: 10/489e2e7d9889888ad533518f194e3ab7cc19b1f1365a38ee99fbdda542a47f41cda7dc89870180050f4d04ea402e9ff294e1d767d03c0f1694e0028b7609eec9
quickselect: "npm:^3.0.0"
checksum: 10/8db2f9b464ee31cbb13237e762140c27f4de517a470d1639f840cc606b1f917f64f6273178b2f07c93d95c44cc068cc0c25c84ad40c4a483404e60d17c054eec
languageName: node
linkType: hard
@@ -28334,7 +28267,7 @@ __metadata:
languageName: node
linkType: hard
"rw@npm:1, rw@npm:^1.3.3":
"rw@npm:1":
version: 1.3.3
resolution: "rw@npm:1.3.3"
checksum: 10/e90985d64777a00f4ab5f8c0bfea2fb5645c6bda5238840afa339c8a4f86f776e8ce83731155643a7425a0b27ce89077dab27b2f57519996ba4d2fe54cac1941
@@ -29335,20 +29268,6 @@ __metadata:
languageName: node
linkType: hard
"sort-asc@npm:^0.1.0":
version: 0.1.0
resolution: "sort-asc@npm:0.1.0"
checksum: 10/c130223336a9431edd4c12cf0a4893eb9327591f8c9d9ccd1b27a42f7657b4bb84807d7150d79fc52ab7d1e9691684897de7ef2a6a3516d32349af68d2705d57
languageName: node
linkType: hard
"sort-desc@npm:^0.1.1":
version: 0.1.1
resolution: "sort-desc@npm:0.1.1"
checksum: 10/f2a2568f4eaf9a7315700ae9e46e74ae7b395f24323bf807f07b20269a7c162b549b0bac6d5bb8e26f7ee15af72a74fdaf09d47257227dbe31c4ac8f13b19e1d
languageName: node
linkType: hard
"sort-keys@npm:^2.0.0":
version: 2.0.0
resolution: "sort-keys@npm:2.0.0"
@@ -29367,16 +29286,6 @@ __metadata:
languageName: node
linkType: hard
"sort-object@npm:^0.3.2":
version: 0.3.2
resolution: "sort-object@npm:0.3.2"
dependencies:
sort-asc: "npm:^0.1.0"
sort-desc: "npm:^0.1.1"
checksum: 10/701fac8b49e9c720f4e5f4b70e995a795771dbecab2368b2e362c5c02cc269418a061f3303c47137d22fc3fe1ded03b4fd4215edec0960c4721274d320dae2b4
languageName: node
linkType: hard
"source-list-map@npm:^2.0.0, source-list-map@npm:^2.0.1":
version: 2.0.1
resolution: "source-list-map@npm:2.0.1"
@@ -33037,3 +32946,10 @@ __metadata:
checksum: 10/0e35432dcca7f053e63f5dd491a87c78abe0d981817547252c3b6d05f0f58788695d1a69724759c6501dff3fd62929be24c9f314a3625179bee889150f7a61fa
languageName: node
linkType: hard
"zstddec@npm:^0.1.0":
version: 0.1.0
resolution: "zstddec@npm:0.1.0"
checksum: 10/818d7a7b910509bed32a5ae42352dc45e87e4ee8470c27352859824540efceb9643864afbbb93564beb76822d72a946a6ee7cfbf01627ee34a1cd9656f2857b8
languageName: node
linkType: hard