IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency ol to v6.13.0 (#45949)

Browse Source 
* Update dependency ol to v6.13.0

* fix types

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
renovate[bot] 2022-03-03 09:45:33 +01:00 committed by GitHub
parent 1255f8a76a
commit 52568c7af1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 41 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -319,7 +319,7 @@
"mousetrap": "1.6.5",
"mousetrap-global-bind": "1.1.0",
"moveable": "0.27.3",
"ol": "6.12.0",
"ol": "6.13.0",
"papaparse": "5.3.1",
"pluralize": "^8.0.0",
"prismjs": "1.27.0",

2
packages/grafana-data/package.json
View File

@ -31,7 +31,7 @@
"marked": "4.0.12",
"moment": "2.29.1",
"moment-timezone": "0.5.34",
"ol": "6.12.0",
"ol": "6.13.0",
"papaparse": "5.3.1",
"react": "17.0.2",
"react-dom": "17.0.2",

2
packages/grafana-ui/package.json
View File

@ -60,7 +60,7 @@
"memoize-one": "6.0.0",
"moment": "2.29.1",
"monaco-editor": "^0.31.1",
"ol": "6.12.0",
"ol": "6.13.0",
"prismjs": "1.27.0",
"rc-cascader": "3.2.1",
"rc-drawer": "4.4.3",

2
public/app/features/geo/format/geojson.ts
View File

@ -47,7 +47,7 @@ export function frameFromGeoJSON(body: Document | Element | Object | string): Da
};
for (let i = 0; i < length; i++) {
const feature = data[i];
geo[i] = feature.getGeometry();
geo[i] = feature.getGeometry()!;
const id = feature.getId();
if (id != null) {

4
public/app/features/geo/utils/frameVectorSource.ts
View File

@ -6,7 +6,7 @@ import { getGeometryField, LocationFieldMatchers } from './location';
export interface FrameVectorSourceOptions {}
export class FrameVectorSource extends VectorSource<Geometry> {
export class FrameVectorSource<T extends Geometry = Geometry> extends VectorSource<T> {
constructor(private location: LocationFieldMatchers) {
super({});
}
@ -24,7 +24,7 @@ export class FrameVectorSource extends VectorSource<Geometry> {
new Feature({
frame,
rowIndex: i,
geometry: info.field.values.get(i),
geometry: info.field.values.get(i) as T,
})
);
}

3
public/app/plugins/panel/geomap/layers/data/heatMap.tsx
View File

@ -12,6 +12,7 @@ import { getLocationMatchers } from 'app/features/geo/utils/location';
import { ScaleDimensionConfig, getScaledDimension } from 'app/features/dimensions';
import { ScaleDimensionEditor } from 'app/features/dimensions/editors';
import { FrameVectorSource } from 'app/features/geo/utils/frameVectorSource';
import { Point } from 'ol/geom';
// Configuration options for Heatmap overlays
export interface HeatmapConfig {
@ -48,7 +49,7 @@ export const heatmapLayer: MapLayerRegistryItem<HeatmapConfig> = {
const config = { ...defaultOptions, ...options.config };
const location = await getLocationMatchers(options.location);
const source = new FrameVectorSource(location);
const source = new FrameVectorSource<Point>(location);
const WEIGHT_KEY = "_weight";
// Create a new Heatmap layer

2
public/app/plugins/panel/geomap/types.ts
View File

@ -2,7 +2,7 @@ import { MapLayerHandler, MapLayerOptions } from '@grafana/data';
import { HideableFieldConfig } from '@grafana/schema';
import { LayerElement } from 'app/core/components/Layers/types';
import BaseLayer from 'ol/layer/Base';
import { Units } from 'ol/proj/Units';
import Units from 'ol/proj/Units';
import { StyleConfig } from './style/types';
import { MapCenterID } from './view';

103
yarn.lock
View File

@ -4035,7 +4035,7 @@ __metadata:
marked: 4.0.12
moment: 2.29.1
moment-timezone: 0.5.34
ol: 6.12.0
ol: 6.13.0
papaparse: 5.3.1
react: 17.0.2
react-dom: 17.0.2
@ -4430,7 +4430,7 @@ __metadata:
mock-raf: 1.0.1
moment: 2.29.1
monaco-editor: ^0.31.1
ol: 6.12.0
ol: 6.13.0
postcss: 8.4.6
postcss-loader: 6.2.1
prismjs: 1.27.0
@ -14634,7 +14634,7 @@ __metadata:
languageName: node
linkType: hard
"callsites@npm:^3.0.0, callsites@npm:^3.1.0":
"callsites@npm:^3.0.0":
version: 3.1.0
resolution: "callsites@npm:3.1.0"
checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
@ -17225,7 +17225,7 @@ __metadata:
languageName: node
linkType: hard
"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1, debug@npm:^4.3.2":
"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2":
version: 4.3.2
resolution: "debug@npm:4.3.2"
dependencies:
@ -18848,13 +18848,6 @@ __metadata:
languageName: node
linkType: hard
"esm@npm:^3.2.25":
version: 3.2.25
resolution: "esm@npm:3.2.25"
checksum: 978aabe2de83541c105605a6d60a26ed8e627ef6bb0a7605fe15a95bbdea6b8348bd045255cb22219c054dd09a81a94823df00843d9e97f42419c92015ce3a64
languageName: node
linkType: hard
"espree@npm:^7.3.0, espree@npm:^7.3.1":
version: 7.3.1
resolution: "espree@npm:7.3.1"
@ -20150,18 +20143,18 @@ __metadata:
languageName: node
linkType: hard
"geotiff@npm:^1.0.8":
version: 1.0.9
resolution: "geotiff@npm:1.0.9"
"geotiff@npm:^2.0.2":
version: 2.0.4
resolution: "geotiff@npm:2.0.4"
dependencies:
"@petamoriken/float16": ^3.4.7
lerc: ^3.0.0
lru-cache: ^6.0.0
pako: ^2.0.4
parse-headers: ^2.0.2
threads: ^1.7.0
web-worker: ^1.2.0
xml-utils: ^1.0.2
checksum: 27eabb360cfd67ef19bed1bfe6562842c64f93fa0d446dfddcd3191b41379a1ff7d4609b9bb792fb257e31a14c5a272a2b7c3033af1a140b6c8eeda466f3255b
checksum: 68d54ea7b9a8965287b20a7c30b5eb9552bd21ed341edfd65dfd424309b7d91fffb2dc474298f23bc2274ed8b34d1792812fa444385bd6000173d706de675169
languageName: node
linkType: hard
@ -20886,7 +20879,7 @@ __metadata:
ngtemplate-loader: 2.1.0
node-notifier: 10.0.1
nodemon: 2.0.15
ol: 6.12.0
ol: 6.13.0
papaparse: 5.3.1
pluralize: ^8.0.0
postcss: 8.4.6
@ -22708,13 +22701,6 @@ __metadata:
languageName: node
linkType: hard
"is-observable@npm:^2.1.0":
version: 2.1.0
resolution: "is-observable@npm:2.1.0"
checksum: 93b0e0f9b115ef4b5f0523f4930667a7809a42e9cf1b23a444f8a9c15f72b9c1729b2a4691d55a5c479a05eafd5dda9b51ed1b65336d56027b7989ecb8ef51bf
languageName: node
linkType: hard
"is-path-cwd@npm:^2.2.0":
version: 2.2.0
resolution: "is-path-cwd@npm:2.2.0"
@ -25693,10 +25679,10 @@ __metadata:
languageName: node
linkType: hard
"mapbox-to-css-font@npm:^2.4.0":
version: 2.4.0
resolution: "mapbox-to-css-font@npm:2.4.0"
checksum: 155786e940aa4fa6706ff5393b4cb86856ecb7f119fd4b51d77ff736c7e9a81cb4f7d2833cf1ee727ebc211dd9e7e980aa4edf470dde8972bcc8ed8f62a74b8d
"mapbox-to-css-font@npm:^2.4.1":
version: 2.4.1
resolution: "mapbox-to-css-font@npm:2.4.1"
checksum: db9e9003d8514286f58793a746bb2477d4f29547ccce17a7bdef34d3ed73f1d670cbb2956cb899e5bcda90564b508de485f7bcbbded908a22ab70482dfe49ed0
languageName: node
linkType: hard
@ -27412,13 +27398,6 @@ __metadata:
languageName: node
linkType: hard
"observable-fns@npm:^0.6.1":
version: 0.6.1
resolution: "observable-fns@npm:0.6.1"
checksum: b575f23f90c6129a8bead1d5001dbae2d83c6d01724a4790ec8f1c7f2db352440c87eae2ffb562117cb58b4a68b4503ab3a7017a77025916993ad710cd0efdd9
languageName: node
linkType: hard
"obuf@npm:^1.0.0, obuf@npm:^1.1.2":
version: 1.1.2
resolution: "obuf@npm:1.1.2"
@ -27426,26 +27405,26 @@ __metadata:
languageName: node
linkType: hard
"ol-mapbox-style@npm:^6.8.2":
version: 6.8.2
resolution: "ol-mapbox-style@npm:6.8.2"
"ol-mapbox-style@npm:^7.0.0":
version: 7.0.0
resolution: "ol-mapbox-style@npm:7.0.0"
dependencies:
"@mapbox/mapbox-gl-style-spec": ^13.20.1
mapbox-to-css-font: ^2.4.0
mapbox-to-css-font: ^2.4.1
webfont-matcher: ^1.1.0
checksum: b7b6f631870dd0e78d217edda52eecb6b8b15cb1120ea8ed14376fa17f231ac39412346c4f9b417badc772161a70d06a6b65deaf00a7db4adcab466c1df8d081
checksum: a18b0049850845fb35b69fee6ec95c45c7d7b78a212174f819a88aacf2012666f33d98fd9cb1a21e41eb085309b2b94fa8801bd99ed56e52d2d53dc2dfa59009
languageName: node
linkType: hard
"ol@npm:6.12.0":
version: 6.12.0
resolution: "ol@npm:6.12.0"
"ol@npm:6.13.0":
version: 6.13.0
resolution: "ol@npm:6.13.0"
dependencies:
geotiff: ^1.0.8
ol-mapbox-style: ^6.8.2
geotiff: ^2.0.2
ol-mapbox-style: ^7.0.0
pbf: 3.2.1
rbush: ^3.0.1
checksum: a0eb5766bda485acd59c95e835e87d214c501310474e22003f4ef9ea600bf005abb43f0f33aa3d4939d2c84748bd40a5c4168c31551e5266c208aeff8eb576dc
checksum: 1655d87a47338bcc42ff011b516804759d9c8be0c1bc0d732092792bf53c64f8f5f2998004016771f085b44fef238f3508e95364b7a3ef3ba8d8cae8b6207953
languageName: node
linkType: hard
@ -34863,22 +34842,6 @@ __metadata:
languageName: node
linkType: hard
"threads@npm:^1.7.0":
version: 1.7.0
resolution: "threads@npm:1.7.0"
dependencies:
callsites: ^3.1.0
debug: ^4.2.0
is-observable: ^2.1.0
observable-fns: ^0.6.1
tiny-worker: ">= 2"
dependenciesMeta:
tiny-worker:
optional: true
checksum: 253574bc5c70d0663756d74c7a438ced64f9c6746ff550abea18b11919a24cc6b1be3322b4d0bdb8c6077e52774eb65f49549bb9deec24e693f149470c316ee1
languageName: node
linkType: hard
"throat@npm:^5.0.0":
version: 5.0.0
resolution: "throat@npm:5.0.0"
@ -34977,15 +34940,6 @@ __metadata:
languageName: node
linkType: hard
"tiny-worker@npm:>= 2":
version: 2.3.0
resolution: "tiny-worker@npm:2.3.0"
dependencies:
esm: ^3.2.25
checksum: 33492c9b0623e064dd39bc64d61e7031a3ba146ed1d6de179c3f8c2e3b965061e204e602c0b019fa363ccca1e6939fc2e8d03c4ad070450cc491d47cd5382409
languageName: node
linkType: hard
"tinycolor2@npm:1.4.2":
version: 1.4.2
resolution: "tinycolor2@npm:1.4.2"
@ -36683,6 +36637,13 @@ __metadata:
languageName: node
linkType: hard
"web-worker@npm:^1.2.0":
version: 1.2.0
resolution: "web-worker@npm:1.2.0"
checksum: 1bb28348ddcf9b2e7c62c5fd02e49a84098795856cd905456de957271bba288e9618941cf69d8960f0a7ae81f5dfb74b427c0634be47ec69e3e955c4ec5213be
languageName: node
linkType: hard
"webfont-matcher@npm:^1.1.0":
version: 1.1.0
resolution: "webfont-matcher@npm:1.1.0"