From 60fe1537206e2286423a7bc1ed5591b1f9c7a1d7 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 30 Nov 2016 11:23:46 +0500
Subject: Revert one check, remove another.

---
 web/app/view/MapMarkerController.js | 34 ++++++++++++++++++----------------
 web/app/view/ReportController.js    | 10 ++++------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'web/app/view')

diff --git a/web/app/view/MapMarkerController.js b/web/app/view/MapMarkerController.js
index bda206ec..97e75925 100644
--- a/web/app/view/MapMarkerController.js
+++ b/web/app/view/MapMarkerController.js
@@ -202,24 +202,26 @@ Ext.define('Traccar.view.MapMarkerController', {
 
         this.addReportMarkers(store, data);
 
-        this.reportRoute = [];
-        for (i = 0; i < data.length; i++) {
-            position = data[i];
-            point = ol.proj.fromLonLat([
-                position.get('longitude'),
-                position.get('latitude')
-            ]);
-            if (i === 0 || data[i].get('deviceId') !== data[i - 1].get('deviceId')) {
-                this.reportRoute.push(new ol.Feature({
-                    geometry: new ol.geom.LineString([])
-                }));
-                this.reportRoute[this.reportRoute.length - 1].setStyle(this.getRouteStyle(data[i].get('deviceId')));
-                this.getView().getRouteSource().addFeature(this.reportRoute[this.reportRoute.length - 1]);
+        if (data.length > 0) {
+            this.reportRoute = [];
+            for (i = 0; i < data.length; i++) {
+                position = data[i];
+                point = ol.proj.fromLonLat([
+                    position.get('longitude'),
+                    position.get('latitude')
+                ]);
+                if (i === 0 || data[i].get('deviceId') !== data[i - 1].get('deviceId')) {
+                    this.reportRoute.push(new ol.Feature({
+                        geometry: new ol.geom.LineString([])
+                    }));
+                    this.reportRoute[this.reportRoute.length - 1].setStyle(this.getRouteStyle(data[i].get('deviceId')));
+                    this.getView().getRouteSource().addFeature(this.reportRoute[this.reportRoute.length - 1]);
+                }
+                this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point);
             }
-            this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point);
-        }
 
-        this.getView().getMapView().fit(this.reportRoute[0].getGeometry(), this.getView().getMap().getSize());
+            this.getView().getMapView().fit(this.reportRoute[0].getGeometry(), this.getView().getMap().getSize());
+        }
     },
 
     addReportMarkers: function (store, data) {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 50775ace..f8a01bc6 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -197,12 +197,10 @@ Ext.define('Traccar.view.ReportController', {
     loadEvents: function (store, data) {
         var i, eventObject, positionIds = [];
         Ext.getStore('ReportRoute').removeAll();
-        if (data.length > 0) {
-            for (i = 0; i < data.length; i++) {
-                eventObject = data[i];
-                if (eventObject.get('positionId')) {
-                    positionIds.push(eventObject.get('positionId'));
-                }
+        for (i = 0; i < data.length; i++) {
+            eventObject = data[i];
+            if (eventObject.get('positionId')) {
+                positionIds.push(eventObject.get('positionId'));
             }
         }
         if (positionIds.length > 0) {
-- 
cgit v1.2.3