From 551b60c733a5ade7cf580e1abc1be09f1749c8e7 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 19 Aug 2024 23:56:15 +0200
Subject: [PATCH] fix: omitting "po" stops in timetable progress bar

---
 src/components/StationsView/StationTable.vue | 2 +-
 src/components/TrainsView/StopLabel.vue      | 2 +-
 src/components/TrainsView/TrainSchedule.vue  | 2 +-
 src/mixins/trainInfoMixin.ts                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index ddf70bb..47f699a 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -414,7 +414,7 @@ export default defineComponent({
 $rowCol: #424242;
 
 .station_table {
-  height: 85vh;
+  height: 90vh;
   max-height: 2000px;
   min-height: 700px;
   overflow: auto;
diff --git a/src/components/TrainsView/StopLabel.vue b/src/components/TrainsView/StopLabel.vue
index 2a4eed8..97cd6df 100644
--- a/src/components/TrainsView/StopLabel.vue
+++ b/src/components/TrainsView/StopLabel.vue
@@ -1,7 +1,7 @@
 <template>
   <span
     class="stop-label"
-    :data-minor="stop.isSBL || (stop.nameRaw.endsWith(', po.') && !stop.duration)"
+    :data-minor="stop.isSBL || (stop.nameRaw.endsWith(', po') && !stop.duration)"
   >
     <router-link :to="`/scenery?station=${stop.sceneryName}`" @click="closeModal">
       <span class="name" v-html="stop.nameHtml"></span>
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index 3bf1a09..e84122e 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -249,7 +249,7 @@ export default defineComponent({
         i < this.train.timetableData!.followingStops.length;
         i++
       ) {
-        if (/po\.|sbl/gi.test(this.train.timetableData!.followingStops[i].stopNameRAW))
+        if (/(, po|sbl|, pe)/gi.test(this.train.timetableData!.followingStops[i].stopNameRAW))
           activeMinorStopList.push(i);
         else break;
       }
diff --git a/src/mixins/trainInfoMixin.ts b/src/mixins/trainInfoMixin.ts
index ca95868..67ab185 100644
--- a/src/mixins/trainInfoMixin.ts
+++ b/src/mixins/trainInfoMixin.ts
@@ -80,13 +80,13 @@ export default defineComponent({
 
       return stops
         .reduce((acc: string[], stop: TrainStop, i: number) => {
-          if (stop.stopType.includes('ph') && !stop.stopNameRAW.includes('po.'))
+          if (stop.stopType.includes('ph') && !stop.stopNameRAW.includes(', po'))
             acc.push(
               `<strong style='color:${stop.confirmed ? 'springgreen' : 'white'}'>${
                 stop.stopName
               }</strong>`
             );
-          else if (i > 0 && i < stops.length - 1 && !/po\.|sbl/gi.test(stop.stopNameRAW))
+          else if (i > 0 && i < stops.length - 1 && !/(, po|sbl)/gi.test(stop.stopNameRAW))
             acc.push(
               `<span style='color:${stop.confirmed ? 'springgreen' : 'lightgray'}'>${
                 stop.stopName