More changes to store classes

6 files changed, 18 insertions, 12 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index 9544f21b2..0ed509686 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -35,7 +35,7 @@ Ext.define('Traccar.Application', {
     stores: [
         'Devices',
         'Positions',
-        'LiveData',
+        'LatestPositions',
         'Users',
         'Attributes',
         'MapTypes',
diff --git a/web/app/store/LiveData.js b/web/app/store/LatestPositions.js
index 35731e339..c656bdcb8 100644
--- a/web/app/store/LiveData.js
+++ b/web/app/store/LatestPositions.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-Ext.define('Traccar.store.LiveData', {
+Ext.define('Traccar.store.LatestPositions', {
     extend: 'Ext.data.Store',
     model: 'Traccar.model.Position'
 });
diff --git a/web/app/store/TimeUnits.js b/web/app/store/TimeUnits.js
index 5d96f3b8b..047fd6016 100644
--- a/web/app/store/TimeUnits.js
+++ b/web/app/store/TimeUnits.js
@@ -16,10 +16,16 @@
 
 Ext.define('Traccar.store.TimeUnits', {
     extend: 'Ext.data.Store',
-    fields: ['multiplier', 'name'],
-    data: [
-        {'multiplier': 1, 'name': strings.sharedSecond},
-        {'multiplier': 60, 'name': strings.sharedMinute},
-        {'multiplier': 3600, 'name': strings.sharedHour}
-    ]
+    fields: ['name', 'factor'],
+
+    data: [{
+        name: strings.sharedSecond,
+        factor: 1
+    }, {
+        name: strings.sharedMinute,
+        factor: 60
+    }, {
+        name: strings.sharedHour,
+        factor: 3600
+    }]
 });
diff --git a/web/app/view/command/CommandDialog.js b/web/app/view/command/CommandDialog.js
index e862b9076..8f567a74a 100644
--- a/web/app/view/command/CommandDialog.js
+++ b/web/app/view/command/CommandDialog.js
@@ -56,7 +56,7 @@ Ext.define('Traccar.view.command.CommandDialog', {
                 name: 'unit',
                 store: 'TimeUnits',
                 displayField: 'name',
-                valueField: 'multiplier'
+                valueField: 'factor'
             }]
         }]
     },
diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js
index 0aab71725..b0d8b8f39 100644
--- a/web/app/view/map/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -49,7 +49,7 @@ Ext.define('Traccar.view.map.MapController', {
                 var i;
                 for (i = 0; i < data.length; i++) {
 
-                    var store = Ext.getStore('LiveData');
+                    var store = Ext.getStore('LatestPositions');
 
                     var found = store.query('deviceId', data[i].deviceId);
                     if (found.getCount() > 0) {
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index bc125e529..23ac72db3 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -29,7 +29,7 @@ Ext.define('Traccar.view.state.StateController', {
     },
 
     init: function() {
-        var store = Ext.getStore('LiveData');
+        var store = Ext.getStore('LatestPositions');
         store.on('add', this.add, this);
         store.on('update', this.update, this);
     },
@@ -137,7 +137,7 @@ Ext.define('Traccar.view.state.StateController', {
 
     selectDevice: function(device) {
         this.deviceId = device.get('id');
-        var found = Ext.getStore('LiveData').query('deviceId', this.deviceId);
+        var found = Ext.getStore('LatestPositions').query('deviceId', this.deviceId);
         if (found.getCount() > 0) {
             this.updatePosition(found.first());
         } else {