Merge pull request #100 from Spythere/development

v1.25.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stacjownik",
-  "version": "1.25.1",
+  "version": "1.25.2",
   "private": true,
   "scripts": {
     "dev": "vite",

src/App.vue

@@ -131,7 +131,8 @@ export default defineComponent({
         };
 
         this.isUpdateCardOpen =
-          storageVersion != version || import.meta.env.VITE_UPDATE_TEST === 'test';
+          (storageVersion != '' && storageVersion != version) ||
+          import.meta.env.VITE_UPDATE_TEST === 'test';
       } catch (error) {
         console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
       }

src/components/Global/StockList.vue

@@ -16,7 +16,7 @@
             :data-mouseover="vehicleName"
             data-tooltip-type="VehiclePreviewTooltip"
             :data-tooltip-content="vehicleName"
-            :src="`https://static.spythere.eu/thumbnails/${thumbnailImage}.png`"
+            :src="`https://static.spythere.eu/thumbnails/v2/${thumbnailImage}.png`"
             @error="onImageError($event, imagesFallbacks[imageIndex])"
             @click.stop="() => {}"
             height="60"

src/components/JournalView/JournalTimetables/TimetableStops.vue

@@ -1,23 +1,41 @@
 <template>
-  <div class="stop-list" v-if="showExtraInfo == true">
+  <div class="timetable-stops">
-    <span
+    <div class="stop-list">
-      v-for="(stop, i) in timetableStops.filter((_, i) =>
+      <span
-        !showExtraInfo ? i == 0 || i == timetableStops.length - 1 : true
+        v-for="(stop, i) in timetableStops.filter((_, i) =>
-      )"
+          !showExtraInfo ? i == 0 || i == timetableStops.length - 1 : true
-      class="stop-list-item"
+        )"
-      :key="stop.stopName"
+        class="stop-list-item"
-      :data-confirmed="stop.confirmed"
+        :key="stop.stopName"
-    >
+        :data-confirmed="stop.confirmed"
-      <span v-if="i > 0">
+      >
-        &gt;
+        <span v-if="i > 0">
-        <span v-if="!showExtraInfo && i == 1 && timetableStops.length > 2">
+          &gt;
-          ... (+{{ timetableStops.length - 2 }}) &gt;
+          <span v-if="!showExtraInfo && i == 1 && timetableStops.length > 2">
+            ... (+{{ timetableStops.length - 2 }}) &gt;
+          </span>
+        </span>
+
+        <span class="stop-name">{{ stop.stopName }}</span>
+        <span v-html="stop.html"></span>
+      </span>
+    </div>
+
+    <div class="path-details" v-if="showExtraInfo && timetablePathDetails">
+      <span
+        v-for="(pathData, i) in timetablePathDetails"
+        :data-visited="pathData.isVisited"
+        :data-next-visited="
+          i < timetablePathDetails.length - 1 && timetablePathDetails[i + 1].isVisited
+        "
+      >
+        <span class="path-arrival" v-if="pathData.arrival">/ {{ pathData.arrival }} &RightArrow; </span>
+        <b class="path-scenery">{{ pathData.sceneryName }}</b>
+        <span class="path-departure" v-if="pathData.departure">
+          &RightArrow; {{ pathData.departure }}&nbsp;
         </span>
       </span>
-
+    </div>
-      <span class="stop-name">{{ stop.stopName }}</span>
-      <span v-html="stop.html"></span>
-    </span>
   </div>
 </template>
 
