Zmiany w wyświetlaniu trasy pocągu, poprawki w wyglądzie tabel

src/components/TrainsView/TrainSchedule.vue

@@ -14,8 +14,12 @@
 
           <div
             class="stop-line arrival"
-            v-if="i > 0 && followingStops[i - 1].departureLine != stop.arrivalLine"
-          >{{ stop.arrivalLine }}</div>
+            v-if="
+              i > 0 && followingStops[i - 1].departureLine != stop.arrivalLine
+            "
+          >
+            {{ stop.arrivalLine }}
+          </div>
 
           <span class="stop-info">
             <div class="info-indicator"></div>
@@ -25,20 +29,35 @@
               <span
                 class="date-arrival"
                 v-if="!stop.beginsHere"
-                :class="{delayed: stop.arrivalDelay > 0, preponed: stop.arrivalDelay < 0}"
-              >p. {{stylizeTime(stop.arrivalRealTimeString, stop.arrivalDelay)}}</span>
+                :class="{
+                  delayed: stop.arrivalDelay > 0,
+                  preponed: stop.arrivalDelay < 0,
+                }"
+                >p.
+                {{
+                  stylizeTime(stop.arrivalRealTimeString, stop.arrivalDelay)
+                }}</span
+              >
 
               <span
                 class="date-stop"
                 v-if="stop.stopTime"
                 :class="stop.stopType.replace(', ', '-')"
-              >{{ stop.stopTime }} {{ stop.stopType }}</span>
+                >{{ stop.stopTime }} {{ stop.stopType }}</span
+              >
 
               <span
                 class="date-departure"
                 v-if="!stop.terminatesHere && stop.stopTime != 0"
-                :class="{delayed: stop.departureDelay > 0, preponed: stop.departureDelay < 0}"
-              >o. {{ stylizeTime(stop.departureRealTimeString, stop.departureDelay) }}</span>
+                :class="{
+                  delayed: stop.departureDelay > 0,
+                  preponed: stop.departureDelay < 0,
+                }"
+                >o.
+                {{
+                  stylizeTime(stop.departureRealTimeString, stop.departureDelay)
+                }}</span
+              >
             </span>
           </span>
 
@@ -185,7 +204,8 @@ li.schedule-item > .stop-info {
       }
 
       &.pt,
-      &.pm {
+      &.pm,
+      &.pt-pm {
         background: #252525;
       }
     }

src/components/TrainsView/TrainTable.vue

@@ -171,6 +171,7 @@ import Train from "@/scripts/interfaces/Train";
 import Station from "@/scripts/interfaces/Station";
 
 import TrainSchedule from "@/components/TrainsView/TrainSchedule.vue";
