From 450f4a3a2423c90985603103b10e61a195d0f74f Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 7 Nov 2016 15:27:31 +0500
Subject: Draft of device images

---
 web/app/view/MapController.js | 88 +++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

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

diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 32ea6b05..7875e94d 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -22,7 +22,8 @@ Ext.define('Traccar.view.MapController', {
     requires: [
         'Traccar.model.Position',
         'Traccar.model.Device',
-        'Traccar.GeofenceConverter'
+        'Traccar.GeofenceConverter',
+        'Traccar.DeviceImages'
     ],
 
     config: {
@@ -86,17 +87,14 @@ Ext.define('Traccar.view.MapController', {
     },
 
     changeMarkerColor: function (style, color) {
-        return new ol.style.Style({
-            image: new ol.style.Arrow({
-                radius: style.getImage().getRadius(),
-                fill: new ol.style.Fill({
-                    color: color
-                }),
-                stroke: style.getImage().getStroke(),
-                rotation: style.getImage().getRotation()
-            }),
+        var newStyle = new ol.style.Style({
+            image: Traccar.DeviceImages.getImageIcon(color,
+                    style.getImage().zoom,
+                    style.getImage().angle,
+                    style.getImage().category),
             text: style.getText()
         });
+        return newStyle;
     },
 
     updateDevice: function (store, data) {
@@ -154,18 +152,20 @@ Ext.define('Traccar.view.MapController', {
         if (deviceId in this.latestMarkers) {
             marker = this.latestMarkers[deviceId];
             marker.setGeometry(geometry);
+            marker.setStyle(this.rotateMarker(marker.getStyle(), position.get('course')));
         } else {
             marker = new ol.Feature(geometry);
             marker.set('record', device);
-            this.latestMarkers[deviceId] = marker;
-            this.getView().getLatestSource().addFeature(marker);
 
-            style = this.getLatestMarker(this.getDeviceColor(device));
+            style = this.getLatestMarker(this.getDeviceColor(device),
+                    position.get('course'),
+                    device.get('category'));
             style.getText().setText(device.get('name'));
             marker.setStyle(style);
-        }
+            this.latestMarkers[deviceId] = marker;
+            this.getView().getLatestSource().addFeature(marker);
 
-        marker.getStyle().getImage().setRotation(position.get('course') * Math.PI / 180);
+        }
 
         if (marker === this.selectedMarker && this.followSelected()) {
             this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates());
@@ -231,8 +231,7 @@ Ext.define('Traccar.view.MapController', {
                 this.reportMarkers[position.get('id')] = marker;
                 this.getView().getReportSource().addFeature(marker);
 
-                style = this.getReportMarker(position.get('deviceId'));
-                style.getImage().setRotation(position.get('course') * Math.PI / 180);
+                style = this.getReportMarker(position.get('deviceId'), position.get('course'));
                 /*style.getText().setText(
                     Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat24));*/
 
@@ -278,18 +277,9 @@ Ext.define('Traccar.view.MapController', {
         });
     },
 
-    getMarkerStyle: function (radius, color) {
+    getMarkerStyle: function (zoom, color, angle, category) {
         return new ol.style.Style({
-            image: new ol.style.Arrow({
-                radius: radius,
-                fill: new ol.style.Fill({
-                    color: color
-                }),
-                stroke: new ol.style.Stroke({
-                    color: Traccar.Style.mapArrowStrokeColor,
-                    width: Traccar.Style.mapArrowStrokeWidth
-                })
-            }),
+            image: Traccar.DeviceImages.getImageIcon(color, zoom, angle, category),
             text: new ol.style.Text({
                 textBaseline: 'bottom',
                 fill: new ol.style.Fill({
@@ -299,47 +289,55 @@ Ext.define('Traccar.view.MapController', {
                     color: Traccar.Style.mapTextStrokeColor,
                     width: Traccar.Style.mapTextStrokeWidth
                 }),
-                offsetY: -radius / 2 - Traccar.Style.mapTextOffset,
+                offsetY: -Traccar.Style.mapTextOffset,
                 font : Traccar.Style.mapTextFont
             })
         });
     },
 
-    getLatestMarker: function (color) {
-        return this.getMarkerStyle(
-            Traccar.Style.mapRadiusNormal, color);
+    getLatestMarker: function (color, angle, category) {
+        return this.getMarkerStyle(false, color, angle, category);
     },
 
-    getReportMarker: function (deviceId) {
+    getReportMarker: function (deviceId, angle) {
         var index = 0;
         if (deviceId !== undefined) {
             index = deviceId % Traccar.Style.mapRouteColor.length;
         }
-        return this.getMarkerStyle(
-            Traccar.Style.mapRadiusNormal, Traccar.Style.mapRouteColor[index]);
+        return this.getMarkerStyle(false, Traccar.Style.mapRouteColor[index], angle);
     },
 
-    resizeMarker: function (style, radius) {
-        return new ol.style.Style({
-            image: new ol.style.Arrow({
-                radius: radius,
-                fill: style.getImage().getFill(),
-                stroke: style.getImage().getStroke(),
-                rotation: style.getImage().getRotation()
-            }),
+    resizeMarker: function (style, zoom) {
+        var newStyle = new ol.style.Style({
+            image: Traccar.DeviceImages.getImageIcon(style.getImage().fill,
+                    zoom,
+                    style.getImage().angle,
+                    style.getImage().category),
+            text: style.getText()
+        });
+        return newStyle;
+    },
+    
+    rotateMarker: function (style, angle) {
+        var newStyle = new ol.style.Style({
+            image: Traccar.DeviceImages.getImageIcon(style.getImage().fill,
+                    style.getImage().zoom,
+                    angle,
+                    style.getImage().category),
             text: style.getText()
         });
+        return newStyle;
     },
 
     selectMarker: function (marker, center) {
         if (this.selectedMarker) {
             this.selectedMarker.setStyle(
-                this.resizeMarker(this.selectedMarker.getStyle(), Traccar.Style.mapRadiusNormal));
+                this.resizeMarker(this.selectedMarker.getStyle(), false));
         }
 
         if (marker) {
             marker.setStyle(
-                this.resizeMarker(marker.getStyle(), Traccar.Style.mapRadiusSelected));
+                this.resizeMarker(marker.getStyle(), true));
             if (center) {
                 this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates());
             }
-- 
cgit v1.2.3


From 97fd53f33b92e334e6094edb340ea551a44d136e Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 8 Nov 2016 10:03:18 +0500
Subject: - Move arrow to file - Change stroke width - Fix label offset

---
 web/app/DeviceImages.js       |  2 +-
 web/app/Style.js              |  2 +-
 web/app/store/DeviceImages.js |  7 ++-----
 web/app/view/MapController.js |  5 +++--
 web/images/arrow.svg          |  1 +
 web/images/bus.svg            | 42 +++++++++++++++++++++---------------------
 web/images/car.svg            | 14 +++++++-------
 web/images/truck.svg          | 18 +++++++++---------
 8 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 web/images/arrow.svg

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

diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index ade88bd9..52eea1d0 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -62,7 +62,7 @@ Ext.define('Traccar.DeviceImages', {
    
         image =  new ol.style.Icon({
             imgSize: [width, height], // Workaround for IE
-            src: 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent((new XMLSerializer()).serializeToString(svg.documentElement))
+            src: 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(new XMLSerializer().serializeToString(svg.documentElement))
         });
         image.fill = color;
         image.zoom = zoom;
diff --git a/web/app/Style.js b/web/app/Style.js
index 2353a218..4fe5afd7 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -52,7 +52,7 @@ Ext.define('Traccar.Style', {
     mapTextColor: 'rgba(50, 50, 50, 1.0)',
     mapTextStrokeColor: 'rgba(255, 255, 255, 1.0)',
     mapTextStrokeWidth: 2,
-    mapTextOffset: 10,
+    mapTextOffset: 2,
     mapTextFont: 'bold 12px sans-serif',
 
     mapColorOnline: 'rgba(77, 250, 144, 1.0)',
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index 968f90c4..57745f1c 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -22,10 +22,7 @@ Ext.define('Traccar.store.DeviceImages', {
     data: [{
         key: 'default',
         name: Strings.categoryDefault,
-        svg: (new DOMParser())
-                .parseFromString('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26">'
-                + '<polygon id="arrow" points="13,4 19,22 13,19 7,22" '
-                + 'style="fill:#008000;stroke:#000000;stroke-width:2px;" transform="" /></svg>', "image/svg+xml"),
+        url: 'images/arrow.svg',
         rotateId: 'arrow',
         fillId: 'arrow',
         scale: 1
@@ -60,7 +57,7 @@ Ext.define('Traccar.store.DeviceImages', {
                     url: device.url,
                     scope: device,
                     success: function (response) {
-                        this.svg = (new DOMParser()).parseFromString(response.responseText, "image/svg+xml");
+                        this.svg = new DOMParser().parseFromString(response.responseText, "image/svg+xml");
                     }
                 });
             }
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 7875e94d..829a8ea5 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -278,8 +278,9 @@ Ext.define('Traccar.view.MapController', {
     },
 
     getMarkerStyle: function (zoom, color, angle, category) {
+        var image = Traccar.DeviceImages.getImageIcon(color, zoom, angle, category);
         return new ol.style.Style({
-            image: Traccar.DeviceImages.getImageIcon(color, zoom, angle, category),
+            image: image,
             text: new ol.style.Text({
                 textBaseline: 'bottom',
                 fill: new ol.style.Fill({
@@ -289,7 +290,7 @@ Ext.define('Traccar.view.MapController', {
                     color: Traccar.Style.mapTextStrokeColor,
                     width: Traccar.Style.mapTextStrokeWidth
                 }),
-                offsetY: -Traccar.Style.mapTextOffset,
+                offsetY: - image.getSize()[1] / 2 - Traccar.Style.mapTextOffset,
                 font : Traccar.Style.mapTextFont
             })
         });
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
new file mode 100644
index 00000000..538b0581
--- /dev/null
+++ b/web/images/arrow.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1.2px;" transform="" /></svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index f9260558..4e3d1f7a 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -71,7 +71,7 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="opacity:1;fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:8px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 196.11953,55.873016 0.0829,391.607144 c 3.72662,13.54113 11.5055,22.80612 24.73849,24.46428 l 57.14286,0.35714 c 15.35608,-3.67133 22.29313,-12.95537 24.82143,-25.17856 l 0.7143,-390.892861 c -0.2913,-5.886565 -2.12374,-9.65786 -5.18591,-13.644643 l 24.97726,-0.374645 C 321.1664,37.001224 307.61725,27.363695 297.51536,40.879459 293.08957,33.592704 284.57147,29.058489 276.47667,28.015873 L 222.36952,27.8373 c -11.06058,1.916208 -17.21769,7.780519 -21.69229,14.905049 -11.14642,-16.386951 -25.50315,-2.099791 -25.63481,0.838857 l 24.90118,0.425857 c -2.37652,4.331728 -3.38012,8.63026 -3.82407,11.865953 z"
        id="path4713"
        inkscape:connector-curvature="0"
@@ -84,67 +84,67 @@
          inkscape:connector-curvature="0"
          id="path4735"
          d="M 249.91072,39.732142 C 231.04598,39.712452 205.58753,37.16641 201.25,43.749999 l 5.17857,17.678572 c 7.57822,-5.855074 19.92572,-4.245259 43.21429,-4.285715 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
          id="path4735-1"
          d="m 249.82219,39.7043 c 18.86474,-0.01969 43.96605,-2.655018 48.30358,3.928571 l -5.17857,17.678572 c -7.57822,-5.85507 -19.79179,-4.155974 -43.08036,-4.196434 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
          id="path4752"
          d="m 201.14663,43.411049 c -6.8176,6.360856 -5.00544,36.02672 -5.08906,59.457411 l 8.81082,-0.0446 c 0.34555,-15.012868 -1.01474,-36.78369 1.58154,-41.29316 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <rect
          y="102.85714"
          x="196.07143"
          height="53.660713"
          width="8.7946253"
          id="rect4754"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          y="156.60713"
          x="196.11607"
          height="53.035713"
          width="8.7053576"
          id="rect4756"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          y="209.73213"
          x="196.16071"
          height="53.035721"
          width="8.7053614"
          id="rect4758"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          y="262.71875"
          x="196.20045"
          height="53.30722"
          width="8.6079798"
          id="rect4760"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          y="315.89285"
          x="196.16072"
          height="53.839287"
          width="8.5714283"
          id="rect4762"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          y="369.6167"
          x="196.23468"
          height="53.419014"
          width="8.4974623"
          id="rect4764"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
          id="path4752-5"
          d="m 298.17268,43.254296 c 7.90416,5.274295 5.11759,35.914567 5.08906,59.457414 l -8.81082,-0.0446 c -0.34555,-15.012873 1.01474,-36.783695 -1.58154,-41.293165 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="102.70039"
@@ -152,7 +152,7 @@
          height="53.660713"
          width="8.7946253"
          id="rect4754-4"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="156.45038"
@@ -160,7 +160,7 @@
          height="53.035713"
          width="8.7053576"
          id="rect4756-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="209.57536"
@@ -168,7 +168,7 @@
          height="53.035721"
          width="8.7053614"
          id="rect4758-6"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="262.56201"
@@ -176,7 +176,7 @@
          height="53.30722"
          width="8.6079798"
          id="rect4760-9"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="315.73611"
@@ -184,7 +184,7 @@
          height="53.839287"
          width="8.5714283"
          id="rect4762-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          y="369.45996"
@@ -192,28 +192,28 @@
          height="53.419014"
          width="8.4974623"
          id="rect4764-2"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path4801"
          d="m 204.47033,423.30342 c -3.64856,22.24167 9.12482,44.86492 26.42857,45.17854 l 37.14286,-0.17853 c 18.9215,0.41739 30.05186,-22.16657 26.96428,-45.53573 0.76011,18.51126 -12.10167,34.0046 -27.14285,34.10713 l -37.32617,-0.16888 c -11.82277,-0.73357 -25.86632,-12.71876 -26.06669,-33.40253 z"
-         style="opacity:1;fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:1;fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 227.05992,65.086657 0.0829,382.056203"
        id="path4837"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 272.14286,65.043328 0.12627,382.521662"
        id="path4839"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 249.53825,65.169597 0.0829,382.521663"
        id="path4841"
        inkscape:connector-curvature="0"
diff --git a/web/images/car.svg b/web/images/car.svg
index 071d3900..e12ed9a0 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -75,45 +75,45 @@
          inkscape:connector-curvature="0"
          id="path4149"
          d="m 164.31862,85.468446 c -4.19906,39.571694 6.55669,91.762434 6.06092,147.482284 -10.52016,-1.80797 -20.2496,-2.39539 -19.86866,17.20586 l 19.27693,-7.70658 c -1.71236,42.20755 -11.244,119.22302 -5.46918,163.23681 5.77482,44.01379 37.68226,70.86495 98.99495,68.69037 57.16171,-0.22437 86.65984,-29.45295 90.49531,-70.49531 3.83547,-41.04236 -5.62278,-121.15641 -7.1144,-159.69692 l 20.41226,5.93837 c 2.35433,-15.05893 -9.06025,-22.05503 -20.45559,-18.18275 -1.71417,-0.64282 8.60748,-110.55723 6.06091,-143.946754 -2.54656,-33.389517 -38.86205,-60.167876 -92.5497,-62.358976 -53.46176,1.44606 -91.64469,20.261919 -95.84375,59.833596 z"
-         style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:18px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="zcccccccz"
          inkscape:connector-curvature="0"
          id="path4151"
          d="m 256.92615,171.78049 c -44.12883,0.0136 -75.14588,18.92974 -76.71251,52.74454 l 5.82327,27.11352 33.05682,-9.37798 38.66401,-1.22862 38.32614,0.83942 34.40484,9.26211 5.51905,-27.34552 c 0.87812,-33.65356 -34.95279,-52.02103 -79.08162,-52.00747 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cczccc"
          inkscape:connector-curvature="0"
          id="path4153"
          d="m 198.15874,345.07766 -1.51523,52.02286 c 5.65793,29.35218 29.45066,42.46306 59.09392,42.42641 29.64326,-0.0367 60.86511,-12.41133 65.15484,-43.43656 l -0.50508,-51.51778 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cczc"
          inkscape:connector-curvature="0"
          id="path4157"
          d="m 180.22853,226.53267 -3.03046,98.0894 c 5.0681,37.51079 14.77304,32.79101 14.39468,-18.68782 -0.37837,-51.47882 -2.37697,-64.13759 -11.36422,-79.40158 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cczc"
          inkscape:connector-curvature="0"
          id="path4157-3"
          d="m 336.17606,224.45923 4.54569,98.61614 c -5.0681,37.51079 -14.77304,32.79101 -14.39468,-18.68782 0.37837,-51.47882 3.63966,-56.58311 9.84899,-79.92832 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <ellipse
          ry="16.293392"
          rx="12.721964"
          cy="64.4645"
          cx="198.43823"
          id="path4174"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:1.27035797" />
+         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
       <ellipse
          ry="16.293392"
          rx="12.721964"
          cy="63.750187"
          cx="316.84073"
          id="path4174-6"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:1.27035797" />
+         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
     </g>
   </g>
 </svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index ef835b6c..1f65e0dc 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -71,54 +71,54 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 190.79351,28.531817 C 177.60808,29.049025 171.0544,44.782872 171.3023,50.256254 l -0.0396,61.172316 -21.40626,-0.22779 c -16.86908,2.86168 -11.58456,23.89093 -0.28466,24.08815 l 10.97663,-0.0797 c 0.98536,-5.38348 1.35729,-10.66472 10.16589,-17.35207 l 0.71428,111.42857 c -4.24692,-0.33046 -7.28269,-0.19489 -7.22579,4.62119 l -0.16961,235.20922 c -0.23841,3.16729 1.19892,4.56696 5.67097,4.03317 l 166.39639,0.1696 c 1.15311,-0.32283 2.67054,0.26515 2.55383,-3.23223 l 0,-238.1134 c 0.0879,-3.22046 -1.18803,-3.6906 -5.20548,-3.60732 l 0.41841,-111.01388 c 8.11407,4.34267 9.84097,11.11853 11.00273,18.10969 l 12.13401,-3.7e-4 c 15.62702,-6.6151 9.83035,-22.17132 -0.75992,-24.63941 l -22.37682,0.6066 -0.59173,-65.48649 c -0.0903,-5.888911 -9.72969,-17.446043 -19.47262,-17.496921 z"
        id="path4718"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccccccccccccccccc" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 171.34713,229.15285 162.04573,-0.75999"
        id="path4739"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 214.46429,28.392856 c -5.80071,1.089231 -5.50629,6.100613 -6.47005,9.466144 L 200,105.35714"
        id="path4741"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 291.45828,28.52044 c 5.80071,1.089231 5.50629,6.100613 6.47005,9.466144 l 7.99424,67.498136"
        id="path4741-3"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc" />
     <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 171.64234,122.98288 25.47002,27.23648 111.48924,0.0785 24.30679,-27.52665 0.0631,-5.74525 c -2.39904,-9.44151 -31.06848,-13.2503 -37.75445,-13.51078 l -84.60027,0 c -8.97913,0.17928 -34.45033,4.81556 -39.02612,13.74429 z"
        id="path4758"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccc" />
     <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 176.7767,128.76894 0.32387,70.726 20.9633,1.17603 -0.84691,-50.51026 z"
        id="path4760"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 329.22204,127.27242 -0.1976,72.49377 -20.9633,1.17603 0.84691,-50.51026 z"
        id="path4760-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 203.04066,28.511299 c -1.81103,5.394916 -1.5885,11.016271 -10.6066,13.637059 l -19.1929,0.252538 c 1.93578,-3.984031 7.27783,-12.810686 16.28871,-13.889597 z"
        id="path4801"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 302.30988,28.661154 c 1.81103,5.394916 1.5885,11.016271 10.6066,13.637059 l 19.1929,0.252538 C 330.1736,38.56672 324.83155,29.740065 315.82067,28.661154 Z"
        id="path4801-5"
        inkscape:connector-curvature="0"
-- 
cgit v1.2.3


From dbd7cb8ca62dd7fbc62fbfb9ccc16fc4b8a08d64 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 8 Nov 2016 16:01:59 +0500
Subject: Changed icon styles

---
 web/app/DeviceImages.js       |  11 ++-
 web/app/store/DeviceImages.js |  26 +++---
 web/app/view/MapController.js |  17 ++--
 web/images/arrow.svg          |   2 +-
 web/images/bus.svg            | 178 +++++-------------------------------------
 web/images/car.svg            |  76 +++++-------------
 web/images/truck.svg          |  69 ++++------------
 7 files changed, 90 insertions(+), 289 deletions(-)

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

diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index 52eea1d0..c79406b0 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -39,6 +39,7 @@ Ext.define('Traccar.DeviceImages', {
         svg.getElementById(device.get('fillId')).style.fill = color;
         // Prepare rotate transformation
         rotateTransform = 'rotate(' + angle + ' ' + (width / 2) + ' ' + (height / 2) + ')';
+        svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform);
 
         // Adjust size and prepare scale transformation
         width *= device.get('scale');
@@ -51,9 +52,13 @@ Ext.define('Traccar.DeviceImages', {
             scaleTransform = 'scale(' + device.get('scale') + ') ';
         }
 
-        //Apply both transformation in right order
-        transform = scaleTransform + ' ' + rotateTransform;
-        svg.getElementById(device.get('rotateId')).setAttribute('transform', transform);
+        if (device.get('scaleId') !== device.get('rotateId')) {
+            svg.getElementById(device.get('scaleId')).setAttribute('transform', scaleTransform);
+        } else {
+            svg.getElementById(device.get('scaleId')).setAttribute('transform', scaleTransform + ' ' + rotateTransform);
+        }
+        //transform = scaleTransform + ' ' + rotateTransform;
+        
 
         // Set dimension attributes
         svg.documentElement.setAttribute('width', width);
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index 22a7872f..e7ad4cbc 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -17,35 +17,39 @@
  */
 Ext.define('Traccar.store.DeviceImages', {
     extend: 'Ext.data.Store',
-    fields: ['key', 'name', 'url', 'svg', 'fillId', 'rotateId', 'scale'],
+    fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId', 'scale'],
 
     data: [{
         key: 'default',
         name: Strings.categoryDefault,
         svg: document.getElementById('arrowSvg').contentDocument,
-        rotateId: 'arrow',
         fillId: 'arrow',
+        rotateId: 'arrow',
+        scaleId: 'arrow',
         scale: 1
     }, {
         key: 'car',
         name: Strings.categoryCar,
         svg: document.getElementById('carSvg').contentDocument,
-        fillId: 'path4149',
-        rotateId: 'g4207',
-        scale: 0.06,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }, {
         key: 'bus',
         name: Strings.categoryBus,
         svg: document.getElementById('busSvg').contentDocument,
-        fillId: 'path4713',
-        rotateId: 'layer2',
-        scale: 0.12,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }, {
         key: 'truck',
         name: Strings.categoryTruck,
         svg: document.getElementById('truckSvg').contentDocument,
-        fillId: 'path4718',
-        rotateId: 'layer2',
-        scale: 0.1,
+        fillId: 'path4148',
+        rotateId: 'path4148',
+        scaleId: 'layer2',
+        scale: 1
     }]
 });
\ No newline at end of file
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 829a8ea5..2f72e81c 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -309,14 +309,17 @@ Ext.define('Traccar.view.MapController', {
     },
 
     resizeMarker: function (style, zoom) {
-        var newStyle = new ol.style.Style({
-            image: Traccar.DeviceImages.getImageIcon(style.getImage().fill,
-                    zoom,
-                    style.getImage().angle,
-                    style.getImage().category),
-            text: style.getText()
+        var image, text;
+        image = Traccar.DeviceImages.getImageIcon(style.getImage().fill,
+                zoom,
+                style.getImage().angle,
+                style.getImage().category);
+        text = style.getText();
+        text.setOffsetY(- image.getSize()[1] / 2 - Traccar.Style.mapTextOffset);
+        return newStyle = new ol.style.Style({
+            image: image,
+            text: text
         });
-        return newStyle;
     },
     
     rotateMarker: function (style, angle) {
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
index 538b0581..a85201d8 100644
--- a/web/images/arrow.svg
+++ b/web/images/arrow.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1.2px;" transform="" /></svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index 4e3d1f7a..2847eab4 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500px"
-   height="500px"
-   viewBox="0 0 500.00001 500.00001"
-   id="svg4144"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
+   id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="bus.svg">
   <defs
-     id="defs4146" />
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,27 +25,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="203.40483"
-     inkscape:cy="161.67936"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="-4.2362527"
+     inkscape:cy="18.152102"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata4149">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
@@ -71,152 +71,16 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="opacity:1;fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:8px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 196.11953,55.873016 0.0829,391.607144 c 3.72662,13.54113 11.5055,22.80612 24.73849,24.46428 l 57.14286,0.35714 c 15.35608,-3.67133 22.29313,-12.95537 24.82143,-25.17856 l 0.7143,-390.892861 c -0.2913,-5.886565 -2.12374,-9.65786 -5.18591,-13.644643 l 24.97726,-0.374645 C 321.1664,37.001224 307.61725,27.363695 297.51536,40.879459 293.08957,33.592704 284.57147,29.058489 276.47667,28.015873 L 222.36952,27.8373 c -11.06058,1.916208 -17.21769,7.780519 -21.69229,14.905049 -11.14642,-16.386951 -25.50315,-2.099791 -25.63481,0.838857 l 24.90118,0.425857 c -2.37652,4.331728 -3.38012,8.63026 -3.82407,11.865953 z"
-       id="path4713"
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <g
-       id="g4818"
-       style="fill:#f2f2f2">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4735"
-         d="M 249.91072,39.732142 C 231.04598,39.712452 205.58753,37.16641 201.25,43.749999 l 5.17857,17.678572 c 7.57822,-5.855074 19.92572,-4.245259 43.21429,-4.285715 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4735-1"
-         d="m 249.82219,39.7043 c 18.86474,-0.01969 43.96605,-2.655018 48.30358,3.928571 l -5.17857,17.678572 c -7.57822,-5.85507 -19.79179,-4.155974 -43.08036,-4.196434 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4752"
-         d="m 201.14663,43.411049 c -6.8176,6.360856 -5.00544,36.02672 -5.08906,59.457411 l 8.81082,-0.0446 c 0.34555,-15.012868 -1.01474,-36.78369 1.58154,-41.29316 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="102.85714"
-         x="196.07143"
-         height="53.660713"
-         width="8.7946253"
-         id="rect4754"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="156.60713"
-         x="196.11607"
-         height="53.035713"
-         width="8.7053576"
-         id="rect4756"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="209.73213"
-         x="196.16071"
-         height="53.035721"
-         width="8.7053614"
-         id="rect4758"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="262.71875"
-         x="196.20045"
-         height="53.30722"
-         width="8.6079798"
-         id="rect4760"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="315.89285"
-         x="196.16072"
-         height="53.839287"
-         width="8.5714283"
-         id="rect4762"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="369.6167"
-         x="196.23468"
-         height="53.419014"
-         width="8.4974623"
-         id="rect4764"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4752-5"
-         d="m 298.17268,43.254296 c 7.90416,5.274295 5.11759,35.914567 5.08906,59.457414 l -8.81082,-0.0446 c -0.34555,-15.012873 1.01474,-36.783695 -1.58154,-41.293165 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="102.70039"
-         x="-303.24789"
-         height="53.660713"
-         width="8.7946253"
-         id="rect4754-4"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="156.45038"
-         x="-303.20325"
-         height="53.035713"
-         width="8.7053576"
-         id="rect4756-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="209.57536"
-         x="-303.1586"
-         height="53.035721"
-         width="8.7053614"
-         id="rect4758-6"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="262.56201"
-         x="-303.11887"
-         height="53.30722"
-         width="8.6079798"
-         id="rect4760-9"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="315.73611"
-         x="-303.1586"
-         height="53.839287"
-         width="8.5714283"
-         id="rect4762-5"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         y="369.45996"
-         x="-303.08463"
-         height="53.419014"
-         width="8.4974623"
-         id="rect4764-2"
-         style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4801"
-         d="m 204.47033,423.30342 c -3.64856,22.24167 9.12482,44.86492 26.42857,45.17854 l 37.14286,-0.17853 c 18.9215,0.41739 30.05186,-22.16657 26.96428,-45.53573 0.76011,18.51126 -12.10167,34.0046 -27.14285,34.10713 l -37.32617,-0.16888 c -11.82277,-0.73357 -25.86632,-12.71876 -26.06669,-33.40253 z"
-         style="opacity:1;fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 227.05992,65.086657 0.0829,382.056203"
-       id="path4837"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.8434273;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.444761 C 16.961442,10.444954 10.444954,16.961442 10.444761,25 10.444954,33.038558 16.961442,39.555046 25,39.555239 33.038558,39.555046 39.555046,33.038558 39.555239,25 39.555046,16.961442 33.038558,10.444954 25,10.444761 Z m -0.164733,4.556013 0.0024,0 c 3.155084,0.0979 6.515016,0.567167 7.217613,2.520398 0.583475,2.537942 1.473743,4.963655 1.461405,7.532955 l 0.0071,7.036405 -1.437875,-0.0071 0.0094,1.656732 c 0.0036,1.678026 -2.685458,1.674435 -2.725136,0.02824 l 0.01412,-1.675559 -8.70255,0.01181 0.0047,1.475528 c 0.0035,1.863548 -2.688814,1.852016 -2.751022,0.01181 l 0.0071,-1.508474 -1.463761,0.0047 0.02824,-7.212904 c 0.150002,-2.626816 0.92017,-5.079313 1.543772,-7.476474 0.814705,-1.822141 3.854148,-2.309935 6.7846,-2.398025 z m 3.779421,1.750865 -7.187017,0.02589 c -0.748177,-0.0063 -0.767618,1.489368 -0.04075,1.489831 L 28.6366,18.3065 c 0.84169,-0.0068 0.817847,-1.561956 -0.02192,-1.554848 z m 1.449641,3.012147 -10.145131,0.0071 c -0.514212,0.03547 -0.646498,0.31785 -0.729527,0.510669 l -0.804832,3.892472 c 0.01567,0.625782 0.271458,0.822646 0.63304,0.830719 l 12.011308,0.01883 c 0.295009,-0.132124 0.641506,-0.162229 0.651867,-0.863667 l -0.790712,-3.763037 c -0.072,-0.198901 -0.09149,-0.593618 -0.826013,-0.633043 z m 0.635395,7.342429 c -0.799321,-4.68e-4 -1.447491,0.64454 -1.447287,1.440227 -2.04e-4,0.795688 0.647966,1.440697 1.447287,1.440228 0.798401,-8.25e-4 1.445138,-0.645454 1.444934,-1.440228 2.04e-4,-0.794772 -0.646533,-1.439401 -1.444934,-1.440227 z m -11.364148,0.0047 c -0.799321,-4.69e-4 -1.447491,0.644541 -1.447287,1.440228 -2.04e-4,0.795687 0.647966,1.440695 1.447287,1.440227 0.799321,4.68e-4 1.447492,-0.64454 1.447287,-1.440227 2.05e-4,-0.795687 -0.647966,-1.440697 -1.447287,-1.440228 z"
+       id="path4179"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 272.14286,65.043328 0.12627,382.521662"
-       id="path4839"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 249.53825,65.169597 0.0829,382.521663"
-       id="path4841"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccc" />
   </g>
 </svg>
diff --git a/web/images/car.svg b/web/images/car.svg
index e12ed9a0..0f56cc59 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -9,8 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -24,12 +25,13 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-332.69084"
-     inkscape:cy="476.11054"
+     inkscape:zoom="32.000001"
+     inkscape:cx="28.992205"
+     inkscape:cy="19.572065"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer2"
      showgrid="false"
+     units="px"
      inkscape:window-width="1920"
      inkscape:window-height="981"
      inkscape:window-x="0"
@@ -65,55 +67,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g4207">
-      <path
-         sodipodi:nodetypes="zccczczccczcz"
-         inkscape:connector-curvature="0"
-         id="path4149"
-         d="m 164.31862,85.468446 c -4.19906,39.571694 6.55669,91.762434 6.06092,147.482284 -10.52016,-1.80797 -20.2496,-2.39539 -19.86866,17.20586 l 19.27693,-7.70658 c -1.71236,42.20755 -11.244,119.22302 -5.46918,163.23681 5.77482,44.01379 37.68226,70.86495 98.99495,68.69037 57.16171,-0.22437 86.65984,-29.45295 90.49531,-70.49531 3.83547,-41.04236 -5.62278,-121.15641 -7.1144,-159.69692 l 20.41226,5.93837 c 2.35433,-15.05893 -9.06025,-22.05503 -20.45559,-18.18275 -1.71417,-0.64282 8.60748,-110.55723 6.06091,-143.946754 -2.54656,-33.389517 -38.86205,-60.167876 -92.5497,-62.358976 -53.46176,1.44606 -91.64469,20.261919 -95.84375,59.833596 z"
-         style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:18px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="zcccccccz"
-         inkscape:connector-curvature="0"
-         id="path4151"
-         d="m 256.92615,171.78049 c -44.12883,0.0136 -75.14588,18.92974 -76.71251,52.74454 l 5.82327,27.11352 33.05682,-9.37798 38.66401,-1.22862 38.32614,0.83942 34.40484,9.26211 5.51905,-27.34552 c 0.87812,-33.65356 -34.95279,-52.02103 -79.08162,-52.00747 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczccc"
-         inkscape:connector-curvature="0"
-         id="path4153"
-         d="m 198.15874,345.07766 -1.51523,52.02286 c 5.65793,29.35218 29.45066,42.46306 59.09392,42.42641 29.64326,-0.0367 60.86511,-12.41133 65.15484,-43.43656 l -0.50508,-51.51778 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczc"
-         inkscape:connector-curvature="0"
-         id="path4157"
-         d="m 180.22853,226.53267 -3.03046,98.0894 c 5.0681,37.51079 14.77304,32.79101 14.39468,-18.68782 -0.37837,-51.47882 -2.37697,-64.13759 -11.36422,-79.40158 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczc"
-         inkscape:connector-curvature="0"
-         id="path4157-3"
-         d="m 336.17606,224.45923 4.54569,98.61614 c -5.0681,37.51079 -14.77304,32.79101 -14.39468,-18.68782 0.37837,-51.47882 3.63966,-56.58311 9.84899,-79.92832 z"
-         style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <ellipse
-         ry="16.293392"
-         rx="12.721964"
-         cy="64.4645"
-         cx="198.43823"
-         id="path4174"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
-      <ellipse
-         ry="16.293392"
-         rx="12.721964"
-         cy="63.750187"
-         cx="316.84073"
-         id="path4174-6"
-         style="opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:5" />
-    </g>
+     id="layer2"
+     inkscape:label="Layer 2">
+    <path
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.60713017;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.33164 A 14.668712,14.668712 0 0 0 10.33164,25 14.668712,14.668712 0 0 0 25,39.66836 14.668712,14.668712 0 0 0 39.66836,25 14.668712,14.668712 0 0 0 25,10.33164 Z m -3.865712,6.635744 7.835774,0.04032 c 1.53138,0.145913 2.201745,0.919069 2.637222,1.864078 l 1.128883,4.49893 c 1.541149,-0.02204 2.241616,0.731963 2.485439,1.845106 l 0,4.546362 -1.247463,0.0166 0,1.501224 c 0.0043,2.349095 -3.798813,2.290352 -3.794564,-0.0095 l 0.01186,-1.517826 -10.352045,0.02135 -0.0047,1.460907 c 0.0074,2.412595 -3.843637,2.383667 -3.813536,-0.0047 l 0.02371,-1.444305 -1.052991,-0.0095 c -0.113588,0.0033 -0.213279,-0.01916 -0.213445,-0.237161 l 0.0072,-4.311572 c 0.36842,-1.045963 0.870527,-1.961458 2.549472,-1.845107 l 1.107538,-4.562963 c 0.252447,-0.737352 1.125378,-1.818866 2.691768,-1.852221 z m 0.03083,2.56133 c -0.180038,0.01554 -0.320307,0.07228 -0.362855,0.225302 l -0.879865,3.675983 10.269038,0 -0.93204,-3.555031 c -0.08363,-0.303493 -0.218321,-0.308551 -0.346254,-0.346254 l -7.748024,0 z m -3.199292,5.435712 a 1.6132596,1.6218878 0 0 0 -1.61506,1.622177 1.6132596,1.6218878 0 0 0 1.61506,1.622174 1.6132596,1.6218878 0 0 0 1.61269,-1.622174 1.6132596,1.6218878 0 0 0 -1.61269,-1.622177 z m 14.092061,0.0498 a 1.6132596,1.6218878 0 0 0 -1.612689,1.622175 1.6132596,1.6218878 0 0 0 1.612689,1.619805 1.6132596,1.6218878 0 0 0 1.61269,-1.619805 1.6132596,1.6218878 0 0 0 -1.61269,-1.622175 z"
+       id="path4179"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index 1f65e0dc..f9a34d49 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
-   viewBox="0 0 500.00001 500.00001"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="195.16338"
-     inkscape:cy="286.29962"
+     inkscape:zoom="16"
+     inkscape:cx="40.268129"
+     inkscape:cy="20.202497"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -71,57 +71,16 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="fill:#008000;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 190.79351,28.531817 C 177.60808,29.049025 171.0544,44.782872 171.3023,50.256254 l -0.0396,61.172316 -21.40626,-0.22779 c -16.86908,2.86168 -11.58456,23.89093 -0.28466,24.08815 l 10.97663,-0.0797 c 0.98536,-5.38348 1.35729,-10.66472 10.16589,-17.35207 l 0.71428,111.42857 c -4.24692,-0.33046 -7.28269,-0.19489 -7.22579,4.62119 l -0.16961,235.20922 c -0.23841,3.16729 1.19892,4.56696 5.67097,4.03317 l 166.39639,0.1696 c 1.15311,-0.32283 2.67054,0.26515 2.55383,-3.23223 l 0,-238.1134 c 0.0879,-3.22046 -1.18803,-3.6906 -5.20548,-3.60732 l 0.41841,-111.01388 c 8.11407,4.34267 9.84097,11.11853 11.00273,18.10969 l 12.13401,-3.7e-4 c 15.62702,-6.6151 9.83035,-22.17132 -0.75992,-24.63941 l -22.37682,0.6066 -0.59173,-65.48649 c -0.0903,-5.888911 -9.72969,-17.446043 -19.47262,-17.496921 z"
-       id="path4718"
+       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
+       id="path4148"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccc" />
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 171.34713,229.15285 162.04573,-0.75999"
-       id="path4739"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 214.46429,28.392856 c -5.80071,1.089231 -5.50629,6.100613 -6.47005,9.466144 L 200,105.35714"
-       id="path4741"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 291.45828,28.52044 c 5.80071,1.089231 5.50629,6.100613 6.47005,9.466144 l 7.99424,67.498136"
-       id="path4741-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 171.64234,122.98288 25.47002,27.23648 111.48924,0.0785 24.30679,-27.52665 0.0631,-5.74525 c -2.39904,-9.44151 -31.06848,-13.2503 -37.75445,-13.51078 l -84.60027,0 c -8.97913,0.17928 -34.45033,4.81556 -39.02612,13.74429 z"
-       id="path4758"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 176.7767,128.76894 0.32387,70.726 20.9633,1.17603 -0.84691,-50.51026 z"
-       id="path4760"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 329.22204,127.27242 -0.1976,72.49377 -20.9633,1.17603 0.84691,-50.51026 z"
-       id="path4760-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 203.04066,28.511299 c -1.81103,5.394916 -1.5885,11.016271 -10.6066,13.637059 l -19.1929,0.252538 c 1.93578,-3.984031 7.27783,-12.810686 16.28871,-13.889597 z"
-       id="path4801"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2f2f2;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 302.30988,28.661154 c 1.81103,5.394916 1.5885,11.016271 10.6066,13.637059 l 19.1929,0.252538 C 330.1736,38.56672 324.83155,29.740065 315.82067,28.661154 Z"
-       id="path4801-5"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84430718;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 25,10.429576 C 16.953056,10.429769 10.429769,16.953056 10.429576,25 10.429769,33.046944 16.953056,39.570231 25,39.570424 33.046944,39.570231 39.570231,33.046944 39.570424,25 39.570231,16.953056 33.046944,10.429769 25,10.429576 Z m 8.841196,6.770477 c 0.460634,0.02953 0.622705,0.267803 0.650193,0.603076 l 0.03534,11.540907 c -0.07256,0.299323 -0.236494,0.572403 -0.69024,0.579519 l -0.770337,0.01885 c -0.07661,3.844781 -5.58244,3.657007 -5.564323,-0.0025 l -4.29221,-0.01183 c 0.0137,3.807627 -5.659897,3.856665 -5.630285,-0.01413 l -1.394615,-0.0047 c -0.958858,0.01435 -0.940133,-1.339998 0.01182,-1.363989 l 0.0025,-5.029565 c 0,0 0.03734,-0.309502 0.55596,-0.904614 l 2.108412,-2.113124 c 0.192955,-0.194626 0.404056,-0.415465 1.144904,-0.433461 l 1.821009,0.0025 -0.0047,-2.167306 c 0.02174,-0.279544 0.07758,-0.641486 0.636056,-0.69024 z m -13.472636,4.461824 -2.433508,2.13197 0.0071,0.525336 3.868171,-0.04004 0.02827,-2.617258 z m 0.02356,7.293457 c -0.565965,7.6e-4 -1.024459,0.465576 -1.02476,1.038894 3.01e-4,0.573318 0.458795,1.038134 1.02476,1.038894 0.566886,5.56e-4 1.026813,-0.464646 1.027115,-1.038894 -3.02e-4,-0.574249 -0.460229,-1.03945 -1.027115,-1.038894 z m 9.92485,0.05653 c -0.566874,7.61e-4 -1.025743,0.467012 -1.024759,1.041249 3.01e-4,0.573316 0.458793,1.038133 1.024759,1.038894 0.566885,5.57e-4 1.026813,-0.464645 1.027115,-1.038894 9.85e-4,-0.575169 -0.45932,-1.041808 -1.027115,-1.041249 z"
+       id="path4179"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" />
   </g>
 </svg>
-- 
cgit v1.2.3


From 03c7abe38d7d4852e80630d9f3f2124387f65d2c Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 8 Nov 2016 17:28:30 +0500
Subject: - Make icon inner space transparent - Use array of fillId - Make
 default icon consistent with other - Use bare arrow for route markers

---
 web/app/DeviceImages.js       | 10 ++++--
 web/app/store/DeviceImages.js | 18 +++++++---
 web/app/view/MapController.js |  2 +-
 web/images/arrow.svg          |  1 -
 web/images/bus.svg            | 46 +++++++++++++++++-------
 web/images/car.svg            | 33 +++++++++++------
 web/images/default.svg        | 84 +++++++++++++++++++++++++++++++++++++++++++
 web/images/route.svg          |  1 +
 web/images/truck.svg          | 40 ++++++++++++++-------
 web/load.js                   |  3 +-
 10 files changed, 193 insertions(+), 45 deletions(-)
 delete mode 100644 web/images/arrow.svg
 create mode 100644 web/images/default.svg
 create mode 100644 web/images/route.svg

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

diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index c79406b0..d781b529 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -20,7 +20,7 @@ Ext.define('Traccar.DeviceImages', {
     singleton: true,
     
     getImageIcon: function(color, zoom, angle, category) {
-        var image, device, svg, width, height, rotateTransform, scaleTransform, transform;
+        var image, device, svg, width, height, rotateTransform, scaleTransform, transform, fill;
         // Get right image or fallback to default arrow
         if (category) {
             device = Ext.getStore('DeviceImages').findRecord('key', category);
@@ -36,7 +36,13 @@ Ext.define('Traccar.DeviceImages', {
         width = parseFloat(svg.documentElement.getAttribute('width'));
         height = parseFloat(svg.documentElement.getAttribute('height'));
         // Colorize
-        svg.getElementById(device.get('fillId')).style.fill = color;
+        fill = device.get('fillId');
+        if (!Ext.isArray(fill)) {
+            fill = [fill];
+        }
+        for (i = 0; i < fill.length; i++) {
+            svg.getElementById(fill[i]).style.fill = color;
+        }
         // Prepare rotate transformation
         rotateTransform = 'rotate(' + angle + ' ' + (width / 2) + ' ' + (height / 2) + ')';
         svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform);
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index e7ad4cbc..ba91575a 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -20,18 +20,26 @@ Ext.define('Traccar.store.DeviceImages', {
     fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId', 'scale'],
 
     data: [{
-        key: 'default',
+        key: 'route',
         name: Strings.categoryDefault,
-        svg: document.getElementById('arrowSvg').contentDocument,
+        svg: document.getElementById('routeSvg').contentDocument,
         fillId: 'arrow',
         rotateId: 'arrow',
         scaleId: 'arrow',
         scale: 1
+    }, {
+        key: 'default',
+        name: Strings.categoryDefault,
+        svg: document.getElementById('defaultSvg').contentDocument,
+        fillId: ['arrow', 'path4148'],
+        rotateId: 'layer2',
+        scaleId: 'layer2',
+        scale: 1
     }, {
         key: 'car',
         name: Strings.categoryCar,
         svg: document.getElementById('carSvg').contentDocument,
-        fillId: 'path4148',
+        fillId: ['path4148', 'path4157'],
         rotateId: 'path4148',
         scaleId: 'layer2',
         scale: 1
@@ -39,7 +47,7 @@ Ext.define('Traccar.store.DeviceImages', {
         key: 'bus',
         name: Strings.categoryBus,
         svg: document.getElementById('busSvg').contentDocument,
-        fillId: 'path4148',
+        fillId: ['path4148', 'path4200'],
         rotateId: 'path4148',
         scaleId: 'layer2',
         scale: 1
@@ -47,7 +55,7 @@ Ext.define('Traccar.store.DeviceImages', {
         key: 'truck',
         name: Strings.categoryTruck,
         svg: document.getElementById('truckSvg').contentDocument,
-        fillId: 'path4148',
+        fillId: ['path4148', 'path4336'],
         rotateId: 'path4148',
         scaleId: 'layer2',
         scale: 1
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 2f72e81c..a0e28671 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -305,7 +305,7 @@ Ext.define('Traccar.view.MapController', {
         if (deviceId !== undefined) {
             index = deviceId % Traccar.Style.mapRouteColor.length;
         }
-        return this.getMarkerStyle(false, Traccar.Style.mapRouteColor[index], angle);
+        return this.getMarkerStyle(false, Traccar.Style.mapRouteColor[index], angle, 'route');
     },
 
     resizeMarker: function (style, zoom) {
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
deleted file mode 100644
index a85201d8..00000000
--- a/web/images/arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index 2847eab4..935d7b92 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="-4.2362527"
-     inkscape:cy="18.152102"
+     inkscape:zoom="16"
+     inkscape:cx="24.67596"
+     inkscape:cy="22.389227"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -71,16 +71,36 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
-       id="path4148"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscccs" />
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 24.835938,15 c -2.029405,0.104367 -4.224031,0.194416 -5.955099,1.384579 -0.967027,0.625001 -0.992823,1.834875 -1.313127,2.824078 -0.634042,2.314087 -1.159315,4.692966 -1.065749,7.106185 -0.0078,1.92435 -0.01563,3.848699 -0.02345,5.773049 0.488281,-0.0013 0.976562,-0.0026 1.464843,-0.0039 0.06247,0.821104 -0.222941,1.763667 0.355267,2.45298 0.725171,0.850603 2.364263,0.385698 2.379597,-0.787667 0.01539,-0.547653 6.57e-4,-1.095919 0.0034,-1.643828 2.901042,-0.0039 5.802083,-0.0078 8.703125,-0.01172 0.04124,0.736959 -0.129081,1.507503 0.114137,2.214921 0.525411,1.082242 2.49727,0.850284 2.589362,-0.416067 0.01489,-0.602538 -0.0036,-1.205791 -0.0024,-1.80862 0.479167,0.002 0.958333,0.0039 1.4375,0.0059 -0.01716,-2.624357 0.02704,-5.250153 -0.03272,-7.87352 C 33.334549,21.925736 32.563956,19.744982 32.054629,17.52153 31.45137,16.048265 29.736634,15.607466 28.321878,15.325483 27.171936,15.117024 26.002455,15.037677 24.835938,15 Z"
+       id="path4200"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 28.615234,16.751953 c 0.419884,-0.0036 0.634905,0.382734 0.640625,0.771485 0.0057,0.38875 -0.198295,0.779803 -0.61914,0.783203 l -7.25,-0.03906 c -0.363434,-2.31e-4 -0.540727,-0.374859 -0.533203,-0.748047 0.0075,-0.373187 0.20013,-0.745337 0.574218,-0.742187 l 7.1875,-0.02539 z"
+       id="path4198" />
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 30.064453,19.763672 c 0.367262,0.01971 0.556422,0.129342 0.662109,0.257812 0.105688,0.12847 0.128063,0.27555 0.164063,0.375 l 0.791016,3.763672 c -0.0052,0.350719 -0.09591,0.53281 -0.220703,0.644532 -0.124796,0.111721 -0.284137,0.152687 -0.431641,0.21875 l -12.011719,-0.01953 c -0.180791,-0.004 -0.334209,-0.05515 -0.445312,-0.183594 -0.111104,-0.128447 -0.179665,-0.333593 -0.1875,-0.646484 l 0.804687,-3.892578 c 0.08303,-0.192819 0.216257,-0.474296 0.730469,-0.509766 l 10.144531,-0.0078 z"
+       id="path4196" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 30.699219,27.105469 c 0.678139,-0.01219 1.31348,0.51714 1.422706,1.186688 0.125573,0.631851 -0.238002,1.312303 -0.828117,1.56677 -0.586035,0.275196 -1.340663,0.09168 -1.733251,-0.423637 -0.418234,-0.509187 -0.407572,-1.306388 0.02181,-1.80562 0.270416,-0.329597 0.690327,-0.527309 1.116857,-0.524201 z"
+       id="path4194"
+       inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.8434273;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 25,10.444761 C 16.961442,10.444954 10.444954,16.961442 10.444761,25 10.444954,33.038558 16.961442,39.555046 25,39.555239 33.038558,39.555046 39.555046,33.038558 39.555239,25 39.555046,16.961442 33.038558,10.444954 25,10.444761 Z m -0.164733,4.556013 0.0024,0 c 3.155084,0.0979 6.515016,0.567167 7.217613,2.520398 0.583475,2.537942 1.473743,4.963655 1.461405,7.532955 l 0.0071,7.036405 -1.437875,-0.0071 0.0094,1.656732 c 0.0036,1.678026 -2.685458,1.674435 -2.725136,0.02824 l 0.01412,-1.675559 -8.70255,0.01181 0.0047,1.475528 c 0.0035,1.863548 -2.688814,1.852016 -2.751022,0.01181 l 0.0071,-1.508474 -1.463761,0.0047 0.02824,-7.212904 c 0.150002,-2.626816 0.92017,-5.079313 1.543772,-7.476474 0.814705,-1.822141 3.854148,-2.309935 6.7846,-2.398025 z m 3.779421,1.750865 -7.187017,0.02589 c -0.748177,-0.0063 -0.767618,1.489368 -0.04075,1.489831 L 28.6366,18.3065 c 0.84169,-0.0068 0.817847,-1.561956 -0.02192,-1.554848 z m 1.449641,3.012147 -10.145131,0.0071 c -0.514212,0.03547 -0.646498,0.31785 -0.729527,0.510669 l -0.804832,3.892472 c 0.01567,0.625782 0.271458,0.822646 0.63304,0.830719 l 12.011308,0.01883 c 0.295009,-0.132124 0.641506,-0.162229 0.651867,-0.863667 l -0.790712,-3.763037 c -0.072,-0.198901 -0.09149,-0.593618 -0.826013,-0.633043 z m 0.635395,7.342429 c -0.799321,-4.68e-4 -1.447491,0.64454 -1.447287,1.440227 -2.04e-4,0.795688 0.647966,1.440697 1.447287,1.440228 0.798401,-8.25e-4 1.445138,-0.645454 1.444934,-1.440228 2.04e-4,-0.794772 -0.646533,-1.439401 -1.444934,-1.440227 z m -11.364148,0.0047 c -0.799321,-4.69e-4 -1.447491,0.644541 -1.447287,1.440228 -2.04e-4,0.795687 0.647966,1.440695 1.447287,1.440227 0.799321,4.68e-4 1.447492,-0.64454 1.447287,-1.440227 2.05e-4,-0.795687 -0.647966,-1.440697 -1.447287,-1.440228 z"
-       id="path4179"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccc" />
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 19.335938,27.111328 c 0.665875,-0.01325 1.294092,0.494428 1.41792,1.149271 0.137989,0.617714 -0.191102,1.29637 -0.759018,1.574081 -0.583075,0.309284 -1.3635,0.149537 -1.775759,-0.366694 -0.429377,-0.499232 -0.440039,-1.296433 -0.02181,-1.80562 0.269487,-0.345034 0.700603,-0.554527 1.138662,-0.551038 z"
+       id="path4181"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 30.064453 19.763672 L 19.919922 19.771484 C 19.40571 19.806954 19.272482 20.088431 19.189453 20.28125 L 18.384766 24.173828 C 18.392601 24.486719 18.461162 24.691865 18.572266 24.820312 C 18.683369 24.94876 18.836787 24.99987 19.017578 25.003906 L 31.029297 25.023438 C 31.176801 24.957375 31.336142 24.916409 31.460938 24.804688 C 31.585733 24.692966 31.67646 24.510875 31.681641 24.160156 L 30.890625 20.396484 C 30.854625 20.297034 30.83225 20.149954 30.726562 20.021484 C 30.620875 19.893014 30.431715 19.783384 30.064453 19.763672 z "
+       id="path4185" />
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 28.126748,43.324765 35.941754,40.043911 39.57889,33.839327 43.471367,27.647386 42.664931,19.005572 37.705569,13.635688 35.848955,11.500603 33.373153,9.9676699 30.796754,8.9051796 28.818278,6.4478541 26.839803,3.9905286 24.861328,1.5332031 Z M 25,10.445312 C 31.718978,10.31196 38.025287,15.466156 39.259766,22.066406 40.645829,28.295943 37.349871,35.1464 31.626829,37.963035 25.868939,41.028841 18.176824,39.535013 13.993847,34.52613 9.5491383,29.57914 9.2593433,21.544158 13.337144,16.290647 16.025561,12.64863 20.469187,10.408583 25,10.445312 Z"
+       id="path4148"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/web/images/car.svg b/web/images/car.svg
index 0f56cc59..893078fa 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="28.992205"
-     inkscape:cy="19.572065"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-6.1434451"
+     inkscape:cy="26.255618"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -71,15 +71,28 @@
      id="layer2"
      inkscape:label="Layer 2">
     <path
-       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
-       id="path4148"
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 21.134766,16.966797 c -1.38074,-0.02043 -2.662213,1.062691 -2.832936,2.436607 l -0.921698,3.89102 c -1.030864,0.02164 -2.1403,0.529554 -2.448528,1.549583 -0.08585,0.66913 -0.08614,1.388686 -0.07126,2.054772 l 0.01365,2.858336 1.189799,0.01566 0.001,1.548644 c 0.179748,2.389748 3.7531,2.12524 3.766748,0.02427 0.0066,-0.524033 0.005,-1.048171 0.0083,-1.572246 3.450521,-0.0072 6.901041,-0.01432 10.351562,-0.02148 0.05778,0.910442 -0.249011,1.970932 0.45243,2.704019 0.988358,1.038977 3.20042,0.602342 3.320249,-0.963432 0.02206,-0.570623 0.0053,-1.142204 0.01052,-1.713243 0.415365,-0.0059 0.830729,-0.01172 1.246094,-0.01758 l 0,-4.546875 c -0.147573,-1.134958 -1.234974,-1.904789 -2.342351,-1.843564 l -1.27093,-4.500186 C 31.138256,17.606118 29.783723,16.901333 28.479776,17.00525 Z"
+       id="path4157"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscccs" />
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 21.166016,19.529297 c 2.582682,0 5.165364,0 7.748046,0 0.466632,0.143466 0.391901,0.755072 0.553141,1.137183 0.241401,0.921069 0.482802,1.842139 0.724203,2.763208 -3.423177,0 -6.846354,0 -10.269531,0 0.318103,-1.254803 0.572247,-2.533108 0.930254,-3.773248 0.07632,-0.09232 0.201879,-0.116527 0.313887,-0.127143 z"
+       id="path4155" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 17.966797,24.964844 c 1.160497,-0.0485 2.007143,1.347083 1.435547,2.357422 -0.482677,1.078253 -2.151895,1.188153 -2.769532,0.179687 -0.742773,-1.0203 0.06301,-2.57906 1.333985,-2.537109 z"
+       id="path4138" />
     <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.60713017;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 25,10.33164 A 14.668712,14.668712 0 0 0 10.33164,25 14.668712,14.668712 0 0 0 25,39.66836 14.668712,14.668712 0 0 0 39.66836,25 14.668712,14.668712 0 0 0 25,10.33164 Z m -3.865712,6.635744 7.835774,0.04032 c 1.53138,0.145913 2.201745,0.919069 2.637222,1.864078 l 1.128883,4.49893 c 1.541149,-0.02204 2.241616,0.731963 2.485439,1.845106 l 0,4.546362 -1.247463,0.0166 0,1.501224 c 0.0043,2.349095 -3.798813,2.290352 -3.794564,-0.0095 l 0.01186,-1.517826 -10.352045,0.02135 -0.0047,1.460907 c 0.0074,2.412595 -3.843637,2.383667 -3.813536,-0.0047 l 0.02371,-1.444305 -1.052991,-0.0095 c -0.113588,0.0033 -0.213279,-0.01916 -0.213445,-0.237161 l 0.0072,-4.311572 c 0.36842,-1.045963 0.870527,-1.961458 2.549472,-1.845107 l 1.107538,-4.562963 c 0.252447,-0.737352 1.125378,-1.818866 2.691768,-1.852221 z m 0.03083,2.56133 c -0.180038,0.01554 -0.320307,0.07228 -0.362855,0.225302 l -0.879865,3.675983 10.269038,0 -0.93204,-3.555031 c -0.08363,-0.303493 -0.218321,-0.308551 -0.346254,-0.346254 l -7.748024,0 z m -3.199292,5.435712 a 1.6132596,1.6218878 0 0 0 -1.61506,1.622177 1.6132596,1.6218878 0 0 0 1.61506,1.622174 1.6132596,1.6218878 0 0 0 1.61269,-1.622174 1.6132596,1.6218878 0 0 0 -1.61269,-1.622177 z m 14.092061,0.0498 a 1.6132596,1.6218878 0 0 0 -1.612689,1.622175 1.6132596,1.6218878 0 0 0 1.612689,1.619805 1.6132596,1.6218878 0 0 0 1.61269,-1.619805 1.6132596,1.6218878 0 0 0 -1.61269,-1.622175 z"
-       id="path4179"
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 32.058594,25.013672 c -0.766342,-0.01507 -1.475814,0.591834 -1.589844,1.347656 -0.153101,0.790611 0.37843,1.636985 1.160156,1.835938 0.770126,0.232914 1.6622,-0.218965 1.931641,-0.976563 0.306933,-0.743792 -0.04694,-1.678626 -0.771485,-2.029297 C 32.563971,25.07741 32.311423,25.0126 32.058594,25.013672 Z"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
+       id="path4148"
        inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/web/images/default.svg b/web/images/default.svg
new file mode 100644
index 00000000..b199135e
--- /dev/null
+++ b/web/images/default.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="50"
+   viewBox="0 0 50.000001 50.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="default.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="1.1750604"
+     inkscape:cy="21.052061"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2">
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
+       id="path4148"
+       inkscape:connector-curvature="0" />
+    <polygon
+       transform="translate(11.748737,10.957319)"
+       id="arrow"
+       points="13,19 7,22 13,4 19,22 "
+       style="fill:#008000;stroke:#000000;stroke-width:1px" />
+  </g>
+</svg>
diff --git a/web/images/route.svg b/web/images/route.svg
new file mode 100644
index 00000000..a85201d8
--- /dev/null
+++ b/web/images/route.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index f9a34d49..e0026c3b 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -26,8 +26,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="40.268129"
-     inkscape:cy="20.202497"
+     inkscape:cx="12.420548"
+     inkscape:cy="24.226399"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
@@ -72,15 +72,31 @@
      inkscape:label="Layer 2">
     <path
        style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="M 42.046474,25 C 42.046474,34.414508 34.414508,42.046474 25,42.046474 15.585492,42.046474 7.9535258,34.414508 7.9535255,25 7.9535253,17.60606 12.661055,11.311623 19.242451,8.9503498 l 5.619408,-7.4180155 6.003402,7.4570729 C 37.390248,11.380441 42.046474,17.64646 42.046474,25 Z"
-       id="path4148"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscccs" />
+       d="M 30.316406 29.011719 C 30.032969 29.012099 29.77725 29.129922 29.591797 29.318359 C 29.406343 29.506797 29.292477 29.765616 29.292969 30.052734 C 29.293119 30.339392 29.406391 30.599146 29.591797 30.787109 C 29.777203 30.975073 30.033423 31.091416 30.316406 31.091797 C 30.599849 31.092075 30.857088 30.977075 31.042969 30.789062 C 31.228849 30.60105 31.343599 30.339859 31.34375 30.052734 C 31.344243 29.76515 31.228896 29.504892 31.042969 29.316406 C 30.857041 29.12792 30.600304 29.011439 30.316406 29.011719 z "
+       id="path4330" />
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 33.841797,17.199219 c -3.79362,0.0033 -7.587239,0.0065 -11.380859,0.0098 -0.69659,0.0028 -0.655606,0.76697 -0.635167,1.261258 0.0014,0.532055 0.0029,1.064109 0.0043,1.596164 -0.818995,0.03277 -1.654099,-0.08495 -2.459094,0.09178 -0.632659,0.315896 -1.044459,0.93882 -1.568543,1.403598 -0.56765,0.63639 -1.366187,1.150658 -1.603243,2.005594 -6.59e-4,1.659164 -0.0013,3.318328 -0.002,4.977492 -1.027034,-0.04909 -0.863853,1.622575 0.143695,1.365669 0.413039,0.0012 0.826078,0.0023 1.239117,0.0035 -0.100744,1.404697 0.999905,2.745148 2.412469,2.862533 1.463988,0.236545 3.041103,-0.817833 3.182341,-2.338018 -0.193618,-0.695013 0.435198,-0.483296 0.862971,-0.50858 1.154698,0.0032 2.309396,0.0063 3.464094,0.0095 -0.08973,1.41597 1.077973,2.71414 2.487157,2.80097 1.412682,0.199315 2.875611,-0.838574 3.031898,-2.283519 -0.189293,-0.741658 0.532546,-0.463074 0.971937,-0.547762 0.650835,-0.120978 0.531304,-0.853948 0.532032,-1.34246 -0.01093,-3.587977 -0.02186,-7.175954 -0.03278,-10.763931 0.0027,-0.357707 -0.302217,-0.611902 -0.650391,-0.603515 z"
+       id="path4336"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 20.369141,21.662109 1.46875,0 -0.02734,2.617188 -3.869141,0.03906 -0.0059,-0.52539 2.433594,-2.13086 z"
+       id="path4334" />
     <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84430718;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 25,10.429576 C 16.953056,10.429769 10.429769,16.953056 10.429576,25 10.429769,33.046944 16.953056,39.570231 25,39.570424 33.046944,39.570231 39.570231,33.046944 39.570424,25 39.570231,16.953056 33.046944,10.429769 25,10.429576 Z m 8.841196,6.770477 c 0.460634,0.02953 0.622705,0.267803 0.650193,0.603076 l 0.03534,11.540907 c -0.07256,0.299323 -0.236494,0.572403 -0.69024,0.579519 l -0.770337,0.01885 c -0.07661,3.844781 -5.58244,3.657007 -5.564323,-0.0025 l -4.29221,-0.01183 c 0.0137,3.807627 -5.659897,3.856665 -5.630285,-0.01413 l -1.394615,-0.0047 c -0.958858,0.01435 -0.940133,-1.339998 0.01182,-1.363989 l 0.0025,-5.029565 c 0,0 0.03734,-0.309502 0.55596,-0.904614 l 2.108412,-2.113124 c 0.192955,-0.194626 0.404056,-0.415465 1.144904,-0.433461 l 1.821009,0.0025 -0.0047,-2.167306 c 0.02174,-0.279544 0.07758,-0.641486 0.636056,-0.69024 z m -13.472636,4.461824 -2.433508,2.13197 0.0071,0.525336 3.868171,-0.04004 0.02827,-2.617258 z m 0.02356,7.293457 c -0.565965,7.6e-4 -1.024459,0.465576 -1.02476,1.038894 3.01e-4,0.573318 0.458795,1.038134 1.02476,1.038894 0.566886,5.56e-4 1.026813,-0.464646 1.027115,-1.038894 -3.02e-4,-0.574249 -0.460229,-1.03945 -1.027115,-1.038894 z m 9.92485,0.05653 c -0.566874,7.61e-4 -1.025743,0.467012 -1.024759,1.041249 3.01e-4,0.573316 0.458793,1.038133 1.024759,1.038894 0.566885,5.57e-4 1.026813,-0.464645 1.027115,-1.038894 9.85e-4,-0.575169 -0.45932,-1.041808 -1.027115,-1.041249 z"
-       id="path4179"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" />
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 20.392578,28.955078 c 0.495617,-0.01 0.949054,0.392744 1.015279,0.880782 0.08326,0.480935 -0.222962,0.990466 -0.686539,1.142734 -0.433519,0.157426 -0.953792,-0.03157 -1.192133,-0.42471 -0.264966,-0.402656 -0.196351,-0.982659 0.156372,-1.311528 0.187059,-0.182377 0.44554,-0.288296 0.707021,-0.287278 z"
+       id="path4322"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
+       d="m 30.316406,29.011719 c 0.478158,-0.0097 0.92095,0.363157 1.006701,0.831145 0.100881,0.459837 -0.150196,0.969495 -0.58392,1.158109 -0.416503,0.197732 -0.954004,0.0628 -1.228859,-0.307059 -0.31121,-0.389351 -0.284147,-1.000054 0.06429,-1.357684 0.189169,-0.203633 0.463259,-0.325919 0.741784,-0.324511 z"
+       id="path4328"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.429688 c 6.598201,-0.123185 12.819493,4.830867 14.196406,11.280617 1.543338,6.202211 -1.588945,13.143604 -7.251063,16.101735 -5.688194,3.206782 -13.425166,1.899164 -17.73054,-3.015306 C 9.647006,29.954251 9.1668508,21.921033 13.117741,16.56535 15.789672,12.756758 20.34357,10.392898 25,10.429688 Z"
+       id="path4148"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/web/load.js b/web/load.js
index 7f0caf9d..7f5c62c0 100644
--- a/web/load.js
+++ b/web/load.js
@@ -130,7 +130,8 @@
     addStyleFile('app.css');
     //addScriptFile('arrow.js');
     
-    addSvgFile('images/arrow.svg', 'arrowSvg');
+    addSvgFile('images/default.svg', 'defaultSvg');
+    addSvgFile('images/route.svg', 'routeSvg');
     addSvgFile('images/car.svg', 'carSvg');
     addSvgFile('images/bus.svg', 'busSvg');
     addSvgFile('images/truck.svg', 'truckSvg');
-- 
cgit v1.2.3


From 185a6e4b3518ea7cebac33430751507b1bb94994 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 10 Nov 2016 12:08:25 +0500
Subject: - Implement category selector for DeviceDialog - Fix jscs and jshint
 issues

---
 web/app/Application.js           |  1 -
 web/app/DeviceImages.js          | 43 +++++++++++----------
 web/app/Style.js                 |  2 +-
 web/app/store/DeviceImages.js    | 64 ++++++++++++++++----------------
 web/app/view/DeviceDialog.js     |  8 ++++
 web/app/view/MapController.js    | 12 +++---
 web/app/view/ReportController.js |  2 +-
 web/images/arrow.svg             |  1 +
 web/images/bicycle.svg           | 70 +++++++++++------------------------
 web/images/bus.svg               | 80 +++++++++++-----------------------------
 web/images/car.svg               | 70 ++++++++++-------------------------
 web/images/default.svg           | 69 ++++++++++++----------------------
 web/images/motorcycle.svg        | 70 +++++++++++------------------------
 web/images/person.svg            | 69 +++++++++++-----------------------
 web/images/plane.svg             | 70 +++++++++++------------------------
 web/images/route.svg             |  1 -
 web/images/ship.svg              | 70 +++++++++++------------------------
 web/images/truck.svg             | 76 +++++++++++---------------------------
 web/l10n/en.json                 |  1 +
 web/load.js                      | 30 +++++++--------
 20 files changed, 283 insertions(+), 526 deletions(-)
 create mode 100644 web/images/arrow.svg
 delete mode 100644 web/images/route.svg

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

diff --git a/web/app/Application.js b/web/app/Application.js
index a92d148b..702a75a9 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -127,7 +127,6 @@ Ext.define('Traccar.Application', {
     },
 
     showError: function (response) {
-        var data;
         if (Ext.isString(response)) {
             Ext.Msg.alert(Strings.errorTitle, response);
         } else if (response.responseText) {
diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index 87f2ca87..f96a3b06 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -18,24 +18,21 @@
 
 Ext.define('Traccar.DeviceImages', {
     singleton: true,
-    
-    getImageIcon: function(color, zoom, angle, category) {
-        var image, device, svg, width, height, rotateTransform, scaleTransform, transform, fill;
-        // Get right image or fallback to default arrow
+
+    getImageSvg: function (color, zoom, angle, category) {
+        var i, device, svg, width, height, rotateTransform, scaleTransform, fill;
+
         if (category) {
-            device = Ext.getStore('DeviceImages').findRecord('key', category);
+            device = Ext.getStore('DeviceImages').findRecord('key', category, 0, false, false, true);
         }
         if (device === undefined || device === null) {
-            device = Ext.getStore('DeviceImages').findRecord('key', 'default');
+            device = Ext.getStore('DeviceImages').findRecord('key', 'default', 0, false, false, true);
         }
-
-        // Duplicate svg object to not brake origin
         svg = Ext.clone(device.get('svg'));
 
-        // Get original dimensions
         width = parseFloat(svg.documentElement.getAttribute('width'));
         height = parseFloat(svg.documentElement.getAttribute('height'));
-        // Colorize
+
         fill = device.get('fillId');
         if (!Ext.isArray(fill)) {
             fill = [fill];
@@ -43,11 +40,10 @@ Ext.define('Traccar.DeviceImages', {
         for (i = 0; i < fill.length; i++) {
             svg.getElementById(fill[i]).style.fill = color;
         }
-        // Prepare rotate transformation
+
         rotateTransform = 'rotate(' + angle + ' ' + (width / 2) + ' ' + (height / 2) + ')';
         svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform);
 
-        // Adjust size and prepare scale transformation
         width *= Traccar.Style.mapScaleNormal;
         height *= Traccar.Style.mapScaleNormal;
         if (zoom) {
@@ -63,23 +59,30 @@ Ext.define('Traccar.DeviceImages', {
         } else {
             svg.getElementById(device.get('scaleId')).setAttribute('transform', scaleTransform + ' ' + rotateTransform);
         }
-        //transform = scaleTransform + ' ' + rotateTransform;
-        
 
-        // Set dimension attributes
         svg.documentElement.setAttribute('width', width);
         svg.documentElement.setAttribute('height', height);
         svg.documentElement.setAttribute('viewBox', '0 0 ' + width + ' ' + height);
-   
+
+        return svg;
+    },
+
+    getImageIcon: function (color, zoom, angle, category) {
+        var image, svg, width, height;
+
+        svg = this.getImageSvg(color, zoom, angle, category);
+        width = parseFloat(svg.documentElement.getAttribute('width'));
+        height = parseFloat(svg.documentElement.getAttribute('height'));
+
         image =  new ol.style.Icon({
-            imgSize: [width, height], // Workaround for IE
+            imgSize: [width, height],
             src: 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(new XMLSerializer().serializeToString(svg.documentElement))
         });
         image.fill = color;
         image.zoom = zoom;
         image.angle = angle;
         image.category = category;
-        
+
         return image;
-    }        
-});
\ No newline at end of file
+    }
+});
diff --git a/web/app/Style.js b/web/app/Style.js
index b19584f0..a7fe1056 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -57,7 +57,7 @@ Ext.define('Traccar.Style', {
 
     mapColorOnline: 'rgba(77, 250, 144, 1.0)',
     mapColorUnknown: 'rgba(250, 190, 77, 1.0)',
-    mapColorOffline: 'rgba(255, 84, 104, 1.0)',
+    mapColorOffline: 'rgba(255, 162, 173, 1.0)',
 
     mapScaleNormal: 1,
     mapScaleSelected: 1.5,
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index 64a78556..efe8606a 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -17,12 +17,12 @@
  */
 Ext.define('Traccar.store.DeviceImages', {
     extend: 'Ext.data.Store',
-    fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId', 'scale'],
+    fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId'],
 
     data: [{
-        key: 'route',
-        name: Strings.categoryRoute,
-        svg: document.getElementById('routeSvg').contentDocument,
+        key: 'arrow',
+        name: Strings.categoryArrow,
+        svg: document.getElementById('arrowSvg').contentDocument,
         fillId: 'arrow',
         rotateId: 'arrow',
         scaleId: 'arrow'
@@ -30,64 +30,64 @@ Ext.define('Traccar.store.DeviceImages', {
         key: 'default',
         name: Strings.categoryDefault,
         svg: document.getElementById('defaultSvg').contentDocument,
-        fillId: ['path4148', 'path4149'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'car',
         name: Strings.categoryCar,
         svg: document.getElementById('carSvg').contentDocument,
-        fillId: ['path4148', 'path4157'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'bus',
         name: Strings.categoryBus,
         svg: document.getElementById('busSvg').contentDocument,
-        fillId: ['path4148', 'path4200'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'truck',
         name: Strings.categoryTruck,
         svg: document.getElementById('truckSvg').contentDocument,
-        fillId: ['path4148', 'path4336'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'ship',
         name: Strings.categoryShip,
         svg: document.getElementById('shipSvg').contentDocument,
-        fillId: ['path4148', 'path4177'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'plane',
         name: Strings.categoryPlane,
         svg: document.getElementById('planeSvg').contentDocument,
-        fillId: ['path4148', 'path4203'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'motorcycle',
         name: Strings.categoryMotorcycle,
         svg: document.getElementById('motorcycleSvg').contentDocument,
-        fillId: ['path4148', 'path4256'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'bicycle',
         name: Strings.categoryBicycle,
         svg: document.getElementById('bicycleSvg').contentDocument,
-        fillId: ['path4148', 'path4282'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }, {
         key: 'person',
         name: Strings.categoryPerson,
         svg: document.getElementById('personSvg').contentDocument,
-        fillId: ['path4148', 'path4308'],
-        rotateId: 'path4148',
-        scaleId: 'layer2'
+        fillId: 'path4724',
+        rotateId: 'path4724',
+        scaleId: 'layer1'
     }]
-});
\ No newline at end of file
+});
diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js
index dea50749..d3f964ed 100644
--- a/web/app/view/DeviceDialog.js
+++ b/web/app/view/DeviceDialog.js
@@ -65,6 +65,14 @@ Ext.define('Traccar.view.DeviceDialog', {
             queryMode: 'local',
             displayField: 'name',
             valueField: 'key',
+            listConfig: {
+                getInnerTpl: function () {
+                    return '<table><tr valign="middle" ><td><div align="center" style="width:40px;height:40px;" >' +
+                    '{[new XMLSerializer().serializeToString(Traccar.DeviceImages.getImageSvg(' +
+                    'Traccar.Style.mapColorOnline, false, 0, values.key))]}</div></td>' +
+                    '<td>- {name}</td></tr></table>';
+                }
+            }
         }]
     }
 });
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index a0e28671..103d62ed 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -71,7 +71,7 @@ Ext.define('Traccar.view.MapController', {
         this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile());
     },
 
-    showReports: function() {
+    showReports: function () {
         Traccar.app.showReports(true);
     },
 
@@ -290,7 +290,7 @@ Ext.define('Traccar.view.MapController', {
                     color: Traccar.Style.mapTextStrokeColor,
                     width: Traccar.Style.mapTextStrokeWidth
                 }),
-                offsetY: - image.getSize()[1] / 2 - Traccar.Style.mapTextOffset,
+                offsetY: -image.getSize()[1] / 2 - Traccar.Style.mapTextOffset,
                 font : Traccar.Style.mapTextFont
             })
         });
@@ -305,7 +305,7 @@ Ext.define('Traccar.view.MapController', {
         if (deviceId !== undefined) {
             index = deviceId % Traccar.Style.mapRouteColor.length;
         }
-        return this.getMarkerStyle(false, Traccar.Style.mapRouteColor[index], angle, 'route');
+        return this.getMarkerStyle(false, Traccar.Style.mapRouteColor[index], angle, 'arrow');
     },
 
     resizeMarker: function (style, zoom) {
@@ -315,13 +315,13 @@ Ext.define('Traccar.view.MapController', {
                 style.getImage().angle,
                 style.getImage().category);
         text = style.getText();
-        text.setOffsetY(- image.getSize()[1] / 2 - Traccar.Style.mapTextOffset);
-        return newStyle = new ol.style.Style({
+        text.setOffsetY(-image.getSize()[1] / 2 - Traccar.Style.mapTextOffset);
+        return new ol.style.Style({
             image: image,
             text: text
         });
     },
-    
+
     rotateMarker: function (style, angle) {
         var newStyle = new ol.style.Style({
             image: Traccar.DeviceImages.getImageIcon(style.getImage().fill,
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 67fcf121..50eabaea 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -41,7 +41,7 @@ Ext.define('Traccar.view.ReportController', {
         }
     },
 
-    hideReports: function() {
+    hideReports: function () {
         Traccar.app.showReports(false);
     },
 
diff --git a/web/images/arrow.svg b/web/images/arrow.svg
new file mode 100644
index 00000000..a85201d8
--- /dev/null
+++ b/web/images/arrow.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/bicycle.svg b/web/images/bicycle.svg
index 2f0c4d95..86132ffc 100644
--- a/web/images/bicycle.svg
+++ b/web/images/bicycle.svg
@@ -9,18 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="bicycle.svg"
-   inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="bicycle.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -28,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="15.977102"
-     inkscape:cy="28.79197"
+     inkscape:zoom="15.839192"
+     inkscape:cx="-2.9160663"
+     inkscape:cy="26.96638"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -41,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -49,46 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
-    <path
-       d="m 21.136144,27.536275 -3.110899,0 q -0.396293,0 -0.574625,-0.346757 -0.168424,-0.346756 0.06935,-0.66379 l 1.862577,-2.486738 q -0.643976,-0.307127 -1.357303,-0.307127 -1.307767,0 -2.239055,0.931288 -0.931289,0.931288 -0.931289,2.239055 0,1.307767 0.931289,2.239055 0.931288,0.931289 2.239055,0.931289 1.139342,0 2.011186,-0.713328 0.871845,-0.723235 1.099713,-1.822947 z m -1.842762,-1.268138 1.842762,0 q -0.178332,-0.842122 -0.743049,-1.466283 l -1.099713,1.466283 z m 4.755515,0 2.853309,-3.804411 -4.755515,0 -0.980825,1.307766 q 1.040269,1.020454 1.248323,2.496645 l 1.634708,0 z m 10.164913,2.873124 q 0.931289,-0.931288 0.931289,-2.239055 0,-1.307767 -0.931289,-2.239055 -0.931288,-0.931288 -2.239055,-0.931288 -0.594439,0 -1.198786,0.237776 l 1.723874,2.575903 q 0.14861,0.227869 0.09907,0.485459 -0.04954,0.257591 -0.267497,0.396293 -0.14861,0.108981 -0.356664,0.108981 -0.346756,0 -0.525088,-0.287313 L 29.72579,24.673058 q -0.921381,0.941196 -0.921381,2.229148 0,1.307767 0.931288,2.239055 0.931289,0.931289 2.239055,0.931289 1.307767,0 2.239055,-0.931289 z m 0.891659,-5.369769 q 1.307767,1.297859 1.307767,3.130714 0,1.832855 -1.307767,3.140621 -1.297859,1.29786 -3.130714,1.29786 -1.832855,0 -3.140621,-1.29786 -1.29786,-1.307766 -1.29786,-3.140621 0,-0.96101 0.386386,-1.81304 0.396293,-0.861937 1.089806,-1.486098 l -0.643977,-0.970918 -3.497284,4.646534 q -0.178332,0.257591 -0.505274,0.257591 l -1.951742,0 q -0.227869,1.624801 -1.476191,2.714606 -1.248323,1.089806 -2.912753,1.089806 -1.832855,0 -3.140622,-1.29786 -1.297859,-1.307766 -1.297859,-3.140621 0,-1.832855 1.297859,-3.130714 1.307767,-1.307766 3.140622,-1.307766 1.129434,0 2.130074,0.544902 l 1.357303,-1.81304 -2.21924,0 q -0.25759,0 -0.44583,-0.188239 -0.188239,-0.188239 -0.188239,-0.445829 0,-0.257591 0.188239,-0.44583 0.18824,-0.188239 0.44583,-0.188239 l 3.804412,0 0,1.268137 4.309685,0 -0.842122,-1.268137 -2.199426,0 q -0.25759,0 -0.445829,-0.188239 -0.188239,-0.188239 -0.188239,-0.44583 0,-0.25759 0.188239,-0.445829 0.188239,-0.18824 0.445829,-0.18824 l 2.536275,0 q 0.326941,0 0.525088,0.277406 l 2.645255,3.962928 q 0.901567,-0.435921 1.902206,-0.435921 1.832855,0 3.130714,1.307766 z"
-       style="fill:#008000;stroke:#000000;stroke-width:0.71658581;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4282"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4140"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17.279576,21.785713 -2.19029,0 q -0.279018,0 -0.404576,-0.24414 -0.118583,-0.244141 0.04883,-0.467355 l 1.311384,-1.750837 q -0.453404,-0.216239 -0.955636,-0.216239 -0.920759,0 -1.576451,0.655692 -0.655692,0.655692 -0.655692,1.576451 0,0.920759 0.655692,1.576451 0.655692,0.655692 1.576451,0.655692 0.802176,0 1.416015,-0.502232 0.61384,-0.509208 0.774275,-1.283483 z m -1.297433,-0.892857 1.297433,0 Q 17.154018,20.299943 16.756418,19.86049 l -0.774275,1.032366 z m 3.348214,0 2.008929,-2.678571 -3.348214,0 -0.69057,0.920759 q 0.732422,0.718471 0.878907,1.757812 l 1.150948,0 z m 7.156808,2.02288 q 0.655692,-0.655692 0.655692,-1.576451 0,-0.920759 -0.655692,-1.576451 -0.655692,-0.655692 -1.576451,-0.655692 -0.418526,0 -0.844029,0.167411 l 1.213728,1.813616 q 0.104632,0.160435 0.06976,0.341797 -0.03488,0.181361 -0.188338,0.279018 -0.104631,0.07673 -0.251116,0.07673 -0.24414,0 -0.369698,-0.202287 L 23.327293,19.76981 q -0.648716,0.662668 -0.648716,1.569476 0,0.920759 0.655692,1.576451 0.655691,0.655692 1.57645,0.655692 0.920759,0 1.576451,-0.655692 z m 0.62779,-3.780692 q 0.920759,0.913783 0.920759,2.204241 0,1.290457 -0.920759,2.211216 -0.913783,0.913784 -2.204241,0.913784 -1.290457,0 -2.211216,-0.913784 -0.913784,-0.920759 -0.913784,-2.211216 0,-0.676618 0.272043,-1.276507 0.279018,-0.606864 0.767299,-1.046317 l -0.453404,-0.683594 -2.462333,3.271485 q -0.125558,0.181361 -0.355747,0.181361 l -1.374163,0 q -0.160436,1.143974 -1.039342,1.911273 -0.878906,0.767299 -2.050781,0.767299 -1.290458,0 -2.211217,-0.913784 -0.913783,-0.920759 -0.913783,-2.211216 0,-1.290458 0.913783,-2.204241 0.920759,-0.920759 2.211217,-0.920759 0.795201,0 1.499721,0.383649 l 0.955636,-1.276506 -1.5625,0 q -0.181362,0 -0.313895,-0.132534 -0.132534,-0.132533 -0.132534,-0.313895 0,-0.181361 0.132534,-0.313895 0.132533,-0.132533 0.313895,-0.132533 l 2.678571,0 0,0.892857 3.03432,0 -0.592913,-0.892857 -1.548549,0 q -0.181362,0 -0.313896,-0.132534 -0.132533,-0.132533 -0.132533,-0.313895 0,-0.181362 0.132533,-0.313895 0.132534,-0.132534 0.313896,-0.132534 l 1.785714,0 q 0.23019,0 0.369699,0.195313 l 1.862444,2.790179 q 0.634765,-0.30692 1.339285,-0.30692 1.290458,0 2.204241,0.920759 z" />
   </g>
 </svg>
diff --git a/web/images/bus.svg b/web/images/bus.svg
index 935d7b92..6f1b7a90 100644
--- a/web/images/bus.svg
+++ b/web/images/bus.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="bus.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="24.67596"
-     inkscape:cy="22.389227"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-29.149417"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -38,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,61 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 24.835938,15 c -2.029405,0.104367 -4.224031,0.194416 -5.955099,1.384579 -0.967027,0.625001 -0.992823,1.834875 -1.313127,2.824078 -0.634042,2.314087 -1.159315,4.692966 -1.065749,7.106185 -0.0078,1.92435 -0.01563,3.848699 -0.02345,5.773049 0.488281,-0.0013 0.976562,-0.0026 1.464843,-0.0039 0.06247,0.821104 -0.222941,1.763667 0.355267,2.45298 0.725171,0.850603 2.364263,0.385698 2.379597,-0.787667 0.01539,-0.547653 6.57e-4,-1.095919 0.0034,-1.643828 2.901042,-0.0039 5.802083,-0.0078 8.703125,-0.01172 0.04124,0.736959 -0.129081,1.507503 0.114137,2.214921 0.525411,1.082242 2.49727,0.850284 2.589362,-0.416067 0.01489,-0.602538 -0.0036,-1.205791 -0.0024,-1.80862 0.479167,0.002 0.958333,0.0039 1.4375,0.0059 -0.01716,-2.624357 0.02704,-5.250153 -0.03272,-7.87352 C 33.334549,21.925736 32.563956,19.744982 32.054629,17.52153 31.45137,16.048265 29.736634,15.607466 28.321878,15.325483 27.171936,15.117024 26.002455,15.037677 24.835938,15 Z"
-       id="path4200"
-       inkscape:connector-curvature="0" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 28.615234,16.751953 c 0.419884,-0.0036 0.634905,0.382734 0.640625,0.771485 0.0057,0.38875 -0.198295,0.779803 -0.61914,0.783203 l -7.25,-0.03906 c -0.363434,-2.31e-4 -0.540727,-0.374859 -0.533203,-0.748047 0.0075,-0.373187 0.20013,-0.745337 0.574218,-0.742187 l 7.1875,-0.02539 z"
-       id="path4198" />
-    <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 30.064453,19.763672 c 0.367262,0.01971 0.556422,0.129342 0.662109,0.257812 0.105688,0.12847 0.128063,0.27555 0.164063,0.375 l 0.791016,3.763672 c -0.0052,0.350719 -0.09591,0.53281 -0.220703,0.644532 -0.124796,0.111721 -0.284137,0.152687 -0.431641,0.21875 l -12.011719,-0.01953 c -0.180791,-0.004 -0.334209,-0.05515 -0.445312,-0.183594 -0.111104,-0.128447 -0.179665,-0.333593 -0.1875,-0.646484 l 0.804687,-3.892578 c 0.08303,-0.192819 0.216257,-0.474296 0.730469,-0.509766 l 10.144531,-0.0078 z"
-       id="path4196" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 30.699219,27.105469 c 0.678139,-0.01219 1.31348,0.51714 1.422706,1.186688 0.125573,0.631851 -0.238002,1.312303 -0.828117,1.56677 -0.586035,0.275196 -1.340663,0.09168 -1.733251,-0.423637 -0.418234,-0.509187 -0.407572,-1.306388 0.02181,-1.80562 0.270416,-0.329597 0.690327,-0.527309 1.116857,-0.524201 z"
-       id="path4194"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 19.335938,27.111328 c 0.665875,-0.01325 1.294092,0.494428 1.41792,1.149271 0.137989,0.617714 -0.191102,1.29637 -0.759018,1.574081 -0.583075,0.309284 -1.3635,0.149537 -1.775759,-0.366694 -0.429377,-0.499232 -0.440039,-1.296433 -0.02181,-1.80562 0.269487,-0.345034 0.700603,-0.554527 1.138662,-0.551038 z"
-       id="path4181"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 30.064453 19.763672 L 19.919922 19.771484 C 19.40571 19.806954 19.272482 20.088431 19.189453 20.28125 L 18.384766 24.173828 C 18.392601 24.486719 18.461162 24.691865 18.572266 24.820312 C 18.683369 24.94876 18.836787 24.99987 19.017578 25.003906 L 31.029297 25.023438 C 31.176801 24.957375 31.336142 24.916409 31.460938 24.804688 C 31.585733 24.692966 31.67646 24.510875 31.681641 24.160156 L 30.890625 20.396484 C 30.854625 20.297034 30.83225 20.149954 30.726562 20.021484 C 30.620875 19.893014 30.431715 19.783384 30.064453 19.763672 z "
-       id="path4185" />
-    <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 28.126748,43.324765 35.941754,40.043911 39.57889,33.839327 43.471367,27.647386 42.664931,19.005572 37.705569,13.635688 35.848955,11.500603 33.373153,9.9676699 30.796754,8.9051796 28.818278,6.4478541 26.839803,3.9905286 24.861328,1.5332031 Z M 25,10.445312 C 31.718978,10.31196 38.025287,15.466156 39.259766,22.066406 40.645829,28.295943 37.349871,35.1464 31.626829,37.963035 25.868939,41.028841 18.176824,39.535013 13.993847,34.52613 9.5491383,29.57914 9.2593433,21.544158 13.337144,16.290647 16.025561,12.64863 20.469187,10.408583 25,10.445312 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4477"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17.056362,22.866908 q 0.265067,-0.265067 0.265067,-0.634766 0,-0.369699 -0.265067,-0.62779 -0.258092,-0.265067 -0.62779,-0.265067 -0.369699,0 -0.634766,0.265067 -0.258091,0.258091 -0.258091,0.62779 0,0.369699 0.258091,0.634766 0.265067,0.258091 0.634766,0.258091 0.369698,0 0.62779,-0.258091 z m 7.142857,0 q 0.265067,-0.265067 0.265067,-0.634766 0,-0.369699 -0.265067,-0.62779 -0.258091,-0.265067 -0.62779,-0.265067 -0.369699,0 -0.634766,0.265067 -0.258091,0.258091 -0.258091,0.62779 0,0.369699 0.258091,0.634766 0.265067,0.258091 0.634766,0.258091 0.369699,0 0.62779,-0.258091 z m -0.0558,-3.397043 -0.502233,-2.678571 q -0.03488,-0.160435 -0.160435,-0.258092 -0.118582,-0.104631 -0.279018,-0.104631 l -6.40346,0 q -0.160435,0 -0.285993,0.104631 -0.118582,0.09766 -0.15346,0.258092 l -0.502232,2.678571 q -0.03488,0.209264 0.09766,0.369699 0.132534,0.160435 0.341797,0.160435 l 7.407924,0 q 0.209264,0 0.341797,-0.160435 0.132534,-0.160435 0.09766,-0.369699 z m -1.674108,-4.031808 q 0.09766,-0.09766 0.09766,-0.237165 0,-0.139509 -0.09766,-0.237165 -0.09766,-0.09766 -0.237165,-0.09766 l -4.464285,0 q -0.139509,0 -0.237166,0.09766 -0.09766,0.09766 -0.09766,0.237165 0,0.139509 0.09766,0.237165 0.09766,0.09766 0.237166,0.09766 l 4.464285,0 q 0.139509,0 0.237165,-0.09766 z m 2.887835,4.820034 0,4.206194 -0.892857,0 0,0.892857 q 0,0.369699 -0.265067,0.62779 -0.258091,0.265067 -0.62779,0.265067 -0.369699,0 -0.634766,-0.265067 -0.258091,-0.258091 -0.258091,-0.62779 l 0,-0.892857 -5.357143,0 0,0.892857 q 0,0.369699 -0.265067,0.62779 -0.258092,0.265067 -0.62779,0.265067 -0.369699,0 -0.634766,-0.265067 -0.258091,-0.258091 -0.258091,-0.62779 l 0,-0.892857 -0.892857,0 0,-4.206194 q 0,-0.78125 0.174386,-1.555525 l 0.718471,-3.166853 q 0.06278,-0.544084 0.676618,-0.955636 0.620815,-0.411551 1.604353,-0.620814 0.99051,-0.209264 2.183311,-0.209264 1.192802,0 2.17634,0.209264 0.990513,0.209263 1.604352,0.620814 0.620815,0.411552 0.683594,0.955636 l 0.732422,3.166853 q 0.160435,0.711496 0.160435,1.555525 z" />
   </g>
 </svg>
diff --git a/web/images/car.svg b/web/images/car.svg
index 893078fa..d712374f 100644
--- a/web/images/car.svg
+++ b/web/images/car.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="car.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-6.1434451"
-     inkscape:cy="26.255618"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-29.149417"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -38,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,53 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 21.134766,16.966797 c -1.38074,-0.02043 -2.662213,1.062691 -2.832936,2.436607 l -0.921698,3.89102 c -1.030864,0.02164 -2.1403,0.529554 -2.448528,1.549583 -0.08585,0.66913 -0.08614,1.388686 -0.07126,2.054772 l 0.01365,2.858336 1.189799,0.01566 0.001,1.548644 c 0.179748,2.389748 3.7531,2.12524 3.766748,0.02427 0.0066,-0.524033 0.005,-1.048171 0.0083,-1.572246 3.450521,-0.0072 6.901041,-0.01432 10.351562,-0.02148 0.05778,0.910442 -0.249011,1.970932 0.45243,2.704019 0.988358,1.038977 3.20042,0.602342 3.320249,-0.963432 0.02206,-0.570623 0.0053,-1.142204 0.01052,-1.713243 0.415365,-0.0059 0.830729,-0.01172 1.246094,-0.01758 l 0,-4.546875 c -0.147573,-1.134958 -1.234974,-1.904789 -2.342351,-1.843564 l -1.27093,-4.500186 C 31.138256,17.606118 29.783723,16.901333 28.479776,17.00525 Z"
-       id="path4157"
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 21.166016,19.529297 c 2.582682,0 5.165364,0 7.748046,0 0.466632,0.143466 0.391901,0.755072 0.553141,1.137183 0.241401,0.921069 0.482802,1.842139 0.724203,2.763208 -3.423177,0 -6.846354,0 -10.269531,0 0.318103,-1.254803 0.572247,-2.533108 0.930254,-3.773248 0.07632,-0.09232 0.201879,-0.116527 0.313887,-0.127143 z"
-       id="path4155" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 17.966797,24.964844 c 1.160497,-0.0485 2.007143,1.347083 1.435547,2.357422 -0.482677,1.078253 -2.151895,1.188153 -2.769532,0.179687 -0.742773,-1.0203 0.06301,-2.57906 1.333985,-2.537109 z"
-       id="path4138" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 32.058594,25.013672 c -0.766342,-0.01507 -1.475814,0.591834 -1.589844,1.347656 -0.153101,0.790611 0.37843,1.636985 1.160156,1.835938 0.770126,0.232914 1.6622,-0.218965 1.931641,-0.976563 0.306933,-0.743792 -0.04694,-1.678626 -0.771485,-2.029297 C 32.563971,25.07741 32.311423,25.0126 32.058594,25.013672 Z"
-       id="path4146"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4409"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.877511,21.904297 q 0.327846,-0.327846 0.327846,-0.788225 0,-0.46038 -0.327846,-0.788226 Q 15.549665,20 15.089285,20 q -0.460379,0 -0.788225,0.327846 -0.327846,0.327846 -0.327846,0.788226 0,0.460379 0.327846,0.788225 0.327846,0.327846 0.788225,0.327846 0.46038,0 0.788226,-0.327846 z m 0.578962,-3.020368 7.087053,0 -0.620814,-2.490235 q -0.01395,-0.0558 -0.09766,-0.118582 -0.0837,-0.06976 -0.146484,-0.06976 l -5.357143,0 q -0.06278,0 -0.146484,0.06976 -0.08371,0.06278 -0.09766,0.118582 l -0.620815,2.490235 z m 9.242466,3.020368 q 0.327846,-0.327846 0.327846,-0.788225 0,-0.46038 -0.327846,-0.788226 Q 25.371093,20 24.910714,20 q -0.46038,0 -0.788226,0.327846 -0.327846,0.327846 -0.327846,0.788226 0,0.460379 0.327846,0.788225 0.327846,0.327846 0.788226,0.327846 0.460379,0 0.788225,-0.327846 z m 1.443918,-1.457868 0,2.678571 q 0,0.09766 -0.06278,0.160436 -0.06278,0.06278 -0.160436,0.06278 l -0.669642,0 0,0.892857 q 0,0.558035 -0.390625,0.94866 -0.390625,0.390625 -0.948661,0.390625 -0.558036,0 -0.948661,-0.390625 -0.390625,-0.390625 -0.390625,-0.94866 l 0,-0.892857 -7.142857,0 0,0.892857 q 0,0.558035 -0.390625,0.94866 -0.390625,0.390625 -0.948661,0.390625 -0.558035,0 -0.94866,-0.390625 Q 13.75,24.799107 13.75,24.241072 l 0,-0.892857 -0.669643,0 q -0.09766,0 -0.160436,-0.06278 -0.06278,-0.06278 -0.06278,-0.160436 l 0,-2.678571 q 0,-0.648717 0.453404,-1.102121 0.46038,-0.460379 1.109096,-0.460379 l 0.195313,0 0.732422,-2.922712 q 0.160435,-0.655692 0.725446,-1.095145 0.565011,-0.446429 1.248605,-0.446429 l 5.357143,0 q 0.683594,0 1.248605,0.446429 0.565011,0.439453 0.725446,1.095145 l 0.732422,2.922712 0.195313,0 q 0.648716,0 1.10212,0.460379 0.46038,0.453404 0.46038,1.102121 z" />
   </g>
 </svg>
diff --git a/web/images/default.svg b/web/images/default.svg
index 5af1abc7..983e487c 100644
--- a/web/images/default.svg
+++ b/web/images/default.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="default.svg"
+   sodipodi:docname="default.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="5.642786"
-     inkscape:cy="31.741592"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-7.4058825"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -38,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,47 +46,24 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <circle
-       style="fill:#008000;stroke:#000000;stroke-width:0.81650639;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4149"
-       cx="25"
-       cy="25"
-       r="7.0917473" />
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81362325;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4250"
+       cx="20"
+       cy="20"
+       r="5.2625632" />
   </g>
 </svg>
diff --git a/web/images/motorcycle.svg b/web/images/motorcycle.svg
index d3b6ee76..5e46b4d3 100644
--- a/web/images/motorcycle.svg
+++ b/web/images/motorcycle.svg
@@ -9,18 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="motorcycle.svg"
-   inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="motorcycle.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -28,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="25.580285"
-     inkscape:cy="37.395"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-7.4058825"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -41,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -49,46 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
-    <path
-       d="m 36.550791,26.40708 q 0.120641,1.035497 -0.221174,2.000621 -0.341815,0.955071 -0.995284,1.638701 -0.65347,0.683629 -1.598487,1.065657 -0.934964,0.382029 -1.970462,0.311655 -1.618593,-0.110587 -2.814945,-1.256672 -1.186298,-1.146085 -1.347152,-2.754625 -0.120641,-1.115924 0.271441,-2.111208 0.402135,-1.005338 1.196352,-1.719128 L 28.35729,22.50637 q -0.965124,0.80427 -1.51806,1.950355 -0.552936,1.146084 -0.552936,2.453023 0,0.271442 -0.191014,0.472509 -0.18096,0.191014 -0.452401,0.191014 l -2.573665,0 -0.693682,0 q -0.231228,1.648754 -1.497954,2.754625 -1.266725,1.105872 -2.955692,1.105872 -1.859874,0 -3.18692,-1.316993 -1.316992,-1.327045 -1.316992,-3.18692 0,-1.859874 1.316992,-3.176866 1.327046,-1.327046 3.18692,-1.327046 0.764056,0 1.528113,0.271441 l 0.241281,-0.452402 q -1.236565,-1.105871 -3.056226,-1.105871 l -0.643416,0 q -0.261388,0 -0.452402,-0.191014 -0.191014,-0.191014 -0.191014,-0.452402 0,-0.261388 0.191014,-0.452402 0.191014,-0.191014 0.452402,-0.191014 l 1.286832,0 q 0.784163,0 1.45774,0.140747 0.673575,0.130694 1.166191,0.382028 0.502669,0.251335 0.723843,0.402135 0.221174,0.140748 0.512722,0.361922 l 5.147328,0 1.156139,0 -0.854537,-1.286832 -2.23185,0 q -0.301601,0 -0.492615,-0.221174 -0.191014,-0.231228 -0.140747,-0.53283 0.04021,-0.231227 0.231227,-0.382028 0.191014,-0.150801 0.432295,-0.150801 l 2.543505,0 q 0.331761,0 0.532829,0.281495 l 0.703736,1.055604 1.146084,-1.146084 q 0.191015,-0.191015 0.462456,-0.191015 l 1.015391,0 q 0.261388,0 0.452402,0.191015 0.191014,0.191014 0.191014,0.452402 l 0,1.286832 q 0,0.261388 -0.191014,0.452402 -0.191014,0.191014 -0.452402,0.191014 l -1.799554,0 1.156138,1.729181 q 1.316992,-0.633363 2.764678,-0.361922 1.437633,0.261388 2.453024,1.357206 1.015391,1.085764 1.186298,2.543504 z m -18.628905,3.739855 q 1.156138,0 2.040835,-0.723843 0.884697,-0.733896 1.115925,-1.849821 l -3.15676,0 q -0.351868,0 -0.552936,-0.311654 -0.18096,-0.321709 -0.01005,-0.633363 l 1.477847,-2.784785 q -0.472509,-0.130694 -0.914858,-0.130694 -1.327045,0 -2.272063,0.945017 -0.945017,0.945017 -0.945017,2.272063 0,1.327046 0.945017,2.272063 0.945018,0.945017 2.272063,0.945017 z m 11.88309,-0.945017 q 0.945018,0.945017 2.272063,0.945017 1.327046,0 2.272063,-0.945017 0.945017,-0.945017 0.945017,-2.272063 0,-1.327046 -0.945017,-2.272063 -0.945017,-0.945017 -2.272063,-0.945017 -0.603202,0 -1.216459,0.241281 l 1.749288,2.613878 q 0.1508,0.231227 0.100534,0.492615 -0.05027,0.261388 -0.271441,0.402135 -0.150801,0.110587 -0.361922,0.110587 -0.351868,0 -0.532829,-0.291548 l -1.749287,-2.613877 q -0.934964,0.95507 -0.934964,2.262009 0,1.327046 0.945017,2.272063 z"
-       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.80562139;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4256"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4140"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 28.014333,20.976253 q 0.08371,0.718471 -0.15346,1.388114 -0.237165,0.662667 -0.690569,1.136997 -0.453404,0.474331 -1.109096,0.739398 -0.648716,0.265067 -1.367187,0.216238 -1.123047,-0.07673 -1.953125,-0.87193 -0.823103,-0.795201 -0.93471,-1.911273 -0.08371,-0.774274 0.188337,-1.464843 0.279018,-0.697545 0.830078,-1.192802 l -0.495257,-0.746373 q -0.669643,0.558036 -1.053292,1.353237 -0.38365,0.795201 -0.38365,1.702009 0,0.188337 -0.132533,0.327846 -0.125558,0.132533 -0.313895,0.132533 l -1.785714,0 -0.481306,0 q -0.160436,1.143974 -1.039342,1.911273 -0.878906,0.767299 -2.050781,0.767299 -1.290458,0 -2.211217,-0.913784 -0.913783,-0.920759 -0.913783,-2.211216 0,-1.290458 0.913783,-2.204241 0.920759,-0.920759 2.211217,-0.920759 0.530134,0 1.060268,0.188337 l 0.167411,-0.313895 q -0.85798,-0.767299 -2.120536,-0.767299 l -0.446429,0 q -0.181361,0 -0.313895,-0.132534 -0.132533,-0.132533 -0.132533,-0.313895 0,-0.181361 0.132533,-0.313895 0.132534,-0.132533 0.313895,-0.132533 l 0.892857,0 q 0.544085,0 1.01144,0.09766 0.467355,0.09068 0.809152,0.265067 0.348772,0.174386 0.502232,0.279018 0.15346,0.09766 0.355748,0.251116 l 3.571428,0 0.802177,0 -0.592913,-0.892857 -1.548549,0 q -0.209264,0 -0.341797,-0.15346 -0.132534,-0.160435 -0.09766,-0.369699 0.0279,-0.160435 0.160435,-0.265067 0.132533,-0.104632 0.299944,-0.104632 l 1.764788,0 q 0.23019,0 0.369699,0.195313 l 0.488281,0.732422 0.795201,-0.795201 q 0.132533,-0.132534 0.32087,-0.132534 l 0.70452,0 q 0.181362,0 0.313895,0.132534 0.132534,0.132533 0.132534,0.313895 l 0,0.892857 q 0,0.181362 -0.132534,0.313895 -0.132533,0.132534 -0.313895,0.132534 l -1.248605,0 0.802177,1.199777 q 0.913783,-0.439454 1.918248,-0.251117 0.997488,0.181362 1.702009,0.941686 0.70452,0.753348 0.823102,1.764788 z m -12.925502,2.594866 q 0.802176,0 1.416016,-0.502232 0.613839,-0.509208 0.774274,-1.283483 l -2.19029,0 q -0.244141,0 -0.38365,-0.216238 -0.125558,-0.223215 -0.007,-0.439453 l 1.025391,-1.932199 q -0.327846,-0.09068 -0.634766,-0.09068 -0.920759,0 -1.576451,0.655692 -0.655692,0.655692 -0.655692,1.576451 0,0.920759 0.655692,1.576451 0.655692,0.655692 1.576451,0.655692 z m 8.244978,-0.655692 q 0.655692,0.655692 1.576451,0.655692 0.920758,0 1.57645,-0.655692 0.655692,-0.655692 0.655692,-1.576451 0,-0.920759 -0.655692,-1.576451 -0.655692,-0.655692 -1.57645,-0.655692 -0.418527,0 -0.844029,0.167411 l 1.213727,1.813616 q 0.104632,0.160435 0.06976,0.341797 -0.03488,0.181361 -0.188337,0.279018 -0.104632,0.07673 -0.251116,0.07673 -0.244141,0 -0.369699,-0.202287 L 23.326833,19.7695 q -0.648716,0.662668 -0.648716,1.569476 0,0.920759 0.655692,1.576451 z" />
   </g>
 </svg>
diff --git a/web/images/person.svg b/web/images/person.svg
index 306b3033..71546ecb 100644
--- a/web/images/person.svg
+++ b/web/images/person.svg
@@ -9,18 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="person.svg"
-   inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="person.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -28,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="19.841247"
-     inkscape:cy="37.395"
+     inkscape:zoom="15.839192"
+     inkscape:cx="-2.9160663"
+     inkscape:cy="21.915617"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -41,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -49,45 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
-    <path
-       d="m 32.504338,30.89794 q 0,1.278083 -0.738708,2.192674 -0.726983,0.914591 -1.758829,0.914591 l -10.013601,0 q -1.031846,0 -1.770555,-0.914591 -0.726982,-0.914591 -0.726982,-2.192674 0,-0.99667 0.0938,-1.876084 0.10553,-0.891141 0.375217,-1.782281 0.269687,-0.902865 0.68008,-1.536044 0.422119,-0.644904 1.1022,-1.043572 0.691806,-0.410393 1.582946,-0.410393 1.536044,1.500867 3.670091,1.500867 2.134046,0 3.67009,-1.500867 0.89114,0 1.571221,0.410393 0.691806,0.398668 1.102199,1.043572 0.422119,0.633179 0.691806,1.536044 0.269687,0.89114 0.363492,1.782281 0.105529,0.879414 0.105529,1.876084 z M 28.177619,17.319779 q 1.324984,1.313259 1.324984,3.177618 0,1.864359 -1.324984,3.189343 -1.31326,1.313259 -3.177618,1.313259 -1.864359,0 -3.189344,-1.313259 -1.313259,-1.324984 -1.313259,-3.189343 0,-1.864359 1.313259,-3.177618 1.324985,-1.324985 3.189344,-1.324985 1.864358,0 3.177618,1.324985 z"
-       style="stroke:#000000;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#008000;fill-opacity:1"
-       id="path4308" />
+       inkscape:connector-curvature="0"
+       id="path4140"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 24.464286,23.508649 q 0,0.760323 -0.439454,1.304408 -0.432477,0.544085 -1.046317,0.544085 l -5.957031,0 q -0.613839,0 -1.053292,-0.544085 -0.432478,-0.544085 -0.432478,-1.304408 0,-0.592913 0.0558,-1.116072 0.06278,-0.530134 0.223214,-1.060268 0.160435,-0.537109 0.404576,-0.913783 0.251116,-0.38365 0.655692,-0.620815 0.411551,-0.24414 0.941685,-0.24414 0.913784,0.892857 2.183315,0.892857 1.269531,0 2.183315,-0.892857 0.530134,0 0.934709,0.24414 0.411552,0.237165 0.655692,0.620815 0.251116,0.376674 0.411552,0.913783 0.160435,0.530134 0.216239,1.060268 0.06278,0.523159 0.06278,1.116072 z m -2.57394,-8.077567 q 0.788225,0.78125 0.788225,1.890346 0,1.109096 -0.788225,1.897321 -0.78125,0.78125 -1.890346,0.78125 -1.109096,0 -1.897322,-0.78125 -0.78125,-0.788225 -0.78125,-1.897321 0,-1.109096 0.78125,-1.890346 Q 18.890904,14.642856 20,14.642856 q 1.109096,0 1.890346,0.788226 z" />
   </g>
 </svg>
diff --git a/web/images/plane.svg b/web/images/plane.svg
index b3b749ca..5c81e9b4 100644
--- a/web/images/plane.svg
+++ b/web/images/plane.svg
@@ -9,18 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="plane.svg"
-   inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="plane.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -28,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="13.062504"
-     inkscape:cy="37.395"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-7.4058825"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -41,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -49,46 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
-    <path
-       d="m 33.004602,16.995793 q 0.521366,0.616159 0.142191,1.753686 -0.379176,1.137525 -1.279717,2.038066 l -1.907725,1.907727 1.895876,8.247061 q 0.05924,0.225136 -0.142191,0.391024 l -1.516701,1.137526 q -0.08294,0.0711 -0.225135,0.0711 -0.0474,0 -0.08294,-0.01184 -0.177739,-0.03554 -0.248833,-0.189588 l -3.305935,-6.019407 -3.06895,3.06895 0.62801,2.29875 q 0.05924,0.201437 -0.0948,0.367326 l -1.137525,1.137525 q -0.106643,0.106644 -0.272533,0.106644 l -0.0237,0 q -0.17774,-0.0237 -0.284384,-0.154045 l -2.239504,-2.986006 -2.986005,-2.239503 q -0.130341,-0.08294 -0.15404,-0.272532 -0.01184,-0.15404 0.106644,-0.296231 l 1.137526,-1.149375 Q 18.050879,26.096 18.216769,26.096 q 0.0711,0 0.09479,0.01185 l 2.29875,0.628008 3.06895,-3.068949 -6.019407,-3.305935 q -0.165889,-0.09479 -0.201437,-0.284381 -0.0237,-0.189588 0.106643,-0.31993 l 1.516701,-1.5167 q 0.165889,-0.154041 0.355477,-0.0948 l 7.879736,1.884027 1.895875,-1.895876 q 0.900542,-0.900541 2.038068,-1.279716 1.137525,-0.379175 1.753686,0.14219 z"
-       style="fill:#008000;stroke:#000000;stroke-width:0.93743491;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4203"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4140"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 24.710579,15.289739 q 0.30692,0.362723 0.08371,1.032366 -0.223214,0.669642 -0.753348,1.199776 l -1.123047,1.123047 1.116072,4.854911 q 0.03488,0.132533 -0.08371,0.23019 l -0.892857,0.669643 q -0.04883,0.04185 -0.132533,0.04185 -0.0279,0 -0.04883,-0.007 -0.104632,-0.02093 -0.146485,-0.111607 l -1.946149,-3.543527 -1.806641,1.80664 0.369699,1.353237 q 0.03488,0.118583 -0.0558,0.216239 l -0.669643,0.669643 q -0.06278,0.06278 -0.160435,0.06278 l -0.01395,0 Q 18.342,24.873977 18.279221,24.797247 L 16.960858,23.03946 15.203046,21.7211 q -0.07673,-0.04883 -0.09068,-0.160435 -0.007,-0.09068 0.06278,-0.174386 l 0.669643,-0.676619 q 0.06278,-0.06278 0.160435,-0.06278 0.04185,0 0.0558,0.007 l 1.353237,0.369698 1.806641,-1.80664 -3.543527,-1.94615 q -0.09766,-0.0558 -0.118583,-0.16741 -0.01395,-0.111608 0.06278,-0.188337 L 16.51443,16.02216 q 0.09766,-0.09068 0.209263,-0.0558 l 4.638672,1.109096 1.116071,-1.116072 q 0.530134,-0.530134 1.199777,-0.753348 0.669643,-0.223214 1.032366,0.08371 z" />
   </g>
 </svg>
diff --git a/web/images/route.svg b/web/images/route.svg
deleted file mode 100644
index a85201d8..00000000
--- a/web/images/route.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="26" height="26"><polygon id="arrow" points="13,4 19,22 13,19 7,22" style="fill:#008000;stroke:#000000;stroke-width:1px;" transform="" /></svg>
diff --git a/web/images/ship.svg b/web/images/ship.svg
index 5e242997..c82dc6c7 100644
--- a/web/images/ship.svg
+++ b/web/images/ship.svg
@@ -9,18 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="ship.svg"
-   inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="ship.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -28,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="36.757017"
-     inkscape:cy="20.285436"
+     inkscape:zoom="11.313708"
+     inkscape:cx="14.337652"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -41,54 +38,31 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:title></dc:title>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path9144"
-       ry="5.0823298"
-       rx="5.2149124"
-       cy="16.191458"
-       cx="-31.99658" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       d="m 31.631482,30.552917 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379182,0.160099 l 1.078564,1.078564 -0.758365,0.758365 -0.699381,-0.699381 -0.699381,0.699381 q -0.151673,0.1601 -0.379183,0.1601 -0.227509,0 -0.379182,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.1601 -0.379183,0.1601 -0.219083,0 -0.379182,-0.1601 l -0.699382,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.1601 -0.379183,0.1601 -0.219083,0 -0.379182,-0.1601 L 19.0679,31.690465 18.368519,32.389846 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -1.078564,-1.078563 0.758366,-0.758366 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.1601,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699382,0.699382 0.69938,-0.699382 q 0.1601,-0.160099 0.379183,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219084,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699381,0.699382 0.699382,-0.699382 z M 18.368519,30.232719 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -1.078564,-1.078564 0.758366,-0.758365 0.699381,0.690955 0.699381,-0.690955 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.690955 0.539282,-0.539282 0,-2.468899 -1.769519,-2.645852 q -0.143246,-0.219083 -0.05898,-0.471871 0.08426,-0.261215 0.337051,-0.345478 l 1.491452,-0.488724 0,-2.519457 1.078563,0 0,-1.078564 2.157128,0 0,-1.078564 2.157127,0 0,1.078564 2.157127,0 0,1.078564 1.078564,0 0,2.519457 1.491451,0.488724 q 0.252788,0.08426 0.337051,0.345478 0.08426,0.252788 -0.05898,0.471871 l -1.769518,2.645852 0,2.468899 0.160099,-0.151673 q 0.160099,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699381,0.690955 0.699382,-0.690955 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379182,0.160099 l 1.078564,1.078564 -0.758365,0.758365 -0.699381,-0.699381 -0.699381,0.699381 q -0.151673,0.160099 -0.379183,0.160099 -0.227509,0 -0.379182,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.160099 -0.379183,0.160099 -0.219083,0 -0.379182,-0.160099 l -0.699382,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.160099 -0.379183,0.160099 -0.219083,0 -0.379182,-0.160099 l -0.69939,-0.699381 -0.699381,0.699381 z m 3.39579,-9.546973 0,1.078563 3.235692,-1.078563 3.23569,1.078563 0,-1.078563 -1.078563,0 0,-1.078564 -4.314255,0 0,1.078564 -1.078564,0 z"
-       id="path4177"
        inkscape:connector-curvature="0"
-       style="fill:#008000;stroke:#000000;stroke-width:0.66699368;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path4511"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 25.489676,24.596818 q 0.132533,-0.132533 0.313895,-0.132533 0.181362,0 0.313895,0.132533 l 0.892857,0.892858 -0.62779,0.62779 -0.578962,-0.578962 -0.578962,0.578962 q -0.125558,0.132533 -0.313895,0.132533 -0.188337,0 -0.313895,-0.132533 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132534,0.132533 -0.313895,0.132533 -0.181362,0 -0.313895,-0.132533 l -0.578963,-0.578962 -0.578962,0.578962 q -0.132533,0.132533 -0.313895,0.132533 -0.181361,0 -0.313895,-0.132533 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132533,0.132533 -0.313895,0.132533 -0.181362,0 -0.313895,-0.132533 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132534,0.132533 -0.313895,0.132533 -0.181362,0 -0.313895,-0.132533 L 16.875,25.538504 16.296038,26.117466 q -0.132534,0.132533 -0.313896,0.132533 -0.181361,0 -0.313895,-0.132533 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132533,0.132533 -0.313895,0.132533 -0.181361,0 -0.313895,-0.132533 l -0.892857,-0.892857 0.62779,-0.627791 0.578962,0.578962 0.578962,-0.578962 q 0.132534,-0.132533 0.313895,-0.132533 0.181362,0 0.313895,0.132533 l 0.578962,0.578962 0.578963,-0.578962 q 0.132533,-0.132533 0.313895,-0.132533 0.181361,0 0.313895,0.132533 l 0.578962,0.578962 0.578962,-0.578962 q 0.132533,-0.132533 0.313895,-0.132533 0.181361,0 0.313895,0.132533 l 0.578962,0.578962 0.578962,-0.578962 q 0.132534,-0.132533 0.313895,-0.132533 0.181362,0 0.313895,0.132533 l 0.578962,0.578962 0.578962,-0.578962 q 0.132534,-0.132533 0.313895,-0.132533 0.181362,0 0.313896,0.132533 L 23.125,25.17578 23.703962,24.596818 q 0.132533,-0.132533 0.313895,-0.132533 0.181361,0 0.313895,0.132533 l 0.578962,0.578962 0.578962,-0.578962 z M 14.510323,24.331751 q -0.132533,0.132534 -0.313895,0.132534 -0.181361,0 -0.313895,-0.132534 l -0.892857,-0.892857 0.62779,-0.62779 0.578962,0.571987 0.578962,-0.571987 q 0.132534,-0.132533 0.313895,-0.132533 0.181362,0 0.313895,0.132533 l 0.578962,0.571987 0.446429,-0.446429 0,-2.043806 -1.464844,-2.19029 q -0.118582,-0.181361 -0.04883,-0.390625 0.06976,-0.216239 0.279018,-0.285993 l 1.234654,-0.404576 0,-2.085659 0.892857,0 0,-0.892857 1.785714,0 0,-0.892857 1.785715,0 0,0.892857 1.785714,0 0,0.892857 0.892857,0 0,2.085659 1.234654,0.404576 q 0.209264,0.06975 0.279018,0.285993 0.06976,0.209264 -0.04883,0.390625 l -1.464844,2.19029 0,2.043806 0.132534,-0.125558 q 0.132533,-0.132533 0.313895,-0.132533 0.181361,0 0.313895,0.132533 l 0.578962,0.571987 0.578962,-0.571987 q 0.132533,-0.132533 0.313895,-0.132533 0.181362,0 0.313895,0.132533 l 0.892857,0.892857 -0.62779,0.62779 -0.578962,-0.578962 -0.578962,0.578962 q -0.125558,0.132534 -0.313895,0.132534 -0.188337,0 -0.313895,-0.132534 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132534,0.132534 -0.313895,0.132534 -0.181362,0 -0.313895,-0.132534 l -0.578963,-0.578962 -0.578962,0.578962 q -0.132533,0.132534 -0.313895,0.132534 -0.181361,0 -0.313895,-0.132534 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132533,0.132534 -0.313895,0.132534 -0.181362,0 -0.313895,-0.132534 l -0.578962,-0.578962 -0.578962,0.578962 q -0.132534,0.132534 -0.313895,0.132534 -0.181362,0 -0.313895,-0.132534 L 16.875,23.752789 16.296038,24.331751 q -0.132534,0.132534 -0.313896,0.132534 -0.181361,0 -0.313895,-0.132534 l -0.578962,-0.578962 -0.578962,0.578962 z m 2.811105,-7.90318 0,0.892857 L 20,16.428571 l 2.678571,0.892857 0,-0.892857 -0.892857,0 0,-0.892858 -3.571429,0 0,0.892858 -0.892857,0 z" />
   </g>
 </svg>
diff --git a/web/images/truck.svg b/web/images/truck.svg
index e0026c3b..0f82a3e8 100644
--- a/web/images/truck.svg
+++ b/web/images/truck.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="50"
-   height="50"
-   viewBox="0 0 50.000001 50.000001"
-   id="svg2"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="truck.svg">
   <defs
-     id="defs4" />
+     id="defs4147" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,11 +25,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="12.420548"
-     inkscape:cy="24.226399"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-7.4058825"
+     inkscape:cy="17.209557"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1920"
@@ -38,7 +38,7 @@
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata4150">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,57 +46,23 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2">
+     id="layer1">
     <path
-       style="opacity:1;fill:#ff5468;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="M 30.316406 29.011719 C 30.032969 29.012099 29.77725 29.129922 29.591797 29.318359 C 29.406343 29.506797 29.292477 29.765616 29.292969 30.052734 C 29.293119 30.339392 29.406391 30.599146 29.591797 30.787109 C 29.777203 30.975073 30.033423 31.091416 30.316406 31.091797 C 30.599849 31.092075 30.857088 30.977075 31.042969 30.789062 C 31.228849 30.60105 31.343599 30.339859 31.34375 30.052734 C 31.344243 29.76515 31.228896 29.504892 31.042969 29.316406 C 30.857041 29.12792 30.600304 29.011439 30.316406 29.011719 z "
-       id="path4330" />
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.94994837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.525025,20 c 0,7.469665 -6.05536,13.525025 -13.525025,13.525025 -7.469665,0 -13.5250252,-6.05536 -13.5250254,-13.525025 -2e-7,-5.309252 3.0591749,-9.903995 7.5109944,-12.117699 L 20,1.4749746 26.049865,7.9001866 C 30.482258,10.120688 33.525025,14.705006 33.525025,20 Z"
+       id="path4724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssscccs" />
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 33.841797,17.199219 c -3.79362,0.0033 -7.587239,0.0065 -11.380859,0.0098 -0.69659,0.0028 -0.655606,0.76697 -0.635167,1.261258 0.0014,0.532055 0.0029,1.064109 0.0043,1.596164 -0.818995,0.03277 -1.654099,-0.08495 -2.459094,0.09178 -0.632659,0.315896 -1.044459,0.93882 -1.568543,1.403598 -0.56765,0.63639 -1.366187,1.150658 -1.603243,2.005594 -6.59e-4,1.659164 -0.0013,3.318328 -0.002,4.977492 -1.027034,-0.04909 -0.863853,1.622575 0.143695,1.365669 0.413039,0.0012 0.826078,0.0023 1.239117,0.0035 -0.100744,1.404697 0.999905,2.745148 2.412469,2.862533 1.463988,0.236545 3.041103,-0.817833 3.182341,-2.338018 -0.193618,-0.695013 0.435198,-0.483296 0.862971,-0.50858 1.154698,0.0032 2.309396,0.0063 3.464094,0.0095 -0.08973,1.41597 1.077973,2.71414 2.487157,2.80097 1.412682,0.199315 2.875611,-0.838574 3.031898,-2.283519 -0.189293,-0.741658 0.532546,-0.463074 0.971937,-0.547762 0.650835,-0.120978 0.531304,-0.853948 0.532032,-1.34246 -0.01093,-3.587977 -0.02186,-7.175954 -0.03278,-10.763931 0.0027,-0.357707 -0.302217,-0.611902 -0.650391,-0.603515 z"
-       id="path4336"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 20.369141,21.662109 1.46875,0 -0.02734,2.617188 -3.869141,0.03906 -0.0059,-0.52539 2.433594,-2.13086 z"
-       id="path4334" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 20.392578,28.955078 c 0.495617,-0.01 0.949054,0.392744 1.015279,0.880782 0.08326,0.480935 -0.222962,0.990466 -0.686539,1.142734 -0.433519,0.157426 -0.953792,-0.03157 -1.192133,-0.42471 -0.264966,-0.402656 -0.196351,-0.982659 0.156372,-1.311528 0.187059,-0.182377 0.44554,-0.288296 0.707021,-0.287278 z"
-       id="path4322"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.90704989"
-       d="m 30.316406,29.011719 c 0.478158,-0.0097 0.92095,0.363157 1.006701,0.831145 0.100881,0.459837 -0.150196,0.969495 -0.58392,1.158109 -0.416503,0.197732 -0.954004,0.0628 -1.228859,-0.307059 -0.31121,-0.389351 -0.284147,-1.000054 0.06429,-1.357684 0.189169,-0.203633 0.463259,-0.325919 0.741784,-0.324511 z"
-       id="path4328"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.429688 c 6.598201,-0.123185 12.819493,4.830867 14.196406,11.280617 1.543338,6.202211 -1.588945,13.143604 -7.251063,16.101735 -5.688194,3.206782 -13.425166,1.899164 -17.73054,-3.015306 C 9.647006,29.954251 9.1668508,21.921033 13.117741,16.56535 15.789672,12.756758 20.34357,10.392898 25,10.429688 Z"
-       id="path4148"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4443"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17.726005,23.75279 q 0.265067,-0.265067 0.265067,-0.627791 0,-0.362723 -0.265067,-0.62779 -0.265067,-0.265067 -0.627791,-0.265067 -0.362723,0 -0.62779,0.265067 -0.265067,0.265067 -0.265067,0.62779 0,0.362724 0.265067,0.627791 0.265067,0.265067 0.62779,0.265067 0.362724,0 0.627791,-0.265067 z m -2.413505,-4.199219 2.678572,0 0,-1.785714 -1.102121,0 q -0.09068,0 -0.15346,0.06278 l -1.360212,1.360212 q -0.06278,0.06278 -0.06278,0.153459 l 0,0.209264 z m 8.663505,4.199219 q 0.265067,-0.265067 0.265067,-0.627791 0,-0.362723 -0.265067,-0.62779 -0.265067,-0.265067 -0.627791,-0.265067 -0.362723,0 -0.62779,0.265067 -0.265067,0.265067 -0.265067,0.62779 0,0.362724 0.265067,0.627791 0.265067,0.265067 0.62779,0.265067 0.362724,0 0.627791,-0.265067 z m 2.050781,-8.217076 0,7.142857 q 0,0.104632 -0.0279,0.188337 -0.0279,0.07673 -0.09766,0.125558 -0.06278,0.04883 -0.111607,0.0837 -0.04883,0.0279 -0.167411,0.04185 -0.111607,0.007 -0.15346,0.01395 -0.04185,0 -0.181361,0 -0.132534,-0.007 -0.15346,-0.007 0,0.739398 -0.523159,1.262556 -0.523158,0.523159 -1.262556,0.523159 -0.739397,0 -1.262555,-0.523159 Q 21.5625,23.864397 21.5625,23.124999 l -2.678571,0 q 0,0.739398 -0.523159,1.262556 -0.523158,0.523159 -1.262556,0.523159 -0.739397,0 -1.262555,-0.523159 Q 15.3125,23.864397 15.3125,23.124999 l -0.446428,0 q -0.02093,0 -0.160436,0.007 -0.132533,0 -0.174386,0 -0.04185,-0.007 -0.160435,-0.01395 -0.111607,-0.01395 -0.160435,-0.04185 -0.04883,-0.03488 -0.118583,-0.0837 -0.06278,-0.04883 -0.09068,-0.125558 -0.0279,-0.0837 -0.0279,-0.188337 0,-0.181362 0.132534,-0.313895 0.132533,-0.132534 0.313895,-0.132534 l 0,-2.232143 q 0,-0.0558 -0.007,-0.24414 0,-0.188337 0,-0.265067 0.007,-0.07673 0.02093,-0.237165 0.01395,-0.167411 0.04185,-0.258092 0.03488,-0.09766 0.09766,-0.216239 0.06975,-0.118582 0.160435,-0.209263 l 1.381138,-1.381138 q 0.132534,-0.132534 0.348773,-0.223215 0.223214,-0.09068 0.411551,-0.09068 l 1.116072,0 0,-1.339285 q 0,-0.181362 0.132533,-0.313895 0.132534,-0.132534 0.313895,-0.132534 l 7.142857,0 q 0.181362,0 0.313895,0.132534 0.132534,0.132533 0.132534,0.313895 z" />
   </g>
 </svg>
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 9dc20adc..ee6bef81 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -187,6 +187,7 @@
     "statisticsRequests": "Requests",
     "statisticsMessagesReceived": "Messages Received",
     "statisticsMessagesStored": "Messages Stored",
+    "categoryArrow": "Arrow",
     "categoryDefault": "Default",
     "categoryCar": "Car",
     "categoryBus": "Bus",
diff --git a/web/load.js b/web/load.js
index 6257fe0e..0d13b2c6 100644
--- a/web/load.js
+++ b/web/load.js
@@ -1,33 +1,34 @@
 (function () {
+    var debugMode, touchMode, locale, localeParameter, extjsVersion, fontAwesomeVersion, olVersion;
 
     function addStyleFile(file) {
         var link = document.createElement('link');
         link.setAttribute('rel', 'stylesheet');
         link.setAttribute('type', 'text/css');
         link.setAttribute('href', file);
-        document.head.appendChild(link)
+        document.head.appendChild(link);
     }
 
     function addScriptFile(file) {
         var script = document.createElement('script');
         script.setAttribute('src', file);
-        script.async = false
+        script.async = false;
         document.head.appendChild(script);
     }
-    
+
     function addSvgFile(file, id) {
         var svg = document.createElement('object');
         svg.setAttribute('id', id);
         svg.setAttribute('data', file);
         svg.setAttribute('type', 'image/svg+xml');
-        svg.setAttribute('style','visibility:hidden')
+        svg.setAttribute('style', 'visibility:hidden');
         document.body.appendChild(svg);
     }
 
-    var debugMode = document.getElementById('loadScript').getAttribute('mode') === 'debug';
-    var touchMode = 'ontouchstart' in window || navigator.maxTouchPoints;
+    debugMode = document.getElementById('loadScript').getAttribute('mode') === 'debug';
+    touchMode = 'ontouchstart' in window || navigator.maxTouchPoints;
 
-    var locale = {};
+    locale = {};
     window.Locale = locale;
 
     locale.languages = {
@@ -74,7 +75,7 @@
         'zh': { name: '中文', code: 'zh_CN' }
     };
 
-    var localeParameter = window.location.search.match(/locale=([^&#]+)/);
+    localeParameter = window.location.search.match(/locale=([^&#]+)/);
     locale.language = localeParameter && localeParameter[1];
     if (locale.language === undefined) {
         locale.language = window.navigator.userLanguage || window.navigator.language;
@@ -85,7 +86,7 @@
         locale.language = 'en'; // default
     }
 
-    window.addEventListener("load", function (event) {
+    window.addEventListener('load', function (event) {
 
         if (debugMode) {
             Ext.Loader.setConfig({
@@ -108,9 +109,9 @@
 
     });
 
-    var extjsVersion = '6.0.1';
-    var fontAwesomeVersion = '4.6.3';
-    var olVersion = '3.18.2';
+    extjsVersion = '6.0.1';
+    fontAwesomeVersion = '4.6.3';
+    olVersion = '3.18.2';
 
     if (debugMode) {
         addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/ext-all-debug.js');
@@ -128,10 +129,9 @@
     addScriptFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol-debug.js');
 
     addStyleFile('app.css');
-    //addScriptFile('arrow.js');
-    
+
     addSvgFile('images/default.svg', 'defaultSvg');
-    addSvgFile('images/route.svg', 'routeSvg');
+    addSvgFile('images/arrow.svg', 'arrowSvg');
     addSvgFile('images/car.svg', 'carSvg');
     addSvgFile('images/bus.svg', 'busSvg');
     addSvgFile('images/truck.svg', 'truckSvg');
-- 
cgit v1.2.3


From fb76f0118e148f77c83fb55e75c805127bb597a2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 10 Nov 2016 13:20:51 +0500
Subject: - Update device icon on map after device update - Fix devices buttons
 enabling

---
 web/app/view/DevicesController.js | 1 +
 web/app/view/MapController.js     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index aa8e7886..a31ceb77 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -147,6 +147,7 @@ Ext.define('Traccar.view.DevicesController', {
 
     selectDevice: function (device, center) {
         this.getView().getSelectionModel().select([device], false, true);
+        this.updateButtons(this.getView().getSelectionModel());
         this.getView().getView().focusRow(device);
     },
 
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 103d62ed..c981fabc 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -86,12 +86,12 @@ Ext.define('Traccar.view.MapController', {
         }
     },
 
-    changeMarkerColor: function (style, color) {
+    changeMarkerColor: function (style, color, category) {
         var newStyle = new ol.style.Style({
             image: Traccar.DeviceImages.getImageIcon(color,
                     style.getImage().zoom,
                     style.getImage().angle,
-                    style.getImage().category),
+                    category),
             text: style.getText()
         });
         return newStyle;
@@ -111,7 +111,7 @@ Ext.define('Traccar.view.MapController', {
             if (deviceId in this.latestMarkers) {
                 marker = this.latestMarkers[deviceId];
                 marker.setStyle(
-                    this.changeMarkerColor(marker.getStyle(), this.getDeviceColor(device)));
+                    this.changeMarkerColor(marker.getStyle(), this.getDeviceColor(device), device.get('category')));
             }
         }
     },
-- 
cgit v1.2.3