From 8ead897ea6b562567aceedee85a6c5c4f9088a5d Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 30 Nov 2016 09:59:14 +0500
Subject: Show events on map

---
 web/app/view/MapMarkerController.js | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'web/app/view/MapMarkerController.js')

diff --git a/web/app/view/MapMarkerController.js b/web/app/view/MapMarkerController.js
index 4ef55bb..100ede9 100644
--- a/web/app/view/MapMarkerController.js
+++ b/web/app/view/MapMarkerController.js
@@ -45,6 +45,7 @@ Ext.define('Traccar.view.MapMarkerController', {
                     update: 'updateLatest'
                 },
                 '#ReportRoute': {
+                    add: 'addReportMarkers',
                     load: 'loadReport',
                     clear: 'clearReport'
                 }
@@ -197,13 +198,18 @@ Ext.define('Traccar.view.MapMarkerController', {
     },
 
     loadReport: function (store, data) {
-        var i, position, point, geometry, marker, style;
+        var i, position, point;
 
-        this.clearReport(store);
+        this.addReportMarkers(store, data);
 
         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([])
@@ -211,33 +217,37 @@ Ext.define('Traccar.view.MapMarkerController', {
                     this.reportRoute[this.reportRoute.length - 1].setStyle(this.getRouteStyle(data[i].get('deviceId')));
                     this.getView().getRouteSource().addFeature(this.reportRoute[this.reportRoute.length - 1]);
                 }
-                position = data[i];
+                this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point);
+            }
 
+            this.getView().getMapView().fit(this.reportRoute[0].getGeometry(), this.getView().getMap().getSize());
+        }
+    },
+
+    addReportMarkers: function (store, data) {
+        var i, position, point, geometry, marker, style;
+        this.clearReport();
+        if (data.length > 0) {
+            for (i = 0; i < data.length; i++) {
+                position = data[i];
                 point = ol.proj.fromLonLat([
                     position.get('longitude'),
                     position.get('latitude')
                 ]);
                 geometry = new ol.geom.Point(point);
-
                 marker = new ol.Feature(geometry);
                 marker.set('record', position);
-                this.reportMarkers[position.get('id')] = marker;
-                this.getView().getReportSource().addFeature(marker);
-
                 style = this.getReportMarker(position.get('deviceId'), position.get('course'));
                 /*style.getText().setText(
                     Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat24));*/
-
                 marker.setStyle(style);
-
-                this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point);
+                this.reportMarkers[position.get('id')] = marker;
+                this.getView().getReportSource().addFeature(marker);
             }
-
-            this.getView().getMapView().fit(this.reportRoute[0].getGeometry(), this.getView().getMap().getSize());
         }
     },
 
-    clearReport: function (store) {
+    clearReport: function () {
         var key, i;
 
         if (this.reportRoute) {
-- 
cgit v1.2.3