+import TrainStop from '@/scripts/interfaces/TrainStop';
 
 @Component({
   components: { TrainSchedule }
@@ -202,11 +203,10 @@ export default class TrainTable extends Vue {
 
   generateStopList(stops: any): string | undefined {
     if (!stops) return "";
-    return stops.reduce((acc, stop, i) => {
-
-      if (stop.stopType.includes("ph")) acc.push(`<strong>${stop.stopName}</strong>`);
-      else if (i > 0 && i < stops.length - 1 && !stop.stopName.includes("po."))
-        acc.push(`<span style='color: #ccc;'>${stop.stopName.includes("podg.") ? stop.stopName.split(",")[0] : stop.stopName}</span>`);
+    return stops.reduce((acc, stop: TrainStop, i) => {
+      if (stop.stopType.includes("ph")) acc.push(`<strong style='color:${stop.confirmed ? "springgreen" : "white"}'>${stop.stopName}</strong>`);
+      else if (i > 0 && i < stops.length - 1)
+        acc.push(`<span style='color:${stop.confirmed ? "springgreen" : "lightgray"}'>${stop.stopName}</span>`);
       return acc;
     }, []).join(" * ");
   }
@@ -360,6 +360,10 @@ export default class TrainTable extends Vue {
 }
 
 .stats {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
   &-main {
     display: flex;
     margin-bottom: 1.5em;

src/data/stations.json

@@ -264,7 +264,7 @@
     },
     "default": true,
     "nonPublic": false,
-    "stops": ["Głowno"]
+    "stops": ["Głowno, Domaniewice"]
   },
   {
     "stationName": "LCS Ozorków",
@@ -1933,5 +1933,29 @@
     },
     "default": false,
     "nonPublic": false
+  },
+  {
+    "stationName": "Ciechany",
+    "stationURL": "https://td2.info.pl/w-trakcie-prac/ciechany/",
+    "stationLines": "",
+    "reqLevel": "3",
+    "supportersOnly": "NIE",
+    "signalType": "współczesna",
+    "controlType": "SCS",
+    "SBL": "",
+    "twoWayBlock": "",
+    "routes": {
+      "oneWay": {
+        "catenary": 1,
+        "noCatenary": 0
+      },
+      "twoWay": {
+        "catenary": 0,
+        "noCatenary": 0
+      }
+    },
+    "default": false,
+    "nonPublic": false,
+    "stops": ["Pawonki"]
   }
 ]

src/scripts/interfaces/Station.ts

@@ -33,6 +33,7 @@ export default interface Station {
     driverName: string;
     driverId: number;
     currentStationName: string;
+    currentStationHash: string;
     category: string;
     stopInfo: TrainStop;
 

src/scripts/interfaces/Train.ts

@@ -11,6 +11,7 @@ export default interface Train {
   trainNo: number;
   driverName: string;
   currentStationName: string;
+  currentStationHash: string;
   locoURL: string;
   locoType: string;
   online: boolean;

src/store/store.ts

@@ -183,6 +183,7 @@ export default class Store extends VuexModule {
             driverName: train.driverName,
             driverId: train.driverId,
             currentStationName: train.currentStationName,
+            currentStationHash: train.currentStationHash,
             timetableId: trainInfo.timetableId,
             category: trainInfo.trainCategoryCode,
             route: trainInfo.route,
@@ -253,6 +254,7 @@ export default class Store extends VuexModule {
                 driverId: train.driverId,
                 driverName: train.driverName,
                 currentStationName: train.station.stationName,
+                currentStationHash: train.station.stationHash,
                 connectedTrack: train.dataSceneryConnection,
                 locoType,
                 locoURL: getLocoURL(locoType),
@@ -375,11 +377,11 @@ export default class Store extends VuexModule {
           ? timetableData.followingStops.findIndex((stop: any) => {
               const stationName = station.stationName.toLowerCase();
               const stopName = stop.stopNameRAW.toLowerCase();
-
-              return (
+//stationName.includes('lcs') && 
+            return (
                 stationName.includes(stopName) ||
                 (stopName.includes('podg.') && stopName.split(', podg.')[0] && stationName.includes(stopName.split(', podg.')[0])) ||
-                (stationName.includes('lcs') && JSONStationData.some(data => data.stationName.includes(station.stationName) && data.stops && data.stops.includes(stop.stopNameRAW)))
+                (JSONStationData.some(data => data.stationName.includes(station.stationName) && data.stops && data.stops.includes(stop.stopNameRAW)))
               );
             })
           : -1;
@@ -401,6 +403,7 @@ export default class Store extends VuexModule {
             driverName: timetableData.driverName,
             driverId: timetableData.driverId,
             currentStationName: timetableData.currentStationName,
+            currentStationHash: timetableData.currentStationHash,
             category: timetableData.category,
             stopInfo,
             stopLabel,

src/styles/user_badge.scss

@@ -1,5 +1,5 @@
 $no-timetable: #aaa;
-$departed: lime;
+$departed: springgreen;
 $stopped: #ffa600;
 $online: gold;
 $terminated: red;