aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2021-12-07 00:53:01 -0600
committerIván Ávalos <avalos@disroot.org>2021-12-07 00:53:01 -0600
commit8164e6b30e007a3eeaea25decf98ccb098d9e85f (patch)
tree332aa2d38bc0f3c3ae3f1001909624e041573428
parenta273d60becc5ccc9e4626325ea2dca20271b36bc (diff)
downloadetbsa-traccar-web-8164e6b30e007a3eeaea25decf98ccb098d9e85f.tar.gz
etbsa-traccar-web-8164e6b30e007a3eeaea25decf98ccb098d9e85f.tar.bz2
etbsa-traccar-web-8164e6b30e007a3eeaea25decf98ccb098d9e85f.zip
Changed stuff
-rwxr-xr-xdeploy.sh2
-rw-r--r--modern/public/images/icon/animal.svg2
-rw-r--r--modern/public/images/icon/bicycle.svg2
-rw-r--r--modern/public/images/icon/boat.svg2
-rw-r--r--modern/public/images/icon/bus.svg2
-rw-r--r--modern/public/images/icon/car.svg2
-rw-r--r--modern/public/images/icon/crane.svg2
-rw-r--r--modern/public/images/icon/default.svg2
-rw-r--r--modern/public/images/icon/helicopter.svg2
-rw-r--r--modern/public/images/icon/motorcycle.svg2
-rw-r--r--modern/public/images/icon/offroad.svg2
-rw-r--r--modern/public/images/icon/person.svg2
-rw-r--r--modern/public/images/icon/pickup.svg2
-rw-r--r--modern/public/images/icon/plane.svg2
-rw-r--r--modern/public/images/icon/scooter.svg2
-rw-r--r--modern/public/images/icon/ship.svg2
-rw-r--r--modern/public/images/icon/tractor.svg2
-rw-r--r--modern/public/images/icon/train.svg2
-rw-r--r--modern/public/images/icon/tram.svg2
-rw-r--r--modern/public/images/icon/trolleybus.svg2
-rw-r--r--modern/public/images/icon/truck.svg2
-rw-r--r--modern/public/images/icon/van.svg2
-rw-r--r--modern/public/index.html2
-rw-r--r--modern/public/logo.svg63
-rw-r--r--modern/public/manifest.json4
-rw-r--r--modern/src/DevicesList.js16
-rw-r--r--modern/src/map/Map.js2
-rw-r--r--modern/src/map/SelectedDeviceMap.js4
-rw-r--r--modern/src/map/mapUtil.js8
-rw-r--r--modern/src/store/devices.js3
30 files changed, 66 insertions, 80 deletions
diff --git a/deploy.sh b/deploy.sh
index 0b840f9..45036b8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-URL=gemini://avalos.me/gemlog
WEB_DIR=./web
SSH_CMD="ssh"
RSYNC_TO=etbsa.net:/opt/traccar/web/
rsync --progress -e "$SSH_CMD" -rvO --delete $WEB_DIR/ $RSYNC_TO
+
diff --git a/modern/public/images/icon/animal.svg b/modern/public/images/icon/animal.svg
deleted file mode 100644
index 5a23934..0000000
--- a/modern/public/images/icon/animal.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 8.9003906 3.0019531 C 8.7956094 2.9959687 8.6911875 3.0029844 8.5859375 3.0214844 C 7.4759375 3.2044844 6.813875 4.6223594 7.046875 6.3183594 C 7.182875 7.3053594 7.6113594 8.1708594 8.1933594 8.6308594 C 8.5023594 8.8738594 8.8396406 9 9.1816406 9 C 9.2586406 9 9.3360625 8.9934687 9.4140625 8.9804688 C 10.524062 8.7974688 11.186125 7.3795937 10.953125 5.6835938 C 10.817125 4.6965937 10.390594 3.8310937 9.8085938 3.3710938 C 9.5243437 3.1468438 9.2147344 3.0199063 8.9003906 3.0019531 z M 15.097656 3.0039062 C 14.782656 3.0227031 14.474906 3.1448906 14.191406 3.3691406 C 13.609406 3.8291406 13.181875 4.6936406 13.046875 5.6816406 C 12.814875 7.3786406 13.474984 8.7974688 14.583984 8.9804688 C 14.661984 8.9924688 14.740359 9 14.818359 9 C 15.161359 9 15.499594 8.8738594 15.808594 8.6308594 C 16.390594 8.1708594 16.818125 7.3063594 16.953125 6.3183594 C 17.185125 4.6213594 16.524062 3.2025312 15.414062 3.0195312 C 15.308063 3.0025313 15.202656 2.9976406 15.097656 3.0039062 z M 4.6484375 8 C 4.5197266 8.0056641 4.39225 8.0274063 4.265625 8.0664062 C 3.824625 8.2044063 3.4583281 8.5369062 3.2363281 9.0039062 C 2.9493281 9.6089062 2.9221094 10.382 3.1621094 11.125 C 3.5271094 12.257 4.4012969 13 5.2792969 13 C 5.4322969 13 5.584375 12.977641 5.734375 12.931641 C 6.175375 12.793641 6.5416719 12.461141 6.7636719 11.994141 C 7.0506719 11.389141 7.0778906 10.616047 6.8378906 9.8730469 C 6.4625156 8.7110469 5.5494141 7.9603516 4.6484375 8 z M 19.349609 8 C 18.447197 7.9608438 17.537484 8.7101719 17.162109 9.8730469 C 16.922109 10.615047 16.948328 11.389141 17.236328 11.994141 C 17.458328 12.461141 17.824625 12.793641 18.265625 12.931641 C 18.415625 12.977641 18.568703 13 18.720703 13 C 19.598703 13 20.471891 12.256047 20.837891 11.123047 C 21.077891 10.381047 21.051672 9.6089063 20.763672 9.0039062 C 20.541672 8.5369062 20.175375 8.2044062 19.734375 8.0664062 C 19.607375 8.0275313 19.478525 8.0055937 19.349609 8 z M 12 10 C 10.835 10 9.7605 11.077125 9.0625 12.828125 C 8.5395 14.138125 7.503625 15.152125 6.265625 15.828125 C 5.154625 16.434125 5 17.11725 5 17.65625 C 5 19.82025 8.533 20.998047 12 20.998047 C 15.467 20.998047 19 19.82025 19 17.65625 C 19 17.11725 18.845375 16.433172 17.734375 15.826172 C 16.495375 15.151172 15.4605 14.138125 14.9375 12.828125 C 14.2395 11.078125 13.165 10 12 10 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/bicycle.svg b/modern/public/images/icon/bicycle.svg
deleted file mode 100644
index a473f4b..0000000
--- a/modern/public/images/icon/bicycle.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 15 3 A 1.0001 1.0001 0 0 0 14 4 L 14 4.1855469 A 1.0001 1.0001 0 0 0 14.052734 4.5058594 L 14.978516 7.2382812 L 9.9550781 15 L 9.8925781 15 C 9.5602248 13.416061 8.4541484 12.127761 6.9960938 11.492188 L 8.5527344 9 L 11 9 L 11 7 L 5 7 L 5 9 L 6.1972656 9 L 4.9453125 11.003906 A 1.0001 1.0001 0 0 0 4.9003906 11.005859 A 1.0001 1.0001 0 0 0 4.8007812 11.023438 A 1.0001 1.0001 0 0 0 4.640625 11.072266 C 2.0692551 11.267733 5.9211895e-16 13.381669 0 16 C 0 18.745455 2.2545455 21 5 21 C 7.4035927 21 9.4308229 19.272621 9.8984375 17 L 10.5 17 A 1.0001 1.0001 0 0 0 11.339844 16.542969 L 15.796875 9.65625 L 16.490234 11.705078 C 15.010817 12.576973 14 14.171245 14 16 C 14 18.745455 16.254545 21 19 21 C 21.745455 21 24 18.745455 24 16 C 24 13.381005 21.929707 11.266824 19.357422 11.072266 A 1.0001 1.0001 0 0 0 19 11 C 18.788557 11 18.581767 11.017029 18.376953 11.042969 L 16.332031 5 L 19 5 C 19.56503 5 20 5.4349698 20 6 C 20 6.5650302 19.56503 7 19 7 L 19 9 C 20.64497 9 22 7.6449698 22 6 C 22 4.3550302 20.64497 3 19 3 L 15 3 z M 5 13 C 6.3020387 13 7.4022636 13.838627 7.8164062 15 L 5 15 L 5 17 L 7.8164062 17 C 7.4022636 18.161373 6.3020387 19 5 19 C 3.3454545 19 2 17.654545 2 16 C 2 14.345455 3.3454545 13 5 13 z M 19.041016 13.003906 C 20.676234 13.026486 22 14.359504 22 16 C 22 17.654545 20.654545 19 19 19 C 17.345455 19 16 17.654545 16 16 C 16 15.046643 16.45524 14.2061 17.150391 13.65625 L 18.052734 16.320312 L 19.947266 15.679688 L 19.041016 13.003906 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/boat.svg b/modern/public/images/icon/boat.svg
deleted file mode 100644
index 33bfe27..0000000
--- a/modern/public/images/icon/boat.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 8.984375 2 A 1.0001 1.0001 0 0 0 8 3 L 8 3.171875 A 1.0001 1.0001 0 0 0 8.1796875 3.7441406 C 8.1180983 3.655854 8.2336897 3.8448895 8.3242188 4.0742188 C 8.4147476 4.303548 8.5237599 4.6182502 8.625 4.9804688 C 8.8274803 5.7049057 9 6.6278333 9 7.5 C 9 8.3721667 8.826034 9.3020135 8.6230469 10.035156 C 8.5215533 10.401728 8.4134185 10.720739 8.3222656 10.955078 C 8.2311127 11.189417 8.1185954 11.380905 8.1699219 11.304688 A 1.0001 1.0001 0 0 0 8 11.863281 L 8 12 A 1.0001 1.0001 0 0 0 9.125 12.992188 L 17.125 11.992188 A 1.0001 1.0001 0 0 0 18 11 C 18 7.3353738 15.68235 4.987833 13.509766 3.6992188 C 11.337181 2.4106043 9.1835938 2.0175781 9.1835938 2.0175781 A 1.0001 1.0001 0 0 0 8.984375 2 z M 10.568359 4.5625 C 11.166859 4.7839713 11.793876 5.0049413 12.490234 5.4179688 C 14.111319 6.3794746 15.54945 7.8407091 15.869141 10.132812 L 10.472656 10.808594 C 10.498986 10.720814 10.524991 10.661471 10.550781 10.568359 C 10.789539 9.7060027 11 8.6278333 11 7.5 C 11 6.4168081 10.795681 5.4010041 10.568359 4.5625 z M 3 14.990234 C 2.735 14.990234 2.4799687 15.095203 2.2929688 15.283203 C 2.1059688 15.471203 2 15.725234 2 15.990234 C 2 18.038234 2.5637344 19.616687 3.6777344 20.679688 C 5.1287344 22.064688 6.9660469 21.991234 6.9980469 21.990234 L 17.998047 22 L 18 22 C 21.007 22 23 17.73 23 16 C 23 15.448 22.553 15 22 15 L 3 14.990234 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/bus.svg b/modern/public/images/icon/bus.svg
deleted file mode 100644
index 5e88148..0000000
--- a/modern/public/images/icon/bus.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 11 3 C 7.375 3 3 3.237 3 7 L 3 18 C 3 18.884916 3.3906671 19.671627 4 20.220703 L 4 22 C 4 22.552 4.448 23 5 23 L 6 23 C 6.552 23 7 22.552 7 22 L 7 21 L 17 21 L 17 22 C 17 22.552 17.448 23 18 23 L 19 23 C 19.552 23 20 22.552 20 22 L 20 20.220703 C 20.609333 19.671627 21 18.884916 21 18 L 21 7 C 21 3.237 16.625 3 13 3 L 11 3 z M 5 7 L 19 7 L 19 13 L 5 13 L 5 7 z M 6.5 16 C 7.328 16 8 16.672 8 17.5 C 8 18.328 7.328 19 6.5 19 C 5.672 19 5 18.328 5 17.5 C 5 16.672 5.672 16 6.5 16 z M 17.5 16 C 18.328 16 19 16.672 19 17.5 C 19 18.328 18.328 19 17.5 19 C 16.672 19 16 18.328 16 17.5 C 16 16.672 16.672 16 17.5 16 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/car.svg b/modern/public/images/icon/car.svg
deleted file mode 100644
index f919e0b..0000000
--- a/modern/public/images/icon/car.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M18.947,5.013C18.74,4.407,18.169,4,17.529,4H6.471C5.831,4,5.26,4.407,5.053,5.013L3,11v8c0,0.552,0.448,1,1,1h1 c0.552,0,1-0.448,1-1v-1h12v1c0,0.552,0.448,1,1,1h1c0.552,0,1-0.448,1-1v-8L18.947,5.013z M6.829,6h10.343l1.371,4H5.457L6.829,6z M6.5,15C5.672,15,5,14.328,5,13.5S5.672,12,6.5,12S8,12.672,8,13.5S7.328,15,6.5,15z M17.5,15c-0.828,0-1.5-0.672-1.5-1.5 s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S18.328,15,17.5,15z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/crane.svg b/modern/public/images/icon/crane.svg
deleted file mode 100644
index 23db091..0000000
--- a/modern/public/images/icon/crane.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 20.970703 1 A 1.0001 1.0001 0 0 0 20.59375 1.0859375 L 11.714844 5.03125 C 11.624515 5.018834 11.53526 5 11.443359 5 L 7 5 C 5.897 5 5 5.897 5 7 L 5 13 C 2.8026661 13 1 14.802666 1 17 L 1 18 L 1.203125 18 C 1.6594792 19.706363 3.1564058 21 5 21 L 17 21 C 18.843594 21 20.340521 19.706363 20.796875 18 L 21 18 L 21 17 C 21 14.802666 19.197334 13 17 13 L 17 11.220703 C 17 10.653703 16.808922 10.092703 16.419922 9.5957031 L 13.585938 6.390625 L 20 3.5390625 L 20 7.5 C 20 7.7869372 19.786937 8 19.5 8 C 19.213063 8 19 7.7869372 19 7.5 L 17 7.5 C 17 8.8690628 18.130937 10 19.5 10 C 20.869063 10 22 8.8690628 22 7.5 L 22 2 A 1.0001 1.0001 0 0 0 20.970703 1 z M 9 7 L 11.517578 7.0664062 L 14.111328 10 L 9 10 L 9 7 z M 5 15 L 17 15 C 18.116666 15 19 15.883334 19 17 C 19 18.116666 18.116666 19 17 19 L 5 19 C 3.8833339 19 3 18.116666 3 17 C 3 15.883334 3.8833339 15 5 15 z M 5 16 A 1 1 0 0 0 4 17 A 1 1 0 0 0 5 18 A 1 1 0 0 0 6 17 A 1 1 0 0 0 5 16 z M 9 16 A 1 1 0 0 0 8 17 A 1 1 0 0 0 9 18 A 1 1 0 0 0 10 17 A 1 1 0 0 0 9 16 z M 13 16 A 1 1 0 0 0 12 17 A 1 1 0 0 0 13 18 A 1 1 0 0 0 14 17 A 1 1 0 0 0 13 16 z M 17 16 A 1 1 0 0 0 16 17 A 1 1 0 0 0 17 18 A 1 1 0 0 0 18 17 A 1 1 0 0 0 17 16 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/default.svg b/modern/public/images/icon/default.svg
deleted file mode 100644
index a4ba881..0000000
--- a/modern/public/images/icon/default.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M12,2C8.134,2,5,5.134,5,9c0,5,7,13,7,13s7-8,7-13C19,5.134,15.866,2,12,2z M12,11.5c-1.381,0-2.5-1.119-2.5-2.5 c0-1.381,1.119-2.5,2.5-2.5s2.5,1.119,2.5,2.5C14.5,10.381,13.381,11.5,12,11.5z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/helicopter.svg b/modern/public/images/icon/helicopter.svg
deleted file mode 100644
index 2849ee8..0000000
--- a/modern/public/images/icon/helicopter.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 2 3 L 2 5 L 9 5 L 9 3 L 2 3 z M 11 3 L 11 6.2050781 C 8.584 6.6840781 7.012375 7.956 6.359375 9 L 4 9 L 4 7 L 2 7 L 2 13 L 4 13 L 4 11 L 6 11 L 6 13.300781 C 6 15.370781 7.8795313 17 10.269531 17 L 13.810547 17 C 16.170547 17 21.570703 17 21.970703 13 L 17 13 C 14.79 13 13 11.21 13 9 L 13 3 L 11 3 z M 15 3 L 15 5 L 22 5 L 22 3 L 15 3 z M 15 6.1699219 L 15 9 C 15 10.1 15.9 11 17 11 L 21.740234 11 C 20.940234 8.64 18.28 6.7299219 15 6.1699219 z M 21 18 C 21 18.552 20.552 19 20 19 L 6 19 L 6 21 L 20 21 C 21.654 21 23 19.654 23 18 L 21 18 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/motorcycle.svg b/modern/public/images/icon/motorcycle.svg
deleted file mode 100644
index 0289a34..0000000
--- a/modern/public/images/icon/motorcycle.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 12 2 L 12 4 L 14.300781 4 L 15.228516 6.5371094 L 13.837891 7 L 11 7 A 1.0001 1.0001 0 0 0 10.292969 7.2929688 L 8.5859375 9 L 6 9 L 4 9 L 2 9 L 2 11 L 4 11 L 4 12.050781 C 1.7620407 12.304527 0 14.197514 0 16.5 C 0 18.973437 2.0265633 21 4.5 21 C 6.9734367 21 9 18.973437 9 16.5 C 9 16.272263 8.9647678 16.052912 8.9316406 15.833984 L 13.195312 14.980469 A 1.0001 1.0001 0 0 0 13.986328 14.164062 L 14.886719 8.7597656 L 15.916016 8.4160156 L 17.421875 12.535156 C 15.991607 13.291295 15 14.778882 15 16.5 C 15 18.973437 17.026563 21 19.5 21 C 21.973437 21 24 18.973437 24 16.5 C 24 14.026563 21.973437 12 19.5 12 C 19.452602 12 19.408387 12.012195 19.361328 12.013672 L 17.894531 8 L 21 8 L 21 6 L 17.162109 6 L 15.939453 2.65625 A 1.0001 1.0001 0 0 0 15 2 L 12 2 z M 11.414062 9 L 12.820312 9 L 12.126953 13.154297 L 8.1914062 13.941406 C 7.6586419 13.176759 6.8905699 12.598894 6 12.279297 L 6 11 L 9 11 A 1.0001 1.0001 0 0 0 9.7070312 10.707031 L 11.414062 9 z M 4.5 14 C 5.8925565 14 7 15.107443 7 16.5 C 7 17.892557 5.8925565 19 4.5 19 C 3.1074435 19 2 17.892557 2 16.5 C 2 15.107443 3.1074435 14 4.5 14 z M 19.5 14 C 20.892557 14 22 15.107443 22 16.5 C 22 17.892557 20.892557 19 19.5 19 C 18.107443 19 17 17.892557 17 16.5 C 17 15.107443 18.107443 14 19.5 14 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/offroad.svg b/modern/public/images/icon/offroad.svg
deleted file mode 100644
index b0072b6..0000000
--- a/modern/public/images/icon/offroad.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M22,6h-2v2.65l-1.02-4.84C18.89,3.34,18.48,3,18,3H6C5.52,3,5.11,3.34,5.02,3.81L4,8.64V6H2v3h1.62L2.3,10.28 C2.11,10.47,2,10.73,2,11v9c0,0.552,0.448,1,1,1h2l-0.006-3h14.011L19,21h2c0.552,0,1-0.448,1-1v-9c0-0.27-0.11-0.53-0.31-0.72 L20.37,9H22V6z M6.82,5h10.36l0.79,4H6.03L6.82,5z M5.5,15C4.67,15,4,14.33,4,13.5C4,12.67,4.67,12,5.5,12S7,12.67,7,13.5 C7,14.33,6.33,15,5.5,15z M15,16H9v-4h6V16z M18.5,15c-0.83,0-1.5-0.67-1.5-1.5c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5 C20,14.33,19.33,15,18.5,15z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/person.svg b/modern/public/images/icon/person.svg
deleted file mode 100644
index 805ba44..0000000
--- a/modern/public/images/icon/person.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 12 4 C 9.789063 4 8 5.789063 8 8 C 8 10.210938 9.789063 12 12 12 C 14.210938 12 16 10.210938 16 8 C 16 5.789063 14.210938 4 12 4 Z M 9.03125 13.40625 C 5.253906 14.550781 4 17.65625 4 17.65625 L 4 20 L 20 20 L 20 17.65625 C 20 17.65625 18.746094 14.550781 14.96875 13.40625 C 14.761719 14.863281 13.511719 16 12 16 C 10.488281 16 9.238281 14.863281 9.03125 13.40625 Z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/pickup.svg b/modern/public/images/icon/pickup.svg
deleted file mode 100644
index db4494b..0000000
--- a/modern/public/images/icon/pickup.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 8 3 A 1.0001 1.0001 0 0 0 7 4 L 7 10 L 1 10 C 0.45 10 0 10.45 0 11 L 0 18 C 0 18.55 0.45 19 1 19 L 2.5605469 19 C 3.2568565 20.187528 4.5333802 21 6 21 C 7.4666198 21 8.7431435 20.187528 9.4394531 19 L 14.560547 19 C 15.256857 20.187528 16.53338 21 18 21 C 19.46662 21 20.743143 20.187528 21.439453 19 L 23 19 C 23.55 19 24 18.55 24 18 L 24 12.820312 C 24 11.870312 23.320625 11.039375 22.390625 10.859375 L 18.642578 10.109375 L 14.869141 3.5039062 A 1.0001 1.0001 0 0 0 14 3 L 8 3 z M 9 5 L 13.419922 5 L 16.275391 10 L 9 10 L 9 5 z M 6 15 C 7.1164141 15 8 15.883586 8 17 C 8 18.116414 7.1164141 19 6 19 C 4.8835859 19 4 18.116414 4 17 C 4 15.883586 4.8835859 15 6 15 z M 18 15 C 19.116414 15 20 15.883586 20 17 C 20 18.116414 19.116414 19 18 19 C 16.883586 19 16 18.116414 16 17 C 16 15.883586 16.883586 15 18 15 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/plane.svg b/modern/public/images/icon/plane.svg
deleted file mode 100644
index 5210e4c..0000000
--- a/modern/public/images/icon/plane.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M8,22h2l4.997-8H20c1.105,0,2-0.895,2-2s-0.895-2-2-2h-5.003L10,2H8l2.493,8H4.996L3.5,8H2l1,4l-1,4h1.5l1.496-2h5.497 L8,22z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/scooter.svg b/modern/public/images/icon/scooter.svg
deleted file mode 100644
index ea23f9f..0000000
--- a/modern/public/images/icon/scooter.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 17.5 3 C 16.672 3 16 3.672 16 4.5 C 16 4.6761216 16.035954 4.8429605 16.091797 5 L 14 5 L 14 7 L 16.310547 7 L 16.519531 7.5605469 L 12.619141 11 L 9 11 L 9 9 L 12 9 L 12 7 L 2 7 L 2 9 L 4.2402344 9 L 3.7304688 9.4492188 C 2.5804687 10.439219 1 11.8 1 14 C 1 14.27 1.1090625 14.520938 1.2890625 14.710938 L 1.4472656 14.869141 C 1.1853855 15.359439 1.0234375 15.909585 1.0234375 16.5 C 1.0234375 18.418558 2.5945875 20 4.5117188 20 C 6.2579417 20 7.7029312 18.683767 7.9492188 17 L 16.074219 17 C 16.320506 18.683767 17.765496 20 19.511719 20 C 21.42885 20 23 18.418558 23 16.5 C 23 15.033786 22.079411 13.770945 20.791016 13.253906 L 20.695312 13 L 23 13 L 23 11 L 19.945312 11 L 18.070312 6 L 20 6 L 20 3 L 17.5 3 z M 4.5117188 15 C 5.3427564 15 6 15.657134 6 16.5 C 6 17.342866 5.3427564 18 4.5117188 18 C 3.6806811 18 3.0234375 17.342866 3.0234375 16.5 C 3.0234375 15.657134 3.6806811 15 4.5117188 15 z M 19.511719 15 C 20.342756 15 21 15.657134 21 16.5 C 21 17.342866 20.342756 18 19.511719 18 C 18.680681 18 18.023438 17.342866 18.023438 16.5 C 18.023438 15.657134 18.680681 15 19.511719 15 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/ship.svg b/modern/public/images/icon/ship.svg
deleted file mode 100644
index b8c563c..0000000
--- a/modern/public/images/icon/ship.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 11 2 L 11 3 L 9 3 A 1.0001 1.0001 0 0 0 8 4 L 8 5 L 6 5 A 1.0001 1.0001 0 0 0 5 6 L 5 10.880859 L 4.1601562 11.109375 C 3.3001563 11.289375 2.5804688 11.889219 2.2304688 12.699219 C 1.8804687 13.509219 1.940625 14.439453 2.390625 15.189453 L 4 17.880859 L 4 18.980469 C 3.9171433 18.988279 3.8366386 19 3.75 19 C 3.1869011 19 2.694455 18.824995 2.3925781 18.605469 C 2.0907013 18.385943 2 18.181158 2 18 L 0 18 C 0 18.923842 0.52342369 19.718432 1.2167969 20.222656 C 1.91017 20.72688 2.7940989 21 3.75 21 C 4.7059011 21 5.58983 20.72688 6.2832031 20.222656 C 6.3611489 20.165974 6.4268517 20.093089 6.5 20.029297 C 6.5731483 20.093089 6.6388511 20.165974 6.7167969 20.222656 C 7.41017 20.72688 8.2940989 21 9.25 21 C 10.205901 21 11.08983 20.72688 11.783203 20.222656 C 11.861149 20.165974 11.926852 20.093089 12 20.029297 C 12.073148 20.093089 12.138851 20.165974 12.216797 20.222656 C 12.91017 20.72688 13.794099 21 14.75 21 C 15.705901 21 16.58983 20.72688 17.283203 20.222656 C 17.361149 20.165974 17.426852 20.093089 17.5 20.029297 C 17.573148 20.093089 17.638851 20.165974 17.716797 20.222656 C 18.41017 20.72688 19.294099 21 20.25 21 C 21.205901 21 22.08983 20.72688 22.783203 20.222656 C 23.476576 19.718432 24 18.923842 24 18 L 22 18 C 22 18.181158 21.9093 18.385943 21.607422 18.605469 C 21.305545 18.824995 20.813099 19 20.25 19 C 20.163361 19 20.082857 18.988279 20 18.980469 L 20 17.880859 L 21.609375 15.199219 C 22.059375 14.439219 22.119531 13.509219 21.769531 12.699219 C 21.419531 11.889219 20.700625 11.299141 19.890625 11.119141 L 19 10.876953 L 19 6 A 1.0001 1.0001 0 0 0 18 5 L 16 5 L 16 4 A 1.0001 1.0001 0 0 0 15 3 L 13 3 L 13 2 L 11 2 z M 10 5 L 14 5 L 14 6 A 1.0001 1.0001 0 0 0 15 7 L 17 7 L 17 10.335938 L 12 8.9804688 L 7 10.337891 L 7 7 L 9 7 A 1.0001 1.0001 0 0 0 10 6 L 10 5 z M 8 14 C 8.6 14 9 14.47 9 15 C 9 15.53 8.6 16 8 16 C 7.4 16 7 15.53 7 15 C 7 14.47 7.4 14 8 14 z M 16 14 C 16.6 14 17 14.47 17 15 C 17 15.53 16.6 16 16 16 C 15.4 16 15 15.53 15 15 C 15 14.47 15.4 14 16 14 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/tractor.svg b/modern/public/images/icon/tractor.svg
deleted file mode 100644
index 3a9e9f2..0000000
--- a/modern/public/images/icon/tractor.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 5 4 C 4.448 4 4 4.448 4 5 L 4 11.609375 C 2.2234889 12.523708 1 14.3737 1 16.5 C 1 19.525721 3.4742785 22 6.5 22 C 9.0054253 22 11.12762 20.301307 11.785156 18 L 16.050781 18 C 16.026575 18.164905 16 18.328781 16 18.5 C 16 20.421152 17.578848 22 19.5 22 C 21.421152 22 23 20.421152 23 18.5 C 23 17.116848 22.175306 15.9223 21 15.355469 L 21 10 C 21 9.448 20.552 9 20 9 L 17 9 L 17 6 L 18 6 L 19 6 L 19 4 L 18 4 L 17 4 C 15.906937 4 15 4.9069372 15 6 L 15 9 L 12.677734 9 L 10.927734 4.6289062 C 10.775734 4.2499062 10.409 4 10 4 L 5 4 z M 6.5 13 C 8.4448413 13 10 14.555159 10 16.5 C 10 18.444841 8.4448413 20 6.5 20 C 4.5551587 20 3 18.444841 3 16.5 C 3 14.555159 4.5551587 13 6.5 13 z M 6.5 15 A 1.5 1.5 0 0 0 5 16.5 A 1.5 1.5 0 0 0 6.5 18 A 1.5 1.5 0 0 0 8 16.5 A 1.5 1.5 0 0 0 6.5 15 z M 19.5 17 C 20.340272 17 21 17.659728 21 18.5 C 21 19.340272 20.340272 20 19.5 20 C 18.659728 20 18 19.340272 18 18.5 C 18 17.659728 18.659728 17 19.5 17 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/train.svg b/modern/public/images/icon/train.svg
deleted file mode 100644
index 125b468..0000000
--- a/modern/public/images/icon/train.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 7 2 C 5.34375 2 4 3.34375 4 5 L 4 16.84375 C 4 18.53125 5.332031 19.921875 7 20 L 6 21 L 6 22 L 18 22 L 18 21 L 17 20 C 18.667969 19.921875 20 18.53125 20 16.84375 L 20 5 C 20 3.34375 18.65625 2 17 2 Z M 9 4 L 15 4 L 15 5 L 9 5 Z M 6 7 L 11 7 L 11 12 L 6 12 Z M 13 7 L 18 7 L 18 12 L 13 12 Z M 7.5 15 C 8.328125 15 9 15.671875 9 16.5 C 9 17.328125 8.328125 18 7.5 18 C 6.671875 18 6 17.328125 6 16.5 C 6 15.671875 6.671875 15 7.5 15 Z M 16.5 15 C 17.328125 15 18 15.671875 18 16.5 C 18 17.328125 17.328125 18 16.5 18 C 15.671875 18 15 17.328125 15 16.5 C 15 15.671875 15.671875 15 16.5 15 Z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/tram.svg b/modern/public/images/icon/tram.svg
deleted file mode 100644
index f54084f..0000000
--- a/modern/public/images/icon/tram.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 12 0 C 8.9426113 0 6.309955 0.29967448 4.7363281 0.73242188 L 5.2675781 2.6601562 C 6.4939513 2.3229037 9.0813887 2 12 2 C 14.920658 2 17.508002 2.3229037 18.734375 2.6601562 L 19.265625 0.73242188 C 17.691998 0.29967448 15.059342 0 12 0 z M 8 4 C 5.79 4 4 5.79 4 8 L 4 19 L 4 22.263672 C 4 22.670672 4.336 23 4.75 23 L 7 23 L 7 22 L 17 22 L 17 23 L 19.25 23 C 19.664 23 20 22.670672 20 22.263672 L 20 19 L 20 8 C 20 5.79 18.21 4 16 4 L 8 4 z M 8 6 L 16 6 C 17.1 6 18 6.9 18 8 L 18 13 L 6 13 L 6 8 C 6 6.9 6.9 6 8 6 z M 12 16 C 12.55 16 13 16.45 13 17 C 13 17.55 12.55 18 12 18 C 11.45 18 11 17.55 11 17 C 11 16.45 11.45 16 12 16 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/trolleybus.svg b/modern/public/images/icon/trolleybus.svg
deleted file mode 100644
index 46ecc71..0000000
--- a/modern/public/images/icon/trolleybus.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M17,4h-0.52l1.2-3h-2.16l-1.2,3H9.68l-1.2-3H6.32l1.2,3H7C4.79,4,3,5.79,3,8v13.26C3,21.67,3.34,22,3.75,22H6v-2h12v2h2.25 c0.41,0,0.75-0.33,0.75-0.74V8C21,5.79,19.21,4,17,4z M8,16c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S8.55,16,8,16z M16,16 c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S16.55,16,16,16z M19,11H5V8c0-1.1,0.9-2,2-2h10c1.1,0,2,0.9,2,2V11z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/truck.svg b/modern/public/images/icon/truck.svg
deleted file mode 100644
index df5c164..0000000
--- a/modern/public/images/icon/truck.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 3 3 C 2.45 3 2 3.45 2 4 L 2 17 C 2 17.55 2.45 18 3 18 L 3.0507812 18 C 3.2958204 19.692046 4.7411114 21 6.5 21 C 8.2588886 21 9.7041796 19.692046 9.9492188 18 L 14.050781 18 C 14.29582 19.692046 15.741111 21 17.5 21 C 19.258889 21 20.70418 19.692046 20.949219 18 L 22 18 C 22.55 18 23 17.55 23 17 L 23 12.310547 C 23 11.750547 22.850781 11.210469 22.550781 10.730469 L 20.519531 7.4296875 C 19.969531 6.5496875 19.000937 6 17.960938 6 L 14 6 L 14 4 C 14 3.45 13.55 3 13 3 L 3 3 z M 14 8 L 17.960938 8 C 18.310938 8 18.630547 8.1804687 18.810547 8.4804688 L 20.849609 11.779297 C 20.949609 11.939297 21 12.120547 21 12.310547 L 21 16 L 20.648438 16 C 20.084435 14.821937 18.891001 14 17.5 14 C 16.108999 14 14.915565 14.821937 14.351562 16 L 14 16 L 14 8 z M 6.5 16 C 7.327 16 8 16.673 8 17.5 C 8 18.327 7.327 19 6.5 19 C 5.673 19 5 18.327 5 17.5 C 5 16.673 5.673 16 6.5 16 z M 17.5 16 C 18.327 16 19 16.673 19 17.5 C 19 18.327 18.327 19 17.5 19 C 16.673 19 16 18.327 16 17.5 C 16 16.673 16.673 16 17.5 16 z" fill="#000000"/></svg>
diff --git a/modern/public/images/icon/van.svg b/modern/public/images/icon/van.svg
deleted file mode 100644
index a3ee13c..0000000
--- a/modern/public/images/icon/van.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="#000000"><path d="M 5 3 C 3.35 3 2 4.35 2 6 L 2 17 C 2 17.55 2.45 18 3 18 L 4.0507812 18 C 4.2958204 19.692046 5.7411114 21 7.5 21 C 9.2588886 21 10.70418 19.692046 10.949219 18 L 13.050781 18 C 13.29582 19.692046 14.741111 21 16.5 21 C 18.258889 21 19.70418 19.692046 19.949219 18 L 21 18 C 21.55 18 22 17.55 22 17 L 22 11.740234 C 22 11.020234 21.739297 10.329063 21.279297 9.7890625 L 16.359375 4.0507812 C 15.789375 3.3807813 14.960078 3 14.080078 3 L 5 3 z M 12 5 L 14.080078 5 C 14.370078 5 14.649844 5.1296094 14.839844 5.3496094 L 19.679688 11 L 12 11 L 12 5 z M 7.5 16 C 8.327 16 9 16.673 9 17.5 C 9 18.327 8.327 19 7.5 19 C 6.673 19 6 18.327 6 17.5 C 6 16.673 6.673 16 7.5 16 z M 16.5 16 C 17.327 16 18 16.673 18 17.5 C 18 18.327 17.327 19 16.5 19 C 15.673 19 15 18.327 15 17.5 C 15 16.673 15.673 16 16.5 16 z" fill="#000000"/></svg>
diff --git a/modern/public/index.html b/modern/public/index.html
index 78138ed..b6919c8 100644
--- a/modern/public/index.html
+++ b/modern/public/index.html
@@ -7,7 +7,7 @@
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link rel="stylesheet" href="%PUBLIC_URL%/styles.css">
- <title>Traccar</title>
+ <title>ETBSA</title>
</head>
<body style="margin: 0; padding: 0;">
<noscript>
diff --git a/modern/public/logo.svg b/modern/public/logo.svg
index 8183831..d0fd132 100644
--- a/modern/public/logo.svg
+++ b/modern/public/logo.svg
@@ -1,24 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2985" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" viewBox="0 0 240 64" width="240" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g id="img">
- <rect id="rect3778" height="64" width="240" y="0" x="0" fill="none"/>
- <g id="g4194">
- <g id="g4145" fill="currentColor">
- <circle id="path2993" stroke-width="1.3262" transform="rotate(-30)" cy="43.713" cx="9.4364" r="2.2765"/>
- <path id="path3004" stroke-width="1.0095" d="m37.012 24.177-2.8428 3.6128c0.66345 0.52205 1.3255 1.1576 1.7734 1.9333 0.4479 0.77578 0.66726 1.6669 0.78764 2.5025l4.5502-0.65558c-0.193-1.42-0.633-2.804-1.394-4.123s-1.74-2.391-2.874-3.27z"/>
- <path id="path3014" stroke-width="1.0095" d="m42.504 16.9-2.8428 3.6128c1.607 1.2355 3.0914 2.7935 4.1679 4.6581s1.6835 3.9291 1.95 5.9386l4.5502-0.65558c-0.33967-2.5954-1.1669-5.1513-2.5573-7.5594-1.3903-2.4081-3.1901-4.4025-5.268-5.9944z"/>
- <path id="path3036" stroke-width="3.6204" d="m28.667 44.439a9.1058 9.1058 0 0 1 -9.1058 0.000023 9.1058 9.1058 0 0 1 -4.5529 -7.8859 9.1058 9.1058 0 0 1 4.5529 -7.8859l4.5529 7.8859z"/>
- <path id="path3038-8" stroke-width="1.0095" d="m17.502 6.8895c-13.868 8.0065-18.619 25.74-10.612 39.608 8.006 13.868 25.739 18.619 39.608 10.613 13.868-8.007 18.619-25.74 10.613-39.609-8.007-13.868-25.74-18.62-39.609-10.612zm1.706 2.9541c12.237-7.0648 27.884-2.8722 34.948 9.3644 7.065 12.237 2.873 27.884-9.364 34.948-12.237 7.065-27.884 2.873-34.948-9.364-7.0652-12.237-2.8726-27.884 9.364-34.948z"/>
- </g>
+<svg
+ id="img"
+ height="64"
+ viewBox="0 0 240 64"
+ width="240"
+ version="1.1"
+ sodipodi:docname="logo.svg"
+ inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs22" />
+ <sodipodi:namedview
+ id="namedview20"
+ pagecolor="#ffffff"
+ bordercolor="#cccccc"
+ borderopacity="1"
+ inkscape:pageshadow="0"
+ inkscape:pageopacity="1"
+ inkscape:pagecheckerboard="0"
+ showgrid="false"
+ inkscape:zoom="4.5552343"
+ inkscape:cx="132.26542"
+ inkscape:cy="47.747269"
+ inkscape:window-width="1366"
+ inkscape:window-height="695"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g234" />
+ <g
+ transform="translate(46.156565,-0.2695845)">
+ <path
+ style="fill:#efdb1e;stroke-width:0.0901377"
+ d="m 3.3409719,63.234274 c -2.68310269,-0.418158 -5.1206207,-1.669477 -7.0943514,-3.641941 -1.9733059,-1.972037 -3.250335,-4.468735 -3.6532849,-7.142472 -0.1133311,-0.751998 -0.1281317,-3.649757 -0.1051998,-20.596476 0.025256,-18.66434 0.035423,-19.757497 0.1897066,-20.395665 0.6646054,-2.7490461 1.6937732,-4.6240656 3.5665418,-6.4978083 1.8319083,-1.8328616 3.70315231,-2.8812438 6.3152663,-3.538185 L 3.3258211,1.2290366 73.407916,1.2022102 c 61.608354,-0.023583 70.185634,-0.010656 70.938404,0.1069518 1.28953,0.2014615 2.36095,0.5406129 3.56045,1.1270302 3.71857,1.8179753 6.26588,5.1285559 7.09539,9.2214568 l 0.20575,1.015207 v 19.559892 c 0,18.372433 -0.01,19.611878 -0.16041,20.416201 -0.5188,2.769123 -1.6942,4.999941 -3.65765,6.941905 -0.57715,0.570834 -1.35481,1.246517 -1.72814,1.501517 -1.38677,0.947236 -2.98521,1.644017 -4.66096,2.031773 l -0.87978,0.203573 -69.991952,0.01531 C 15.096417,63.355939 4.0124095,63.338874 3.3409719,63.234263 Z M 143.85648,61.295646 c 2.84418,-0.395588 5.6604,-2.123389 7.3731,-4.523511 0.87958,-1.232612 1.59334,-2.941439 1.87281,-4.483737 0.1007,-0.556095 0.1225,-4.11424 0.1225,-20.05565 0,-18.254074 -0.01,-19.425553 -0.16107,-20.170564 -0.46293,-2.2733251 -1.41885,-4.0482244 -3.0755,-5.7104011 -1.43381,-1.4386066 -3.00707,-2.3538357 -4.98454,-2.8996987 l -0.88281,-0.243692 H 73.813536 3.5060967 L 2.6047197,3.4562747 C 1.4697865,3.7683862 -0.24145949,4.605543 -1.1843646,5.3099275 -3.3956931,6.9618738 -4.9484791,9.4948339 -5.415212,12.21144 c -0.1203571,0.700558 -0.1375342,3.206124 -0.1375342,20.066377 0,16.985777 0.016516,19.360558 0.1395288,20.065983 0.788328,4.520609 4.3531978,8.078665 8.9193141,8.902268 0.6239771,0.112545 10.0776683,0.131156 70.1882413,0.138154 48.988082,0.0057 69.672032,-0.02041 70.162142,-0.08857 z M 13.805948,54.025829 c 0.162008,-0.02007 0.405381,-0.01965 0.540827,9.19e-4 0.135444,0.02057 0.0029,0.03699 -0.294562,0.03647 -0.297455,-5.41e-4 -0.408275,-0.01733 -0.246265,-0.03739 z m 17.801829,6.31e-4 c 0.137015,-0.02072 0.339824,-0.02017 0.450689,0.0012 0.11086,0.0214 -0.0012,0.03834 -0.249118,0.03767 -0.247879,-7.22e-4 -0.338585,-0.01819 -0.201571,-0.0389 z m 6.39978,0 c 0.137015,-0.02072 0.339824,-0.02017 0.450688,0.0012 0.110861,0.0214 -0.0012,0.03834 -0.249118,0.03767 -0.247878,-7.22e-4 -0.338584,-0.01819 -0.20157,-0.0389 z M 3.6638378,53.93476 c 0.2354849,-0.01857 0.6208241,-0.01857 0.856309,0 0.2354849,0.01857 0.042808,0.03376 -0.4281551,0.03376 -0.4709698,0 -0.6636388,-0.01519 -0.4281539,-0.03376 z m 5.3181275,0 c 0.235485,-0.01857 0.620823,-0.01857 0.856308,0 0.2354837,0.01857 0.04282,0.03376 -0.428154,0.03376 -0.47097,0 -0.663639,-0.01519 -0.428154,-0.03376 z m 9.6474567,-9.1e-5 c 0.236982,-0.01863 0.60204,-0.01841 0.81124,5.41e-4 0.209202,0.01891 0.01531,0.03414 -0.430874,0.03387 -0.446181,-2.69e-4 -0.617346,-0.01575 -0.380366,-0.03437 z m 3.638953,-0.0012 c -0.02314,-0.03718 0.248257,-0.05651 0.603111,-0.04293 1.098222,0.04199 1.225166,0.08104 0.312493,0.09612 -0.480439,0.0079 -0.892459,-0.01599 -0.915604,-0.05318 z m 2.050704,-0.05813 c -0.02654,-0.06915 -0.03208,-0.282101 -0.01233,-0.473223 0.03429,-0.331681 0.03661,-0.328102 0.05107,0.07862 l 0.01515,0.426122 1.645014,0.02673 1.645014,0.02673 -1.647843,0.02037 c -1.340183,0.01656 -1.65685,-0.0031 -1.69609,-0.105356 z m 18.753578,0.01284 c -0.02383,-0.06209 -0.0322,-1.694708 -0.01862,-3.628044 l 0.02471,-3.515157 0.02145,3.581401 0.02145,3.581401 2.230909,0.02576 2.23091,0.02576 -2.233739,0.02089 c -1.721741,0.0161 -2.243668,-0.005 -2.277057,-0.092 z m 5.051622,0.05571 c 0.637248,-0.0667 1.46734,-0.07278 1.428562,-0.0105 -0.02313,0.03718 -0.414871,0.06112 -0.87052,0.05318 -0.455651,-0.0079 -0.706769,-0.02716 -0.558042,-0.04272 z m 5.475868,-0.0092 c 0.235485,-0.01857 0.620824,-0.01857 0.856309,0 0.235485,0.01857 0.04281,0.03376 -0.428155,0.03376 -0.47097,0 -0.663639,-0.01518 -0.428154,-0.03376 z M 15.030154,51.927848 c 0,-0.421394 0.01553,-0.593783 0.03451,-0.383086 0.01898,0.210697 0.01898,0.555474 0,0.766171 -0.01898,0.210697 -0.03451,0.0383 -0.03451,-0.383085 z m -8.8875289,0.293623 c 0.3594247,-0.01711 0.9475742,-0.01711 1.3069976,0 0.3594246,0.01711 0.065354,0.0311 -0.6534988,0.0311 -0.718848,0 -1.0129222,-0.014 -0.6534988,-0.0311 z M 50.719859,52.22129 c 0.386478,-0.01693 0.994908,-0.01683 1.352067,2.71e-4 0.357158,0.01707 0.04095,0.03092 -0.702688,0.0308 -0.743636,-9e-5 -1.035857,-0.01409 -0.649379,-0.03103 z M 10.609841,50.350436 c 5.41e-4,-0.297454 0.01733,-0.408273 0.03739,-0.246264 0.02005,0.16201 0.01965,0.405381 -9.19e-4,0.540827 -0.02057,0.135446 -0.03699,0.0029 -0.03647,-0.294563 z M 133.0791,50.542887 c -0.37181,-0.111935 -0.86269,-0.302428 -1.09082,-0.423325 -0.22813,-0.120894 -2.32179,-1.456954 -4.65259,-2.969015 l -4.2378,-2.749202 3.80482,-0.02349 3.80484,-0.02349 -5.14095,-14.689436 c -2.82753,-8.07919 -5.15225,-14.678128 -5.16608,-14.664305 -0.0138,0.01382 0.45238,3.114987 1.03599,6.891479 l 1.0611,6.86635 -2.20816,6.311639 -2.20817,6.311641 h -5.16545 c -2.84098,0 -5.1655,-0.03042 -5.1656,-0.0676 -1e-4,-0.03718 2.48125,-6.975065 5.51409,-15.417519 l 5.51426,-15.349915 4.37853,0.0265 4.37852,0.0265 0.51402,0.252418 c 0.60983,0.299468 1.26187,0.986621 1.45024,1.528325 0.0731,0.21041 2.73743,7.683721 5.92059,16.607358 3.18316,8.923638 5.86496,16.525359 5.95958,16.892713 0.50672,1.9677 -0.10376,3.60601 -1.63237,4.380609 -0.82913,0.420157 -1.38981,0.492576 -3.78418,0.488784 -2.02686,-0.0032 -2.26395,-0.02023 -2.88441,-0.207008 z M 30.069234,50.350436 c 0.0018,-0.148726 0.02203,-0.198657 0.0449,-0.110958 0.02285,0.0877 0.02135,0.209388 -0.0033,0.270415 -0.02469,0.06102 -0.0434,-0.01074 -0.04155,-0.159458 z m -6.850469,-1.442203 c 0.0018,-0.148727 0.02204,-0.198658 0.0449,-0.110958 0.02285,0.0877 0.02135,0.209387 -0.0033,0.270414 -0.02469,0.06102 -0.04339,-0.01074 -0.04155,-0.159458 z m -3.194928,-0.919922 c 0.111544,-0.02148 0.294076,-0.02148 0.405621,0 0.111544,0.02148 0.02028,0.03906 -0.20281,0.03906 -0.223091,0 -0.314356,-0.01758 -0.202811,-0.03906 z m -5.72203,-0.08899 c 0.0877,-0.02285 0.209387,-0.02135 0.270413,0.0033 0.06102,0.02469 -0.01074,0.04339 -0.159456,0.04155 -0.148728,-0.0018 -0.198659,-0.02203 -0.110958,-0.0449 z m 17.439937,0.0028 c 0.06197,-0.025 0.163375,-0.025 0.225345,0 0.06197,0.02501 0.01123,0.04547 -0.112679,0.04547 -0.123938,0 -0.174641,-0.02046 -0.112666,-0.04547 z m 6.264574,-0.0024 c 0.08675,-0.02267 0.228724,-0.02267 0.315482,0 0.08675,0.02267 0.01577,0.04122 -0.157741,0.04122 -0.173516,0 -0.244499,-0.01855 -0.157741,-0.04122 z M 24.308627,47.195616 c 7.2e-4,-0.24788 0.01819,-0.338586 0.0389,-0.20157 0.02071,0.137014 0.02017,0.339824 -0.0012,0.450688 -0.0214,0.110861 -0.03834,-0.0012 -0.03767,-0.249118 z m -3.467915,-0.467195 c 0.06507,-0.02604 0.142812,-0.02284 0.172763,0.0071 0.02996,0.02996 -0.02329,0.05126 -0.118306,0.04735 -0.105001,-0.0043 -0.126365,-0.02568 -0.05445,-0.05445 z m 72.421754,-5.138742 c 0.0877,-0.02285 0.209391,-0.02135 0.270414,0.0033 0.06103,0.02469 -0.01074,0.04339 -0.159453,0.04155 -0.148728,-0.0018 -0.198655,-0.02203 -0.110958,-0.0449 z m 2.343582,0 c 0.0877,-0.02285 0.20939,-0.02135 0.270413,0.0033 0.06103,0.02469 -0.01074,0.04339 -0.159453,0.04155 -0.148728,-0.0018 -0.198655,-0.02203 -0.110958,-0.0449 z M 44.066702,29.934236 c 0,-6.221758 0.01074,-8.767023 0.0239,-5.656143 0.01315,3.110878 0.01315,8.201408 0,11.312287 -0.01315,3.110879 -0.0239,0.565614 -0.0239,-5.656144 z m 10.636577,-3.60551 c 0,-8.204788 0.01062,-11.561294 0.02358,-7.458899 0.01298,4.102395 0.01298,10.815403 0,14.917798 -0.01298,4.102394 -0.02358,0.745889 -0.02358,-7.458899 z m 89.530371,14.452481 c 0.062,-0.02501 0.16338,-0.02501 0.22534,0 0.062,0.02501 0.011,0.04547 -0.11267,0.04547 -0.12393,0 -0.17464,-0.02046 -0.11267,-0.04547 z m -1.20232,-2.374023 c 0,-0.867575 0.0136,-1.222492 0.03,-0.788705 0.0165,0.433789 0.0165,1.143623 0,1.577411 -0.0165,0.433788 -0.03,0.07887 -0.03,-0.788706 z m -1.19129,-0.04507 c 0.001,-0.148728 0.022,-0.198659 0.0449,-0.110958 0.0228,0.0877 0.0214,0.209388 -0.004,0.270414 -0.0247,0.06102 -0.0435,-0.01074 -0.0415,-0.159456 z m 1.98922,-0.199888 c 0.13702,-0.02072 0.33983,-0.02017 0.45069,0.0012 0.11084,0.0214 -0.001,0.03835 -0.24911,0.03767 -0.24788,-7.21e-4 -0.33859,-0.01819 -0.20158,-0.0389 z M 98.293045,32.766064 c 0.0043,-0.105001 0.02569,-0.126364 0.05446,-0.05445 0.026,0.06507 0.0228,0.142812 -0.007,0.172763 -0.02995,0.02996 -0.05127,-0.02329 -0.04735,-0.118306 z M 70.73409,31.73699 c 0,-0.371817 0.0159,-0.523925 0.03536,-0.338015 0.01945,0.185909 0.01945,0.490123 0,0.676032 -0.01944,0.185909 -0.03536,0.0338 -0.03536,-0.338017 z m 36.94373,0.225345 c 0.001,-0.148727 0.0221,-0.198657 0.0449,-0.110958 0.0228,0.0877 0.0214,0.209388 -0.004,0.270413 -0.0247,0.06103 -0.0433,-0.01074 -0.0415,-0.159456 z m -0.004,-1.306997 c 0,-0.12394 0.0205,-0.174641 0.0455,-0.112667 0.025,0.06197 0.025,0.163374 0,0.225344 -0.025,0.06197 -0.0455,0.01123 -0.0455,-0.112667 z M 82.428803,21.588983 c 0.0043,-0.105001 0.02569,-0.126364 0.05447,-0.05445 0.02604,0.06506 0.02284,0.142813 -0.0071,0.172764 -0.02996,0.02996 -0.05127,-0.02329 -0.04735,-0.118306 z m 24.717637,-1.389624 c 0,-0.272667 0.0169,-0.384213 0.0376,-0.247879 0.0206,0.136334 0.0206,0.359424 0,0.495757 -0.0206,0.136333 -0.0376,0.02479 -0.0376,-0.247878 z M 27.478744,15.016438 c 2.4e-5,-1.983031 0.01196,-2.781428 0.02644,-1.774217 0.01451,1.00721 0.0145,2.62969 -4.4e-5,3.60551 -0.01454,0.975819 -0.02642,0.151738 -0.02639,-1.831293 z m 66.99887,2.599367 c 0.06197,-0.02501 0.163374,-0.02501 0.225344,0 0.06197,0.02501 0.01123,0.04547 -0.112667,0.04547 -0.12394,0 -0.174643,-0.02046 -0.112667,-0.04547 z m 1.177424,-0.0018 c 0.06507,-0.02604 0.142814,-0.02284 0.172767,0.0071 0.02996,0.02996 -0.02329,0.05126 -0.118307,0.04734 -0.105013,-0.0043 -0.126364,-0.02568 -0.05447,-0.05445 z m -2.253443,-6.580056 c 0.06507,-0.02604 0.142813,-0.02284 0.172766,0.0071 0.02996,0.02996 -0.02329,0.05126 -0.118307,0.04734 -0.105013,-0.0043 -0.126363,-0.02568 -0.05447,-0.05445 z m 3.15482,0 c 0.06507,-0.02604 0.142815,-0.02284 0.172768,0.0071 0.02996,0.02996 -0.02329,0.05126 -0.118307,0.04734 -0.105013,-0.0043 -0.126364,-0.02568 -0.05446,-0.05445 z"
+ id="path238" />
+ <path
+ style="fill:#337729;stroke-width:0.0901377"
+ d="M 3.5060967,61.246068 C 2.3978752,61.046175 1.6095179,60.788372 0.59465251,60.293988 -2.0485554,59.006371 -4.0837231,56.695729 -5.0101456,53.93054 -5.5834263,52.219415 -5.5527462,53.443674 -5.5527462,32.277817 c 0,-16.860253 0.017175,-19.365819 0.1375342,-20.066377 C -4.9484791,9.4948339 -3.3956931,6.9618738 -1.1843646,5.3099275 -0.24145949,4.605543 1.4697865,3.7683862 2.6047197,3.4562747 L 3.5060967,3.2083922 H 73.813536 144.12097 l 0.88281,0.243692 c 1.97747,0.545863 3.55073,1.4610921 4.98454,2.8996987 1.65665,1.6621767 2.61257,3.437076 3.0755,5.7104011 0.15171,0.745011 0.16107,1.91649 0.16107,20.170564 0,21.038041 0.0271,19.87475 -0.50264,21.542923 -1.24725,3.927328 -4.81932,6.957165 -8.86577,7.519975 -0.49011,0.06817 -21.17406,0.09428 -70.162142,0.08857 -60.110573,-0.007 -69.5642642,-0.02561 -70.1882413,-0.138154 z m 12.3696093,-7.408099 0.610226,-0.152435 0.02433,-1.915427 0.02433,-1.915428 h -1.443997 -1.443997 v 0.676033 0.676034 h 0.676034 0.676033 v 0.710589 c 0,0.813706 -0.005,0.818284 -0.895453,0.820522 -1.029416,0.0026 -1.600527,-0.542153 -1.818795,-1.73481 -0.206405,-1.127842 0.173247,-2.24784 0.932296,-2.750331 0.514456,-0.34057 1.591843,-0.396851 2.317406,-0.121053 0.269712,0.102523 0.498888,0.177223 0.509281,0.166005 0.11202,-0.120906 0.471277,-1.199502 0.417455,-1.253324 -0.03938,-0.03938 -0.390963,-0.153271 -0.781308,-0.253104 -2.085579,-0.533403 -3.983976,0.172237 -4.696311,1.745629 -0.292628,0.64635 -0.430496,1.513416 -0.358358,2.253733 0.226169,2.321037 1.472029,3.38352 3.808631,3.248043 0.457588,-0.02652 1.10658,-0.116829 1.442203,-0.200672 z m 17.353312,0.01376 0.518291,-0.144876 v -0.673798 c 0,-0.604777 -0.01616,-0.667573 -0.157741,-0.613017 -0.911991,0.351426 -1.987136,0.400488 -2.547389,0.116244 -0.598485,-0.303638 -0.840013,-0.836763 -0.884827,-1.953078 -0.05123,-1.276215 0.196133,-1.956433 0.878765,-2.416458 0.417198,-0.281149 1.162469,-0.277427 1.925067,0.0096 l 0.570056,0.214567 0.19457,-0.507515 c 0.107016,-0.279134 0.218599,-0.57273 0.247965,-0.652435 0.09182,-0.249215 -1.086601,-0.576284 -2.074289,-0.575719 -1.146933,6.31e-4 -1.650618,0.19192 -2.351469,0.892915 -0.718781,0.718925 -0.945375,1.289296 -1.006243,2.53287 -0.109884,2.244799 0.75526,3.608249 2.489742,3.923814 0.543828,0.09894 1.545397,0.02915 2.197502,-0.15313 z m 6.251628,0.01627 c 0.866006,-0.257176 1.516066,-0.908324 1.891915,-1.895078 0.138394,-0.363346 0.171397,-0.686513 0.17029,-1.667548 -0.0017,-1.548417 -0.167645,-2.043343 -0.93994,-2.804131 -0.687797,-0.67755 -1.174441,-0.846449 -2.438852,-0.846449 -1.270037,0 -1.763437,0.171604 -2.440705,0.848873 -0.671075,0.671075 -0.902461,1.269273 -0.962076,2.487238 -0.111568,2.279422 0.799498,3.685987 2.592618,4.002644 0.611054,0.107906 1.521621,0.05416 2.12675,-0.125549 z M 37.38897,52.573063 c -0.473344,-0.222298 -0.719555,-0.573813 -0.903088,-1.289337 -0.328114,-1.279176 0.02881,-2.710438 0.78141,-3.133421 0.497346,-0.279523 1.513842,-0.248909 1.945699,0.0586 0.419146,0.298458 0.677974,0.928907 0.731174,1.780986 0.07545,1.208364 -0.195106,2.054384 -0.800291,2.502545 -0.354337,0.262396 -1.277538,0.304812 -1.754904,0.08062 z m -32.1883064,0.546746 0.2575068,-0.836145 1.3179847,0.0249 1.3179859,0.0249 0.2557903,0.833774 0.255791,0.833775 h 0.807817 c 0.5866187,0 0.8075857,-0.03086 0.8069657,-0.112667 -4.5e-4,-0.06197 -0.5601887,-1.69459 -1.2438227,-3.628045 L 7.7337106,46.74493 6.7799318,46.719455 c -0.8451704,-0.02257 -0.9610209,-0.0072 -1.0173726,0.135206 -0.149808,0.378513 -2.4818073,7.048125 -2.4818073,7.09807 0,0.03028 0.374042,0.04339 0.8312024,0.02914 l 0.8312025,-0.02591 z m 0.6979235,-2.251076 c 0.0061,-0.106502 0.8894048,-2.959689 0.8936966,-2.886591 0.0033,0.05551 0.7463886,2.508498 0.8608389,2.841522 0.029271,0.08519 -0.1804295,0.112679 -0.859827,0.112679 -0.4942013,0 -0.8968202,-0.03042 -0.8947085,-0.0676 z M 19.775959,52.598945 V 51.19687 l 0.422611,0.02748 0.422611,0.02748 0.849814,1.374601 0.849814,1.374601 h 0.845812 c 0.465196,0 0.845811,-0.02347 0.845811,-0.05217 0,-0.0287 -0.468371,-0.745094 -1.040826,-1.592003 -0.756336,-1.118949 -1.008871,-1.558414 -0.923912,-1.607804 1.089651,-0.633462 1.42865,-1.517464 1.054073,-2.748684 -0.09502,-0.312312 -0.531523,-0.761628 -0.938975,-0.966528 -0.45703,-0.229831 -1.276734,-0.333972 -2.628732,-0.333972 h -1.290442 v 3.650579 3.650579 h 0.76617 0.766171 z m 0.0676,-2.70473 c -0.03718,-0.03827 -0.0676,-0.468438 -0.0676,-0.955933 v -0.886355 l 0.60843,3.6e-4 c 1.001421,5.41e-4 1.420633,0.394923 1.229735,1.156857 -0.054,0.215562 -0.172092,0.374516 -0.359006,0.483264 -0.298676,0.173769 -1.299746,0.316906 -1.411555,0.20183 z m 7.77438,3.622145 v -0.484657 l -0.450688,-0.193881 -0.45069,-0.193881 v -2.294488 -2.29449 l 0.45069,-0.228381 c 0.450386,-0.228229 0.450688,-0.228683 0.450688,-0.679584 v -0.451205 l -1.645014,0.02457 -1.645014,0.02457 -0.0277,0.433725 -0.0277,0.433727 0.455855,0.192593 0.455855,0.192594 v 2.324173 2.324173 L 24.733533,52.8743 c -0.435947,0.22091 -0.450689,0.241109 -0.450689,0.61746 0,0.213993 0.02704,0.416119 0.06009,0.44917 0.03306,0.03306 0.783447,0.06009 1.667549,0.06009 h 1.607456 z M 47.53838,53.324985 v -0.676033 h -1.442204 -1.442204 v -2.978055 -2.978055 l -0.788705,0.02605 -0.788705,0.02605 -0.02362,3.515156 c -0.01299,1.933337 -0.0041,3.565957 0.0197,3.628046 0.03307,0.08618 0.566458,0.112886 2.254524,0.112886 h 2.211203 z m 2.253551,-0.180275 0.247646,-0.81124 1.314173,-0.02491 1.314174,-0.02493 0.256417,0.836161 0.256414,0.83616 0.829391,0.02591 c 0.456166,0.01426 0.829391,-0.0096 0.829391,-0.05299 0,-0.04339 -0.563996,-1.677537 -1.253325,-3.631426 l -1.25332,-3.552523 h -0.970239 -0.97024 l -1.242294,3.515372 c -0.683262,1.933455 -1.244294,3.567597 -1.246739,3.631428 -0.0034,0.0883 0.192241,0.109859 0.818234,0.09013 l 0.822678,-0.02591 z m 0.720741,-2.275979 c -5.41e-4,-0.143975 0.850501,-2.924617 0.872385,-2.850379 0.01276,0.04326 0.221823,0.717495 0.464605,1.498314 l 0.441422,1.419669 h -0.88908 c -0.488993,0 -0.889192,-0.03042 -0.889332,-0.0676 z m 88.224298,-0.248566 c 0.6782,-0.159901 1.34025,-0.482922 1.77861,-0.867815 0.92707,-0.813972 1.26368,-2.321639 0.86448,-3.871845 -0.0946,-0.367355 -2.77642,-7.969076 -5.95958,-16.892714 -3.18316,-8.923636 -5.84742,-16.396948 -5.92059,-16.607358 -0.18837,-0.541703 -0.84041,-1.228857 -1.45024,-1.528325 l -0.51402,-0.252418 -4.37852,-0.0265 -4.37853,-0.0265 -5.51426,15.349916 c -3.03284,8.442453 -5.51419,15.380337 -5.51409,15.417518 0,0.03718 2.32462,0.0676 5.1656,0.0676 h 5.16545 l 2.20817,-6.31164 2.20816,-6.311639 -1.0611,-6.86635 c -0.58361,-3.776492 -1.04981,-6.877658 -1.03599,-6.891479 0.0138,-0.01382 2.33855,6.585115 5.16608,14.664305 l 5.14095,14.689436 -3.80484,0.02349 -3.80482,0.02349 4.2378,2.749201 c 2.3308,1.512061 4.42446,2.848118 4.65259,2.969016 0.22813,0.120894 0.71901,0.311393 1.09082,0.423325 0.62046,0.186781 0.85755,0.203797 2.88441,0.207008 1.6438,0.0026 2.35283,-0.03057 2.77346,-0.129733 z M 27.009513,45.43174 c 0.483364,-0.398258 0.878843,-0.762598 0.878843,-0.809646 0,-0.04784 -0.369838,-0.08554 -0.839072,-0.08554 h -0.839072 l -0.595995,0.758287 c -0.327797,0.417057 -0.572165,0.782113 -0.54304,0.811239 0.02913,0.02913 0.279426,0.05223 0.556224,0.05137 0.495428,-0.0016 0.516961,-0.01288 1.382112,-0.725699 z m 70.555318,-3.959103 c 4.503659,-0.58465 7.620059,-2.352497 9.049319,-5.133406 0.78602,-1.529381 1.08256,-2.901661 1.08212,-5.00786 0,-1.096129 -0.0383,-1.504938 -0.20122,-2.15966 -0.68166,-2.739729 -2.59291,-4.594668 -5.9315,-5.756753 -0.49421,-0.172026 -2.275511,-0.625409 -3.958454,-1.00752 -4.116798,-0.934722 -5.214658,-1.347056 -5.7068,-2.143372 -0.647848,-1.048239 -0.01821,-2.068461 1.520199,-2.463258 0.887939,-0.227867 2.659379,-0.204669 3.439052,0.04504 1.084601,0.347361 1.777742,1.185772 1.930152,2.334658 l 0.0623,0.469546 h 4.179781 4.17979 l -6e-5,-0.247879 c 0,-1.352799 -0.3929,-3.250156 -0.86812,-4.196586 -1.39409,-2.776479 -4.68096,-4.62728 -9.065948,-5.104931 -1.10344,-0.120199 -3.381193,-0.121846 -4.442836,-0.0032 -4.620108,0.516258 -8.03522,2.472886 -9.514823,5.451344 -0.589293,1.186254 -0.807084,2.059596 -0.87082,3.491983 -0.122579,2.75476 0.491188,4.599984 2.084399,6.266512 1.75463,1.835377 3.588555,2.63948 8.571657,3.758325 4.116122,0.924186 5.182245,1.481286 5.182245,2.707976 0,0.817327 -0.520032,1.342249 -1.621804,1.637057 -0.446704,0.119527 -0.960634,0.15783 -2.163305,0.161234 -1.435218,0.004 -1.638353,-0.01539 -2.253444,-0.215749 -0.562901,-0.183359 -0.760358,-0.304184 -1.179894,-0.721992 -0.590546,-0.588113 -0.823048,-1.15998 -0.831368,-2.044914 l -0.0054,-0.573323 h -4.231543 -4.231544 l 0.04689,1.41967 c 0.03893,1.178551 0.08697,1.554211 0.282906,2.211829 0.541494,1.817413 1.595484,3.264433 3.282186,4.506113 1.617712,1.190895 4.294694,2.104016 7.048051,2.404096 0.940732,0.102523 4.095454,0.05036 5.137851,-0.08496 z M 145.544,40.99649 c 1.02011,-0.467029 1.60674,-1.346432 1.6671,-2.499167 0.0485,-0.924343 -0.19823,-1.581686 -0.83081,-2.214255 -1.42792,-1.427932 -3.87452,-0.996081 -4.71124,0.831591 -0.62354,1.36196 -0.13386,2.952151 1.15425,3.748316 0.76104,0.470392 1.86637,0.524636 2.7207,0.133515 z m -2.35585,-0.52356 c -0.85931,-0.429403 -1.27733,-1.148823 -1.27357,-2.191868 0.004,-0.923636 0.46413,-1.673597 1.29423,-2.10636 0.90043,-0.469439 2.1252,-0.28134 2.8432,0.436661 0.71799,0.718002 0.9061,1.942754 0.43666,2.843199 -0.63469,1.21741 -2.03659,1.649963 -3.30052,1.018368 z m 0.34693,-1.167197 c 0,-0.70026 0.0752,-0.795842 0.51532,-0.655006 0.16671,0.05335 0.38397,0.282937 0.64775,0.684536 0.35924,0.5469 0.42566,0.604264 0.69971,0.604264 h 0.3028 l -0.2395,-0.383086 c -0.13171,-0.210697 -0.35871,-0.535192 -0.50445,-0.721101 -0.19422,-0.24774 -0.2282,-0.338017 -0.12723,-0.338017 0.24936,0 0.60267,-0.393602 0.65639,-0.731262 0.0437,-0.274878 0.01,-0.373239 -0.22094,-0.630966 l -0.27276,-0.305321 h -0.97643 -0.97642 l -0.0247,1.554876 -0.0247,1.554877 h 0.27255 0.27253 z m 0,-1.61965 v -0.45069 h 0.52077 c 0.57105,0 0.92143,0.170873 0.92143,0.449363 0,0.322512 -0.24717,0.452016 -0.86274,0.452016 h -0.57946 z M 25.634912,37.64159 v -3.559864 l -6.692727,-0.02311 -6.692728,-0.02311 -0.02403,-2.366116 -0.02403,-2.366115 h 6.040726 6.040725 v -3.334452 -3.334458 l -6.016695,-0.02318 -6.016694,-0.02317 -0.02417,-2.140771 -0.02417,-2.140771 h 6.716894 6.716893 V 14.881232 11.455997 H 14.457832 3.2807519 V 26.328726 41.201455 H 14.457832 25.634912 Z M 44.113149,29.889167 V 18.576879 h 3.740717 3.740717 V 15.016438 11.455997 H 39.516124 27.437667 v 3.560441 3.560441 h 3.785785 3.785786 v 11.312288 11.312288 h 4.551956 4.551955 z m 29.339837,11.062579 c 0.811067,-0.228112 2.0046,-0.773221 2.619871,-1.196541 1.490274,-1.025332 2.711542,-2.717395 3.196582,-4.428839 0.247752,-0.8742 0.327822,-2.435277 0.180473,-3.518578 -0.24759,-1.820315 -0.758744,-2.912347 -1.890314,-4.038523 -0.858581,-0.854483 -1.623643,-1.313296 -2.844684,-1.705979 -0.396606,-0.127547 -0.741384,-0.264971 -0.766172,-0.30539 -0.02479,-0.04042 0.241967,-0.18516 0.592782,-0.321653 2.119824,-0.824767 3.442911,-2.20107 4.009399,-4.170678 0.241975,-0.841297 0.339649,-2.90807 0.180664,-3.822684 -0.2434,-1.400163 -0.885567,-2.56025 -2.06949,-3.738555 -0.777583,-0.773892 -0.970856,-0.91317 -1.902115,-1.370672 -1.820683,-0.894458 -0.882629,-0.822312 -11.109476,-0.85443 l -8.991241,-0.02823 v 14.877729 14.87773 l 9.03631,-0.02594 9.036308,-0.02594 z M 63.132213,31.73699 v -2.523856 h 2.977441 c 3.26706,0 3.292424,0.0035 3.916268,0.551312 0.53994,0.474073 0.673904,0.866189 0.673904,1.972544 0,0.727034 -0.0385,1.0312 -0.166054,1.31203 -0.201881,0.444465 -0.829279,1.000144 -1.266302,1.121546 -0.181432,0.0504 -1.587189,0.0895 -3.228314,0.08978 l -2.906943,5.03e-4 z m 0,-11.447494 V 17.76564 l 2.546391,0.0022 c 1.400516,0.0012 2.705651,0.03909 2.9003,0.08423 0.506262,0.117416 1.041213,0.525973 1.356576,1.036061 0.258571,0.418229 0.272499,0.489726 0.271607,1.394347 -0.001,1.061177 -0.102914,1.377717 -0.61167,1.900738 -0.590593,0.60715 -0.702746,0.626006 -3.736537,0.628209 l -2.726667,0.002 z"
+ id="path236" />
</g>
- <g id="logotext" aria-label="Traccar" fill="currentColor">
- <path id="path4172" d="m89.719 48.671h-3.915v-30.192h-10.663v-3.4775h25.241v3.4775h-10.663v30.192z"/>
- <path id="path4174" d="m116.36 22.969q1.6812 0 3.0169 0.27636l-0.52968 3.5466q-1.566-0.34544-2.7636-0.34544-3.063 0-5.2508 2.4872-2.1648 2.4872-2.1648 6.195v13.541h-3.8229v-25.241h3.1551l0.43756 4.675h0.18424q1.4048-2.4642 3.3854-3.7999t4.3526-1.3357z"/>
- <path id="path4176" d="m139.62 48.671-0.75998-3.5926h-0.18424q-1.8884 2.3721-3.7769 3.2242-1.8654 0.82907-4.675 0.82907-3.7538 0-5.8956-1.9345-2.1187-1.9345-2.1187-5.5041 0-7.6459 12.229-8.0143l4.2835-0.13818v-1.566q0-2.9708-1.2897-4.3756-1.2666-1.4278-4.0763-1.4278-3.1551 0-7.1392 1.9345l-1.1745-2.9248q1.8654-1.0133 4.0762-1.589 2.2339-0.57574 4.4678-0.57574 4.5138 0 6.6786 2.0036 2.1878 2.0036 2.1878 6.4253v17.226h-2.8326zm-8.6361-2.6945q3.5696 0 5.5962-1.9575 2.0496-1.9575 2.0496-5.4811v-2.2799l-3.8229 0.16121q-4.5599 0.16121-6.5865 1.4278-2.0036 1.2436-2.0036 3.892 0 2.0727 1.2436 3.1551 1.2666 1.0824 3.5236 1.0824z"/>
- <path id="path4178" d="m160.44 49.131q-5.4811 0-8.498-3.3623-2.9939-3.3854-2.9939-9.5573 0-6.3332 3.0399-9.7876 3.063-3.4545 8.7052-3.4545 1.8194 0 3.6387 0.3915t2.8557 0.92119l-1.1745 3.2472q-1.2666-0.50665-2.7636-0.82907-1.4969-0.34544-2.6484-0.34544-7.6919 0-7.6919 9.8106 0 4.652 1.8654 7.1392 1.8884 2.4872 5.5732 2.4872 3.1551 0 6.4713-1.3588v3.3854q-2.5333 1.3127-6.3792 1.3127z"/>
- <path id="path4180" d="m182.92 49.131q-5.4811 0-8.498-3.3623-2.9939-3.3854-2.9939-9.5573 0-6.3332 3.0399-9.7876 3.063-3.4545 8.7052-3.4545 1.8193 0 3.6387 0.3915t2.8557 0.92119l-1.1745 3.2472q-1.2666-0.50665-2.7636-0.82907-1.4969-0.34544-2.6484-0.34544-7.6919 0-7.6919 9.8106 0 4.652 1.8654 7.1392 1.8884 2.4872 5.5732 2.4872 3.1551 0 6.4714-1.3588v3.3854q-2.5333 1.3127-6.3792 1.3127z"/>
- <path id="path4182" d="m210.83 48.671-0.75998-3.5926h-0.18424q-1.8884 2.3721-3.7769 3.2242-1.8654 0.82907-4.675 0.82907-3.7538 0-5.8956-1.9345-2.1187-1.9345-2.1187-5.5041 0-7.6459 12.229-8.0143l4.2835-0.13818v-1.566q0-2.9708-1.2897-4.3756-1.2666-1.4278-4.0762-1.4278-3.1551 0-7.1392 1.9345l-1.1745-2.9248q1.8654-1.0133 4.0762-1.589 2.2339-0.57574 4.4678-0.57574 4.5138 0 6.6786 2.0036 2.1878 2.0036 2.1878 6.4253v17.226h-2.8326zm-8.6361-2.6945q3.5696 0 5.5962-1.9575 2.0496-1.9575 2.0496-5.4811v-2.2799l-3.8229 0.16121q-4.5599 0.16121-6.5865 1.4278-2.0036 1.2436-2.0036 3.892 0 2.0727 1.2436 3.1551 1.2666 1.0824 3.5235 1.0824z"/>
- <path id="path4184" d="m233.08 22.969q1.6812 0 3.0169 0.27636l-0.52968 3.5466q-1.566-0.34544-2.7636-0.34544-3.0629 0-5.2508 2.4872-2.1648 2.4872-2.1648 6.195v13.541h-3.8229v-25.241h3.1551l0.43757 4.675h0.18423q1.4048-2.4642 3.3854-3.7999t4.3526-1.3357z"/>
- </g>
- </g>
</svg>
diff --git a/modern/public/manifest.json b/modern/public/manifest.json
index 350ef8a..163d908 100644
--- a/modern/public/manifest.json
+++ b/modern/public/manifest.json
@@ -1,6 +1,6 @@
{
- "short_name": "Traccar",
- "name": "Traccar GPS Tracking System",
+ "short_name": "ETBSA",
+ "name": "Aplicación de rastreo GPS para ETBSA",
"icons": [
{
"src": "favicon.ico",
diff --git a/modern/src/DevicesList.js b/modern/src/DevicesList.js
index e06fd58..9b2a5bf 100644
--- a/modern/src/DevicesList.js
+++ b/modern/src/DevicesList.js
@@ -30,9 +30,8 @@ const useStyles = makeStyles((theme) => ({
margin: theme.spacing(1.5, 0),
},
icon: {
- width: '25px',
- height: '25px',
- filter: 'brightness(0) invert(1)',
+ width: '30px',
+ height: '30px',
},
listItem: {
backgroundColor: 'white',
@@ -93,10 +92,15 @@ const DeviceRow = ({ data, index, style }) => {
return (
<div style={style}>
- <ListItem button key={item.id} className={classes.listItem} onClick={() => dispatch(devicesActions.select(item))}>
+ <ListItem button key={item.id} className={classes.listItem} onClick={() => {
+ dispatch(devicesActions.select(item));
+ setTimeout (() => {
+ dispatch(devicesActions.unselect());
+ }, 1000);
+ }}>
<ListItemAvatar>
<Avatar>
- <img className={classes.icon} src={`images/icon/${item.category || 'default'}.svg`} alt="" />
+ <img className={classes.icon} src={`images/icon/${item.category || 'default'}.png`} alt="" />
</Avatar>
</ListItemAvatar>
<ListItemText primary={item.name} secondary={item.status} classes={{ secondary: classes[getStatusColor(item.status)] }} />
@@ -153,7 +157,7 @@ const DeviceView = ({ updateTimestamp, onMenuClick }) => {
height={height}
itemCount={items.length}
itemData={{ items, onMenuClick }}
- itemSize={72}
+ itemSize={92}
overscanCount={10}
innerRef={listInnerEl}
>
diff --git a/modern/src/map/Map.js b/modern/src/map/Map.js
index dcf5a92..a5f69e0 100644
--- a/modern/src/map/Map.js
+++ b/modern/src/map/Map.js
@@ -49,7 +49,7 @@ const initMap = async () => {
await Promise.all(deviceCategories.map(async (category) => {
const results = [];
['green', 'red', 'gray'].forEach((color) => {
- results.push(loadImage(`images/icon/${category}.svg`).then((icon) => {
+ results.push(loadImage(`images/icon/${category}.png`).then((icon) => {
map.addImage(`${category}-${color}`, prepareIcon(background, icon, palette.common[color]), {
pixelRatio: window.devicePixelRatio,
});
diff --git a/modern/src/map/SelectedDeviceMap.js b/modern/src/map/SelectedDeviceMap.js
index 6384717..d05394b 100644
--- a/modern/src/map/SelectedDeviceMap.js
+++ b/modern/src/map/SelectedDeviceMap.js
@@ -16,10 +16,10 @@ const SelectedDeviceMap = () => {
useEffect(() => {
if (mapCenter) {
- map.easeTo({ center: mapCenter.position });
+ map.easeTo({ center: mapCenter.position, zoom:18 });
}
}, [mapCenter]);
-
+
return null;
};
diff --git a/modern/src/map/mapUtil.js b/modern/src/map/mapUtil.js
index 2aa86c6..ca7b3af 100644
--- a/modern/src/map/mapUtil.js
+++ b/modern/src/map/mapUtil.js
@@ -39,14 +39,14 @@ export const prepareIcon = (background, icon, color) => {
context.drawImage(background, 0, 0, canvas.width, canvas.height);
if (icon) {
- const iconRatio = 0.5;
+ const iconRatio = 0.8;
const imageWidth = canvas.width * iconRatio;
const imageHeight = canvas.height * iconRatio;
- if (navigator.userAgent.indexOf('Firefox') > 0) {
+ /*if (navigator.userAgent.indexOf('Firefox') > 0) {*/
context.drawImage(icon, (canvas.width - imageWidth) / 2, (canvas.height - imageHeight) / 2, imageWidth, imageHeight);
- } else {
+ /*} else {
context.drawImage(canvasTintImage(icon, color), (canvas.width - imageWidth) / 2, (canvas.height - imageHeight) / 2, imageWidth, imageHeight);
- }
+ }*/
}
return context.getImageData(0, 0, canvas.width, canvas.height);
diff --git a/modern/src/store/devices.js b/modern/src/store/devices.js
index cca23cb..b76bc2f 100644
--- a/modern/src/store/devices.js
+++ b/modern/src/store/devices.js
@@ -17,6 +17,9 @@ const { reducer, actions } = createSlice({
select(state, action) {
state.selectedId = action.payload.id;
},
+ unselect(state, action) {
+ state.selectedId = null;
+ },
remove(state, action) {
delete state.items[action.payload];
},