From 591466507225d41c3ba3ae677aee5423c05e1aeb Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 7 Sep 2017 17:03:58 +0500
Subject: Fix units migration

---
 web/app/view/CustomNumberField.js | 4 ++--
 web/app/view/edit/Attributes.js   | 4 ++--
 web/app/view/map/BaseMap.js       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/app/view/CustomNumberField.js b/web/app/view/CustomNumberField.js
index e8fe5f7..807bad4 100644
--- a/web/app/view/CustomNumberField.js
+++ b/web/app/view/CustomNumberField.js
@@ -33,7 +33,7 @@ Ext.define('Traccar.view.CustomNumberField', {
                         return Ext.getStore('SpeedUnits');
                     };
                     config.units.getValue = function () {
-                        return Traccar.app.getPreference('speedUnit', 'kn');
+                        return Traccar.app.getAttributePreference('speedUnit', 'kn');
                     };
                     unitName = Ext.getStore('SpeedUnits').findRecord('key', config.units.getValue()).get('name');
                     break;
@@ -43,7 +43,7 @@ Ext.define('Traccar.view.CustomNumberField', {
                         return Ext.getStore('DistanceUnits');
                     };
                     config.units.getValue = function () {
-                        return Traccar.app.getPreference('distanceUnit', 'km');
+                        return Traccar.app.getAttributePreference('distanceUnit', 'km');
                     };
                     unitName = Ext.getStore('DistanceUnits').findRecord('key', config.units.getValue()).get('name');
                     break;
diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js
index a76223b..2dd06be 100644
--- a/web/app/view/edit/Attributes.js
+++ b/web/app/view/edit/Attributes.js
@@ -62,9 +62,9 @@ Ext.define('Traccar.view.edit.Attributes', {
                     attribute = Ext.getStore(this.attributesStore).getById(record.get('name'));
                 }
                 if (attribute && attribute.get('dataType') === 'speed') {
-                    return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn'), true);
+                    return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getAttributePreference('speedUnit', 'kn'), true);
                 } else if (attribute && attribute.get('dataType') === 'distance') {
-                    return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km'), true);
+                    return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getAttributePreference('distanceUnit', 'km'), true);
                 } else {
                     return value;
                 }
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 0559e0c..30ac23e 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -175,7 +175,7 @@ Ext.define('Traccar.view.map.BaseMap', {
             view: this.mapView
         });
 
-        switch (Traccar.app.getPreference('distanceUnit', 'km')) {
+        switch (Traccar.app.getAttributePreference('distanceUnit', 'km')) {
             case 'mi':
                 this.map.addControl(new ol.control.ScaleLine({
                     units: 'us'
-- 
cgit v1.2.3