From ca02696ce4ebe43652ec97b28c6553bd97910dcd Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 21 Nov 2015 11:57:38 +1300
Subject: Remove time label from report markers

---
 web/app/Style.js              |  6 ++----
 web/app/view/Map.js           | 10 +---------
 web/app/view/MapController.js |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/web/app/Style.js b/web/app/Style.js
index 49dcd1b99..5202a3fb2 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -32,8 +32,6 @@ Ext.define('Traccar.Style', {
     reportHeight: 250,
     reportTime: 100,
 
-    mapClusterDistance: 30,
-
     mapDefaultLat: 51.507222,
     mapDefaultLon: -0.1275,
     mapDefaultZoom: 6,
@@ -55,8 +53,8 @@ Ext.define('Traccar.Style', {
     mapColorOffline: 'rgba(255, 84, 104, 1.0)',
     mapColorReport: 'rgba(21, 127, 204, 1.0)',
 
-    mapRadiusNormal: 10,
-    mapRadiusSelected: 15,
+    mapRadiusNormal: 9,
+    mapRadiusSelected: 14,
 
     mapMaxZoom: 19,
     mapDelay: 500
diff --git a/web/app/view/Map.js b/web/app/view/Map.js
index d9b041535..b8c0d8dc5 100644
--- a/web/app/view/Map.js
+++ b/web/app/view/Map.js
@@ -98,15 +98,7 @@ Ext.define('Traccar.view.Map', {
 
             this.reportSource = new ol.source.Vector({});
             reportLayer = new ol.layer.Vector({
-                source: new ol.source.Cluster({
-                    distance: Traccar.Style.mapClusterDistance,
-                    source: this.reportSource
-                }),
-                style: function (feature, resolution) {
-                    if (feature.get('features').length == 1) {
-                        return [feature.get('features')[0].getStyle()];
-                    }
-                }
+                source: this.reportSource
             });
 
             lat = user.get('latitude') || server.get('latitude') || Traccar.Style.mapDefaultLat;
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 2b441399b..a3412b796 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -159,8 +159,8 @@ Ext.define('Traccar.view.MapController', {
 
             style = this.getReportMarker();
             style.getImage().setRotation(position.get('course') * Math.PI / 180);
-            style.getText().setText(
-                Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat));
+            /*style.getText().setText(
+                Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat));*/
 
             marker.setStyle(style);
 
-- 
cgit v1.2.3