From 093cdb11fab1937afb4dfb9aef6a4f1a4eca8887 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 4 Jul 2018 09:27:51 +0500
Subject: Add Tram, Train and Trolleybus categories

---
 web/images/train.svg      | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 web/images/tram.svg       | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 web/images/trolleybus.svg | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 web/l10n/en.json          |  3 +++
 web/load.js               |  4 ++--
 5 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 web/images/train.svg
 create mode 100644 web/images/tram.svg
 create mode 100644 web/images/trolleybus.svg

(limited to 'web')

diff --git a/web/images/train.svg b/web/images/train.svg
new file mode 100644
index 0000000..949db92
--- /dev/null
+++ b/web/images/train.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="train.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></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 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
+       id="background" />
+    <path
+       id="icon"
+       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:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 18.126937,11.484292 c -0.598635,0 -1.086857,0.44565 -1.170666,1.021671 H 16.59443 c -1.314337,0 -2.383899,1.026991 -2.383899,2.288117 v 9.727159 c 0,0.877999 0.517487,1.638931 1.277089,2.022057 l -1.638931,1.362228 c -0.146333,0.121058 -0.168948,0.337897 -0.04789,0.484229 0.121057,0.146334 0.337896,0.168949 0.484229,0.04789 l 1.968844,-1.649572 c 0.111746,0.01596 0.224822,0.02128 0.340558,0.02128 h 6.81114 c 0.115736,0 0.228811,-0.0054 0.340557,-0.02128 l 1.968845,1.649572 c 0.146333,0.121057 0.363172,0.09844 0.484229,-0.04789 0.121058,-0.146332 0.09844,-0.363171 -0.04789,-0.484229 l -1.638933,-1.362228 c 0.759601,-0.383126 1.277088,-1.144058 1.277088,-2.022057 V 14.79408 c 0,-1.261126 -1.069563,-2.288117 -2.383899,-2.288117 h -0.361834 c -0.08381,-0.576021 -0.57203,-1.021671 -1.170665,-1.021671 -0.598635,0 -1.086856,0.44565 -1.170664,1.021671 h -1.404803 c -0.08381,-0.576021 -0.572029,-1.021671 -1.170664,-1.021671 z m 0,0.681114 c 0.282023,0 0.510835,0.228811 0.510835,0.510836 0,0.282023 -0.228812,0.510835 -0.510835,0.510835 -0.282024,0 -0.510836,-0.228812 -0.510836,-0.510835 0,-0.282025 0.228812,-0.510836 0.510836,-0.510836 z m 3.746126,0 c 0.282024,0 0.510836,0.228811 0.510836,0.510836 0,0.282023 -0.228812,0.510835 -0.510836,0.510835 -0.282023,0 -0.510836,-0.228812 -0.510836,-0.510835 0,-0.282025 0.228813,-0.510836 0.510836,-0.510836 z m -3.916405,2.724456 h 4.086683 c 0.188903,0 0.340558,0.152984 0.340558,0.340556 v 0.681114 h -4.767798 v -0.681114 c 0,-0.187572 0.152984,-0.340556 0.340557,-0.340556 z m -1.362228,1.702784 h 6.81114 c 0.376475,0 0.681113,0.283355 0.681113,0.627903 v 2.490323 c 0,0.344548 -0.304638,0.627901 -0.681113,0.627901 h -6.81114 c -0.376476,0 -0.681114,-0.283353 -0.681114,-0.627901 v -2.490323 c 0,-0.344548 0.304638,-0.627903 0.681114,-0.627903 z m 0.340556,6.130026 c 0.564048,0 1.021672,0.457623 1.021672,1.021671 0,0.564048 -0.457624,1.021672 -1.021672,1.021672 -0.564047,0 -1.02167,-0.457624 -1.02167,-1.021672 0,-0.564048 0.457623,-1.021671 1.02167,-1.021671 z m 6.130027,0 c 0.564047,0 1.02167,0.457623 1.02167,1.021671 0,0.564048 -0.457623,1.021672 -1.02167,1.021672 -0.564048,0 -1.021672,-0.457624 -1.021672,-1.021672 0,-0.564048 0.457624,-1.021671 1.021672,-1.021671 z" />
+  </g>
+</svg>
diff --git a/web/images/tram.svg b/web/images/tram.svg
new file mode 100644
index 0000000..31d3108
--- /dev/null
+++ b/web/images/tram.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="tram.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></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 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
+       id="background" />
+    <path
+       id="icon"
+       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:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 19.999996,11.299402 c -2.576193,0 -3.828263,0.455422 -3.828263,1.392096 0,0.191685 0.156339,0.348024 0.348024,0.348024 0.191685,0 0.348024,-0.156339 0.348024,-0.348024 0,-0.171294 0.346664,-0.451344 1.424722,-0.598166 L 18.58615,13.8117 c -2.814101,0.315397 -4.502561,1.551154 -4.502561,2.70806 v 8.102434 c 0,1.072621 0.754505,1.978026 1.783624,2.251279 l -1.457351,1.218084 c -0.145463,0.122352 -0.165855,0.333071 -0.0435,0.478533 0.06797,0.08157 0.163136,0.130509 0.26102,0.130509 0.07749,0 0.163137,-0.03264 0.22839,-0.087 l 1.979387,-1.653114 h 6.329685 l 1.979386,1.653114 c 0.06525,0.05438 0.150901,0.087 0.228392,0.087 0.09788,0 0.193043,-0.04894 0.261016,-0.130509 0.122353,-0.145462 0.101962,-0.356181 -0.0435,-0.478533 l -1.457351,-1.218084 c 1.029118,-0.273253 1.783624,-1.178658 1.783624,-2.251279 v -8.102433 c 0,-1.156907 -1.68846,-2.392664 -4.50256,-2.708061 l 0.293645,-1.718368 c 1.078059,0.146822 1.424724,0.426872 1.424724,0.598166 0,0.191685 0.154979,0.348024 0.348024,0.348024 0.193044,0 0.348025,-0.156339 0.348025,-0.348024 0,-0.936674 -1.252072,-1.392096 -3.828265,-1.392096 z m 0,0.696047 c 0.377933,0 0.702846,0.01359 1.000569,0.03264 l -0.293646,1.729245 c -0.231109,-0.01223 -0.463578,-0.02175 -0.706923,-0.02175 -0.243346,0 -0.475813,0.0095 -0.706923,0.02175 L 18.999428,12.02809 c 0.297722,-0.01903 0.622637,-0.03264 1.000568,-0.03264 z m -2.088143,3.828263 h 4.176287 c 0.193044,0 0.348024,0.15634 0.348024,0.348025 v 0.696046 h -4.872337 v -0.696046 c 0,-0.191685 0.156341,-0.348025 0.348026,-0.348025 z m -1.392096,1.74012 h 6.960479 c 0.38473,0 0.696047,0.289566 0.696047,0.641669 v 2.544926 c 0,0.352102 -0.311317,0.641669 -0.696047,0.641669 h -6.960479 c -0.384731,0 -0.696048,-0.289567 -0.696048,-0.641669 v -2.544926 c 0,-0.352103 0.311317,-0.641669 0.696048,-0.641669 z m 0.348024,5.568384 c 0.576414,0 1.044072,0.467656 1.044072,1.044071 0,0.576415 -0.467658,1.044072 -1.044072,1.044072 -0.576415,0 -1.044072,-0.467657 -1.044072,-1.044072 0,-0.576415 0.467657,-1.044071 1.044072,-1.044071 z m 6.264432,0 c 0.576413,0 1.044071,0.467656 1.044071,1.044071 0,0.576415 -0.467658,1.044072 -1.044071,1.044072 -0.576415,0 -1.044073,-0.467657 -1.044073,-1.044072 0,-0.576415 0.467658,-1.044071 1.044073,-1.044071 z" />
+  </g>
+</svg>
diff --git a/web/images/trolleybus.svg b/web/images/trolleybus.svg
new file mode 100644
index 0000000..ebd7229
--- /dev/null
+++ b/web/images/trolleybus.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="trolleybus.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></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 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z "
+       id="background" />
+    <path
+       id="icon"
+       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:1.30545557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16.908545,11.560864 c -0.109467,0.01846 -0.203108,0.091 -0.249268,0.192555 -0.04615,0.100237 -0.03956,0.218935 0.01715,0.313894 l 0.70692,1.181716 h -1.772574 c -1.303054,0 -2.363433,1.060381 -2.363433,2.363434 v 10.466631 c 0,0.298066 0.131888,0.563161 0.337633,0.749123 v 0.601409 c 0,0.557885 0.455014,1.0129 1.012901,1.0129 h 1.350532 c 0.557886,0 1.0129,-0.455015 1.0129,-1.0129 v -0.337634 h 6.077399 v 0.337634 c 0,0.557885 0.455012,1.0129 1.012899,1.0129 h 1.350532 c 0.557888,0 1.012901,-0.455015 1.012901,-1.0129 V 26.828217 C 26.62078,26.642255 26.75267,26.37716 26.75267,26.079094 V 15.612463 c 0,-1.303053 -1.060381,-2.363434 -2.363434,-2.363434 h -1.772575 l 0.70692,-1.181716 c 0.06594,-0.112104 0.062,-0.251906 -0.0092,-0.358735 -0.07254,-0.108148 -0.20047,-0.166178 -0.328401,-0.147714 -0.09892,0.01846 -0.183325,0.08045 -0.232123,0.168816 l -0.907386,1.519349 H 18.153607 L 17.246218,11.72968 c -0.06726,-0.120018 -0.201789,-0.185963 -0.337634,-0.168816 z m -0.960144,3.376332 h 8.103197 c 0.573712,0 1.012901,0.439187 1.012901,1.012899 v 4.726867 c 0,0.573712 -0.439188,1.012898 -1.012901,1.012898 h -8.103197 c -0.573712,0 -1.0129,-0.439186 -1.0129,-1.012898 v -4.726867 c 0,-0.573712 0.439187,-1.012899 1.0129,-1.012899 z m -3.038698,2.0258 c -0.391708,0 -0.675267,0.283558 -0.675267,0.675265 v 2.0258 c 0,0.391708 0.283559,0.675267 0.675267,0.675267 z m 14.180593,0 v 3.376332 c 0.391707,0 0.675268,-0.283559 0.675268,-0.675267 v -2.0258 c 0,-0.391707 -0.283561,-0.675265 -0.675268,-0.675265 z m -11.141895,6.415031 c 0.559203,0 1.012899,0.453695 1.012899,1.0129 0,0.559205 -0.453696,1.012899 -1.012899,1.012899 -0.559206,0 -1.0129,-0.453694 -1.0129,-1.012899 0,-0.559205 0.453694,-1.0129 1.0129,-1.0129 z m 8.103197,0 c 0.559205,0 1.0129,0.453695 1.0129,1.0129 0,0.559205 -0.453696,1.012899 -1.0129,1.012899 -0.559206,0 -1.012899,-0.453694 -1.012899,-1.012899 0,-0.559205 0.453693,-1.0129 1.012899,-1.0129 z" />
+  </g>
+</svg>
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e6a8a99..c7fb1e7 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -414,6 +414,9 @@
     "categoryPlane": "Plane",
     "categoryShip": "Ship",
     "categoryTractor": "Tractor",
