wyświetlanie RJ dla scenerii offline

src/components/App/AppHeader.vue

@@ -100,7 +100,7 @@ export default defineComponent({
     },
 
     onlineDispatchersCount() {
-      return this.store.onlineSceneryList.filter(
+      return this.store.activeSceneryList.filter(
         (scenery) => scenery.region == this.store.region.id
       ).length;
     },

src/components/Global/RegionDropdown.vue

@@ -85,7 +85,7 @@ export default defineComponent({
 
     regionList() {
       return regionsJSON.map((region) => {
-        const regionStationCount = this.store.onlineSceneryList.filter(
+        const regionStationCount = this.store.activeSceneryList.filter(
           (scenery) => scenery.region == region.id
         ).length;
 

src/components/Global/StationStatusBadge.vue

@@ -61,6 +61,9 @@ export default defineComponent({
         case Status.ActiveDispatcher.UNKNOWN:
           return 'unknown';
 
+        case Status.ActiveDispatcher.FREE:
+          return 'free';
+
         default:
           if (this.dispatcherTimestamp != null && this.dispatcherStatus >= Date.now() + 25500000)
             return 'no-limit';

src/components/SceneryView/SceneryDispatchersHistory.vue

@@ -76,7 +76,7 @@ import Station from '../../scripts/interfaces/Station';
 import Loading from '../Global/Loading.vue';
 import styleMixin from '../../mixins/styleMixin';
 import listObserverMixin from '../../mixins/listObserverMixin';
-import { OnlineScenery } from '../../store/typings';
+import { ActiveScenery } from '../../store/typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
 import http from '../../http';
@@ -90,7 +90,7 @@ export default defineComponent({
       type: Object as PropType<Station>
     },
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>
+      type: Object as PropType<ActiveScenery>
     }
   },
 

src/components/SceneryView/SceneryHeader.vue

@@ -15,7 +15,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import Station from '../../scripts/interfaces/Station';
-import { OnlineScenery } from '../../store/typings';
+import { ActiveScenery } from '../../store/typings';
 
 export default defineComponent({
   props: {
@@ -29,7 +29,7 @@ export default defineComponent({
     },
 
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>
+      type: Object as PropType<ActiveScenery>
     }
   }
 });

src/components/SceneryView/SceneryInfo.vue

@@ -90,7 +90,7 @@ import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue';
 import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue';
 import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue';
 import Station from '../../scripts/interfaces/Station';
-import { OnlineScenery } from '../../store/typings';
+import { ActiveScenery } from '../../store/typings';
 
 export default defineComponent({
   components: {
@@ -106,7 +106,7 @@ export default defineComponent({
     },
 
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>
+      type: Object as PropType<ActiveScenery>
     }
   }
 });

src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="info-dispatcher">
-    <div class="dispatcher" v-if="onlineScenery">
+    <div class="dispatcher" v-if="onlineScenery && onlineScenery.dispatcherExp != -1">
       <span
         class="dispatcher_level"
         :style="calculateExpStyle(onlineScenery.dispatcherExp, onlineScenery.dispatcherIsSupporter)"
@@ -42,14 +42,14 @@ import dateMixin from '../../../mixins/dateMixin';
 import routerMixin from '../../../mixins/routerMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import StationStatusBadge from '../../Global/StationStatusBadge.vue';
-import { OnlineScenery } from '../../../store/typings';
+import { ActiveScenery } from '../../../store/typings';
 import donatorMixin from '../../../mixins/donatorMixin';
 
 export default defineComponent({
   mixins: [styleMixin, dateMixin, routerMixin, donatorMixin],
   props: {
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
       required: false
     }
   },

src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue

@@ -30,12 +30,12 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { OnlineScenery } from '../../../store/typings';
+import { ActiveScenery } from '../../../store/typings';
 
 export default defineComponent({
   props: {
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
       required: false
     }
   },

src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue

@@ -32,14 +32,14 @@
 import { PropType, defineComponent } from 'vue';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import routerMixin from '../../../mixins/routerMixin';
-import { OnlineScenery } from '../../../store/typings';
+import { ActiveScenery } from '../../../store/typings';
 
 export default defineComponent({
   mixins: [routerMixin, modalTrainMixin],
 
   props: {
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
       required: false
     }
   }

src/components/SceneryView/SceneryTimetable.vue

@@ -6,10 +6,10 @@
         <span>{{ $t('scenery.timetables') }}</span>
 
         <span>
-          <span class="text--primary">{{ onlineScenery?.scheduledTrainCount.all || 0 }}</span>
+          <span class="text--primary">{{ onlineScenery?.scheduledTrainCount.all ?? 0 }}</span>
           <span> / </span>
           <span class="text--grayed">
-            {{ onlineScenery?.scheduledTrainCount.confirmed || '0' }}
+            {{ onlineScenery?.scheduledTrainCount.confirmed ?? 0 }}
           </span>
         </span>
 
@@ -190,7 +190,7 @@ import Station from '../../scripts/interfaces/Station';
 import { useMainStore } from '../../store/mainStore';
 import modalTrainMixin from '../../mixins/modalTrainMixin';
 import ScheduledTrainStatus from './ScheduledTrainStatus.vue';
-import { OnlineScenery } from '../../store/typings';
+import { ActiveScenery } from '../../store/typings';
 import { useApiStore } from '../../store/apiStore';
 
 export default defineComponent({
@@ -205,7 +205,7 @@ export default defineComponent({
       type: Object as PropType<Station>
     },
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>
+      type: Object as PropType<ActiveScenery>
     }
   },
 

src/components/SceneryView/SceneryTimetablesHistory.vue

@@ -74,7 +74,7 @@ import dateMixin from '../../mixins/dateMixin';
 import Station from '../../scripts/interfaces/Station';
 import Loading from '../Global/Loading.vue';
 import listObserverMixin from '../../mixins/listObserverMixin';
-import { OnlineScenery } from '../../store/typings';
+import { ActiveScenery } from '../../store/typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
 import http from '../../http';
@@ -87,7 +87,7 @@ export default defineComponent({
       type: Object as PropType<Station>
     },
     onlineScenery: {
-      type: Object as PropType<OnlineScenery>
+      type: Object as PropType<ActiveScenery>
     }
   },
 

src/components/StationsView/StationTable.vue

@@ -132,7 +132,7 @@
 
             <td class="station_dispatcher-exp">
               <span
-                v-if="station.onlineInfo"
+                v-if="station.onlineInfo && station.onlineInfo?.dispatcherExp != -1"
                 :style="
                   calculateExpStyle(
                     station.onlineInfo.dispatcherExp,

src/components/TrainsView/TrainSchedule.vue

@@ -181,7 +181,7 @@ export default defineComponent({
             isSBL: /sbl/gi.test(stop.stopName),
             position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route',
             sceneryHash: '',
-            sceneryName: this.timetableSceneryNames[currentSceneryIndex],
+            sceneryName: this.train.timetableData!.sceneryNames[currentSceneryIndex],
             status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed'
           };
         }) ?? []
@@ -216,19 +216,6 @@ export default defineComponent({
       }
 
       return activeMinorStopList;
-    },
-
-    timetableSceneryNames() {
-      if (!this.train.timetableData?.sceneries) return [];
-
-      return this.train.timetableData?.sceneries
-        .map(
-          (sceneryHash) =>
-            this.store.onlineSceneryList.find((st) => st.hash === sceneryHash)?.name ??
-            this.apiStore.sceneryData.find((sd) => sd.hash === sceneryHash)?.name ??
-            sceneryHash
-        )
-        .reverse();
     }
   },
 

src/scripts/interfaces/Station.ts

@@ -1,4 +1,4 @@
-import { Availability, OnlineScenery, ScheduledTrain } from '../../store/typings';
+import { Availability, ActiveScenery, ScheduledTrain } from '../../store/typings';
 import { StationRoutes } from './StationRoutes';
 
 export default interface Station {
@@ -8,6 +8,7 @@ export default interface Station {
     name: string;
     url: string;
     abbr: string;
+    hash?: string;
 
     reqLevel: number;
     // supportersOnly: boolean;
@@ -31,5 +32,5 @@ export default interface Station {
     }[];
   };
 
-  onlineInfo?: OnlineScenery;
+  onlineInfo?: ActiveScenery;
 }

src/scripts/interfaces/Train.ts

@@ -33,5 +33,6 @@ export default interface Train {
     SKR: boolean;
     routeDistance: number;
     sceneries: string[];
+    sceneryNames: string[];
   };
 }

src/store/mainStore.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import Train from '../scripts/interfaces/Train';
 import { parseSpawns, getScheduledTrains, getStationTrains } from './utils';
 
-import { OnlineScenery, ScheduledTrain, StoreState } from './typings';
+import { ActiveScenery, ScheduledTrain, StoreState } from './typings';
 
 import { Status } from '../typings/common';
 import Station from '../scripts/interfaces/Station';
@@ -41,6 +41,14 @@ export const useMainStore = defineStore('store', {
 
           const timetable = train.timetable;
 
+          const sceneryNames =
+            train.timetable?.sceneries?.map(
+              (sceneryHash) =>
+                this.activeSceneryList.find((st) => st.hash === sceneryHash)?.name ??
+                apiStore.sceneryData.find((sd) => sd.hash === sceneryHash)?.name ??
+                sceneryHash
+            ) ?? [];
+
           return {
             trainId: train.driverName + train.trainNo.toString(),
 
@@ -76,43 +84,69 @@ export const useMainStore = defineStore('store', {
                   category: timetable.category,
                   followingStops: timetable.stopList,
                   routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
-                  sceneries: timetable.sceneries
+                  sceneries: timetable.sceneries,
+                  sceneryNames: sceneryNames.reverse()
                 }
               : undefined
           } as Train;
         });
     },
 
-    onlineSceneryList(state): OnlineScenery[] {
+    activeSceneryList(state): ActiveScenery[] {
       const apiStore = useApiStore();
 
       if (state.isOffline) return [];
+
       if (!apiStore.activeData?.activeSceneries) return [];
 
-      return apiStore.activeData?.activeSceneries.reduce((list, scenery) => {
+      console.time('d');
+
+      const offlineActiveSceneries = this.trainList.reduce((acc, train) => {
+        if (!train.timetableData) return acc;
+
+        train.timetableData.sceneryNames.forEach((name) => {
+          if (
+            acc.findIndex((v) => v.name == name && v.region == train.region) != -1 ||
+            apiStore.activeData?.activeSceneries?.findIndex(
+              (sc) => sc.stationName === name && sc.region == train.region
+            ) != -1
+          )
+            return acc;
+
+          acc.push({
+            name: name,
+            hash: '',
+            region: train.region,
+            maxUsers: 0,
+            currentUsers: 0,
+            spawns: [],
+            dispatcherName: '',
+            dispatcherRate: 0,
+            dispatcherId: -1,
+            dispatcherExp: -1,
+            dispatcherIsSupporter: false,
+            scheduledTrains: [],
+            stationTrains: [],
+            dispatcherStatus: Status.ActiveDispatcher.FREE,
+            dispatcherTimestamp: -1,
+
+            isOnline: false,
+
+            scheduledTrainCount: {
+              all: 0,
+              confirmed: 0,
+              unconfirmed: 0
+            }
+          });
+        });
+
+        return acc;
+      }, [] as ActiveScenery[]);
+
+      const onlineActiveSceneries = apiStore.activeData?.activeSceneries.reduce((list, scenery) => {
         if (scenery.isOnline !== 1 && Date.now() - scenery.lastSeen > 1000 * 60 * 2) return list;
         if (scenery.dispatcherStatus == Status.ActiveDispatcher.UNKNOWN) return list;
 
-        const station = this.stationList.find((s) => s.name === scenery.stationName);
-
-        const scheduledTrains = getScheduledTrains(this.trainList, scenery, station?.generalInfo);
-
-        const stationTrains = getStationTrains(
-          this.trainList,
-          scheduledTrains,
-          this.region.id,
-          scenery
-        );
-
-        // Remove checkpoint duplicates
-        const uniqueScheduledTrains = scheduledTrains.reduce(
-          (uniqueList, sTrain) =>
-            uniqueList.find((v) => v.trainId === sTrain.trainId)
-              ? uniqueList
-              : [...uniqueList, sTrain],
-          [] as ScheduledTrain[]
-        );
-
         const dispatcherTimestamp =
           scenery.dispatcherStatus == Status.ActiveDispatcher.NO_LIMIT
             ? Date.now() + 25500000
@@ -132,22 +166,69 @@ export const useMainStore = defineStore('store', {
           dispatcherId: scenery.dispatcherId,
           dispatcherExp: scenery.dispatcherExp,
           dispatcherIsSupporter: scenery.dispatcherIsSupporter,
-          scheduledTrains: scheduledTrains,
+          scheduledTrains: [],
-          stationTrains: stationTrains,
+          stationTrains: [],
+          scheduledTrainCount: {
+            all: 0,
+            confirmed: 0,
+            unconfirmed: 0
+          },
+          // scheduledTrains: scheduledTrains,
+          // stationTrains: stationTrains,
           dispatcherStatus: scenery.dispatcherStatus,
           dispatcherTimestamp: dispatcherTimestamp,
 
-          isOnline: scenery.isOnline == 1,
+          isOnline: scenery.isOnline == 1
 
-          scheduledTrainCount: {
+          // scheduledTrainCount: {
-            all: uniqueScheduledTrains.length,
+          //   all: uniqueScheduledTrains.length,
-            confirmed: uniqueScheduledTrains.filter((train) => train.stopInfo.confirmed).length,
+          //   confirmed: uniqueScheduledTrains.filter((train) => train.stopInfo.confirmed).length,
-            unconfirmed: uniqueScheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+          //   unconfirmed: uniqueScheduledTrains.filter((train) => !train.stopInfo.confirmed).length
-          }
+          // }
         });
 
         return list;
-      }, [] as OnlineScenery[]);
+      }, [] as ActiveScenery[]);
+
+      [...onlineActiveSceneries, ...offlineActiveSceneries].forEach((scenery) => {
+        const station = this.stationList.find((s) => s.name === scenery.name);
+
+        const scheduledTrains = getScheduledTrains(
+          this.trainList,
+          station?.generalInfo,
+          scenery.name,
+          scenery.region
+        );
+
+        const stationTrains = getStationTrains(
+          this.trainList,
+          scheduledTrains,
+          this.region.id,
+          scenery.name
+        );
+
+        // Remove checkpoint duplicates
+        const uniqueScheduledTrains = scheduledTrains.reduce(
+          (uniqueList, sTrain) =>
+            uniqueList.find((v) => v.trainId === sTrain.trainId)
+              ? uniqueList
+              : [...uniqueList, sTrain],
+          [] as ScheduledTrain[]
+        );
+
+        scenery.scheduledTrains = scheduledTrains;
+        scenery.stationTrains = stationTrains;
+
+        scenery.scheduledTrainCount = {
+          all: uniqueScheduledTrains.length,
+          confirmed: uniqueScheduledTrains.filter((train) => train.stopInfo.confirmed).length,
+          unconfirmed: uniqueScheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+        };
+      });
+
+      console.timeEnd('d');
+
+      return [...onlineActiveSceneries, ...offlineActiveSceneries];
     },
 
     stationList(): Station[] {

src/store/stationFiltersStore.ts

@@ -73,7 +73,7 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', {
       const store = useMainStore();
       const savedStationNames = store.stationList.map((s) => s.name);
 
-      const onlineUnsavedStations = store.onlineSceneryList
+      const onlineUnsavedStations = store.activeSceneryList
         .filter((os) => !savedStationNames.includes(os.name) && os.region == store.region.id)
         .map((os) => ({
           name: os.name,
@@ -85,7 +85,8 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', {
         ...onlineUnsavedStations,
         ...store.stationList.map((station) => ({
           ...station,
-          onlineInfo: store.onlineSceneryList.find(
+          // append to 'onlineInfo' object for filtering legacy reasons - to optimize later (hopefully)
+          onlineInfo: store.activeSceneryList.find(
             (os) => os.name == station.name && os.region == store.region.id
           )
         }))

src/store/typings.ts

@@ -63,7 +63,7 @@ export interface StationJSONData {
   availability: Availability;
 }
 
-export interface OnlineScenery {
+export interface ActiveScenery {
   name: string;
   hash: string;
   region: string;

src/store/utils.ts

@@ -187,43 +187,31 @@ export function getCheckpointTrain(
 
 export function getScheduledTrains(
   trainList: Train[],
-  sceneryData: API.ActiveSceneries.Data,
+  stationGeneralInfo: Station['generalInfo'],
-  stationGeneralInfo: Station['generalInfo']
+  stationName: string,
+  region: string
+  // sceneryData: API.ActiveSceneries.Data,
 ): ScheduledTrain[] {
-  const stationNameLower = sceneryData.stationName.toLocaleLowerCase();
-
   stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
 
   return trainList.reduce((acc: ScheduledTrain[], train) => {
     if (!train.timetableData) return acc;
-    if (train.region != sceneryData.region) return acc;
+    if (train.region != region) return acc;
 
     const timetable = train.timetableData;
-    if (!timetable.sceneries.includes(sceneryData.stationHash)) return acc;
+    if (!timetable.sceneryNames.includes(stationName)) return acc;
 
     const stopInfoIndex = timetable.followingStops.findIndex((stop) => {
-      const stopNameLower = stop.stopNameRAW.toLocaleLowerCase();
+      return stationName.toLocaleLowerCase() == stop.stopNameRAW.toLocaleLowerCase();
-
-      return (
-        stationNameLower == stopNameLower ||
-        (!/(po\.|podg\.)/.test(stopNameLower) && stopNameLower.includes(stationNameLower)) ||
-        (!/(po\.|podg\.)/.test(stationNameLower) && stationNameLower.includes(stopNameLower)) ||
-        (stopNameLower.split(', podg.')[0] !== undefined &&
-          stationNameLower.startsWith(stopNameLower.split(', podg.')[0]))
-      );
     });
 
     const checkpointScheduledTrains: ScheduledTrain[] = [];
 
     if (stopInfoIndex != -1) {
-      checkpointScheduledTrains.push(
+      checkpointScheduledTrains.push(getCheckpointTrain(train, stopInfoIndex, stationName));
-        getCheckpointTrain(train, stopInfoIndex, sceneryData.stationName)
-      );
     }
 
     stationGeneralInfo?.checkpoints?.forEach((checkpoint) => {
-      // if (checkpoint.checkpointName.toLocaleLowerCase() == stationNameLower) return;
-
       if (
         checkpointScheduledTrains.findIndex(
           (cpTrain) =>
@@ -237,8 +225,7 @@ export function getScheduledTrains(
         (stop) => stop.stopNameRAW.toLowerCase() == checkpoint.checkpointName.toLowerCase()
       );
 
-      if (index > -1)
+      if (index > -1) checkpointScheduledTrains.push(getCheckpointTrain(train, index, stationName));
-        checkpointScheduledTrains.push(getCheckpointTrain(train, index, sceneryData.stationName));
     });
 
     acc.push(...checkpointScheduledTrains);
@@ -250,14 +237,12 @@ export function getStationTrains(
   trainList: Train[],
   scheduledTrainList: ScheduledTrain[],
   region: string,
-  sceneryData: API.ActiveSceneries.Data
+  stationName: string
 ): StationTrain[] {
   return trainList
     .filter(
       (train) =>
-        train?.region === region &&
+        train?.region === region && train.online && train.currentStationName === stationName
-        train.online &&
-        train.currentStationName === sceneryData.stationName
     )
     .map((train) => ({
       driverName: train.driverName,

src/typings/common.ts

@@ -1,5 +1,6 @@
 export namespace Status {
   export enum ActiveDispatcher {
+    FREE = -3,
     INVALID = -2,
     UNKNOWN = -1,
     NO_LIMIT = 0,

src/views/SceneryView.vue

@@ -147,7 +147,7 @@ export default defineComponent({
     },
 
     onlineSceneryInfo() {
-      return this.store.onlineSceneryList.find(
+      return this.store.activeSceneryList.find(
         (scenery) =>
           scenery.name === this.station?.toString().replace(/_/g, ' ') &&
           scenery.region == this.store.region.id