From a1c1704d1f863d8c7b1ae4a295cffd9553393316 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 31 Oct 2017 14:57:57 +0100
Subject: [PATCH] Adding energy, area, and acceleration units (#9336)

* Adding more units

* move changes to kbn.ts

* remove accidental commits
---
 public/app/core/utils/kbn.ts | 44 ++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index f1c44cfae0e..baadb604685 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -475,6 +475,7 @@ kbn.valueFormats.wpm = kbn.formatBuilders.simpleCountUnit('wpm');
 // Energy
 kbn.valueFormats.watt = kbn.formatBuilders.decimalSIPrefix('W');
 kbn.valueFormats.kwatt = kbn.formatBuilders.decimalSIPrefix('W', 1);
+kbn.valueFormats.kwattm = kbn.formatBuilders.decimalSIPrefix('W/Min', 1);
 kbn.valueFormats.voltamp = kbn.formatBuilders.decimalSIPrefix('VA');
 kbn.valueFormats.kvoltamp = kbn.formatBuilders.decimalSIPrefix('VA', 1);
 kbn.valueFormats.voltampreact = kbn.formatBuilders.decimalSIPrefix('var');
@@ -488,6 +489,7 @@ kbn.valueFormats.kamp = kbn.formatBuilders.decimalSIPrefix('A', 1);
 kbn.valueFormats.volt = kbn.formatBuilders.decimalSIPrefix('V');
 kbn.valueFormats.kvolt = kbn.formatBuilders.decimalSIPrefix('V', 1);
 kbn.valueFormats.dBm = kbn.formatBuilders.decimalSIPrefix('dBm');
+kbn.valueFormats.ohm = kbn.formatBuilders.decimalSIPrefix('Ω');
 
 // Temperature
 kbn.valueFormats.celsius = kbn.formatBuilders.fixedUnit('°C');
@@ -514,6 +516,12 @@ kbn.valueFormats.lengthm = kbn.formatBuilders.decimalSIPrefix('m');
 kbn.valueFormats.lengthmm = kbn.formatBuilders.decimalSIPrefix('m', -1);
 kbn.valueFormats.lengthkm = kbn.formatBuilders.decimalSIPrefix('m', 1);
 kbn.valueFormats.lengthmi = kbn.formatBuilders.fixedUnit('mi');
+kbn.valueFormats.lengthft = kbn.formatBuilders.fixedUnit('ft');
+
+// Area
+kbn.valueFormats.areaM2 = kbn.formatBuilders.fixedUnit('m²');
+kbn.valueFormats.areaF2 = kbn.formatBuilders.fixedUnit('ft²');
+kbn.valueFormats.areaMI2 = kbn.formatBuilders.fixedUnit('mi²');
 
 // Mass
 kbn.valueFormats.massmg = kbn.formatBuilders.decimalSIPrefix('g', -1);
@@ -527,6 +535,11 @@ kbn.valueFormats.velocitykmh = kbn.formatBuilders.fixedUnit('km/h');
 kbn.valueFormats.velocitymph = kbn.formatBuilders.fixedUnit('mph');
 kbn.valueFormats.velocityknot = kbn.formatBuilders.fixedUnit('kn');
 
+// Acceleration
+kbn.valueFormats.accMS2 = kbn.formatBuilders.fixedUnit('m/sec²');
+kbn.valueFormats.accFS2 = kbn.formatBuilders.fixedUnit('f/sec²');
+kbn.valueFormats.accG   = kbn.formatBuilders.fixedUnit('g');
+
 // Volume
 kbn.valueFormats.litre = kbn.formatBuilders.decimalSIPrefix('L');
 kbn.valueFormats.mlitre = kbn.formatBuilders.decimalSIPrefix('L', -1);
@@ -540,6 +553,11 @@ kbn.valueFormats.flowcms = kbn.formatBuilders.fixedUnit('cms');
 kbn.valueFormats.flowcfs = kbn.formatBuilders.fixedUnit('cfs');
 kbn.valueFormats.flowcfm = kbn.formatBuilders.fixedUnit('cfm');
 
+// Angle
+kbn.valueFormats.degree  = kbn.formatBuilders.fixedUnit('°');
+kbn.valueFormats.radian  = kbn.formatBuilders.fixedUnit('rad');
+kbn.valueFormats.grad    = kbn.formatBuilders.fixedUnit('grad');
+
 // Time
 kbn.valueFormats.hertz = kbn.formatBuilders.decimalSIPrefix('Hz');
 
@@ -877,6 +895,14 @@ kbn.getUnitFormats = function() {
         { text: 'mile (mi)', value: 'lengthmi' },
       ],
     },
+    {
+      text: 'area',
+      submenu: [
+        {text: 'Square Meters (m²)', value: 'areaM2' },
+        {text: 'Square Feet (ft²)',  value: 'areaF2' },
+        {text: 'Square Miles (mi²)', value: 'areaMI2'},
+      ]
+    },
     {
       text: 'mass',
       submenu: [
@@ -916,6 +942,7 @@ kbn.getUnitFormats = function() {
         { text: 'kilovolt-ampere reactive (kvar)', value: 'kvoltampreact' },
         { text: 'watt-hour (Wh)', value: 'watth' },
         { text: 'kilowatt-hour (kWh)', value: 'kwatth' },
+        { text: 'kilowatt-min (kWm)', value: 'kwattm' },
         { text: 'joule (J)', value: 'joule' },
         { text: 'electron volt (eV)', value: 'ev' },
         { text: 'Ampere (A)', value: 'amp' },
@@ -923,6 +950,7 @@ kbn.getUnitFormats = function() {
         { text: 'Volt (V)', value: 'volt' },
         { text: 'Kilovolt (kV)', value: 'kvolt' },
         { text: 'Decibel-milliwatt (dBm)', value: 'dBm' },
+        { text: 'Ohm (Ω)', value: 'ohm' }
       ],
     },
     {
@@ -962,6 +990,22 @@ kbn.getUnitFormats = function() {
         { text: 'Cubic feet/min (cfm)', value: 'flowcfm' },
       ],
     },
+    {
+      text: 'angle',
+      submenu: [
+        { text: 'Degrees (°)', value: 'degree' },
+        { text: 'Radians', value: 'radian' },
+        { text: 'Gradian', value: 'grad' }
+      ]
+    },
+    {
+      text: 'acceleration',
+      submenu: [
+        { text: 'Meters/sec²', value: 'accMS2' },
+        { text: 'Feet/sec²',  value: 'accFS2' },
+        { text: 'G unit',  value: 'accG' }
+      ]
+    }
   ];
 };