Add new categories (fix #495)

11 files changed, 366 insertions, 96 deletions

diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index c1a8201d..6f8e8cfd 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -19,82 +19,19 @@ Ext.define('Traccar.store.DeviceImages', {
     extend: 'Ext.data.Store',
     fields: ['key', 'name', 'svg', 'fillId', 'rotateId', 'scaleId'],
 
-    data: [{
-        key: 'arrow',
-        name: Strings.categoryArrow,
-        svg: document.getElementById('arrowSvg').contentDocument,
-        fillId: 'arrow',
-        rotateId: 'arrow',
-        scaleId: 'arrow'
-    }, {
-        key: 'default',
-        name: Strings.categoryDefault,
-        svg: document.getElementById('defaultSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'car',
-        name: Strings.categoryCar,
-        svg: document.getElementById('carSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'bus',
-        name: Strings.categoryBus,
-        svg: document.getElementById('busSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'truck',
-        name: Strings.categoryTruck,
-        svg: document.getElementById('truckSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'ship',
-        name: Strings.categoryShip,
-        svg: document.getElementById('shipSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'plane',
-        name: Strings.categoryPlane,
-        svg: document.getElementById('planeSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'motorcycle',
-        name: Strings.categoryMotorcycle,
-        svg: document.getElementById('motorcycleSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'bicycle',
-        name: Strings.categoryBicycle,
-        svg: document.getElementById('bicycleSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'person',
-        name: Strings.categoryPerson,
-        svg: document.getElementById('personSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }, {
-        key: 'animal',
-        name: Strings.categoryAnimal,
-        svg: document.getElementById('animalSvg').contentDocument,
-        fillId: 'background',
-        rotateId: 'background',
-        scaleId: 'layer1'
-    }]
+    data: (function () {
+        var i, key, data = [];
+        for (i = 0; i < window.Images.length; i++) {
+            key = window.Images[i];
+            data.push({
+                key: key,
+                name: Strings['category' + key.charAt(0).toUpperCase() + key.slice(1)],
+                svg: document.getElementById(key + 'Svg').contentDocument,
+                fillId: key === 'arrow' ? 'arrow' : 'background',
+                rotateId: key === 'arrow' ? 'arrow' : 'background',
+                scaleId: key === 'arrow' ? 'arrow' : 'layer1'
+            });
+        }
+        return data;
+    })()
 });
diff --git a/web/app/view/dialog/Device.js b/web/app/view/dialog/Device.js
index bd4a1286..054931c5 100644
--- a/web/app/view/dialog/Device.js
+++ b/web/app/view/dialog/Device.js
@@ -75,7 +75,7 @@ Ext.define('Traccar.view.dialog.Device', {
                         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>';
+                        '<td>{name}</td></tr></table>';
                     }
                 }
             }]
diff --git a/web/images/boat.svg b/web/images/boat.svg
new file mode 100644
index 00000000..6fd77b93
--- /dev/null
+++ b/web/images/boat.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="boat.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.78952903"
+       d="m 20,11.145921 c -2.131729,5.526703 -6.316232,6.785015 -6.316232,6.785015 L 20,19.83074 20,11.145921 Z m 0,8.684819 -6.710997,0 0,0.641492 c 0,0.930433 0.778079,1.763278 1.801113,2.368588 -0.362154,0.123868 -0.729886,0.148037 -1.011584,0.148037 -0.55267,0 -1.421153,-0.157906 -1.973822,-0.789529 l 0,1.579058 c 0.552669,0.631623 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157906 1.973822,-0.789529 0.552671,0.631623 1.421153,0.789529 1.973823,0.789529 0.552671,0 1.421152,-0.157906 1.973823,-0.789529 0.552671,0.631623 1.421152,0.789529 1.973823,0.789529 0.55267,0 1.421152,-0.157906 1.973823,-0.789529 0.552669,0.631623 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157906 1.973822,-0.789529 l 0,-1.579058 c -0.552669,0.631623 -1.421152,0.789529 -1.973822,0.789529 -0.395858,0 -0.94322,-0.09201 -1.431022,-0.370092 1.079388,-0.59227 2.154428,-1.46526 2.936061,-2.788025 l -2.689332,0 -4.737175,0 z m 4.737175,0 c 0,0 0.0099,-4.016729 -3.306154,-7.253798 0.631624,4.342409 -0.641492,5.921468 -0.641492,5.921468 l 3.947646,1.33233 z m -12.632465,4.737175 0,1.579057 c 0.552669,0.631624 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157905 1.973822,-0.789529 0.552671,0.631624 1.421153,0.789529 1.973823,0.789529 0.552671,0 1.421152,-0.157905 1.973823,-0.789529 0.552671,0.631624 1.421152,0.789529 1.973823,0.789529 0.55267,0 1.421152,-0.157905 1.973823,-0.789529 0.552669,0.631624 1.421152,0.789529 1.973822,0.789529 0.55267,0 1.421153,-0.157905 1.973822,-0.789529 l 0,-1.579057 c -0.552669,0.631623 -1.421152,0.789528 -1.973822,0.789528 -0.55267,0 -1.421153,-0.157905 -1.973822,-0.789528 -0.552671,0.631623 -1.421153,0.789528 -1.973823,0.789528 -0.552671,0 -1.421152,-0.157905 -1.973823,-0.789528 -0.552671,0.631623 -1.421152,0.789528 -1.973823,0.789528 -0.55267,0 -1.421152,-0.157905 -1.973823,-0.789528 -0.552669,0.631623 -1.421152,0.789528 -1.973822,0.789528 -0.55267,0 -1.421153,-0.157905 -1.973822,-0.789528 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/crane.svg b/web/images/crane.svg
new file mode 100644
index 00000000..487a2c40
--- /dev/null
+++ b/web/images/crane.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="crane.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.75357449"
+       d="m 24.334389,12.464255 -4.215308,3.014298 c 0.103994,0.11605 0.203466,0.238883 0.282591,0.376787 l 0.518083,0.91842 2.025231,-1.460051 -1.577796,2.237174 0.494532,0.871321 c 0.140166,0.186132 0.252825,0.393742 0.329689,0.612279 l 4.592095,-6.570228 -2.449117,0 z m 2.449117,1.318755 -1.507149,2.142978 0,4.074012 c 0,0.415973 0.337602,0.753574 0.753575,0.753574 0.415219,0 0.753574,0.338356 0.753574,0.753575 0,0.41522 -0.338355,0.753574 -0.753574,0.753574 -0.41522,0 -0.753575,-0.338354 -0.753575,-0.753574 l -1.507149,0 c 0,1.385823 1.252064,2.476622 2.684609,2.213625 0.887711,-0.162772 1.616418,-0.879987 1.78974,-1.76619 0.229086,-1.171809 -0.453275,-2.207408 -1.460051,-2.566863 l 0,-5.604711 z m -12.057192,1.695543 c -0.8327,0 -1.507149,0.674449 -1.507149,1.507149 l 0,3.767872 c 0,0.415973 0.337602,0.753575 0.753575,0.753575 l 0.753574,0 0,0.753574 5.275021,0 0,-0.753574 0.753575,0 c 0.415973,0 0.753575,-0.337602 0.753575,-0.753575 l 0,-1.507148 -1.836839,-3.014298 C 19.402621,15.764158 18.916,15.478553 18.37644,15.478553 l -3.650126,0 z m 1.507149,1.507149 2.142977,0 1.295206,2.260724 -3.438183,0 0,-2.260724 z m -2.260723,6.028596 c -1.248673,0 -2.260723,1.012051 -2.260723,2.260723 0,1.248673 1.01205,2.260724 2.260723,2.260724 l 6.78217,0 c 1.248673,0 2.260724,-1.012051 2.260724,-2.260724 0,-1.248672 -1.012051,-2.260723 -2.260724,-2.260723 l -6.78217,0 z m 0,1.507149 c 0.415973,0 0.753574,0.337601 0.753574,0.753574 0,0.415974 -0.337601,0.753575 -0.753574,0.753575 -0.415973,0 -0.753575,-0.337601 -0.753575,-0.753575 0,-0.415973 0.337602,-0.753574 0.753575,-0.753574 z m 2.260723,0 c 0.415973,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337602,0.753575 -0.753575,0.753575 -0.415973,0 -0.753574,-0.337601 -0.753574,-0.753575 0,-0.415973 0.337601,-0.753574 0.753574,-0.753574 z m 2.260723,0 c 0.415974,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337601,0.753575 -0.753575,0.753575 -0.415973,0 -0.753574,-0.337601 -0.753574,-0.753575 0,-0.415973 0.337601,-0.753574 0.753574,-0.753574 z m 2.260724,0 c 0.415973,0 0.753575,0.337601 0.753575,0.753574 0,0.415974 -0.337602,0.753575 -0.753575,0.753575 -0.415973,0 -0.753575,-0.337601 -0.753575,-0.753575 0,-0.415973 0.337602,-0.753574 0.753575,-0.753574 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/helicopter.svg b/web/images/helicopter.svg
new file mode 100644
index 00000000..373c7f38
--- /dev/null
+++ b/web/images/helicopter.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="helicopter.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.88712007"
+       d="m 14.605611,13.910009 0,1.77424 6.20984,0 0,0.88712 c -2.66136,0 -3.516544,1.72811 -3.54848,1.77424 l -3.54848,0 0,0.88712 0,0.88712 3.54848,0.88712 c 0,1.323583 1.337777,2.66136 2.66136,2.66136 l 2.66136,0 c 2.661361,0 4.435601,-0.760262 4.435601,-2.66136 0,-1.622543 -2.228446,-3.988048 -5.322721,-4.380155 l 0,-0.942565 6.209841,0 0,-1.77424 -6.209841,0.88712 0,-0.44356 c 0,-0.244846 -0.198715,-0.44356 -0.44356,-0.44356 -0.244845,0 -0.44356,0.198714 -0.44356,0.44356 l 0,0.44356 -6.20984,-0.88712 z m -0.88712,5.32272 c 0,-0.979886 -0.794355,-1.77424 -1.774241,-1.77424 -0.979885,0 -1.77424,0.794354 -1.77424,1.77424 0,0.979885 0.794355,1.77424 1.77424,1.77424 0.979886,0 1.774241,-0.794355 1.774241,-1.77424 z m 7.98408,-0.88712 c 0.282104,-0.03992 2.88314,0.790424 3.548481,2.66136 l -3.548481,0 0,-2.66136 z m 4.435601,5.32272 0,0.88712 -8.871201,0 0,1.774241 8.871201,0 c 0.980267,0 1.77424,-0.793973 1.77424,-1.774241 l 0,-0.88712 -1.77424,0 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/offroad.svg b/web/images/offroad.svg
new file mode 100644
index 00000000..f175ec48
--- /dev/null
+++ b/web/images/offroad.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="offroad.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;block-progression:tb;overflow:visible;stroke-width:0.80151391;enable-background:accumulate"
+       d="m 12.986753,13.988646 c -0.518579,0 -0.787487,0.109406 -1.051987,0.55104 -0.2645,0.441635 -1.552933,4.392497 -1.552933,5.03451 l 0,2.780251 c 0,0.650028 0.602738,1.252366 1.202271,1.252366 l 0.400757,0 c 0,1.328108 1.076433,2.404541 2.404541,2.404541 1.328109,0 2.404542,-1.076433 2.404542,-2.404541 l 7.213626,0 c 0,1.328108 1.076433,2.404541 2.404541,2.404541 1.328109,0 2.404542,-1.076433 2.404542,-2.404541 0,-0.07005 -0.01918,-0.131856 -0.02505,-0.200379 0.375528,-0.285391 0.826561,-0.803212 0.826561,-1.051987 l 0,-2.22921 c 0,-0.868842 -1.545719,-1.18584 -4.258043,-1.853501 0,0 -2.496315,-2.934543 -3.155961,-3.73205 -0.42881,-0.518579 -0.988266,-0.55104 -1.402649,-0.55104 l -7.814761,0 z m 2.655015,1.277412 1.95369,0 0,3.531671 -2.830346,0 c -0.36549,0 -0.64622,-0.106601 -0.525993,-0.701325 0.125036,-0.620371 0.516375,-2.155471 0.626182,-2.429589 0.125037,-0.310987 0.381321,-0.400757 0.776467,-0.400757 z m 3.556718,0 1.728264,0 c 0.308583,0 0.656841,0.09879 0.851609,0.325615 l 2.279305,2.70511 c 0.25408,0.336636 0.14287,0.500946 -0.175331,0.500946 l -4.683847,0 0,-3.531671 z m -4.809084,7.138484 c 0.662853,0 1.202271,0.539419 1.202271,1.202271 0,0.662852 -0.539418,1.202271 -1.202271,1.202271 -0.662852,0 -1.20227,-0.539419 -1.20227,-1.202271 0,-0.662852 0.539418,-1.202271 1.20227,-1.202271 z m 12.022709,0 c 0.662852,0 1.202271,0.539419 1.202271,1.202271 0,0.662852 -0.539419,1.202271 -1.202271,1.202271 -0.662852,0 -1.20227,-0.539419 -1.20227,-1.202271 0,-0.662852 0.539418,-1.202271 1.20227,-1.202271 z"
+       overflow="visible"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/pickup.svg b/web/images/pickup.svg
new file mode 100644
index 00000000..2824f502
--- /dev/null
+++ b/web/images/pickup.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="pickup.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.8815155"
+       d="m 17.19017,14.711392 a 0.8816036,0.8816036 0 0 0 -0.688684,0.661137 l -0.716232,2.864925 -3.278135,0 c -0.969667,0 -1.763031,0.793364 -1.763031,1.763031 l 0,2.121146 c 0,0.352606 0.170794,0.622571 0.5234,0.798874 l 1.267178,0.468305 c 0.147037,1.082397 1.047732,1.900767 2.176241,1.900767 1.079857,0 1.946221,-0.750665 2.148694,-1.76303 l 7.162313,0 c 0.202474,1.012365 1.068837,1.76303 2.148694,1.76303 1.156989,0 2.065191,-0.859994 2.176241,-1.983409 l 0.468305,-0.303022 c 0.264455,-0.176303 0.440758,-0.528909 0.440758,-0.881515 l 0,-1.515104 c 0,-0.352607 -0.253435,-0.683175 -0.60604,-0.771327 l -3.966821,-1.34982 -2.176241,-2.727189 -0.0551,-0.08264 -0.02755,0.02755 c -0.446231,-0.66103 -1.205887,-0.99171 -1.900764,-0.99171 l -3.167945,0 a 0.8816036,0.8816036 0 0 0 -0.08265,0 0.8816036,0.8816036 0 0 0 -0.08264,0 z m 0.853968,1.763031 2.479261,0 c 0.333018,0 0.400363,0.03368 0.495853,0.192832 a 0.8816036,0.8816036 0 0 0 0.0551,0.08264 l 1.184537,1.487557 -4.655503,0 0.440757,-1.76303 z m -3.333231,5.812492 c 0.440758,0 0.798874,0.358116 0.798874,0.798874 0,0.440758 -0.358116,0.798873 -0.798874,0.798873 -0.440758,0 -0.798873,-0.358115 -0.798873,-0.798873 0,-0.440758 0.358115,-0.798874 0.798873,-0.798874 z m 11.459701,0 c 0.440758,0 0.798874,0.358116 0.798874,0.798874 0,0.440758 -0.358116,0.798873 -0.798874,0.798873 -0.440758,0 -0.798873,-0.358115 -0.798873,-0.798873 0,-0.440758 0.358115,-0.798874 0.798873,-0.798874 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/tractor.svg b/web/images/tractor.svg
new file mode 100644
index 00000000..4d2b5ad1
--- /dev/null
+++ b/web/images/tractor.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="tractor.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.84153426"
+       d="m 13.104551,12.426654 a 0.84161836,0.84161836 0 0 0 -0.683747,0.841534 l 0,5.049206 a 0.84161836,0.84161836 0 0 0 0,0.07889 l 0,1.867154 c 0.841534,-0.673228 1.851375,-1.104514 2.94537,-1.104514 2.524602,0 4.628437,2.103835 4.628437,4.628438 l 0,0.420767 3.786905,0 c -0.25895,0.349608 -0.420768,0.785152 -0.420768,1.262302 0,1.178148 0.925688,2.103835 2.103836,2.103835 1.178148,0 2.103835,-0.925687 2.103835,-2.103835 0,-0.55373 -0.213184,-1.047793 -0.552257,-1.420089 0.497179,-0.226205 0.855209,-0.673228 0.973024,-1.262302 l 0.420767,-2.708688 c 0.08415,-0.420767 -0.336613,-0.920428 -0.841534,-0.920428 l -7.126743,-0.788938 -1.314897,-5.312185 a 0.84161836,0.84161836 0 0 0 -0.815236,-0.631149 l -5.049205,0 a 0.84161836,0.84161836 0 0 0 -0.07889,0 0.84161836,0.84161836 0 0 0 -0.07889,0 z m 0.999321,1.683069 3.550223,0 1.025619,4.049883 -4.575842,-0.499661 0,-3.550222 z m 10.098411,0 0,3.629117 1.683068,0.236681 0,-3.865798 -1.683068,0 z m -8.836109,5.89074 c -2.103836,0 -3.786905,1.683067 -3.786905,3.786903 0,2.103836 1.683069,3.786904 3.786905,3.786904 2.103835,0 3.786903,-1.683068 3.786903,-3.786904 0,-2.103836 -1.683068,-3.786903 -3.786903,-3.786903 z m 0,1.2623 c 1.430608,0 2.524602,1.093995 2.524602,2.524603 0,1.430608 -1.093994,2.524603 -2.524602,2.524603 -1.430609,0 -2.524603,-1.093995 -2.524603,-2.524603 0,-1.430608 1.093994,-2.524603 2.524603,-2.524603 z m 10.09841,3.366137 c 0.504921,0 0.841535,0.336614 0.841535,0.841535 0,0.50492 -0.336614,0.841534 -0.841535,0.841534 -0.50492,0 -0.841534,-0.336614 -0.841534,-0.841534 0,-0.504921 0.336614,-0.841535 0.841534,-0.841535 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/images/van.svg b/web/images/van.svg
new file mode 100644
index 00000000..215b9d7b
--- /dev/null
+++ b/web/images/van.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   id="svg4145"
+   version="1.1"
+   sodipodi:docname="van.svg">
+  <defs
+     id="defs4147" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     showgrid="false"
+     units="px" />
+  <metadata
+     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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.001953,3.6816406 -1.130859,3.390625 a 12.37437,12.37437 0 0 1 1.130859,-0.0625 12.37437,12.37437 0 0 1 1.128906,0.056641 L 20.001953,3.6816406 Z M 20,7.625 A 12.37437,12.37437 0 0 0 7.625,20 12.37437,12.37437 0 0 0 20,32.375 12.37437,12.37437 0 0 0 32.375,20 12.37437,12.37437 0 0 0 20,7.625 Z"
+       id="background" />
+    <path
+       style="stroke-width:0.86999887"
+       d="m 12.17001,13.910008 c -0.480239,0 -0.869998,0.38976 -0.869998,0.869999 l 0,3.479995 0,4.349995 c 0,0.961349 0.778649,1.739998 1.739997,1.739998 l 0.05438,0 c 0.202765,0.991229 1.069336,1.739997 2.120622,1.739997 1.051284,0 1.917855,-0.748768 2.120622,-1.739997 l 5.328742,0 c 0.202766,0.991229 1.069338,1.739997 2.120622,1.739997 1.051286,0 1.917857,-0.748768 2.120622,-1.739997 l 0.05438,0 c 0.961348,0 1.739997,-0.778649 1.739997,-1.739998 l 0,-3.208121 0,-0.271875 c 0,0 -1.171888,-3.532847 -3.262496,-5.084056 -0.131369,-0.09831 -0.298627,-0.135937 -0.462186,-0.135937 l -12.805296,0 z m 10.439987,1.739997 2.011872,0 c 0.742109,0.65859 1.37873,1.707808 1.82156,2.609997 l -3.833432,0 0,-2.609997 z m -7.39499,7.394991 c 0.479369,0 0.869998,0.39063 0.869998,0.869999 0,0.479369 -0.390629,0.869998 -0.869998,0.869998 -0.47937,0 -0.87,-0.390629 -0.87,-0.869998 0,-0.479369 0.39063,-0.869999 0.87,-0.869999 z m 9.569987,0 c 0.479369,0 0.869999,0.39063 0.869999,0.869999 0,0.479369 -0.39063,0.869998 -0.869999,0.869998 -0.47937,0 -0.869999,-0.390629 -0.869999,-0.869998 0,-0.479369 0.390629,-0.869999 0.869999,-0.869999 z"
+       id="icon" />
+  </g>
+</svg>
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 754295e2..bb19a1b1 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -330,13 +330,20 @@
     "statisticsGeolocation": "Geolocation Requests",
     "categoryArrow": "Arrow",
     "categoryDefault": "Default",
-    "categoryCar": "Car",
+    "categoryAnimal": "Animal",
+    "categoryBicycle": "Bicycle",
+    "categoryBoat": "Boat",
     "categoryBus": "Bus",
-    "categoryTruck": "Truck",
-    "categoryShip": "Ship",
-    "categoryPlane": "Plane",
+    "categoryCar": "Car",
+    "categoryCrane": "Crane",
+    "categoryHelicopter": "Helicopter",
     "categoryMotorcycle": "Motorcycle",
-    "categoryBicycle": "Bicycle",
+    "categoryOffroad": "Offroad",
     "categoryPerson": "Person",
-    "categoryAnimal": "Animal"
+    "categoryPickup": "Pickup",
+    "categoryPlane": "Plane",
+    "categoryShip": "Ship",
+    "categoryTractor": "Tractor",
+    "categoryTruck": "Truck",
+    "categoryVan": "Van"
 }
diff --git a/web/load.js b/web/load.js
index 88eb1cf0..f6da4e62 100644
--- a/web/load.js
+++ b/web/load.js
@@ -154,16 +154,10 @@
         addScriptFile('//cdnjs.cloudflare.com/ajax/libs/proj4js/' + proj4jsVersion + '/proj4.js');
     }
 
-    addSvgFile('images/default.svg', 'defaultSvg');
-    addSvgFile('images/arrow.svg', 'arrowSvg');
-    addSvgFile('images/car.svg', 'carSvg');
-    addSvgFile('images/bus.svg', 'busSvg');
-    addSvgFile('images/truck.svg', 'truckSvg');
-    addSvgFile('images/ship.svg', 'shipSvg');
-    addSvgFile('images/plane.svg', 'planeSvg');
-    addSvgFile('images/motorcycle.svg', 'motorcycleSvg');
-    addSvgFile('images/bicycle.svg', 'bicycleSvg');
-    addSvgFile('images/person.svg', 'personSvg');
-    addSvgFile('images/animal.svg', 'animalSvg');
+    window.Images = ['arrow', 'default', 'animal', 'bicycle', 'boat', 'bus', 'car', 'crane', 'helicopter',
+        'motorcycle', 'offroad', 'person', 'pickup', 'plane', 'ship', 'tractor', 'truck', 'van'];
 
+    for (i = 0; i < window.Images.length; i++) {
+        addSvgFile('images/' + window.Images[i] + '.svg', window.Images[i] + 'Svg');
+    }
 })();