From bac5d46d07794972de0953100efb79664006c0a8 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Tue, 11 Jan 2022 01:38:35 -0600
Subject: Replaced map icons with SVG icons

---
 androidApp/src/main/res/drawable/map_animal.png     | Bin 1074 -> 0 bytes
 androidApp/src/main/res/drawable/map_animal.xml     |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_bicycle.png    | Bin 1121 -> 0 bytes
 androidApp/src/main/res/drawable/map_bicycle.xml    |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_boat.png       | Bin 1066 -> 0 bytes
 androidApp/src/main/res/drawable/map_boat.xml       |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_bus.png        | Bin 1012 -> 0 bytes
 androidApp/src/main/res/drawable/map_bus.xml        |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_car.png        | Bin 1025 -> 0 bytes
 androidApp/src/main/res/drawable/map_car.xml        |  16 ++++++++++++++++
 androidApp/src/main/res/drawable/map_crane.png      | Bin 1106 -> 0 bytes
 androidApp/src/main/res/drawable/map_crane.xml      |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_default.png    | Bin 819 -> 0 bytes
 androidApp/src/main/res/drawable/map_default.xml    |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_helicopter.png | Bin 1042 -> 0 bytes
 androidApp/src/main/res/drawable/map_helicopter.xml |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_motorcycle.png | Bin 1123 -> 0 bytes
 androidApp/src/main/res/drawable/map_motorcycle.xml |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_offroad.png    | Bin 1031 -> 0 bytes
 androidApp/src/main/res/drawable/map_offroad.xml    |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_person.png     | Bin 957 -> 0 bytes
 androidApp/src/main/res/drawable/map_person.xml     |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_pickup.png     | Bin 989 -> 0 bytes
 androidApp/src/main/res/drawable/map_pickup.xml     |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_plane.png      | Bin 1011 -> 0 bytes
 androidApp/src/main/res/drawable/map_plane.xml      |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_scooter.png    | Bin 973 -> 0 bytes
 androidApp/src/main/res/drawable/map_scooter.xml    |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_ship.png       | Bin 934 -> 0 bytes
 androidApp/src/main/res/drawable/map_ship.xml       |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_tractor.png    | Bin 1131 -> 0 bytes
 androidApp/src/main/res/drawable/map_tractor.xml    |  15 +++++++++++++++
 androidApp/src/main/res/drawable/map_train.png      | Bin 1031 -> 0 bytes
 androidApp/src/main/res/drawable/map_train.xml      |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_tram.png       | Bin 1028 -> 0 bytes
 androidApp/src/main/res/drawable/map_tram.xml       |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_trolleybus.png | Bin 986 -> 0 bytes
 androidApp/src/main/res/drawable/map_trolleybus.xml |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_truck.png      | Bin 996 -> 0 bytes
 androidApp/src/main/res/drawable/map_truck.xml      |  14 ++++++++++++++
 androidApp/src/main/res/drawable/map_van.png        | Bin 921 -> 0 bytes
 androidApp/src/main/res/drawable/map_van.xml        |  15 +++++++++++++++
 42 files changed, 304 insertions(+)
 delete mode 100644 androidApp/src/main/res/drawable/map_animal.png
 create mode 100644 androidApp/src/main/res/drawable/map_animal.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_bicycle.png
 create mode 100644 androidApp/src/main/res/drawable/map_bicycle.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_boat.png
 create mode 100644 androidApp/src/main/res/drawable/map_boat.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_bus.png
 create mode 100644 androidApp/src/main/res/drawable/map_bus.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_car.png
 create mode 100644 androidApp/src/main/res/drawable/map_car.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_crane.png
 create mode 100644 androidApp/src/main/res/drawable/map_crane.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_default.png
 create mode 100644 androidApp/src/main/res/drawable/map_default.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_helicopter.png
 create mode 100644 androidApp/src/main/res/drawable/map_helicopter.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_motorcycle.png
 create mode 100644 androidApp/src/main/res/drawable/map_motorcycle.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_offroad.png
 create mode 100644 androidApp/src/main/res/drawable/map_offroad.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_person.png
 create mode 100644 androidApp/src/main/res/drawable/map_person.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_pickup.png
 create mode 100644 androidApp/src/main/res/drawable/map_pickup.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_plane.png
 create mode 100644 androidApp/src/main/res/drawable/map_plane.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_scooter.png
 create mode 100644 androidApp/src/main/res/drawable/map_scooter.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_ship.png
 create mode 100644 androidApp/src/main/res/drawable/map_ship.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_tractor.png
 create mode 100644 androidApp/src/main/res/drawable/map_tractor.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_train.png
 create mode 100644 androidApp/src/main/res/drawable/map_train.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_tram.png
 create mode 100644 androidApp/src/main/res/drawable/map_tram.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_trolleybus.png
 create mode 100644 androidApp/src/main/res/drawable/map_trolleybus.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_truck.png
 create mode 100644 androidApp/src/main/res/drawable/map_truck.xml
 delete mode 100644 androidApp/src/main/res/drawable/map_van.png
 create mode 100644 androidApp/src/main/res/drawable/map_van.xml

(limited to 'androidApp/src/main/res')

