IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Geomap: fix scale calculations (#37375)

Browse Source
This commit is contained in:
Ryan McKinley 2021-07-29 14:27:52 -07:00 committed by GitHub
parent bee185b637
commit d269d901fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/app/plugins/panel/geomap/dims/scale.test.ts
View File

@ -1,4 +1,5 @@
import { validateScaleConfig } from './scale';
import { ArrayVector, DataFrame, FieldType } from '@grafana/data';
import { getScaledDimension, validateScaleConfig } from './scale';
describe('scale dimensions', () => {
it('should validate empty input', () => {
@ -35,4 +36,33 @@ describe('scale dimensions', () => {
}
`);
});
it('should support negative min values', () => {
const values = [-20, -10, -5, 0, 5, 10, 20];
const frame: DataFrame = {
name: 'a',
length: values.length,
fields: [
{ name: 'time', type: FieldType.number, values: new ArrayVector(values), config: {} },
{
name: 'hello',
type: FieldType.number,
values: new ArrayVector(values),
config: {
min: -10,
max: 10,
},
},
],
};
const supplier = getScaledDimension(frame, {
min: -1,
max: 1,
field: 'hello',
fixed: 0,
});
const scaled = frame.fields[0].values.toArray().map((k, i) => supplier.get(i));
expect(scaled).toEqual([-1, -1, -0.5, 0, 0.5, 1, 1]);
});
});

5
public/app/plugins/panel/geomap/dims/scale.ts
View File

@ -34,6 +34,11 @@ export function getScaledDimension(frame: DataFrame, config: ScaleDimensionConfi
if (value !== -Infinity) {
percent = (value - info.min!) / info.delta;
}
if (percent > 1) {
percent = 1;
} else if (percent < 0) {
percent = 0;
}
return config.min + percent * delta;
},
field,