@@ -42,6 +60,24 @@ export default defineComponent({
   },
 
   computed: {
+    timetablePathDetails() {
+      if (!this.timetable.path || this.timetable.path == '') return null;
+
+      return this.timetable.path.split(';').map((pathEl, i) => {
+        const [arrival, name, departure] = pathEl.split(',');
+        const sceneryName = name.split(' ').slice(0, -1).join(' ');
+        const sceneryHash = name.split(' ').pop()?.replace('.sc', '') ?? '';
+
+        return {
+          arrival,
+          sceneryName,
+          sceneryHash,
+          departure,
+          isVisited: this.timetable.visitedSceneries?.includes(sceneryHash) ?? false
+        };
+      });
+    },
+
     timetableStops() {
       const timetable = this.timetable;
 
@@ -94,13 +130,14 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.stop-list {
+.timetable-stops {
   word-wrap: break-word;
   gap: 0.25em;
   font-size: 0.95em;
-
   color: #adadad;
+}
 
+.stop-list {
   &-item[data-confirmed='true'] {
     color: lightgreen;
 
@@ -109,4 +146,19 @@ export default defineComponent({
     }
   }
 }
+
+.path-details {
+  margin-top: 0.5em;
+}
+
+.path-details > span[data-visited='true'] {
+  .path-arrival,
+  .path-scenery {
+    color: lightgreen;
+  }
+
+  &[data-next-visited='true'] .path-departure {
+    color: lightgreen;
+  }
+}
 </style>

src/components/SceneryView/SceneryTimetable.vue

@@ -238,11 +238,12 @@ export default defineComponent({
     sceneryTimetables(): SceneryTimetableRow[] {
       if (!this.onlineScenery) return [];
 
-      const sceneryName = this.$route.query['station']?.toString() ?? '';
+      const sceneryName = this.$route.query['station']?.toString().replace(/_/g, ' ') ?? '';
 
       return this.onlineScenery.scheduledTrains
         .filter(
           (ct) =>
+            ct.timetablePathElement.stationName == sceneryName &&
             ct.train.region == this.mainStore.region.id &&
             this.chosenCheckpoint &&
             ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase()
@@ -251,75 +252,18 @@ export default defineComponent({
           const trainStopStatus = getTrainStopStatus(
             ct.checkpointStop,
             ct.train.currentStationName,
-            sceneryName.replace(/_/g, ' ')
+            sceneryName
           );
 
-          const trainStopIndex =
-            ct.train.timetableData?.followingStops.findIndex(
-              (stop) => stop.stopName == ct.checkpointStop.stopName
-            ) ?? -1;
-
-          let prevStationName = '',
-            nextStationName = '';
-
-          let departureLine: string | null = null;
-          let arrivingLine: string | null = null;
-
-          let prevDepartureLine: string | null = null,
-            nextArrivalLine: string | null = null;
-
-          if (trainStopIndex > -1 && ct.train.timetableData?.followingStops !== undefined) {
-            for (let i = trainStopIndex; i >= 0; i--) {
-              const stop = ct.train.timetableData.followingStops[i];
-
-              if (
-                /strong|podg\.|pe\./g.test(stop.stopName) &&
-                !prevStationName &&
-                i <= trainStopIndex - 1
-              )
-                prevStationName = stop.stopNameRAW.replace(/,.*/g, '');
-
-              if (
-                stop.arrivalLine != null &&
-                !arrivingLine &&
-                !/-|_|it|sbl/gi.test(stop.arrivalLine)
-              ) {
-                arrivingLine = stop.arrivalLine;
-                prevDepartureLine =
-                  ct.train.timetableData.followingStops[i - 1]?.departureLine || null;
-              }
-            }
-
-            for (let i = trainStopIndex; i < ct.train.timetableData.followingStops.length; i++) {
-              const stop = ct.train.timetableData.followingStops[i];
-
-              if (
-                /strong|podg\.|pe\./g.test(stop.stopName) &&
-                !nextStationName &&
-                i > trainStopIndex
-              )
-                nextStationName = stop.stopNameRAW.replace(/,.*/g, '');
-
-              if (
-                stop.departureLine &&
-                !departureLine &&
-                !/-|_|it|sbl/gi.test(stop.departureLine)
-              ) {
-                departureLine = stop.departureLine;
-                nextArrivalLine = ct.train.timetableData.followingStops[i + 1]?.arrivalLine || null;
-              }
-            }
-          }
-
           return {
             checkpointStop: ct.checkpointStop,
             train: ct.train,
-            prevDepartureLine,
+            prevDepartureLine: ct.previousSceneryElement?.departureRouteExt ?? null,
-            nextArrivalLine,
+            nextArrivalLine: ct.nextSceneryElement?.arrivalRouteExt ?? null,
-            departureLine,
+            departureLine: ct.timetablePathElement.departureRouteExt ?? null,
-            arrivingLine,
+            arrivingLine: ct.timetablePathElement.arrivalRouteExt ?? null,
-            prevStationName,
+            prevStationName: ct.previousSceneryElement?.stationName ?? null,
-            nextStationName,
+            nextStationName: ct.nextSceneryElement?.stationName ?? null,
             status: trainStopStatus
           };
         })

src/store/apiStore.ts

@@ -51,6 +51,12 @@ export const useApiStore = defineStore('apiStore', {
       // Static data
       this.fetchDonatorsData();
       this.fetchStationsGeneralInfo();
+
+      // Ponowne pobieranie danych po ServiceWorkerze
+      setTimeout(() => {
+        this.fetchStationsGeneralInfo();
+      }, Math.floor(Math.random() * 500) + 1000);
+
       this.fetchVehiclesInfo();
     },
 

src/store/mainStore.ts

@@ -96,7 +96,17 @@ export const useMainStore = defineStore('mainStore', {
                   followingStops: timetable.stopList,
                   routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
                   sceneries: timetable.sceneries,
-                  sceneryNames: sceneryNames.reverse()
+                  sceneryNames: sceneryNames.reverse(),
+                  timetablePath: timetable.path.split(';').map((pathElementString) => {
+                    const [arrival, station, departure] = pathElementString.split(',');
+
+                    return {
+                      arrivalRouteExt: arrival,
+                      departureRouteExt: departure,
+                      stationName: station.split(' ').slice(0, -1).join(' '),
+                      stationHash: station.split(' ').slice(-1).join(' ')
+                    };
+                  })
                 }
               : undefined
           } as Train;
@@ -110,21 +120,39 @@ export const useMainStore = defineStore('mainStore', {
           } else sceneriesTrains.set(train.currentStationName, [trainObj]);
 
           // Checkpoints trains map
-          timetable?.stopList.forEach((stop, i) => {
+          if (trainObj.timetableData) {
-            if (/strong|podg\.|pe\./.test(stop.stopName)) {
+            let currentSceneryIndex = 0;
-              const checkpointTrain: CheckpointTrain = {
+            const timetablePath = trainObj.timetableData.timetablePath;
-                train: trainObj,
-                checkpointStop: stop
-              };
 
-              if (checkpointsTrains.has(stop.stopNameRAW.toLowerCase())) {
+            trainObj.timetableData.followingStops.forEach((stop, i) => {
-                checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [
+              if (/strong|podg|pe/.test(stop.stopName)) {
-                  ...checkpointsTrains.get(stop.stopNameRAW.toLowerCase())!,
+                const checkpointTrain: CheckpointTrain = {
-                  checkpointTrain
+                  train: trainObj,
-                ]);
+                  checkpointStop: stop,
-              } else checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [checkpointTrain]);
+
-            }
+                  previousSceneryElement:
-          });
+                    currentSceneryIndex > 0 ? timetablePath[currentSceneryIndex - 1] : null,
+
+                  nextSceneryElement:
+                    currentSceneryIndex < timetablePath.length - 1
+                      ? timetablePath[currentSceneryIndex + 1]
+                      : null,
+
+                  timetablePathElement: timetablePath[currentSceneryIndex]
+                };
+
+                if (checkpointsTrains.has(stop.stopNameRAW.toLowerCase())) {
+                  checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [
+                    ...checkpointsTrains.get(stop.stopNameRAW.toLowerCase())!,
+                    checkpointTrain
+                  ]);
+                } else checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [checkpointTrain]);
+              }
+
+              if (timetablePath[currentSceneryIndex].departureRouteExt == stop.departureLine)
+                currentSceneryIndex++;
+            });
+          }
 
           return trainObj;
         });
@@ -252,8 +280,10 @@ export const useMainStore = defineStore('mainStore', {
 
           if (!scheduledTrains) return;
 
-          scheduledTrains.forEach(({ train, checkpointStop }) => {
+          scheduledTrains.forEach(({ train, checkpointStop, timetablePathElement, ...v }) => {
-            scenery.scheduledTrains.push({ train, checkpointStop });
+            if (scenery.name != timetablePathElement.stationName) return;
+
+            scenery.scheduledTrains.push({ train, checkpointStop, timetablePathElement, ...v });
 
             if (uniqueTrainIds.includes(train.id) || train.region != this.region.id) return;
 

src/typings/api.ts

@@ -195,6 +195,8 @@ export namespace API {
       TWR: boolean;
       SKR: boolean;
       sceneries: string[];
+
+      path: string;
     }
   }
 
@@ -249,16 +251,14 @@ export namespace API {
       hashesString?: string;
       currentSceneryName?: string;
       currentSceneryHash?: string;
-
       routeSceneries?: string;
-
       checkpointArrivals?: string[];
       checkpointDepartures?: string[];
-
       checkpointArrivalsScheduled?: string[];
       checkpointDeparturesScheduled?: string[];
-
       checkpointStopTypes?: string[];
+      visitedSceneries?: string[];
+      path: string;
     }
 
     export type Response = Data[];

src/typings/common.ts

@@ -39,6 +39,13 @@ export interface RegionCounters {
   timetablesCount: number;
 }
 
+export interface TimetablePathElement {
+  arrivalRouteExt?: string;
+  departureRouteExt?: string;
+  stationName: string;
+  stationHash: string;
+}
+
 export interface Train {
   id: string;
   modalId: string;
@@ -73,6 +80,7 @@ export interface Train {
     routeDistance: number;
     sceneries: string[];
     sceneryNames: string[];
+    timetablePath: TimetablePathElement[];
   };
 }
 
@@ -188,6 +196,9 @@ export interface TrainStop {
 export interface CheckpointTrain {
   checkpointStop: TrainStop;
   train: Train;
+  timetablePathElement: TimetablePathElement;
+  previousSceneryElement: TimetablePathElement | null;
+  nextSceneryElement: TimetablePathElement | null;
 }
 
 // Vehicles Data