diff --git a/androidApp/src/main/res/drawable/map_animal.png b/androidApp/src/main/res/drawable/map_animal.png
deleted file mode 100644
index c6b1043..0000000
Binary files a/androidApp/src/main/res/drawable/map_animal.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_animal.xml b/androidApp/src/main/res/drawable/map_animal.xml
new file mode 100644
index 0000000..672838d
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_animal.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m19.525,15.802q0,0.5865 -0.1737,1.1144 -0.1737,0.5181 -0.576,0.8993t-0.96,0.3812q-0.6949,0 -1.2618,-0.5572 -0.5669,-0.567 -0.8412,-1.3294t-0.2743,-1.476q0,-0.5865 0.1737,-1.1046 0.1737,-0.5278 0.576,-0.9091 0.4023,-0.3812 0.96,-0.3812 0.704,0 1.2618,0.567 0.5669,0.5572 0.8412,1.3196 0.2743,0.7527 0.2743,1.476zM16.398,20.5233q0,0.782 -0.384,1.3587 -0.384,0.5767 -1.088,0.5767 -0.6949,0 -1.2983,-0.5376 -0.5943,-0.5474 -0.9143,-1.3099 -0.32,-0.7624 -0.32,-1.4858 0,-0.782 0.384,-1.3587 0.384,-0.5865 1.088,-0.5865 0.6949,0 1.2892,0.5474 0.6035,0.5376 0.9235,1.3099 0.32,0.7624 0.32,1.4858zM20,20.2593q1.0789,0 2.3315,0.9579 1.2526,0.9482 2.0938,2.3167 0.8412,1.3587 0.8412,2.4829 0,0.4496 -0.1554,0.7429 -0.1554,0.303 -0.448,0.4399 -0.2834,0.1466 -0.5852,0.1955 -0.3017,0.0586 -0.6949,0.0586 -0.6217,0 -1.7189,-0.4399 -1.088,-0.44 -1.664,-0.44 -0.6035,0 -1.7646,0.4301 -1.152,0.4399 -1.8286,0.4399 -1.6732,0 -1.6732,-1.4272 0,-0.8407 0.512,-1.867 0.512,-1.0362 1.2709,-1.8866 0.768,-0.8504 1.7189,-1.4272 0.951,-0.577 1.765,-0.577zM22.1852,18.1968q-0.5577,0 -0.96,-0.3812t-0.576,-0.8993q-0.1737,-0.5278 -0.1737,-1.1144 0,-0.7233 0.2743,-1.476 0.2743,-0.7624 0.832,-1.3196 0.5669,-0.567 1.2709,-0.567 0.5577,0 0.96,0.3812t0.576,0.9091q0.1737,0.5181 0.1737,1.1046 0,0.7136 -0.2743,1.476 -0.2743,0.7624 -0.8412,1.3294 -0.5669,0.5572 -1.2618,0.5572zM26.1351,17.1802q0.704,0 1.088,0.5865 0.384,0.5767 0.384,1.3587 0,0.7233 -0.32,1.4858t-0.9235,1.3099q-0.5943,0.5376 -1.2892,0.5376 -0.704,0 -1.088,-0.5767 -0.384,-0.5767 -0.384,-1.3587 0,-0.7233 0.32,-1.4858 0.32,-0.7722 0.9143,-1.3099 0.6035,-0.5474 1.2983,-0.5474z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_bicycle.png b/androidApp/src/main/res/drawable/map_bicycle.png
deleted file mode 100644
index 12956f1..0000000
Binary files a/androidApp/src/main/res/drawable/map_bicycle.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_bicycle.xml b/androidApp/src/main/res/drawable/map_bicycle.xml
new file mode 100644
index 0000000..f8812c0
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_bicycle.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16.793,22.105h-2.5821q-0.3289,0 -0.4769,-0.2878 -0.1398,-0.2878 0.0576,-0.551l1.546,-2.064q-0.5345,-0.2549 -1.1266,-0.2549 -1.0855,0 -1.8585,0.773 -0.773,0.773 -0.773,1.8585t0.773,1.8585q0.773,0.773 1.8585,0.773 0.9457,0 1.6693,-0.5921 0.7236,-0.6003 0.9128,-1.5131zM15.2635,21.0524h1.5295q-0.148,-0.699 -0.6167,-1.217l-0.9128,1.217zM19.2107,21.0524 L21.579,17.8947h-3.9472l-0.8141,1.0855q0.8634,0.847 1.0361,2.0723h1.3568zM27.6478,23.4372q0.773,-0.773 0.773,-1.8585t-0.773,-1.8585q-0.773,-0.773 -1.8585,-0.773 -0.4934,0 -0.995,0.1974l1.4308,2.1381q0.1234,0.1891 0.0822,0.4029 -0.0411,0.2138 -0.222,0.3289 -0.1234,0.0905 -0.296,0.0905 -0.2878,0 -0.4358,-0.2385l-1.4308,-2.1381q-0.7648,0.7812 -0.7648,1.8502 0,1.0855 0.773,1.8585 0.773,0.773 1.8585,0.773t1.8585,-0.773zM28.3879,18.9802q1.0855,1.0772 1.0855,2.5986 0,1.5213 -1.0855,2.6068 -1.0772,1.0772 -2.5986,1.0772 -1.5213,0 -2.6068,-1.0772 -1.0772,-1.0855 -1.0772,-2.6068 0,-0.7977 0.3207,-1.5049 0.3289,-0.7154 0.9046,-1.2335l-0.5345,-0.8059 -2.9028,3.8567q-0.148,0.2138 -0.4194,0.2138h-1.62q-0.1891,1.3486 -1.2253,2.2532 -1.0361,0.9046 -2.4176,0.9046 -1.5213,0 -2.6068,-1.0772 -1.0772,-1.0855 -1.0772,-2.6068t1.0772,-2.5986q1.0855,-1.0855 2.6068,-1.0855 0.9374,0 1.768,0.4523l1.1266,-1.5049h-1.842q-0.2138,0 -0.3701,-0.1562t-0.1562,-0.3701q0,-0.2138 0.1562,-0.3701 0.1562,-0.1562 0.3701,-0.1562h3.1577v1.0526h3.5771l-0.699,-1.0526h-1.8256q-0.2138,0 -0.3701,-0.1562t-0.1562,-0.3701 0.1562,-0.3701 0.3701,-0.1562h2.1052q0.2714,0 0.4358,0.2303l2.1956,3.2893q0.7483,-0.3618 1.5789,-0.3618 1.5213,0 2.5986,1.0855z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_boat.png b/androidApp/src/main/res/drawable/map_boat.png
deleted file mode 100644
index 392f903..0000000
Binary files a/androidApp/src/main/res/drawable/map_boat.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_boat.xml b/androidApp/src/main/res/drawable/map_boat.xml
new file mode 100644
index 0000000..3b6c9ca
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_boat.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m20,11.146c-2.1317,5.5267 -6.3162,6.785 -6.3162,6.785l6.316,1.9v-8.685zM20,19.8308h-6.711v0.6415c0,0.9304 0.7781,1.7633 1.8011,2.3686 -0.3622,0.1239 -0.7299,0.148 -1.0116,0.148 -0.5527,0 -1.4212,-0.1579 -1.9738,-0.7895v1.5791c0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895v-1.5791c-0.5527,0.6316 -1.4212,0.7895 -1.9738,0.7895 -0.3959,0 -0.9432,-0.092 -1.431,-0.3701 1.0794,-0.5923 2.1544,-1.4653 2.9361,-2.788h-2.6893,-4.7372zM24.7372,19.8308s0.0099,-4.0167 -3.3062,-7.2538c0.6316,4.3424 -0.6415,5.9215 -0.6415,5.9215l3.9476,1.3323zM12.1052,24.568v1.5791c0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895 0.5527,0.6316 1.4212,0.7895 1.9738,0.7895 0.5527,0 1.4212,-0.1579 1.9738,-0.7895v-1.5791c-0.5527,0.6316 -1.4212,0.7895 -1.9738,0.7895 -0.5527,0 -1.4212,-0.1579 -1.9738,-0.7895 -0.5527,0.6316 -1.4212,0.7895 -1.9738,0.7895 -0.5527,0 -1.4212,-0.1579 -1.9738,-0.7895 -0.5527,0.6316 -1.4212,0.7895 -1.9738,0.7895 -0.5527,0 -1.4212,-0.1579 -1.9738,-0.7895 -0.5527,0.6316 -1.4212,0.7895 -1.9738,0.7895 -0.5527,0 -1.4212,-0.1579 -1.9738,-0.7895z"
+      android:strokeWidth=".78953"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_bus.png b/androidApp/src/main/res/drawable/map_bus.png
deleted file mode 100644
index 5bade66..0000000
Binary files a/androidApp/src/main/res/drawable/map_bus.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_bus.xml b/androidApp/src/main/res/drawable/map_bus.xml
new file mode 100644
index 0000000..58e3e52
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_bus.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16.144,23.756q0.3472,-0.3472 0.3472,-0.8315t-0.3472,-0.8224q-0.3381,-0.3472 -0.8224,-0.3472 -0.4843,0 -0.8315,0.3472 -0.3381,0.3381 -0.3381,0.8224 0,0.4843 0.3381,0.8315 0.3472,0.3381 0.8315,0.3381t0.8224,-0.3381zM25.5011,23.756q0.3472,-0.3472 0.3472,-0.8315t-0.3472,-0.8224q-0.3381,-0.3472 -0.8224,-0.3472 -0.4843,0 -0.8315,0.3472 -0.3381,0.3381 -0.3381,0.8224 0,0.4843 0.3381,0.8315 0.3472,0.3381 0.8315,0.3381t0.8224,-0.3381zM25.428,19.3059 L24.7701,15.797q-0.0457,-0.2102 -0.2102,-0.3381 -0.1553,-0.1371 -0.3655,-0.1371h-8.3885q-0.2102,0 -0.3747,0.1371 -0.1553,0.1279 -0.201,0.3381l-0.6579,3.5089q-0.046,0.274 0.128,0.484t0.448,0.21h9.7044q0.2741,0 0.4478,-0.2102 0.1736,-0.2102 0.1279,-0.4843zM23.235,14.0239q0.1279,-0.1279 0.1279,-0.3107 0,-0.1828 -0.1279,-0.3107 -0.1279,-0.1279 -0.3107,-0.1279h-5.8482q-0.1828,0 -0.3107,0.1279 -0.1279,0.1279 -0.1279,0.3107t0.1279,0.3107q0.1279,0.1279 0.3107,0.1279h5.8482q0.1828,0 0.3107,-0.1279zM27.0181,20.3381v5.5101h-1.1696v1.1696q0,0.4843 -0.3472,0.8224 -0.3381,0.3472 -0.8224,0.3472 -0.4843,0 -0.8315,-0.3472 -0.3381,-0.3381 -0.3381,-0.8224v-1.1696h-7.0179v1.1696q0,0.4843 -0.3472,0.8224 -0.3381,0.3472 -0.8224,0.3472 -0.4843,0 -0.8315,-0.3472 -0.3381,-0.3381 -0.3381,-0.8224v-1.1696h-1.1696v-5.5101q0,-1.0234 0.2284,-2.0377l0.9412,-4.1486q0.0822,-0.7128 0.8864,-1.2519 0.8133,-0.5391 2.1017,-0.8133 1.2976,-0.2741 2.8601,-0.2741 1.5626,0 2.851,0.2741 1.2976,0.2741 2.1017,0.8133 0.8133,0.5391 0.8955,1.2519l0.9595,4.1486q0.2102,0.9321 0.2102,2.0377z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_car.png b/androidApp/src/main/res/drawable/map_car.png
deleted file mode 100644
index 17c97a2..0000000
Binary files a/androidApp/src/main/res/drawable/map_car.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_car.xml b/androidApp/src/main/res/drawable/map_car.xml
new file mode 100644
index 0000000..0837918
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_car.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m15.029,22.296q0.3954,-0.3954 0.3954,-0.9505t-0.3954,-0.9505q-0.396,-0.395 -0.951,-0.395 -0.5552,0 -0.9505,0.3954t-0.3954,0.9505 0.3954,0.9505 0.9505,0.3954 0.9505,-0.3954zM15.7272,18.6537h8.5463l-0.7487,-3.003q-0.0168,-0.0673 -0.1178,-0.143 -0.1009,-0.0841 -0.1767,-0.0841h-6.4602q-0.0757,0 -0.1767,0.0841 -0.101,0.0757 -0.1178,0.143l-0.7487,3.003zM26.8732,22.296q0.3954,-0.3954 0.3954,-0.9505t-0.3954,-0.9505q-0.396,-0.395 -0.951,-0.395 -0.5552,0 -0.9505,0.3954t-0.3954,0.9505 0.3954,0.9505 0.9505,0.3954 0.9505,-0.3954zM28.6144,20.5379v3.2301q0,0.1178 -0.0757,0.1935 -0.0757,0.0757 -0.1935,0.0757h-0.8075v1.0767q0,0.6729 -0.4711,1.144t-1.144,0.4711 -1.144,-0.4711 -0.4711,-1.144v-1.0767h-8.6136v1.0767q0,0.6729 -0.4711,1.144t-1.144,0.4711 -1.144,-0.4711 -0.4711,-1.144v-1.0767h-0.8075q-0.1178,0 -0.1935,-0.0757 -0.0757,-0.0757 -0.0757,-0.1935v-3.2301q0,-0.7823 0.5468,-1.3291 0.5552,-0.5552 1.3375,-0.5552h0.2355l0.8832,-3.5245q0.1935,-0.7907 0.8748,-1.3206 0.6813,-0.5383 1.5057,-0.5383h6.4602q0.8243,0 1.5057,0.5383 0.6813,0.5299 0.8748,1.3206l0.8832,3.5245h0.2355q0.7823,0 1.3291,0.5552 0.5552,0.5468 0.5552,1.3291z"
+      android:strokeWidth=".1"
+      android:strokeColor="#333"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_crane.png b/androidApp/src/main/res/drawable/map_crane.png
deleted file mode 100644
index 44d22bc..0000000
Binary files a/androidApp/src/main/res/drawable/map_crane.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_crane.xml b/androidApp/src/main/res/drawable/map_crane.xml
new file mode 100644
index 0000000..0bd47a6
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_crane.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m24.334,12.464 l-4.2153,3.0143c0.104,0.116 0.2035,0.2389 0.2826,0.3768l0.5181,0.9184 2.0252,-1.4601 -1.5778,2.2372 0.4945,0.8713c0.1402,0.1861 0.2528,0.3937 0.3297,0.6123l4.5921,-6.5702h-2.4491zM26.7831,13.7828 L25.276,15.9258v4.074c0,0.416 0.3376,0.7536 0.7536,0.7536 0.4152,0 0.7536,0.3384 0.7536,0.7536s-0.3384,0.7536 -0.7536,0.7536c-0.4152,0 -0.7536,-0.3383 -0.7536,-0.7536h-1.5071c0,1.3858 1.2521,2.4766 2.6846,2.2136 0.8877,-0.1628 1.6164,-0.88 1.7897,-1.7662 0.2291,-1.1718 -0.4533,-2.2074 -1.4601,-2.5669v-5.6047zM14.7261,15.4783c-0.8327,0 -1.5071,0.6744 -1.5071,1.5071v3.7679c0,0.416 0.3376,0.7536 0.7536,0.7536h0.7536v0.7536h5.275v-0.7536h0.7536c0.416,0 0.7536,-0.3376 0.7536,-0.7536v-1.5071l-1.8368,-3.0143c-0.269,-0.468 -0.756,-0.753 -1.296,-0.753h-3.6501zM16.2332,16.9854h2.143l1.2952,2.2607h-3.4382v-2.2607zM13.9725,23.014c-1.2487,0 -2.2607,1.0121 -2.2607,2.2607 0,1.2487 1.012,2.2607 2.2607,2.2607h6.7822c1.2487,0 2.2607,-1.0121 2.2607,-2.2607 0,-1.2487 -1.0121,-2.2607 -2.2607,-2.2607h-6.7822zM13.9725,24.5211c0.416,0 0.7536,0.3376 0.7536,0.7536s-0.3376,0.7536 -0.7536,0.7536 -0.7536,-0.3376 -0.7536,-0.7536c0,-0.416 0.3376,-0.7536 0.7536,-0.7536zM16.2332,24.5211c0.416,0 0.7536,0.3376 0.7536,0.7536s-0.3376,0.7536 -0.7536,0.7536c-0.416,0 -0.7536,-0.3376 -0.7536,-0.7536 0,-0.416 0.3376,-0.7536 0.7536,-0.7536zM18.4939,24.5211c0.416,0 0.7536,0.3376 0.7536,0.7536s-0.3376,0.7536 -0.7536,0.7536c-0.416,0 -0.7536,-0.3376 -0.7536,-0.7536 0,-0.416 0.3376,-0.7536 0.7536,-0.7536zM20.7546,24.5211c0.416,0 0.7536,0.3376 0.7536,0.7536s-0.3376,0.7536 -0.7536,0.7536c-0.416,0 -0.7536,-0.3376 -0.7536,-0.7536 0,-0.416 0.3376,-0.7536 0.7536,-0.7536z"
+      android:strokeWidth=".75357"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_default.png b/androidApp/src/main/res/drawable/map_default.png
deleted file mode 100644
index e7d1f72..0000000
Binary files a/androidApp/src/main/res/drawable/map_default.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_default.xml b/androidApp/src/main/res/drawable/map_default.xml
new file mode 100644
index 0000000..9a11189
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_default.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20,20m-5.8251,0a5.8251,5.8251 0,1 1,11.6502 0a5.8251,5.8251 0,1 1,-11.6502 0"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_helicopter.png b/androidApp/src/main/res/drawable/map_helicopter.png
deleted file mode 100644
index 4c602f1..0000000
Binary files a/androidApp/src/main/res/drawable/map_helicopter.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_helicopter.xml b/androidApp/src/main/res/drawable/map_helicopter.xml
new file mode 100644
index 0000000..973cb80
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_helicopter.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m14.606,13.91v1.7742h6.2098v0.8871c-2.6614,0 -3.5165,1.7281 -3.5485,1.7742h-3.5485v0.8871,0.8871l3.5485,0.8871c0,1.3236 1.3378,2.6614 2.6614,2.6614h2.6614c2.6614,0 4.4356,-0.7603 4.4356,-2.6614 0,-1.6225 -2.2284,-3.988 -5.3227,-4.3802v-0.9426h6.2098v-1.7742l-6.2098,0.8871v-0.4436c0,-0.2448 -0.1987,-0.4436 -0.4436,-0.4436s-0.4436,0.1987 -0.4436,0.4436v0.4436l-6.2098,-0.8871zM13.7189,19.2327c0,-0.9799 -0.7944,-1.7742 -1.7742,-1.7742 -0.9799,0 -1.7742,0.7944 -1.7742,1.7742 0,0.9799 0.7944,1.7742 1.7742,1.7742 0.9799,0 1.7742,-0.7944 1.7742,-1.7742zM21.703,18.3456c0.2821,-0.0399 2.8831,0.7904 3.5485,2.6614h-3.5485v-2.6614zM26.1386,23.6683v0.8871h-8.8712v1.7742h8.8712c0.9803,0 1.7742,-0.794 1.7742,-1.7742v-0.8871h-1.7742z"
+      android:strokeWidth=".88712"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_motorcycle.png b/androidApp/src/main/res/drawable/map_motorcycle.png
deleted file mode 100644
index 01e50cc..0000000
Binary files a/androidApp/src/main/res/drawable/map_motorcycle.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_motorcycle.xml b/androidApp/src/main/res/drawable/map_motorcycle.xml
new file mode 100644
index 0000000..fe16b6c
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_motorcycle.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m29.386,21.143q0.098,0.8414 -0.1797,1.6256 -0.2777,0.776 -0.8087,1.3315 -0.531,0.5555 -1.2989,0.8659 -0.7597,0.3104 -1.6011,0.2532 -1.3152,-0.0899 -2.2873,-1.0211 -0.9639,-0.9313 -1.0946,-2.2383 -0.098,-0.9068 0.2206,-1.7155 0.3268,-0.8169 0.9721,-1.3969l-0.58,-0.8741q-0.7842,0.6535 -1.2335,1.5848 -0.4493,0.9313 -0.4493,1.9932 0,0.2206 -0.1552,0.3839 -0.147,0.1552 -0.3676,0.1552h-2.0913,-0.5637q-0.1879,1.3397 -1.2172,2.2383 -1.0293,0.8986 -2.4017,0.8986 -1.5113,0 -2.5896,-1.0701 -1.0701,-1.0783 -1.0701,-2.5896t1.0701,-2.5814q1.0783,-1.0783 2.5896,-1.0783 0.6208,0 1.2417,0.2206l0.1961,-0.3676q-1.0048,-0.8986 -2.4834,-0.8986h-0.5228q-0.2124,0 -0.3676,-0.1552t-0.1552,-0.3676 0.1552,-0.3676 0.3676,-0.1552h1.0456q0.6372,0 1.1845,0.1144 0.5473,0.1062 0.9476,0.3104 0.4085,0.2042 0.5882,0.3268 0.1797,0.1144 0.4166,0.2941h4.1825,0.9394l-0.6944,-1.0456h-1.8135q-0.2451,0 -0.4003,-0.1797 -0.1552,-0.1879 -0.1144,-0.433 0.0327,-0.1879 0.1879,-0.3104t0.3513,-0.1225h2.0667q0.2696,0 0.433,0.2287l0.5718,0.8577 0.9313,-0.9313q0.1552,-0.1552 0.3758,-0.1552h0.8251q0.2124,0 0.3676,0.1552t0.1552,0.3676v1.0456q0,0.2124 -0.1552,0.3676t-0.3676,0.1552h-1.4622l0.9394,1.4051q1.0701,-0.5146 2.2465,-0.2941 1.1682,0.2124 1.9932,1.1028 0.8251,0.8823 0.9639,2.0667zM14.249,24.182q0.9394,0 1.6583,-0.5882 0.7189,-0.5963 0.9068,-1.5031h-2.5651q-0.2859,0 -0.4493,-0.2532 -0.147,-0.2614 -0.0082,-0.5146l1.2008,-2.2628q-0.3839,-0.1062 -0.7434,-0.1062 -1.0783,0 -1.8462,0.7679 -0.7679,0.7679 -0.7679,1.8462t0.7679,1.8462q0.7679,0.7679 1.8462,0.7679zM23.9047,23.4141q0.7679,0.7679 1.8462,0.7679t1.8462,-0.7679q0.7679,-0.7679 0.7679,-1.8462t-0.7679,-1.8462q-0.7679,-0.7679 -1.8462,-0.7679 -0.4901,0 -0.9884,0.1961l1.4214,2.1239q0.1225,0.1879 0.0817,0.4003 -0.0408,0.2124 -0.2206,0.3268 -0.1225,0.0899 -0.2941,0.0899 -0.2859,0 -0.433,-0.2369l-1.4214,-2.1239q-0.7597,0.776 -0.7597,1.838 0,1.0783 0.7679,1.8462z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_offroad.png b/androidApp/src/main/res/drawable/map_offroad.png
deleted file mode 100644
index 38a99ce..0000000
Binary files a/androidApp/src/main/res/drawable/map_offroad.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_offroad.xml b/androidApp/src/main/res/drawable/map_offroad.xml
new file mode 100644
index 0000000..cdd090f
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_offroad.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m12.987,13.989c-0.5186,0 -0.7875,0.1094 -1.052,0.551 -0.2645,0.4416 -1.5529,4.3925 -1.5529,5.0345v2.7803c0,0.65 0.6027,1.2524 1.2023,1.2524h0.4008c0,1.3281 1.0764,2.4045 2.4045,2.4045s2.4045,-1.0764 2.4045,-2.4045h7.2136c0,1.3281 1.0764,2.4045 2.4045,2.4045s2.4045,-1.0764 2.4045,-2.4045c0,-0.0701 -0.0192,-0.1319 -0.025,-0.2004 0.3755,-0.2854 0.8266,-0.8032 0.8266,-1.052v-2.2292c0,-0.8688 -1.5457,-1.1858 -4.258,-1.8535 0,0 -2.4963,-2.9345 -3.156,-3.732 -0.4288,-0.5186 -0.9883,-0.551 -1.4026,-0.551h-7.8148zM15.642,15.2664h1.9537v3.5317h-2.8303c-0.3655,0 -0.6462,-0.1066 -0.526,-0.7013 0.125,-0.6204 0.5164,-2.1555 0.6262,-2.4296 0.125,-0.311 0.3813,-0.4008 0.7765,-0.4008zM19.1987,15.2664h1.7283c0.3086,0 0.6568,0.0988 0.8516,0.3256l2.2793,2.7051c0.2541,0.3366 0.1429,0.5009 -0.1753,0.5009h-4.6838v-3.5317zM14.3896,22.4049c0.6629,0 1.2023,0.5394 1.2023,1.2023 0,0.6629 -0.5394,1.2023 -1.2023,1.2023 -0.6629,0 -1.2023,-0.5394 -1.2023,-1.2023 0,-0.6629 0.5394,-1.2023 1.2023,-1.2023zM26.4126,22.4049c0.6629,0 1.2023,0.5394 1.2023,1.2023 0,0.6629 -0.5394,1.2023 -1.2023,1.2023 -0.6629,0 -1.2023,-0.5394 -1.2023,-1.2023 0,-0.6629 0.5394,-1.2023 1.2023,-1.2023z"
+      android:strokeWidth=".80151"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_person.png b/androidApp/src/main/res/drawable/map_person.png
deleted file mode 100644
index ed15d09..0000000
Binary files a/androidApp/src/main/res/drawable/map_person.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_person.xml b/androidApp/src/main/res/drawable/map_person.xml
new file mode 100644
index 0000000..9566bfc
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_person.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m26.287,24.941q0,1.0708 -0.6189,1.837 -0.6091,0.7663 -1.4736,0.7663h-8.3895q-0.8645,0 -1.4834,-0.7663 -0.6091,-0.7663 -0.6091,-1.837 0,-0.835 0.0786,-1.5718 0.0884,-0.7466 0.3144,-1.4932 0.226,-0.7564 0.5698,-1.2869 0.3537,-0.5403 0.9234,-0.8743 0.5796,-0.3438 1.3262,-0.3438 1.2869,1.2574 3.0748,1.2574t3.0748,-1.2574q0.7466,0 1.3164,0.3438 0.5796,0.334 0.9234,0.8743 0.3537,0.5305 0.5796,1.2869 0.226,0.7466 0.3045,1.4932 0.0884,0.7368 0.0884,1.5718zM22.662,13.565q1.1101,1.1003 1.1101,2.6622 0,1.562 -1.1101,2.6721 -1.1,1.101 -2.662,1.101t-2.6721,-1.1003q-1.1003,-1.1101 -1.1003,-2.6721t1.1003,-2.6622q1.11,-1.11 2.672,-1.11t2.6622,1.1101z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_pickup.png b/androidApp/src/main/res/drawable/map_pickup.png
deleted file mode 100644
index 20c49dd..0000000
Binary files a/androidApp/src/main/res/drawable/map_pickup.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_pickup.xml b/androidApp/src/main/res/drawable/map_pickup.xml
new file mode 100644
index 0000000..8b92c06
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_pickup.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m17.19,14.711a0.8816,0.8816 0,0 0,-0.6887 0.6611l-0.7162,2.8649h-3.2781c-0.9697,0 -1.763,0.7934 -1.763,1.763v2.1211c0,0.3526 0.1708,0.6226 0.5234,0.7989l1.2672,0.4683c0.147,1.0824 1.0477,1.9008 2.1762,1.9008 1.0799,0 1.9462,-0.7507 2.1487,-1.763h7.1623c0.2025,1.0124 1.0688,1.763 2.1487,1.763 1.157,0 2.0652,-0.86 2.1762,-1.9834l0.4683,-0.303c0.2645,-0.1763 0.4408,-0.5289 0.4408,-0.8815v-1.5151c0,-0.3526 -0.2534,-0.6832 -0.606,-0.7713l-3.9668,-1.3498 -2.1762,-2.7272 -0.0551,-0.0826 -0.0276,0.0276c-0.4462,-0.661 -1.2059,-0.9917 -1.9008,-0.9917h-3.1679a0.8816,0.8816 0,0 0,-0.0826 0,0.8816 0.8816,0 0,0 -0.0826,0zM18.044,16.474h2.4793c0.333,0 0.4004,0.0337 0.4958,0.1928a0.8816,0.8816 0,0 0,0.0551 0.0826l1.1845,1.4876h-4.6555l0.4408,-1.763zM14.7108,22.2865c0.4408,0 0.7989,0.3581 0.7989,0.7989 0,0.4408 -0.3581,0.7989 -0.7989,0.7989 -0.4408,0 -0.7989,-0.3581 -0.7989,-0.7989 0,-0.4408 0.3581,-0.7989 0.7989,-0.7989zM26.1708,22.2865c0.4408,0 0.7989,0.3581 0.7989,0.7989 0,0.4408 -0.3581,0.7989 -0.7989,0.7989 -0.4408,0 -0.7989,-0.3581 -0.7989,-0.7989 0,-0.4408 0.3581,-0.7989 0.7989,-0.7989z"
+      android:strokeWidth=".88152"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_plane.png b/androidApp/src/main/res/drawable/map_plane.png
deleted file mode 100644
index f5840c6..0000000
Binary files a/androidApp/src/main/res/drawable/map_plane.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_plane.xml b/androidApp/src/main/res/drawable/map_plane.xml
new file mode 100644
index 0000000..d170625
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_plane.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m26.238,13.763q0.4325,0.5111 0.118,1.4548 -0.3146,0.9436 -1.0616,1.6907l-1.5826,1.5826 1.5727,6.8414q0.0492,0.1868 -0.118,0.3244l-1.2582,0.9436q-0.0688,0.059 -0.1868,0.059 -0.0393,0 -0.0688,-0.0099 -0.1474,-0.0295 -0.2064,-0.1573l-2.7425,-4.9934 -2.5459,2.5459 0.521,1.9069q0.0492,0.1671 -0.0786,0.3047l-0.9436,0.9436q-0.0885,0.0885 -0.2261,0.0885h-0.0197q-0.1474,-0.0197 -0.2359,-0.1278l-1.8578,-2.477 -2.4771,-1.8578q-0.1081,-0.0688 -0.1278,-0.2261 -0.0099,-0.1278 0.0885,-0.2457l0.9436,-0.9534q0.0885,-0.0885 0.2261,-0.0885 0.059,0 0.0786,0.0099l1.9069,0.521 2.5459,-2.5459 -4.9934,-2.7425q-0.1376,-0.0786 -0.1671,-0.2359 -0.0197,-0.1573 0.0885,-0.2654l1.2582,-1.2582q0.1376,-0.1278 0.2949,-0.0786l6.5367,1.5629 1.5727,-1.5727q0.747,-0.747 1.6907,-1.0616 0.9436,-0.3146 1.4548,0.118z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_scooter.png b/androidApp/src/main/res/drawable/map_scooter.png
deleted file mode 100644
index 61995ae..0000000
Binary files a/androidApp/src/main/res/drawable/map_scooter.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_scooter.xml b/androidApp/src/main/res/drawable/map_scooter.xml
new file mode 100644
index 0000000..e961777
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_scooter.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m20.609,12.298a0.6089,0.6089 0,1 0,0 1.2177h1.3795l2.0228,6.443 -2.5163,3.9077h-5.871c-0.2541,-0.7047 -0.9251,-1.2177 -1.7124,-1.2177 -1.0016,0 -1.8266,0.825 -1.8266,1.8266s0.825,1.8266 1.8266,1.8266c0.7874,0 1.4583,-0.5131 1.7124,-1.2177h6.2028a0.6089,0.6089 0,0 0,0.5113 -0.2795l2.1477,-3.3345 0.4923,1.5697c-0.4311,0.3355 -0.7159,0.8524 -0.7159,1.4354 0,1.0016 0.825,1.8266 1.8266,1.8266s1.8266,-0.825 1.8266,-1.8266c0,-0.9865 -0.8014,-1.7976 -1.7826,-1.8218l-3.1157,-9.9286a0.6089,0.6089 0,0 0,-0.5815 -0.4269h-1.8266zM13.9115,23.866c0.3311,0 0.5835,0.2489 0.6017,0.5744a0.6089,0.6089 0,0 0,0 0.0702c-0.0187,0.3249 -0.271,0.5732 -0.6017,0.5732 -0.3435,0 -0.6089,-0.2654 -0.6089,-0.6089s0.2654,-0.6089 0.6089,-0.6089zM26.0885,23.866c0.3435,0 0.6089,0.2654 0.6089,0.6089 0,0.3435 -0.2654,0.6089 -0.6089,0.6089s-0.6089,-0.2654 -0.6089,-0.6089 0.2654,-0.6089 0.6089,-0.6089z"
+      android:strokeWidth=".60887"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_ship.png b/androidApp/src/main/res/drawable/map_ship.png
deleted file mode 100644
index 1e5e48b..0000000
Binary files a/androidApp/src/main/res/drawable/map_ship.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_ship.xml b/androidApp/src/main/res/drawable/map_ship.xml
new file mode 100644
index 0000000..559f670
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_ship.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m26.094,25.102q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.9911,0.9911 -0.6969,0.6969 -0.6427,-0.6427 -0.6427,0.6427q-0.1394,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.9911,-0.9911 0.6969,-0.6969 0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6427 0.6427,-0.6427zM13.906,24.808q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.9911,-0.9911 0.6969,-0.6969 0.6427,0.6349 0.6427,-0.6349q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6349 0.4955,-0.4955v-2.2686l-1.626,-2.4312q-0.1316,-0.2013 -0.0542,-0.4336 0.0774,-0.24 0.3097,-0.3174l1.3705,-0.4491v-2.3151h0.9911v-0.9911h1.9821v-0.9911h1.9821v0.9911h1.9821v0.9911h0.9911v2.3151l1.3705,0.4491q0.2323,0.0774 0.3097,0.3174 0.0774,0.2323 -0.0542,0.4336l-1.626,2.4312v2.2686l0.1471,-0.1394q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.6427,0.6349 0.6427,-0.6349q0.1471,-0.1471 0.3484,-0.1471t0.3484,0.1471l0.9911,0.9911 -0.6969,0.6969 -0.6427,-0.6427 -0.6427,0.6427q-0.1394,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6426,-0.6427 -0.6427,0.6427q-0.1471,0.1471 -0.3484,0.1471t-0.3484,-0.1471l-0.6427,-0.6427 -0.6427,0.6427zM17.0263,16.0355v0.9911l2.974,-0.991 2.9732,0.9911v-0.9911h-0.9911v-0.9911h-3.9643v0.9911h-0.9911z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_tractor.png b/androidApp/src/main/res/drawable/map_tractor.png
deleted file mode 100644
index 57d2f05..0000000
Binary files a/androidApp/src/main/res/drawable/map_tractor.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_tractor.xml b/androidApp/src/main/res/drawable/map_tractor.xml
new file mode 100644
index 0000000..3ef45d2
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_tractor.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m13.105,12.427a0.8416,0.8416 0,0 0,-0.6837 0.8415v5.0492a0.8416,0.8416 0,0 0,0 0.0789v1.8672c0.8415,-0.6732 1.8514,-1.1045 2.9454,-1.1045 2.5246,0 4.6284,2.1038 4.6284,4.6284v0.4208h3.7869c-0.2589,0.3496 -0.4208,0.7851 -0.4208,1.2623 0,1.1781 0.9257,2.1038 2.1038,2.1038s2.1038,-0.9257 2.1038,-2.1038c0,-0.5537 -0.2132,-1.0478 -0.5523,-1.4201 0.4972,-0.2262 0.8552,-0.6732 0.973,-1.2623l0.4208,-2.7087c0.0842,-0.4208 -0.3366,-0.9204 -0.8415,-0.9204l-7.1267,-0.7889 -1.3149,-5.3122a0.8416,0.8416 0,0 0,-0.8152 -0.6312h-5.0492a0.8416,0.8416 0,0 0,-0.0789 0,0.8416 0.8416,0 0,0 -0.0789,0zM14.1043,14.1101h3.5502l1.0256,4.0499 -4.5758,-0.4997v-3.5502zM24.2023,14.1101v3.6291l1.6831,0.2367v-3.8658h-1.6831zM15.3662,20.0008c-2.1038,0 -3.7869,1.6831 -3.7869,3.7869s1.6831,3.7869 3.7869,3.7869 3.7869,-1.6831 3.7869,-3.7869 -1.6831,-3.7869 -3.7869,-3.7869zM15.3662,21.2631c1.4306,0 2.5246,1.094 2.5246,2.5246s-1.094,2.5246 -2.5246,2.5246 -2.5246,-1.094 -2.5246,-2.5246 1.094,-2.5246 2.5246,-2.5246zM25.4642,24.6292c0.5049,0 0.8415,0.3366 0.8415,0.8415 0,0.5049 -0.3366,0.8415 -0.8415,0.8415 -0.5049,0 -0.8415,-0.3366 -0.8415,-0.8415s0.3366,-0.8415 0.8415,-0.8415z"
+      android:strokeWidth=".84153"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_train.png b/androidApp/src/main/res/drawable/map_train.png
deleted file mode 100644
index 94ef26c..0000000
Binary files a/androidApp/src/main/res/drawable/map_train.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_train.xml b/androidApp/src/main/res/drawable/map_train.xml
new file mode 100644
index 0000000..3e2d8ba
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_train.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m18.127,11.484c-0.5986,0 -1.0869,0.4457 -1.1707,1.0217h-0.362c-1.3143,0 -2.3839,1.027 -2.3839,2.2881v9.7272c0,0.878 0.5175,1.6389 1.2771,2.0221l-1.6389,1.3622c-0.1463,0.1211 -0.169,0.3379 -0.0479,0.4842s0.3379,0.169 0.4842,0.0479l1.9688,-1.6496c0.1117,0.016 0.2248,0.0213 0.3406,0.0213h6.8111c0.1157,0 0.2288,-0.0054 0.3406,-0.0213l1.9688,1.6496c0.1463,0.1211 0.3632,0.0984 0.4842,-0.0479s0.0984,-0.3632 -0.0479,-0.4842l-1.6389,-1.3622c0.7596,-0.3831 1.2771,-1.1441 1.2771,-2.0221v-9.727c0,-1.2611 -1.0696,-2.2881 -2.3839,-2.2881h-0.3618c-0.0838,-0.576 -0.572,-1.0217 -1.1707,-1.0217 -0.5986,0 -1.0869,0.4457 -1.1707,1.0217h-1.4048c-0.0838,-0.576 -0.572,-1.0217 -1.1707,-1.0217zM18.127,12.1651c0.282,0 0.5108,0.2288 0.5108,0.5108 0,0.282 -0.2288,0.5108 -0.5108,0.5108 -0.282,0 -0.5108,-0.2288 -0.5108,-0.5108 0,-0.282 0.2288,-0.5108 0.5108,-0.5108zM21.8731,12.1651c0.282,0 0.5108,0.2288 0.5108,0.5108 0,0.282 -0.2288,0.5108 -0.5108,0.5108 -0.282,0 -0.5108,-0.2288 -0.5108,-0.5108 0,-0.282 0.2288,-0.5108 0.5108,-0.5108zM17.9567,14.8896h4.0867c0.1889,0 0.3406,0.153 0.3406,0.3406v0.6811h-4.7678v-0.6811c0,-0.1876 0.153,-0.3406 0.3406,-0.3406zM16.5945,16.5924h6.8111c0.3765,0 0.6811,0.2834 0.6811,0.6279v2.4903c0,0.3446 -0.3046,0.6279 -0.6811,0.6279h-6.8111c-0.3765,0 -0.6811,-0.2833 -0.6811,-0.6279v-2.4903c0,-0.3446 0.3046,-0.6279 0.6811,-0.6279zM16.9351,22.7224c0.5641,0 1.0217,0.4576 1.0217,1.0217 0,0.5641 -0.4576,1.0217 -1.0217,1.0217 -0.5641,0 -1.0217,-0.4576 -1.0217,-1.0217 0,-0.5641 0.4576,-1.0217 1.0217,-1.0217zM23.0651,22.7224c0.5641,0 1.0217,0.4576 1.0217,1.0217 0,0.5641 -0.4576,1.0217 -1.0217,1.0217 -0.5641,0 -1.0217,-0.4576 -1.0217,-1.0217 0,-0.5641 0.4576,-1.0217 1.0217,-1.0217z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_tram.png b/androidApp/src/main/res/drawable/map_tram.png
deleted file mode 100644
index 9daf131..0000000
Binary files a/androidApp/src/main/res/drawable/map_tram.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_tram.xml b/androidApp/src/main/res/drawable/map_tram.xml
new file mode 100644
index 0000000..ac58744
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_tram.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m20,11.299c-2.5762,0 -3.8283,0.4554 -3.8283,1.3921 0,0.1917 0.1563,0.348 0.348,0.348s0.348,-0.1563 0.348,-0.348c0,-0.1713 0.3467,-0.4513 1.4247,-0.5982l0.294,1.719c-2.8141,0.3154 -4.5026,1.5512 -4.5026,2.7081v8.1024c0,1.0726 0.7545,1.978 1.7836,2.2513l-1.4574,1.2181c-0.1455,0.1223 -0.1659,0.3331 -0.0435,0.4785 0.068,0.0816 0.1631,0.1305 0.261,0.1305 0.0775,0 0.1631,-0.0326 0.2284,-0.087l1.9794,-1.6531h6.3297l1.9794,1.6531c0.0653,0.0544 0.1509,0.087 0.2284,0.087 0.0979,0 0.193,-0.0489 0.261,-0.1305 0.1223,-0.1455 0.102,-0.3562 -0.0435,-0.4785l-1.4574,-1.2181c1.0291,-0.2733 1.7836,-1.1787 1.7836,-2.2513v-8.1024c0,-1.1569 -1.6885,-2.3927 -4.5026,-2.7081l0.2936,-1.7184c1.0781,0.1468 1.4247,0.4269 1.4247,0.5982 0,0.1917 0.155,0.348 0.348,0.348s0.348,-0.1563 0.348,-0.348c0,-0.9367 -1.2521,-1.3921 -3.8283,-1.3921zM20,11.995c0.3779,0 0.7028,0.0136 1.0006,0.0326l-0.2937,1.7292c-0.2311,-0.0122 -0.4636,-0.0217 -0.7069,-0.0217 -0.2433,0 -0.4758,0.0095 -0.7069,0.0217l-0.294,-1.729c0.2977,-0.019 0.6226,-0.0326 1.0006,-0.0326zM17.9119,15.8233h4.1763c0.193,0 0.348,0.1563 0.348,0.348v0.696h-4.8723v-0.696c0,-0.1917 0.1563,-0.348 0.348,-0.348zM16.5198,17.5634h6.9605c0.3847,0 0.696,0.2896 0.696,0.6417v2.5449c0,0.3521 -0.3113,0.6417 -0.696,0.6417h-6.9605c-0.3847,0 -0.696,-0.2896 -0.696,-0.6417v-2.5449c0,-0.3521 0.3113,-0.6417 0.696,-0.6417zM16.8678,23.1318c0.5764,0 1.0441,0.4677 1.0441,1.0441 0,0.5764 -0.4677,1.0441 -1.0441,1.0441 -0.5764,0 -1.0441,-0.4677 -1.0441,-1.0441 0,-0.5764 0.4677,-1.0441 1.0441,-1.0441zM23.1322,23.1318c0.5764,0 1.0441,0.4677 1.0441,1.0441 0,0.5764 -0.4677,1.0441 -1.0441,1.0441 -0.5764,0 -1.0441,-0.4677 -1.0441,-1.0441 0,-0.5764 0.4677,-1.0441 1.0441,-1.0441z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_trolleybus.png b/androidApp/src/main/res/drawable/map_trolleybus.png
deleted file mode 100644
index c0db490..0000000
Binary files a/androidApp/src/main/res/drawable/map_trolleybus.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_trolleybus.xml b/androidApp/src/main/res/drawable/map_trolleybus.xml
new file mode 100644
index 0000000..93b9266
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_trolleybus.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16.909,11.561c-0.1095,0.0185 -0.2031,0.091 -0.2493,0.1926 -0.0461,0.1002 -0.0396,0.2189 0.0171,0.3139l0.7069,1.1817h-1.7726c-1.3031,0 -2.3634,1.0604 -2.3634,2.3634v10.467c0,0.2981 0.1319,0.5632 0.3376,0.7491v0.6014c0,0.5579 0.455,1.0129 1.0129,1.0129h1.3505c0.5579,0 1.0129,-0.455 1.0129,-1.0129v-0.3376h6.0774v0.3376c0,0.5579 0.455,1.0129 1.0129,1.0129h1.3505c0.5579,0 1.0129,-0.455 1.0129,-1.0129v-0.601c0.204,-0.186 0.336,-0.451 0.336,-0.749v-10.467c0,-1.3031 -1.0604,-2.3634 -2.3634,-2.3634h-1.7726l0.7069,-1.1817c0.0659,-0.1121 0.062,-0.2519 -0.0092,-0.3587 -0.0725,-0.1081 -0.2005,-0.1662 -0.3284,-0.1477 -0.0989,0.0185 -0.1833,0.0804 -0.2321,0.1688l-0.9074,1.5193h-3.693l-0.908,-1.518c-0.0673,-0.12 -0.2018,-0.186 -0.3376,-0.1688zM15.9489,14.9373h8.1032c0.5737,0 1.0129,0.4392 1.0129,1.0129v4.7269c0,0.5737 -0.4392,1.0129 -1.0129,1.0129h-8.1032c-0.5737,0 -1.0129,-0.4392 -1.0129,-1.0129v-4.7269c0,-0.5737 0.4392,-1.0129 1.0129,-1.0129zM12.9102,16.9631c-0.3917,0 -0.6753,0.2836 -0.6753,0.6753v2.0258c0,0.3917 0.2836,0.6753 0.6753,0.6753zM27.0912,16.9631v3.3763c0.3917,0 0.6753,-0.2836 0.6753,-0.6753v-2.0258c0,-0.3917 -0.2836,-0.6753 -0.6753,-0.6753zM15.9492,23.3781c0.5592,0 1.0129,0.4537 1.0129,1.0129s-0.4537,1.0129 -1.0129,1.0129c-0.5592,0 -1.0129,-0.4537 -1.0129,-1.0129 0,-0.5592 0.4537,-1.0129 1.0129,-1.0129zM24.0524,23.3781c0.5592,0 1.0129,0.4537 1.0129,1.0129s-0.4537,1.0129 -1.0129,1.0129c-0.5592,0 -1.0129,-0.4537 -1.0129,-1.0129 0,-0.5592 0.4537,-1.0129 1.0129,-1.0129z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_truck.png b/androidApp/src/main/res/drawable/map_truck.png
deleted file mode 100644
index 319f76e..0000000
Binary files a/androidApp/src/main/res/drawable/map_truck.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_truck.xml b/androidApp/src/main/res/drawable/map_truck.xml
new file mode 100644
index 0000000..c0b7fc1
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_truck.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m17.031,24.899q0.346,-0.346 0.346,-0.8195t-0.346,-0.8195 -0.8195,-0.346 -0.8195,0.346 -0.346,0.8195 0.346,0.8195 0.8195,0.346 0.8195,-0.346zM13.8803,19.4171h3.4968v-2.3312h-1.4388q-0.1184,0 -0.2003,0.082l-1.7757,1.7757q-0.082,0.082 -0.082,0.2003v0.2732zM25.1903,24.899q0.346,-0.346 0.346,-0.8195t-0.346,-0.8195 -0.8195,-0.346 -0.8195,0.346 -0.346,0.8195 0.346,0.8195 0.8195,0.346 0.8195,-0.346zM27.8675,14.172v9.3247q0,0.1366 -0.0364,0.2459 -0.0364,0.1002 -0.1275,0.1639 -0.082,0.0637 -0.1457,0.1093 -0.0637,0.0364 -0.2185,0.0546 -0.1457,0.0091 -0.2003,0.0182 -0.0546,0 -0.2368,0 -0.173,-0.0091 -0.2003,-0.0091 0,0.9653 -0.683,1.6482 -0.683,0.683 -1.6482,0.683 -0.9653,0 -1.6482,-0.683 -0.683,-0.6829 -0.683,-1.6482h-3.4968q0,0.9653 -0.683,1.6482 -0.683,0.683 -1.6482,0.683 -0.9653,0 -1.6482,-0.683 -0.683,-0.683 -0.683,-1.6482h-0.5828q-0.0273,0 -0.2094,0.0091 -0.173,0 -0.2277,0 -0.0546,-0.0091 -0.2094,-0.0182 -0.1457,-0.0182 -0.2094,-0.0546 -0.0637,-0.0455 -0.1548,-0.1093 -0.082,-0.0637 -0.1184,-0.1639 -0.0364,-0.1093 -0.0364,-0.2459 0,-0.2368 0.173,-0.4098t0.4098,-0.173v-2.914q0,-0.0728 -0.0091,-0.3187 0,-0.2459 0,-0.346 0.0091,-0.1002 0.0273,-0.3096 0.0182,-0.2185 0.0546,-0.3369 0.0455,-0.1275 0.1275,-0.2823 0.0911,-0.1548 0.2094,-0.2732l1.803,-1.803q0.173,-0.173 0.4553,-0.2914 0.2914,-0.1184 0.5373,-0.1184h1.457v-1.7484q0,-0.2368 0.173,-0.4098t0.4098,-0.173h9.3247q0.2368,0 0.4098,0.173t0.173,0.4098z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_van.png b/androidApp/src/main/res/drawable/map_van.png
deleted file mode 100644
index 7be109e..0000000
Binary files a/androidApp/src/main/res/drawable/map_van.png and /dev/null differ
diff --git a/androidApp/src/main/res/drawable/map_van.xml b/androidApp/src/main/res/drawable/map_van.xml
new file mode 100644
index 0000000..08929f3
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_van.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
+      android:strokeWidth="1.9"
+      android:fillColor="#008000"
+      android:strokeColor="#333"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m12.17,13.91c-0.4802,0 -0.87,0.3898 -0.87,0.87v3.48,4.35c0,0.9614 0.7786,1.74 1.74,1.74h0.0544c0.2028,0.9912 1.0693,1.74 2.1206,1.74s1.9179,-0.7488 2.1206,-1.74h5.3287c0.2028,0.9912 1.0693,1.74 2.1206,1.74s1.9179,-0.7488 2.1206,-1.74h0.0544c0.9614,0 1.74,-0.7786 1.74,-1.74v-3.2081,-0.2719s-1.1719,-3.5328 -3.2625,-5.0841c-0.1314,-0.0983 -0.2986,-0.1359 -0.4622,-0.1359h-12.805zM22.61,15.65h2.0119c0.7421,0.6586 1.3787,1.7078 1.8216,2.61h-3.8334v-2.61zM15.215,23.045c0.4794,0 0.87,0.3906 0.87,0.87s-0.3906,0.87 -0.87,0.87 -0.87,-0.3906 -0.87,-0.87 0.3906,-0.87 0.87,-0.87zM24.785,23.045c0.4794,0 0.87,0.3906 0.87,0.87s-0.3906,0.87 -0.87,0.87 -0.87,-0.3906 -0.87,-0.87 0.3906,-0.87 0.87,-0.87z"
+      android:strokeWidth="0.87"/>
+</vector>
-- 
cgit v1.2.3