From 69ff85cfb12bb219ccc2f2847c1d1467ab9c1e69 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 3 Jun 2024 22:26:58 +0200
Subject: [PATCH] chore: added route electrification indicators in train
 schedule

---
 public/images/icon-w4a.png                  | Bin 0 -> 3325 bytes
 src/components/TrainsView/TrainSchedule.vue |  87 ++++++++++++++++----
 2 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 public/images/icon-w4a.png

diff --git a/public/images/icon-w4a.png b/public/images/icon-w4a.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4700913ddda510e6c8615f7cf629a2faea4ed04
GIT binary patch
literal 3325
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
Hu0mjf@pdc%

literal 0
HcmV?d00001

diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index ecb4a77..961f5c6 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -56,7 +56,19 @@
               </span>
 
               <span v-else-if="stop.departureLine && !/sbl/gi.test(stop.departureLine)">
-                <div>{{ stop.departureLine }}</div>
+                <div class="scenery-route">
+                  <span> {{ stop.departureLine }} | {{ stop.departureLineSpeed }}</span>
+
+                  <img
+                    v-if="stop.departureLineElectrified == false"
+                    src="/images/icon-w4a.png"
+                    title="szlak spalinowy"
+                    width="15"
+                  />
+
+                  <span v-if="stop.departureLineElectrified == true">⚡</span>
+                </div>
+
                 <div
                   class="scenery-change-name"
                   v-if="
@@ -66,8 +78,21 @@
                 >
                   {{ scheduleStops[i + 1].sceneryName }}
                 </div>
-                <div>
-                  {{ scheduleStops[i + 1].arrivalLine }}
+
+                <div class="scenery-route">
+                  <span>
+                    {{ scheduleStops[i + 1].arrivalLine }} |
+                    {{ scheduleStops[i + 1].arrivalLineSpeed }}
+                  </span>
+
+                  <img
+                    v-if="scheduleStops[i + 1].arrivalLineElectrified == false"
+                    src="/images/icon-w4a.png"
+                    title="szlak spalinowy"
+                    width="15"
+                  />
+
+                  <span v-if="scheduleStops[i + 1].arrivalLineElectrified == true">⚡</span>
                 </div>
               </span>
             </div>
@@ -117,6 +142,12 @@ export interface TrainScheduleStop {
   arrivalLine: string | null;
   departureLine: string | null;
 
+  arrivalLineSpeed: number;
+  arrivalLineElectrified: boolean | null;
+
+  departureLineSpeed: number;
+  departureLineElectrified: boolean | null;
+
   comments: string | null;
 }
 
@@ -154,6 +185,17 @@ export default defineComponent({
           )
             currentSceneryIndex++;
 
+          const sceneryName = this.train.timetableData!.sceneryNames[currentSceneryIndex];
+          const sceneryInfo = this.apiStore.sceneryData.find((st) => st.name == sceneryName);
+
+          const arrivalLineInfo = sceneryInfo?.routesInfo.find(
+            (r) => r.routeName == stop.arrivalLine
+          );
+
+          const departureLineInfo = sceneryInfo?.routesInfo.find(
+            (r) => r.routeName == stop.departureLine
+          );
+
           return {
             nameHtml: stop.stopName,
             nameRaw: stop.stopNameRAW,
@@ -172,7 +214,12 @@ export default defineComponent({
             comments: stop.comments ?? null,
 
             arrivalLine: stop.arrivalLine,
+            arrivalLineSpeed: arrivalLineInfo?.routeSpeed ?? 0,
+            arrivalLineElectrified: arrivalLineInfo?.isElectric ?? null,
+
             departureLine: stop.departureLine,
+            departureLineSpeed: departureLineInfo?.routeSpeed ?? 0,
+            departureLineElectrified: departureLineInfo?.isElectric ?? null,
 
             type: stop.stopType,
             distance: stop.stopDistance,
@@ -181,7 +228,7 @@ export default defineComponent({
             isSBL: /sbl/gi.test(stop.stopName),
             position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route',
             sceneryHash: '',
-            sceneryName: this.train.timetableData!.sceneryNames[currentSceneryIndex],
+            sceneryName,
             status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed'
           };
         }) ?? []
@@ -483,22 +530,26 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
   }
 }
 
-.bottom-line-info {
-  .scenery-change-name {
-    position: relative;
-    margin: 0.25em 0;
+.scenery-route {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
 
-    &::before {
-      content: '';
-      position: absolute;
-      height: 2px;
-      width: 30px;
-      background-color: #aaa;
+.scenery-change-name {
+  position: relative;
+  margin: 0.25em 0;
 
-      top: 50%;
-      right: calc(100% + 5px);
-      transform: translate(0, -50%);
-    }
+  &::before {
+    content: '';
+    position: absolute;
+    height: 2px;
+    width: 30px;
+    background-color: #aaa;
+
+    top: 50%;
+    right: calc(100% + 5px);
+    transform: translate(0, -50%);
   }
 }
 </style>