Optimize formatValue functions

2 files changed, 4 insertions, 22 deletions

diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 189f79bd..e64ce234 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -42,21 +42,12 @@ Ext.define('Traccar.store.DistanceUnits', {
         return back ? value / model.get('factor') : value * model.get('factor');
     },
 
-    formatValue: function (value, unit) {
+    formatValue: function (value, unit, convert) {
         var model;
         if (!unit) {
             unit = 'km';
         }
         model = this.findRecord('key', unit);
-        return value.toFixed(2) + ' ' + model.get('name');
-    },
-
-    convertAndFormat: function (value, unit) {
-        var model;
-        if (!unit) {
-            unit = 'km';
-        }
-        model = this.findRecord('key', unit);
-        return this.convertValue(value, unit).toFixed(2) + ' ' + model.get('name');
+        return (convert ? this.convertValue(value, unit) : value).toFixed(2) + ' ' + model.get('name');
     }
 });
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index fc2e573e..a36be928 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -42,21 +42,12 @@ Ext.define('Traccar.store.SpeedUnits', {
         return back ? value / model.get('factor') : value * model.get('factor');
     },
 
-    formatValue: function (value, unit) {
+    formatValue: function (value, unit, convert) {
         var model;
         if (!unit) {
             unit = 'kn';
         }
         model = this.findRecord('key', unit);
-        return value.toFixed(1) + ' ' + model.get('name');
-    },
-
-    convertAndFormat: function (value, unit) {
-        var model;
-        if (!unit) {
-            unit = 'kn';
-        }
-        model = this.findRecord('key', unit);
-        return this.convertValue(value, unit).toFixed(1) + ' ' + model.get('name');
+        return (convert ? this.convertValue(value, unit) : value).toFixed(1) + ' ' + model.get('name');
     }
 });