+    "categoryTrain": "Train",
+    "categoryTram": "Tram",
+    "categoryTrolleybus": "Trolleybus",
     "categoryTruck": "Truck",
     "categoryVan": "Van",
     "maintenanceStart": "Start",
diff --git a/web/load.js b/web/load.js
index 78f1101..4143fd7 100644
--- a/web/load.js
+++ b/web/load.js
@@ -177,8 +177,8 @@
         addScriptFile('//cdnjs.cloudflare.com/ajax/libs/proj4js/' + proj4jsVersion + '/proj4.js');
     }
 
-    window.Images = ['arrow', 'default', 'animal', 'bicycle', 'boat', 'bus', 'car', 'crane', 'helicopter',
-        'motorcycle', 'offroad', 'person', 'pickup', 'plane', 'ship', 'tractor', 'truck', 'van'];
+    window.Images = ['arrow', 'default', 'animal', 'bicycle', 'boat', 'bus', 'car', 'crane', 'helicopter', 'motorcycle',
+        'offroad', 'person', 'pickup', 'plane', 'ship', 'tractor', 'train', 'tram', 'trolleybus', 'truck', 'van'];
 
     for (i = 0; i < window.Images.length; i++) {
         addSvgFile('images/' + window.Images[i] + '.svg', window.Images[i] + 'Svg');
-- 
cgit v1.2.3