From 895b4b40eee4af0ee79b0935856ff1c532ebeb94 Mon Sep 17 00:00:00 2001 From: Worty <6840978+Worty@users.noreply.github.com> Date: Fri, 27 Jul 2018 16:26:04 +0200 Subject: [PATCH 1/3] correct volume unit --- public/app/core/specs/kbn.jest.ts | 2 +- public/app/core/utils/kbn.ts | 36 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/public/app/core/specs/kbn.jest.ts b/public/app/core/specs/kbn.jest.ts index 68945068043..9c62990615c 100644 --- a/public/app/core/specs/kbn.jest.ts +++ b/public/app/core/specs/kbn.jest.ts @@ -402,7 +402,7 @@ describe('duration', function() { describe('volume', function() { it('1000m3', function() { var str = kbn.valueFormats['m3'](1000, 1, null); - expect(str).toBe('1000.0 m3'); + expect(str).toBe('1000.0 m³'); }); }); diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts index 4fc4829811f..74ef2a9e874 100644 --- a/public/app/core/utils/kbn.ts +++ b/public/app/core/utils/kbn.ts @@ -572,9 +572,9 @@ kbn.valueFormats.accG = kbn.formatBuilders.fixedUnit('g'); // Volume kbn.valueFormats.litre = kbn.formatBuilders.decimalSIPrefix('L'); kbn.valueFormats.mlitre = kbn.formatBuilders.decimalSIPrefix('L', -1); -kbn.valueFormats.m3 = kbn.formatBuilders.fixedUnit('m3'); -kbn.valueFormats.Nm3 = kbn.formatBuilders.fixedUnit('Nm3'); -kbn.valueFormats.dm3 = kbn.formatBuilders.fixedUnit('dm3'); +kbn.valueFormats.m3 = kbn.formatBuilders.fixedUnit('m³'); +kbn.valueFormats.Nm3 = kbn.formatBuilders.fixedUnit('Nm³'); +kbn.valueFormats.dm3 = kbn.formatBuilders.fixedUnit('dm³'); kbn.valueFormats.gallons = kbn.formatBuilders.fixedUnit('gal'); // Flow @@ -605,14 +605,14 @@ kbn.valueFormats.radsvh = kbn.formatBuilders.decimalSIPrefix('Sv/h'); // Concentration kbn.valueFormats.ppm = kbn.formatBuilders.fixedUnit('ppm'); kbn.valueFormats.conppb = kbn.formatBuilders.fixedUnit('ppb'); -kbn.valueFormats.conngm3 = kbn.formatBuilders.fixedUnit('ng/m3'); -kbn.valueFormats.conngNm3 = kbn.formatBuilders.fixedUnit('ng/Nm3'); -kbn.valueFormats.conμgm3 = kbn.formatBuilders.fixedUnit('μg/m3'); -kbn.valueFormats.conμgNm3 = kbn.formatBuilders.fixedUnit('μg/Nm3'); -kbn.valueFormats.conmgm3 = kbn.formatBuilders.fixedUnit('mg/m3'); -kbn.valueFormats.conmgNm3 = kbn.formatBuilders.fixedUnit('mg/Nm3'); -kbn.valueFormats.congm3 = kbn.formatBuilders.fixedUnit('g/m3'); -kbn.valueFormats.congNm3 = kbn.formatBuilders.fixedUnit('g/Nm3'); +kbn.valueFormats.conngm3 = kbn.formatBuilders.fixedUnit('ng/m³'); +kbn.valueFormats.conngNm3 = kbn.formatBuilders.fixedUnit('ng/Nm³'); +kbn.valueFormats.conμgm3 = kbn.formatBuilders.fixedUnit('μg/m³'); +kbn.valueFormats.conμgNm3 = kbn.formatBuilders.fixedUnit('μg/Nm³'); +kbn.valueFormats.conmgm3 = kbn.formatBuilders.fixedUnit('mg/m³'); +kbn.valueFormats.conmgNm3 = kbn.formatBuilders.fixedUnit('mg/Nm³'); +kbn.valueFormats.congm3 = kbn.formatBuilders.fixedUnit('g/m³'); +kbn.valueFormats.congNm3 = kbn.formatBuilders.fixedUnit('g/Nm³'); // Time kbn.valueFormats.hertz = kbn.formatBuilders.decimalSIPrefix('Hz'); @@ -1119,13 +1119,13 @@ kbn.getUnitFormats = function() { { text: 'parts-per-million (ppm)', value: 'ppm' }, { text: 'parts-per-billion (ppb)', value: 'conppb' }, { text: 'nanogram per cubic metre (ng/m3)', value: 'conngm3' }, - { text: 'nanogram per normal cubic metre (ng/Nm3)', value: 'conngNm3' }, - { text: 'microgram per cubic metre (μg/m3)', value: 'conμgm3' }, - { text: 'microgram per normal cubic metre (μg/Nm3)', value: 'conμgNm3' }, - { text: 'milligram per cubic metre (mg/m3)', value: 'conmgm3' }, - { text: 'milligram per normal cubic metre (mg/Nm3)', value: 'conmgNm3' }, - { text: 'gram per cubic metre (g/m3)', value: 'congm3' }, - { text: 'gram per normal cubic metre (g/Nm3)', value: 'congNm3' }, + { text: 'nanogram per normal cubic metre (ng/Nm³)', value: 'conngNm3' }, + { text: 'microgram per cubic metre (μg/m³)', value: 'conμgm3' }, + { text: 'microgram per normal cubic metre (μg/Nm³)', value: 'conμgNm3' }, + { text: 'milligram per cubic metre (mg/m³)', value: 'conmgm3' }, + { text: 'milligram per normal cubic metre (mg/Nm³)', value: 'conmgNm3' }, + { text: 'gram per cubic metre (g/m³)', value: 'congm3' }, + { text: 'gram per normal cubic metre (g/Nm³)', value: 'congNm3' }, ], }, ]; From 9c0fbe5a0b3c2e334cff6d6bbe2cb4d5ae48a5fd Mon Sep 17 00:00:00 2001 From: Worty <6840978+Worty@users.noreply.github.com> Date: Mon, 30 Jul 2018 16:19:31 +0200 Subject: [PATCH 2/3] fixed that missing one --- public/app/core/utils/kbn.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts index 74ef2a9e874..7bf2cdc5fd6 100644 --- a/public/app/core/utils/kbn.ts +++ b/public/app/core/utils/kbn.ts @@ -1118,7 +1118,7 @@ kbn.getUnitFormats = function() { submenu: [ { text: 'parts-per-million (ppm)', value: 'ppm' }, { text: 'parts-per-billion (ppb)', value: 'conppb' }, - { text: 'nanogram per cubic metre (ng/m3)', value: 'conngm3' }, + { text: 'nanogram per cubic metre (ng/m³)', value: 'conngm3' }, { text: 'nanogram per normal cubic metre (ng/Nm³)', value: 'conngNm3' }, { text: 'microgram per cubic metre (μg/m³)', value: 'conμgm3' }, { text: 'microgram per normal cubic metre (μg/Nm³)', value: 'conμgNm3' }, From 4fa979649cf412c491a1d9d42d1d0062b13ff55d Mon Sep 17 00:00:00 2001 From: Worty <6840978+Worty@users.noreply.github.com> Date: Mon, 30 Jul 2018 16:28:19 +0200 Subject: [PATCH 3/3] also fixed "Watt per square metre" --- public/app/core/utils/kbn.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts index 7bf2cdc5fd6..c2764670b95 100644 --- a/public/app/core/utils/kbn.ts +++ b/public/app/core/utils/kbn.ts @@ -500,7 +500,7 @@ kbn.valueFormats.watt = kbn.formatBuilders.decimalSIPrefix('W'); kbn.valueFormats.kwatt = kbn.formatBuilders.decimalSIPrefix('W', 1); kbn.valueFormats.mwatt = kbn.formatBuilders.decimalSIPrefix('W', -1); kbn.valueFormats.kwattm = kbn.formatBuilders.decimalSIPrefix('W/Min', 1); -kbn.valueFormats.Wm2 = kbn.formatBuilders.fixedUnit('W/m2'); +kbn.valueFormats.Wm2 = kbn.formatBuilders.fixedUnit('W/m²'); kbn.valueFormats.voltamp = kbn.formatBuilders.decimalSIPrefix('VA'); kbn.valueFormats.kvoltamp = kbn.formatBuilders.decimalSIPrefix('VA', 1); kbn.valueFormats.voltampreact = kbn.formatBuilders.decimalSIPrefix('var'); @@ -1021,7 +1021,7 @@ kbn.getUnitFormats = function() { { text: 'Watt (W)', value: 'watt' }, { text: 'Kilowatt (kW)', value: 'kwatt' }, { text: 'Milliwatt (mW)', value: 'mwatt' }, - { text: 'Watt per square metre (W/m2)', value: 'Wm2' }, + { text: 'Watt per square metre (W/m²)', value: 'Wm2' }, { text: 'Volt-ampere (VA)', value: 'voltamp' }, { text: 'Kilovolt-ampere (kVA)', value: 'kvoltamp' }, { text: 'Volt-ampere reactive (var)', value: 'voltampreact' },