From 84177544036c1bee1a2be3d125be009772e15f90 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 19 May 2024 19:50:01 +0200
Subject: [PATCH 01/13] refactor: optimization of train schedules

---
 src/components/App/UpdateModal.vue            |   5 +-
 src/components/SceneryView/SceneryInfo.vue    |   2 +-
 .../SceneryInfo/SceneryInfoUserList.vue       |  60 ++++--
 .../SceneryView/SceneryTimetable.vue          | 185 ++++++++++++------
 .../SceneryView/ScheduledTrainStatus.vue      |  26 ++-
 src/components/SceneryView/typings.ts         |  13 ++
 src/components/SceneryView/utils.ts           |  42 ++++
 src/components/Tooltip/UsersTooltip.vue       |   4 +-
 src/components/TrainsView/TrainModal.vue      |   2 +-
 src/components/TrainsView/TrainTable.vue      |   6 +-
 src/store/mainStore.ts                        | 107 ++++++----
 src/store/typings.ts                          |   2 +-
 src/store/utils.ts                            | 174 ----------------
 src/typings/api.ts                            |   1 -
 src/typings/common.ts                         |  58 +-----
 15 files changed, 331 insertions(+), 356 deletions(-)
 create mode 100644 src/components/SceneryView/typings.ts
 create mode 100644 src/components/SceneryView/utils.ts

diff --git a/src/components/App/UpdateModal.vue b/src/components/App/UpdateModal.vue
index 7bf6ea0..23d5124 100644
--- a/src/components/App/UpdateModal.vue
+++ b/src/components/App/UpdateModal.vue
@@ -60,10 +60,7 @@ export default defineComponent({
     htmlChangelog() {
       if (this.mainStore.appUpdate == null) return '';
 
-      const x = converter.makeHtml(this.mainStore.appUpdate.changelog);
-      console.log(x);
-
-      return x;
+      return converter.makeHtml(this.mainStore.appUpdate.changelog);
     }
   },
 
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 1b0a2ef..120daf5 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -72,7 +72,7 @@
 
       <div class="info-lists">
         <!-- user list -->
-        <SceneryInfoUserList :onlineScenery="onlineScenery" />
+        <SceneryInfoUserList :onlineScenery="onlineScenery" :station="station" />
 
         <!-- spawn list -->
         <SceneryInfoSpawnList :onlineScenery="onlineScenery" />
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
index 06db7fb..3f2ab4d 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
@@ -13,13 +13,13 @@
       </li>
 
       <li
-        v-for="train in onlineScenery?.stationTrains"
+        v-for="{ train, status } in stationTrains"
         class="badge user"
-        :class="train.stopStatus"
-        :key="train.trainId"
         tabindex="0"
-        @click.prevent="selectModalTrain(train.trainId, $event.currentTarget)"
-        @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
+        :key="train.id"
+        :data-status="status"
+        @click.prevent="selectModalTrain(train.id, $event.currentTarget)"
+        @keydown.enter="selectModalTrain(train.id, $event.currentTarget)"
       >
         <span class="user_train">{{ train.trainNo }}</span>
         <span class="user_name">{{ train.driverName }}</span>
@@ -32,7 +32,9 @@
 import { PropType, defineComponent } from 'vue';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import routerMixin from '../../../mixins/routerMixin';
-import { ActiveScenery } from '../../../typings/common';
+import { ActiveScenery, Station, StopStatus } from '../../../typings/common';
+import { getTrainStopStatus } from '../utils';
+import { useMainStore } from '../../../store/mainStore';
 
 export default defineComponent({
   mixins: [routerMixin, modalTrainMixin],
@@ -41,6 +43,38 @@ export default defineComponent({
     onlineScenery: {
       type: Object as PropType<ActiveScenery>,
       required: false
+    },
+    station: {
+      type: Object as PropType<Station>
+    }
+  },
+
+  data() {
+    return {
+      mainStore: useMainStore()
+    };
+  },
+
+  computed: {
+    stationTrains() {
+      if (!this.onlineScenery) return;
+
+      const name = this.station?.generalInfo?.checkpoints[0] ?? this.onlineScenery.name;
+
+      return this.onlineScenery.stationTrains.map((train) => {
+        const stop = train.timetableData?.followingStops.find(
+          (stop) => stop.stopNameRAW.toLowerCase() == name.toLowerCase()
+        );
+
+        const status = stop
+          ? getTrainStopStatus(stop, train.currentStationName, this.onlineScenery!.name)
+          : 'no-timetable';
+
+        return {
+          train,
+          status
+        };
+      });
     }
   }
 });
@@ -74,31 +108,31 @@ ul {
     -webkit-transition: background-color 200ms;
   }
 
-  &.no-timetable .user_train {
+  &[data-status='no-timetable'] .user_train {
     background-color: $no-timetable;
   }
 
-  &.departed > &_train {
+  &[data-status='departed'] > &_train {
     background-color: $departed;
   }
 
-  &.stopped > &_train {
+  &[data-status='stopped'] > &_train {
     background-color: $stopped;
   }
 
-  &.online > &_train {
+  &[data-status='online'] > &_train {
     background-color: $online;
   }
 
-  &.terminated > &_train {
+  &[data-status='terminated'] > &_train {
     background-color: $terminated;
   }
 
-  &.disconnected > &_train {
+  &[data-status='disconnected'] > &_train {
     background-color: $disconnected;
   }
 
-  &.offline {
+  &[data-status='offline'] {
     background: firebrick;
     pointer-events: none;
   }
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index a1e451f..908a4fa 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -40,7 +40,7 @@
       <transition-group name="list-anim">
         <div
           style="padding-bottom: 5em"
-          v-if="apiStore.dataStatuses.connection == 0 && computedScheduledTrains.length == 0"
+          v-if="apiStore.dataStatuses.connection == 0 && sceneryTimetables.length == 0"
           key="list-loading"
         >
           <Loading />
@@ -48,7 +48,7 @@
 
         <span
           class="timetable-item empty"
-          v-else-if="computedScheduledTrains.length == 0 && !onlineScenery"
+          v-else-if="sceneryTimetables.length == 0 && !onlineScenery"
           key="list-offline"
         >
           {{ $t('scenery.offline') }}
@@ -56,7 +56,7 @@
 
         <div
           class="timetable-item empty"
-          v-else-if="computedScheduledTrains.length == 0"
+          v-else-if="sceneryTimetables.length == 0"
           key="list-no-timetables"
         >
           {{ $t('scenery.no-timetables') }}
@@ -65,59 +65,56 @@
         <div
           class="timetable-item"
           v-else
-          v-for="scheduledTrain in computedScheduledTrains"
-          :key="scheduledTrain.trainId + scheduledTrain.stopInfo.arrivalTimestamp"
+          v-for="row in sceneryTimetables"
+          :key="row.train.id + row.checkpointStop.arrivalTimestamp"
           tabindex="0"
-          @click.prevent.stop="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"
-          @keydown.enter.prevent="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"
+          @click.prevent.stop="selectModalTrain(row.train.id, $event.currentTarget)"
+          @keydown.enter.prevent="selectModalTrain(row.train.id, $event.currentTarget)"
         >
           <span class="timetable-general">
             <span class="general-info">
               <span class="info-number">
-                <strong>{{ scheduledTrain.category }}</strong>
-                {{ scheduledTrain.trainNo }}
+                <strong>{{ row.train.timetableData!.category }}</strong>
+                {{ row.train.trainNo }}
 
-                <span
-                  v-if="scheduledTrain.stopInfo.comments"
-                  :title="scheduledTrain.stopInfo.comments"
-                >
+                <span v-if="row.checkpointStop.comments" :title="row.checkpointStop.comments">
                   <img src="/images/icon-warning.svg" />
                 </span>
               </span>
               &nbsp;|&nbsp;
               <span>
-                {{ scheduledTrain.driverName }}
+                {{ row.train.driverName }}
               </span>
 
               <div class="info-route">
-                <strong>{{ scheduledTrain.beginsAt }} - {{ scheduledTrain.terminatesAt }}</strong>
+                <strong>{{ row.train.timetableData!.route.replace('|', ' - ') }}</strong>
               </div>
 
-              <ScheduledTrainStatus :scheduledTrain="scheduledTrain" />
+              <ScheduledTrainStatus :sceneryTimetableRow="row" />
             </span>
           </span>
 
           <span class="timetable-schedule">
             <span class="schedule-arrival">
-              <span class="arrival-time begins" v-if="scheduledTrain.stopInfo.beginsHere">
+              <span class="arrival-time begins" v-if="row.checkpointStop.beginsHere">
                 {{ $t('timetables.begins') }}
               </span>
 
               <span class="arrival-time" v-else>
-                <div v-if="scheduledTrain.stopInfo.arrivalDelay == 0">
-                  <span>{{ timestampToString(scheduledTrain.stopInfo.arrivalTimestamp) }}</span>
+                <div v-if="row.checkpointStop.arrivalDelay == 0">
+                  <span>{{ timestampToString(row.checkpointStop.arrivalTimestamp) }}</span>
                 </div>
                 <div v-else>
                   <div>
                     <s style="margin-right: 0.2em" class="text--grayed">{{
-                      timestampToString(scheduledTrain.stopInfo.arrivalTimestamp)
+                      timestampToString(row.checkpointStop.arrivalTimestamp)
                     }}</s>
                   </div>
 
                   <span>
-                    {{ timestampToString(scheduledTrain.stopInfo.arrivalRealTimestamp) }}
-                    ({{ scheduledTrain.stopInfo.arrivalDelay > 0 ? '+' : ''
-                    }}{{ scheduledTrain.stopInfo.arrivalDelay }})
+                    {{ timestampToString(row.checkpointStop.arrivalRealTimestamp) }}
+                    ({{ row.checkpointStop.arrivalDelay > 0 ? '+' : ''
+                    }}{{ row.checkpointStop.arrivalDelay }})
                   </span>
                 </div>
               </span>
@@ -125,41 +122,39 @@
 
             <span class="schedule-stop">
               <span class="stop-connection">
-                {{ scheduledTrain.arrivingLine }}
+                {{ row.arrivingLine }}
               </span>
 
               <span class="stop-time">
-                {{ scheduledTrain.stopInfo.stopTime || '' }}
-                {{
-                  scheduledTrain.stopInfo.stopTime ? scheduledTrain.stopInfo.stopType || 'pt' : ''
-                }}
+                {{ row.checkpointStop.stopTime || '' }}
+                {{ row.checkpointStop.stopTime ? row.checkpointStop.stopType || 'pt' : '' }}
               </span>
 
               <span class="stop-connection">
-                {{ scheduledTrain.departureLine }}
+                {{ row.departureLine }}
               </span>
             </span>
 
             <span class="schedule-departure">
-              <span class="departure-time terminates" v-if="scheduledTrain.stopInfo.terminatesHere">
+              <span class="departure-time terminates" v-if="row.checkpointStop.terminatesHere">
                 {{ $t('timetables.terminates') }}
               </span>
 
               <span class="departure-time" v-else>
-                <div v-if="scheduledTrain.stopInfo.departureDelay == 0">
-                  <span>{{ timestampToString(scheduledTrain.stopInfo.departureTimestamp) }}</span>
+                <div v-if="row.checkpointStop.departureDelay == 0">
+                  <span>{{ timestampToString(row.checkpointStop.departureTimestamp) }}</span>
                 </div>
                 <div v-else>
                   <div>
                     <s style="margin-right: 0.2em" class="text--grayed">{{
-                      timestampToString(scheduledTrain.stopInfo.departureTimestamp)
+                      timestampToString(row.checkpointStop.departureTimestamp)
                     }}</s>
                   </div>
 
                   <span>
-                    {{ timestampToString(scheduledTrain.stopInfo.departureRealTimestamp) }}
-                    ({{ scheduledTrain.stopInfo.departureDelay > 0 ? '+' : ''
-                    }}{{ scheduledTrain.stopInfo.departureDelay }})
+                    {{ timestampToString(row.checkpointStop.departureRealTimestamp) }}
+                    ({{ row.checkpointStop.departureDelay > 0 ? '+' : ''
+                    }}{{ row.checkpointStop.departureDelay }})
                   </span>
                 </div>
               </span>
@@ -183,6 +178,8 @@ import modalTrainMixin from '../../mixins/modalTrainMixin';
 import ScheduledTrainStatus from './ScheduledTrainStatus.vue';
 import { useApiStore } from '../../store/apiStore';
 import { ActiveScenery, Station } from '../../typings/common';
+import { SceneryTimetableRow } from './typings';
+import { getTrainStopStatus, stopStatusPriority } from './utils';
 
 export default defineComponent({
   name: 'SceneryTimetable',
@@ -204,10 +201,6 @@ export default defineComponent({
     listOpen: false
   }),
 
-  mounted() {
-    this.loadSelectedOption();
-  },
-
   activated() {
     this.loadSelectedOption();
   },
@@ -241,27 +234,105 @@ export default defineComponent({
       return url;
     },
 
-    computedScheduledTrains() {
+    sceneryTimetables(): SceneryTimetableRow[] {
       if (!this.station) return [];
+      if (!this.onlineScenery) return [];
 
-      return (
-        this.onlineScenery?.scheduledTrains
-          ?.filter(
-            (train) =>
-              train.checkpointName.toLocaleLowerCase() ==
-                (this.chosenCheckpoint || this.station!.name).toLocaleLowerCase() &&
-              train.region == this.mainStore.region.id
-          )
-          .sort((a, b) => {
-            if (a.stopStatusID > b.stopStatusID) return 1;
-            if (a.stopStatusID < b.stopStatusID) return -1;
+      return this.onlineScenery.scheduledTrains
+        .filter(
+          (ct) =>
+            ct.train.region == this.mainStore.region.id &&
+            this.chosenCheckpoint &&
+            ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase()
+        )
+        .map((ct) => {
+          const trainStopStatus = getTrainStopStatus(
+            ct.checkpointStop,
+            ct.train.currentStationName,
+            this.station!.name
+          );
 
-            if (a.stopInfo.arrivalTimestamp > b.stopInfo.arrivalTimestamp) return 1;
-            if (a.stopInfo.arrivalTimestamp < b.stopInfo.arrivalTimestamp) return -1;
+          const trainStopIndex =
+            ct.train.timetableData?.followingStops.findIndex(
+              (stop) => stop.stopName == ct.checkpointStop.stopName
+            ) ?? -1;
 
-            return a.stopInfo.departureTimestamp > b.stopInfo.departureTimestamp ? 1 : -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,
+            nextArrivalLine,
+            departureLine,
+            arrivingLine,
+            prevStationName,
+            nextStationName,
+            status: trainStopStatus
+          };
+        })
+        .sort((a, b) => {
+          if (stopStatusPriority.indexOf(a.status) - stopStatusPriority.indexOf(b.status) < 0)
+            return -1;
+
+          if (stopStatusPriority.indexOf(a.status) - stopStatusPriority.indexOf(b.status) > 0)
+            return 1;
+
+          if (a.checkpointStop.arrivalTimestamp > b.checkpointStop.arrivalTimestamp) return 1;
+          if (a.checkpointStop.arrivalTimestamp < b.checkpointStop.arrivalTimestamp) return -1;
+
+          return a.checkpointStop.departureTimestamp > b.checkpointStop.departureTimestamp ? 1 : -1;
+        });
     }
   },
 
diff --git a/src/components/SceneryView/ScheduledTrainStatus.vue b/src/components/SceneryView/ScheduledTrainStatus.vue
index 6d69c01..f315400 100644
--- a/src/components/SceneryView/ScheduledTrainStatus.vue
+++ b/src/components/SceneryView/ScheduledTrainStatus.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="general-status">
     <span
-      :class="computedScheduledTrain.stopStatus"
+      :class="computedScheduledTrain.status"
       :title="computedScheduledTrain.stopStatusDescription"
     >
       {{ computedScheduledTrain.stopStatusIndicator }}
@@ -11,25 +11,21 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { ScheduledTrain, StopStatus } from '../../typings/common';
-
-interface ScheduledTrainComp extends ScheduledTrain {
-  stopStatusIndicator: string;
-  stopStatusDescription: string;
-}
+import { StopStatus } from '../../typings/common';
+import { SceneryTimetableRow } from './typings';
 
 export default defineComponent({
   props: {
-    scheduledTrain: {
-      type: Object as PropType<ScheduledTrain>,
+    sceneryTimetableRow: {
+      type: Object as PropType<SceneryTimetableRow>,
       required: true
     }
   },
 
   computed: {
-    computedScheduledTrain(): ScheduledTrainComp {
-      const { prevDepartureLine, prevStationName, stopStatus, nextArrivalLine, nextStationName } =
-        this.scheduledTrain;
+    computedScheduledTrain() {
+      const { prevDepartureLine, prevStationName, nextArrivalLine, nextStationName, status } =
+        this.sceneryTimetableRow;
 
       const prevDepartureIndicator = prevDepartureLine
         ? `(${prevDepartureLine}) ${prevStationName}`
@@ -41,7 +37,7 @@ export default defineComponent({
       let stopStatusDescription = '',
         stopStatusIndicator = '';
 
-      switch (stopStatus) {
+      switch (status) {
         case StopStatus.ARRIVING:
           stopStatusIndicator = `${this.$t('timetables.from')}: ${prevDepartureIndicator}`;
           stopStatusDescription = this.$t('timetables.desc-arriving', {
@@ -56,7 +52,7 @@ export default defineComponent({
             ? `${this.$t('timetables.to')}: ${nextArrivalIndicator}`
             : `${this.$t('timetables.desc-end')}`;
           stopStatusDescription = nextArrivalLine
-            ? this.$t(`timetables.desc-${stopStatus}`, { nextStationName, nextArrivalLine })
+            ? this.$t(`timetables.desc-${status}`, { nextStationName, nextArrivalLine })
             : '';
           break;
 
@@ -85,7 +81,7 @@ export default defineComponent({
           break;
       }
       return {
-        ...this.scheduledTrain,
+        ...this.sceneryTimetableRow,
         stopStatusDescription,
         stopStatusIndicator
       };
diff --git a/src/components/SceneryView/typings.ts b/src/components/SceneryView/typings.ts
new file mode 100644
index 0000000..7a24107
--- /dev/null
+++ b/src/components/SceneryView/typings.ts
@@ -0,0 +1,13 @@
+import { StopStatus, Train, TrainStop } from '../../typings/common';
+
+export interface SceneryTimetableRow {
+  checkpointStop: TrainStop;
+  train: Train;
+  prevDepartureLine: string | null;
+  nextArrivalLine: string | null;
+  departureLine: string | null;
+  arrivingLine: string | null;
+  prevStationName: string | null;
+  nextStationName: string | null;
+  status: StopStatus;
+}
diff --git a/src/components/SceneryView/utils.ts b/src/components/SceneryView/utils.ts
new file mode 100644
index 0000000..5392dcd
--- /dev/null
+++ b/src/components/SceneryView/utils.ts
@@ -0,0 +1,42 @@
+import { StopStatus, TrainStop } from '../../typings/common';
+
+export const stopStatusPriority = [
+  StopStatus.ONLINE,
+  StopStatus.STOPPED,
+  StopStatus.DEPARTED,
+  StopStatus.ARRIVING,
+  StopStatus.DEPARTED_AWAY,
+  StopStatus.TERMINATED
+];
+
+export function getTrainStopStatus(
+  stopInfo: TrainStop,
+  currentStationName: string,
+  sceneryName: string
+) {
+  if (stopInfo.terminatesHere && stopInfo.confirmed) {
+    return StopStatus.TERMINATED;
+  }
+
+  if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName == sceneryName) {
+    return StopStatus.DEPARTED;
+  }
+
+  if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName != sceneryName) {
+    return StopStatus.DEPARTED_AWAY;
+  }
+
+  if (currentStationName == sceneryName && !stopInfo.stopped) {
+    return StopStatus.ONLINE;
+  }
+
+  if (currentStationName == sceneryName && stopInfo.stopped) {
+    return StopStatus.STOPPED;
+  }
+
+  if (currentStationName != sceneryName) {
+    return StopStatus.ARRIVING;
+  }
+
+  return StopStatus.ONLINE;
+}
diff --git a/src/components/Tooltip/UsersTooltip.vue b/src/components/Tooltip/UsersTooltip.vue
index 3d07f8d..544aebe 100644
--- a/src/components/Tooltip/UsersTooltip.vue
+++ b/src/components/Tooltip/UsersTooltip.vue
@@ -10,7 +10,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { useTooltipStore } from '../../store/tooltipStore';
-import { StationTrain } from '../../typings/common';
+import { Train } from '../../typings/common';
 
 export default defineComponent({
   data() {
@@ -23,7 +23,7 @@ export default defineComponent({
     trains() {
       if (this.tooltipStore.content == '') return [];
 
-      const parsedTrains = JSON.parse(this.tooltipStore.content) as StationTrain[];
+      const parsedTrains = JSON.parse(this.tooltipStore.content) as Train[];
       return (parsedTrains ?? []).sort((a, b) => a.trainNo - b.trainNo);
     }
   }
diff --git a/src/components/TrainsView/TrainModal.vue b/src/components/TrainsView/TrainModal.vue
index daee8f1..40ccc4c 100644
--- a/src/components/TrainsView/TrainModal.vue
+++ b/src/components/TrainsView/TrainModal.vue
@@ -21,7 +21,7 @@ export default defineComponent({
 
   computed: {
     chosenTrain() {
-      return this.store.trainList.find((train) => train.trainId == this.store.chosenModalTrainId);
+      return this.store.trainList.find((train) => train.id == this.store.chosenModalTrainId);
     }
   },
 
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 08d9ca6..a3be347 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -15,10 +15,10 @@
         <li
           class="train-row"
           v-for="train in trains"
-          :key="train.trainId"
+          :key="train.id"
           tabindex="0"
-          @click.stop="selectModalTrain(train.trainId, $event.currentTarget)"
-          @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
+          @click.stop="selectModalTrain(train.id, $event.currentTarget)"
+          @keydown.enter="selectModalTrain(train.id, $event.currentTarget)"
         >
           <TrainInfo :train="train" :extended="false" />
         </li>
diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index 9371ef5..8f56076 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -1,9 +1,9 @@
 import { defineStore } from 'pinia';
-import { parseSpawns, getScheduledTrains, getStationTrains } from './utils';
+import { parseSpawns } from './utils';
 
 import {
   ActiveScenery,
-  ScheduledTrain,
+  CheckpointTrain,
   Station,
   StationRoutes,
   Status,
@@ -12,6 +12,9 @@ import {
 import { useApiStore } from './apiStore';
 import { MainStoreState } from './typings';
 
+const checkpointsTrains: Map<string, CheckpointTrain[]> = new Map();
+const sceneriesTrains: Map<string, Train[]> = new Map();
+
 export const useMainStore = defineStore('mainStore', {
   state: () =>
     ({
@@ -33,10 +36,17 @@ export const useMainStore = defineStore('mainStore', {
     }) as MainStoreState,
 
   getters: {
+    checkpointsTrains() {
+      return checkpointsTrains;
+    },
+
     trainList(): Train[] {
       const apiStore = useApiStore();
 
-      return (apiStore.activeData?.trains ?? [])
+      checkpointsTrains.clear();
+      sceneriesTrains.clear();
+
+      const x = (apiStore.activeData?.trains ?? [])
         .filter((train) => train.timetable || train.online)
         .map((train) => {
           const stock = train.stockString.split(';');
@@ -53,8 +63,8 @@ export const useMainStore = defineStore('mainStore', {
                 sceneryHash
             ) ?? [];
 
-          return {
-            trainId: train.driverName + train.trainNo.toString(),
+          const trainObj = {
+            id: train.id,
 
             trainNo: train.trainNo,
             mass: train.mass,
@@ -93,7 +103,36 @@ export const useMainStore = defineStore('mainStore', {
                 }
               : undefined
           } as Train;
+
+          // Sceneries trains map
+          if (sceneriesTrains.has(train.currentStationName)) {
+            sceneriesTrains.set(train.currentStationName, [
+              ...sceneriesTrains.get(train.currentStationName)!,
+              trainObj
+            ]);
+          } else sceneriesTrains.set(train.currentStationName, [trainObj]);
+
+          // Checkpoints trains map
+          timetable?.stopList.forEach((stop, i) => {
+            if (/strong|podg\.|pe\./.test(stop.stopName)) {
+              const checkpointTrain: CheckpointTrain = {
+                train: trainObj,
+                checkpointStop: stop
+              };
+
+              if (checkpointsTrains.has(stop.stopNameRAW.toLowerCase())) {
+                checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [
+                  ...checkpointsTrains.get(stop.stopNameRAW.toLowerCase())!,
+                  checkpointTrain
+                ]);
+              } else checkpointsTrains.set(stop.stopNameRAW.toLowerCase(), [checkpointTrain]);
+            }
+          });
+
+          return trainObj;
         });
+
+      return x;
     },
 
     // computed active sceneries
@@ -104,6 +143,7 @@ export const useMainStore = defineStore('mainStore', {
 
       if (!apiStore.activeData?.activeSceneries) return [];
 
+      console.time('activeSceneryList');
       const offlineActiveSceneries = this.trainList.reduce((acc, train) => {
         if (!train.timetableData) return acc;
 
@@ -131,13 +171,14 @@ export const useMainStore = defineStore('mainStore', {
             dispatcherId: -1,
             dispatcherExp: -1,
             dispatcherIsSupporter: false,
-            scheduledTrains: [],
-            stationTrains: [],
             dispatcherStatus: Status.ActiveDispatcher.FREE,
             dispatcherTimestamp: -1,
 
             isOnline: false,
 
+            stationTrains: [],
+            scheduledTrains: [],
+
             scheduledTrainCount: {
               all: 0,
               confirmed: 0,
@@ -177,8 +218,9 @@ export const useMainStore = defineStore('mainStore', {
 
           isOnline: scenery.isOnline == 1,
 
-          scheduledTrains: [],
           stationTrains: [],
+          scheduledTrains: [],
+
           scheduledTrainCount: {
             all: 0,
             confirmed: 0,
@@ -196,39 +238,34 @@ export const useMainStore = defineStore('mainStore', {
 
         const station = this.stationList.find((s) => s.name === scenery.name);
 
-        const scheduledTrains = getScheduledTrains(
-          this.trainList,
-          station?.generalInfo,
-          scenery.name,
-          scenery.region
-        );
+        const checkpoints = [scenery.name];
+        if (station?.generalInfo?.checkpoints) checkpoints.push(...station.generalInfo.checkpoints);
 
-        const stationTrains = getStationTrains(
-          this.trainList,
-          scheduledTrains,
-          this.region.id,
-          scenery.name
-        );
+        scenery.stationTrains =
+          sceneriesTrains.get(scenery.name)?.filter((sc) => sc.region == this.region.id) ?? [];
 
-        // Remove checkpoint duplicates
-        const uniqueScheduledTrains = scheduledTrains.reduce(
-          (uniqueList, sTrain) =>
-            uniqueList.find((v) => v.trainId === sTrain.trainId)
-              ? uniqueList
-              : [...uniqueList, sTrain],
-          [] as ScheduledTrain[]
-        );
+        const uniqueTrainIds: string[] = [];
+        checkpoints.forEach((cp) => {
+          const scheduledTrains = checkpointsTrains.get(cp.toLowerCase());
 
-        scenery.scheduledTrains = scheduledTrains;
-        scenery.stationTrains = stationTrains;
+          if (!scheduledTrains) return;
 
-        scenery.scheduledTrainCount = {
-          all: uniqueScheduledTrains.length,
-          confirmed: uniqueScheduledTrains.filter((train) => train.stopInfo.confirmed).length,
-          unconfirmed: uniqueScheduledTrains.filter((train) => !train.stopInfo.confirmed).length
-        };
+          scheduledTrains.forEach(({ train, checkpointStop }) => {
+            if (uniqueTrainIds.includes(train.id) || train.region != this.region.id) return;
+
+            scenery.scheduledTrainCount.all += 1;
+            scenery.scheduledTrains.push({ train, checkpointStop });
+
+            if (checkpointStop.confirmed) scenery.scheduledTrainCount.confirmed++;
+            else scenery.scheduledTrainCount.unconfirmed++;
+
+            uniqueTrainIds.push(train.id);
+          });
+        });
       }
 
+      console.timeEnd('activeSceneryList');
+
       return allActiveSceneries;
     },
 
diff --git a/src/store/typings.ts b/src/store/typings.ts
index 4270727..bdb486a 100644
--- a/src/store/typings.ts
+++ b/src/store/typings.ts
@@ -1,5 +1,5 @@
 import { API } from '../typings/api';
-import { Availability, StationRoutesInfo, Status } from '../typings/common';
+import { Availability, CheckpointTrain, StationRoutesInfo, Status } from '../typings/common';
 
 export interface MainStoreState {
   region: { id: string; value: string; name: string };
diff --git a/src/store/utils.ts b/src/store/utils.ts
index 36413e1..fa13f27 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -2,7 +2,6 @@ import {
   TrainStop,
   StopStatus,
   Train,
-  ScheduledTrain,
   Station,
   StationTrain,
   ScenerySpawn,
@@ -57,176 +56,3 @@ export function parseSpawns(spawnString: string | null): ScenerySpawn[] {
 export function getTimestamp(date: string | null): number {
   return date ? new Date(date).getTime() : 0;
 }
-
-export function getTrainStopStatus(
-  stopInfo: TrainStop,
-  currentStationName: string,
-  sceneryName: string
-) {
-  let stopStatus = StopStatus.ARRIVING,
-    stopLabel = '',
-    stopStatusID = -1;
-
-  if (stopInfo.terminatesHere && stopInfo.confirmed) {
-    stopStatus = StopStatus.TERMINATED;
-    stopLabel = 'Skończył bieg';
-    stopStatusID = 5;
-  } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName == sceneryName) {
-    stopStatus = StopStatus.DEPARTED;
-    stopLabel = 'Odprawiony';
-    stopStatusID = 2;
-  } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName != sceneryName) {
-    stopStatus = StopStatus.DEPARTED_AWAY;
-    stopLabel = 'Odjechał';
-    stopStatusID = 4;
-  } else if (currentStationName == sceneryName && !stopInfo.stopped) {
-    stopStatus = StopStatus.ONLINE;
-    stopLabel = 'Na stacji';
-    stopStatusID = 0;
-  } else if (currentStationName == sceneryName && stopInfo.stopped) {
-    stopStatus = StopStatus.STOPPED;
-    stopLabel = 'Postój';
-    stopStatusID = 1;
-  } else if (currentStationName != sceneryName) {
-    stopStatus = StopStatus.ARRIVING;
-    stopLabel = 'W drodze';
-    stopStatusID = 3;
-  }
-
-  return { stopStatus, stopLabel, stopStatusID };
-}
-
-export function getCheckpointTrain(
-  train: Train,
-  trainStopIndex: number,
-  sceneryName: string
-): ScheduledTrain {
-  const timetable = train.timetableData!;
-  const followingStops = timetable.followingStops;
-  const trainStop = followingStops[trainStopIndex];
-
-  const trainStopStatus = getTrainStopStatus(trainStop, train.currentStationName, sceneryName);
-
-  let prevStationName = '',
-    nextStationName = '';
-
-  let departureLine: string | null = null;
-  let arrivingLine: string | null = null;
-
-  let prevDepartureLine: string | null = null,
-    nextArrivalLine: string | null = null;
-
-  for (let i = trainStopIndex; i >= 0; i--) {
-    const stop = 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 = followingStops[i - 1]?.departureLine || null;
-    }
-  }
-
-  for (let i = trainStopIndex; i < followingStops.length; i++) {
-    const stop = 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 = followingStops[i + 1]?.arrivalLine || null;
-    }
-  }
-
-  return {
-    checkpointName: trainStop.stopNameRAW,
-
-    trainNo: train.trainNo,
-    trainId: train.trainId,
-
-    signal: train.signal,
-    connectedTrack: train.connectedTrack,
-
-    driverName: train.driverName,
-    driverId: train.driverId,
-    currentStationName: train.currentStationName,
-    currentStationHash: train.currentStationHash,
-    category: timetable.category,
-    beginsAt: timetable.followingStops[0].stopNameRAW,
-    terminatesAt: timetable.followingStops[timetable.followingStops.length - 1].stopNameRAW,
-
-    nextStationName,
-    prevStationName,
-
-    stopInfo: trainStop,
-    stopLabel: trainStopStatus.stopLabel,
-    stopStatus: trainStopStatus.stopStatus,
-    stopStatusID: trainStopStatus.stopStatusID,
-
-    region: train.region,
-
-    arrivingLine: arrivingLine,
-    departureLine: departureLine,
-
-    nextArrivalLine,
-    prevDepartureLine
-  };
-}
-
-export function getScheduledTrains(
-  trainList: Train[],
-  stationGeneralInfo: Station['generalInfo'],
-  stationName: string,
-  region: string
-  // sceneryData: API.ActiveSceneries.Data,
-): ScheduledTrain[] {
-  // stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
-
-  return trainList.reduce((acc: ScheduledTrain[], train) => {
-    if (!train.timetableData) return acc;
-    if (train.region != region) return acc;
-
-    const timetable = train.timetableData;
-    if (!timetable.sceneryNames.includes(stationName)) return acc;
-
-    const checkpoints = [stationName];
-    if (stationGeneralInfo?.checkpoints) checkpoints.push(...stationGeneralInfo.checkpoints);
-
-    const checkpointScheduledTrains: ScheduledTrain[] = [];
-    for (let i = 0; i < timetable.followingStops.length; i++) {
-      if (
-        new RegExp(`^(${checkpoints.join('|')})$`, 'i').test(
-          timetable.followingStops[i].stopNameRAW
-        )
-      ) {
-        checkpointScheduledTrains.push(getCheckpointTrain(train, i, stationName));
-      }
-    }
-
-    acc.push(...checkpointScheduledTrains);
-    return acc;
-  }, []) as ScheduledTrain[];
-}
-
-export function getStationTrains(
-  trainList: Train[],
-  scheduledTrainList: ScheduledTrain[],
-  region: string,
-  stationName: string
-): StationTrain[] {
-  return trainList
-    .filter(
-      (train) =>
-        train?.region === region && train.online && train.currentStationName === stationName
-    )
-    .map((train) => ({
-      driverName: train.driverName,
-      driverId: train.driverId,
-      trainNo: train.trainNo,
-      trainId: train.trainId,
-      stopStatus:
-        scheduledTrainList.find((st) => st.trainNo === train.trainNo)?.stopStatus || 'no-timetable'
-    }));
-}
diff --git a/src/typings/api.ts b/src/typings/api.ts
index 847c9af..f37635d 100644
--- a/src/typings/api.ts
+++ b/src/typings/api.ts
@@ -161,7 +161,6 @@ export namespace API {
       stopNameRAW: string;
       stopType: string;
       stopDistance: number;
-      pointId: string;
 
       mainStop: boolean;
 
diff --git a/src/typings/common.ts b/src/typings/common.ts
index 4bc710c..3be1cf6 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -41,7 +41,6 @@ export interface RegionCounters {
 
 export interface Train {
   id: string;
-  trainId: string;
   mass: number;
   length: number;
   speed: number;
@@ -148,8 +147,8 @@ export interface ActiveScenery {
   dispatcherStatus: Status.ActiveDispatcher | number;
   dispatcherTimestamp: number | null;
   isOnline: boolean;
-  stationTrains?: StationTrain[];
-  scheduledTrains?: ScheduledTrain[];
+  stationTrains: Train[];
+  scheduledTrains: CheckpointTrain[];
   scheduledTrainCount: {
     all: number;
     confirmed: number;
@@ -164,49 +163,6 @@ export interface ScenerySpawn {
   spawnType: ScenerySpawnType;
 }
 
-export interface StationTrain {
-  driverName: string;
-  driverId: number;
-  trainNo: number;
-  trainId: string;
-  stopStatus: string;
-}
-
-export interface ScheduledTrain {
-  checkpointName: string;
-
-  trainId: string;
-  trainNo: number;
-
-  driverName: string;
-  driverId: number;
-  currentStationName: string;
-  currentStationHash: string;
-  category: string;
-  stopInfo: TrainStop;
-
-  terminatesAt: string;
-  beginsAt: string;
-
-  prevStationName: string;
-  nextStationName: string;
-
-  arrivingLine: string | null;
-  departureLine: string | null;
-
-  prevDepartureLine: string | null;
-  nextArrivalLine: string | null;
-
-  signal: string;
-  connectedTrack: string;
-
-  stopLabel: string;
-  stopStatus: StopStatus;
-  stopStatusID: number;
-
-  region: string;
-}
-
 export interface TrainStop {
   stopName: string;
   stopNameRAW: string;
@@ -223,13 +179,17 @@ export interface TrainStop {
   departureTimestamp: number;
   departureRealTimestamp: number;
   departureDelay: number;
-  pointId: number;
 
   comments?: string;
 
   beginsHere: boolean;
   terminatesHere: boolean;
-  confirmed: boolean;
-  stopped: boolean;
+  confirmed: number;
+  stopped: number;
   stopTime: number | null;
 }
+
+export interface CheckpointTrain {
+  checkpointStop: TrainStop;
+  train: Train;
+}

From 6901c3d2b4e8ca90379f23fced1fd8edc0839162 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 19 May 2024 22:30:21 +0200
Subject: [PATCH 02/13] chore: hotfix

---
 src/store/utils.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/store/utils.ts b/src/store/utils.ts
index fa13f27..8744e10 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -1,12 +1,4 @@
-import {
-  TrainStop,
-  StopStatus,
-  Train,
-  Station,
-  StationTrain,
-  ScenerySpawn,
-  ScenerySpawnType
-} from '../typings/common';
+import { ScenerySpawn, ScenerySpawnType } from '../typings/common';
 
 export function getStatusTimestamp(stationStatus: any): number {
   if (!stationStatus) return -2;

From 3ed2c0918478dd6680b43d0fd61e502f8138243a Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 19 May 2024 23:05:57 +0200
Subject: [PATCH 03/13] chore: checkpoints filtering

---
 src/store/mainStore.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index 8f56076..a4a9c33 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -251,10 +251,11 @@ export const useMainStore = defineStore('mainStore', {
           if (!scheduledTrains) return;
 
           scheduledTrains.forEach(({ train, checkpointStop }) => {
+            scenery.scheduledTrains.push({ train, checkpointStop });
+
             if (uniqueTrainIds.includes(train.id) || train.region != this.region.id) return;
 
             scenery.scheduledTrainCount.all += 1;
-            scenery.scheduledTrains.push({ train, checkpointStop });
 
             if (checkpointStop.confirmed) scenery.scheduledTrainCount.confirmed++;
             else scenery.scheduledTrainCount.unconfirmed++;

From 7e75fa25162ba36f1cdcafe888beab2586eae4dd Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 19 May 2024 23:12:07 +0200
Subject: [PATCH 04/13] chore: checkpoints hotfix

---
 src/store/mainStore.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index a4a9c33..5ad01a0 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -239,7 +239,8 @@ export const useMainStore = defineStore('mainStore', {
         const station = this.stationList.find((s) => s.name === scenery.name);
 
         const checkpoints = [scenery.name];
-        if (station?.generalInfo?.checkpoints) checkpoints.push(...station.generalInfo.checkpoints);
+        if (station?.generalInfo?.checkpoints)
+          checkpoints.push(...station.generalInfo.checkpoints.filter((cp) => cp != scenery.name));
 
         scenery.stationTrains =
           sceneriesTrains.get(scenery.name)?.filter((sc) => sc.region == this.region.id) ?? [];

From 1a8da02cedf2afb341feab18f256ed2f77bcd4b9 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 19 May 2024 23:42:06 +0200
Subject: [PATCH 05/13] chore: checkpoints detection fix

---
 src/components/SceneryView/SceneryTimetable.vue | 6 +++---
 src/store/mainStore.ts                          | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 908a4fa..c6d0788 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -213,9 +213,7 @@ export default defineComponent({
     const mainStore = useMainStore();
 
     const chosenCheckpoint = ref(
-      props.station?.generalInfo?.checkpoints?.length == 0
-        ? ''
-        : props.station?.generalInfo?.checkpoints[0] ?? null
+      props.station?.generalInfo?.checkpoints[0] ?? props.station?.name ?? ''
     );
 
     return {
@@ -238,6 +236,8 @@ export default defineComponent({
       if (!this.station) return [];
       if (!this.onlineScenery) return [];
 
+      console.log(this.onlineScenery.scheduledTrains, this.chosenCheckpoint);
+
       return this.onlineScenery.scheduledTrains
         .filter(
           (ct) =>
diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index 5ad01a0..1ac3b12 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -239,8 +239,8 @@ export const useMainStore = defineStore('mainStore', {
         const station = this.stationList.find((s) => s.name === scenery.name);
 
         const checkpoints = [scenery.name];
-        if (station?.generalInfo?.checkpoints)
-          checkpoints.push(...station.generalInfo.checkpoints.filter((cp) => cp != scenery.name));
+        if (station?.generalInfo?.checkpoints && station.generalInfo.checkpoints.length > 0)
+          checkpoints.push(...station.generalInfo.checkpoints.filter((cp) => cp !== station.name));
 
         scenery.stationTrains =
           sceneriesTrains.get(scenery.name)?.filter((sc) => sc.region == this.region.id) ?? [];
@@ -320,7 +320,10 @@ export const useMainStore = defineStore('mainStore', {
             ...scenery,
             authors: scenery.authors?.split(',').map((a) => a.trim()),
             routes: routes,
-            checkpoints: scenery.checkpoints?.split(';') ?? []
+            checkpoints:
+              scenery.checkpoints && scenery.checkpoints.trim().length > 0
+                ? scenery.checkpoints.split(';')
+                : []
           }
         };
       });

From a5b5df7452e707f376101f937bc43d256e1c0bd3 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 21 May 2024 16:17:23 +0200
Subject: [PATCH 06/13] refactor: restructured station filters

---
 src/components/StationsView/FilterOption.vue  |  25 +-
 .../StationsView/StationFilterCard.vue        | 227 ++++++++-------
 src/components/StationsView/StationTable.vue  |  62 ++--
 src/components/StationsView/typings.ts        |  77 ++---
 src/components/StationsView/utils.ts          |   0
 src/locales/en.json                           |  25 +-
 src/locales/pl.json                           |  24 +-
 src/managers/stationFilterManager.ts          | 116 ++++++++
 src/managers/storageManager.ts                |   4 +
 src/scripts/data/stationHeaderNames.ts        |  20 --
 src/scripts/utils/stationFilterUtils.ts       | 275 ++++++++++--------
 src/store/stationFiltersStore.ts              |  87 +-----
 src/typings/common.ts                         |  45 ++-
 src/views/StationsView.vue                    |  24 +-
 14 files changed, 546 insertions(+), 465 deletions(-)
 create mode 100644 src/components/StationsView/utils.ts
 create mode 100644 src/managers/stationFilterManager.ts

diff --git a/src/components/StationsView/FilterOption.vue b/src/components/StationsView/FilterOption.vue
index 5376db0..381f3a4 100644
--- a/src/components/StationsView/FilterOption.vue
+++ b/src/components/StationsView/FilterOption.vue
@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';
 
 interface FilterOption {
   id: string;
@@ -40,15 +39,9 @@ export default defineComponent({
 
   emits: ['update:optionValue'],
 
-  setup() {
-    return {
-      filterStore: useStationFiltersStore()
-    };
-  },
-
   watch: {
     'option.value'() {
-      this.filterStore.changeFilterValue(this.option.name, !this.option.value);
+      // this.filterStore.changeFilterValue(this.option.name, !this.option.value);
     }
   },
 
@@ -56,17 +49,17 @@ export default defineComponent({
     handleDbClick(e: Event) {
       e.preventDefault();
 
-      this.filterStore.lastClickedFilterId = this.option.id;
+      // this.filterStore.lastClickedFilterId = this.option.id;
       // this.option.value = true;
       this.$emit('update:optionValue', true);
 
-      this.filterStore.inputs.options
-        .filter((option) => {
-          return option.section == this.option.section && option.id != this.option.id;
-        })
-        .forEach((option) => {
-          option.value = !this.option.value;
-        });
+      // this.filterStore.inputs.options
+      //   .filter((option) => {
+      //     return option.section == this.option.section && option.id != this.option.id;
+      //   })
+      //   .forEach((option) => {
+      //     option.value = !this.option.value;
+      //   });
     }
   }
 });
diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue
index ced72ed..19b7ac4 100644
--- a/src/components/StationsView/StationFilterCard.vue
+++ b/src/components/StationsView/StationFilterCard.vue
@@ -4,7 +4,7 @@
       <button class="card-button btn--filled btn--image" @click="toggleCard">
         <img class="button_icon" src="/images/icon-filter2.svg" alt="filter icon" />
         <p>[F] {{ $t('options.filters') }}</p>
-        <span class="active-indicator" v-if="!filterStore.areFiltersAtDefault"></span>
+        <span class="active-indicator" v-if="!areFiltersAtDefaultComp"></span>
       </button>
 
       <label for="scenery-search">
@@ -36,26 +36,37 @@
           <section class="card_options">
             <div
               class="option-section"
-              v-for="section in filterStore.inputs.optionSections"
-              :key="section"
+              v-for="(sectionFilters, sectionKey) in filtersSections"
+              :key="sectionKey"
             >
               <h3 class="text--primary">
-                {{ $t(`filters.sections.${section}`) }}
+                {{ $t(`filters.sections.${sectionKey}`) }}
 
-                <button @click="filterStore.resetSectionOptions(section)">RESET</button>
+                <button @click="resetSectionOptions(sectionKey)">RESET</button>
               </h3>
 
               <hr />
 
-              <div class="section-inputs">
-                <FilterOption
-                  v-for="(option, i) in filterStore.inputs.options.filter(
-                    (o) => o.section == section
-                  )"
-                  v-model:optionValue="option.value"
-                  :option="option"
-                  :key="i"
-                />
+              <!-- 
+                  @dblclick="handleDbClick"
+
+               -->
+              <div class="section-filters">
+                <div
+                  v-for="filter in sectionFilters"
+                  @click="() => (filters[filter] = !filters[filter])"
+                >
+                  <input
+                    :checked="filters[filter]"
+                    v-model="filters[filter]"
+                    type="checkbox"
+                    :class="sectionKey"
+                    :name="filter"
+                  />
+                  <span>
+                    {{ $t(`filters.${filter}`) }}
+                  </span>
+                </div>
               </div>
             </div>
           </section>
@@ -68,7 +79,7 @@
               <span>{{
                 minimumHours == 0
                   ? $t('filters.now')
-                  : minimumHours < 8
+                  : minimumHours < 7
                     ? minimumHours + $t('filters.hour')
                     : $t('filters.no-limit')
               }}</span>
@@ -76,21 +87,21 @@
             </span>
           </section>
 
-          <datalist id="authors">
-            <option v-for="(author, i) in authors" :key="i" :value="author"></option>
-          </datalist>
-
           <section class="card_authors-search">
             <h3 class="section-header">{{ $t('filters.authors-search') }}</h3>
 
+            <datalist id="authors" name="authors">
+              <option v-for="(author, i) in authorsHint" :key="i" :value="author"></option>
+            </datalist>
+
             <form action="javascript:void(0);" @submit="handleAuthorsInput">
               <input
                 type="text"
                 id="author"
                 list="authors"
                 name="authors"
+                v-model="authors"
                 :placeholder="$t('filters.authors-placeholder')"
-                v-model="authorsInputValue"
                 @focus="preventKeyDown = true"
                 @blur="preventKeyDown = false"
               />
@@ -100,19 +111,18 @@
           </section>
 
           <section class="card_sliders">
-            <div class="slider" v-for="(slider, i) in filterStore.inputs.sliders" :key="i">
+            <div class="slider" v-for="(slider, i) in initSliders" :key="i">
               <input
                 class="slider-input"
                 type="range"
-                :name="slider.name"
+                :name="slider.id"
                 :id="slider.id"
                 :min="slider.minRange"
                 :max="slider.maxRange"
                 :step="slider.step"
-                v-model="slider.value"
-                @change="handleInput"
+                v-model="filters[slider.id]"
               />
-              <span class="slider-value">{{ slider.value }}</span>
+              <span class="slider-value">{{ filters[slider.id] }}</span>
               <div class="slider-content">
                 {{ $t(`filters.sliders.${slider.id}`) }}
               </div>
@@ -133,9 +143,9 @@
 
             <button
               class="btn--action"
+              :disabled="areFiltersAtDefaultComp"
+              :data-disabled="areFiltersAtDefaultComp"
               @click="resetFilters"
-              :disabled="filterStore.areFiltersAtDefault"
-              :data-disabled="filterStore.areFiltersAtDefault"
             >
               [R] {{ $t('filters.reset') }}
             </button>
@@ -151,12 +161,21 @@
 import { defineComponent, inject } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
 import routerMixin from '../../mixins/routerMixin';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';
 import { useMainStore } from '../../store/mainStore';
 
 import FilterOption from './FilterOption.vue';
 import StorageManager from '../../managers/storageManager';
 
+import {
+  filtersSections,
+  initSliders,
+  initFilters,
+  areFiltersAtDefault
+} from '../../managers/stationFilterManager';
+
+import { StationFilterSection } from '../../managers/stationFilterManager';
+import { computed } from 'vue';
+
 export default defineComponent({
   components: { FilterOption },
   mixins: [keyMixin, routerMixin],
@@ -165,8 +184,11 @@ export default defineComponent({
     saveOptions: false,
     STORAGE_KEY: 'options_saved',
 
-    authorsInputValue: '',
+    filtersSections,
+    initSliders,
+
     minimumHours: 0,
+    authors: '',
 
     currentRegion: { id: '', value: '' },
 
@@ -180,12 +202,16 @@ export default defineComponent({
   setup() {
     const isVisible = inject('isFilterCardVisible');
     const store = useMainStore();
-    const filterStore = useStationFiltersStore();
+
+    const filters = inject('StationsView_filters') as Record<string, any>;
+
+    const areFiltersAtDefaultComp = computed(() => areFiltersAtDefault(filters));
 
     return {
       isVisible,
       store,
-      filterStore
+      filters,
+      areFiltersAtDefaultComp
     };
   },
 
@@ -194,8 +220,6 @@ export default defineComponent({
 
     if (StorageManager.isRegistered('onlineFromHours') && this.saveOptions) {
       this.minimumHours = StorageManager.getNumericValue('onlineFromHours');
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours);
     }
 
     this.currentRegion = this.store.region;
@@ -214,7 +238,7 @@ export default defineComponent({
       return true;
     },
 
-    authors() {
+    authorsHint() {
       return this.store.stationList
         .reduce((acc, station) => {
           station.generalInfo?.authors?.forEach((author) => {
@@ -258,35 +282,19 @@ export default defineComponent({
       this.scrollTop = (e.target as HTMLElement).scrollTop;
     },
 
-    handleInput(e: Event) {
-      const target = e.target as HTMLInputElement;
-
-      this.filterStore.changeFilterValue(target.name, target.value);
-
-      if (this.saveOptions) StorageManager.setStringValue(target.name, target.value);
-    },
-
     handleAuthorsInput() {
-      this.filterStore.changeFilterValue('authors', this.authorsInputValue);
-
-      if (this.saveOptions) StorageManager.setStringValue('authors', this.authorsInputValue);
-    },
-
-    changeNumericFilterValue(name: string, value: number, saveToStorage = false) {
-      this.filterStore.changeFilterValue(name, value);
-      if (this.saveOptions && saveToStorage) StorageManager.setNumericValue(name, value);
+      this.filters['authors'] = this.authors;
+      // if (this.saveOptions) StorageManager.setStringValue('authors', target.value);
     },
 
     subHour() {
-      this.minimumHours = this.minimumHours < 1 ? 8 : this.minimumHours - 1;
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
+      this.minimumHours = this.minimumHours < 1 ? 7 : this.minimumHours - 1;
+      this.filters['onlineFromHours'] = this.minimumHours;
     },
 
     addHour() {
-      this.minimumHours = this.minimumHours > 7 ? 0 : this.minimumHours + 1;
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
+      this.minimumHours = this.minimumHours > 6 ? 0 : this.minimumHours + 1;
+      this.filters['onlineFromHours'] = this.minimumHours;
     },
 
     saveFilters() {
@@ -299,20 +307,26 @@ export default defineComponent({
 
       StorageManager.registerStorage(this.STORAGE_KEY);
 
-      this.filterStore.inputs.options.forEach((option) =>
-        StorageManager.setBooleanValue(option.name, !option.value)
-      );
-      this.filterStore.inputs.sliders.forEach((slider) =>
-        StorageManager.setNumericValue(slider.name, slider.value)
-      );
+      Object.keys(this.filters).forEach((filterKey) => {
+        StorageManager.setValue(filterKey, this.filters[filterKey]);
+      });
     },
 
     resetFilters() {
-      this.authorsInputValue = '';
-
+      // Reset local model values
       this.minimumHours = 0;
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
-      this.filterStore.resetFilters();
+      this.authors = '';
+
+      // Reset global filters
+      Object.keys(this.filters).forEach((filterKey) => {
+        this.filters[filterKey] = (initFilters as any)[filterKey];
+      });
+    },
+
+    resetSectionOptions(key: string) {
+      filtersSections[key as StationFilterSection].forEach((filter) => {
+        this.filters[filter] = (initFilters as any)[filter];
+      });
     },
 
     closeCard() {
@@ -374,28 +388,6 @@ h3.section-header {
   text-align: center;
 }
 
-.card_regions {
-  display: flex;
-  justify-content: center;
-
-  label > input {
-    display: none;
-  }
-
-  label > span {
-    padding: 0.25em 0.5em;
-    margin: 0 0.25em;
-
-    cursor: pointer;
-
-    background-color: gray;
-
-    &.checked {
-      background-color: seagreen;
-    }
-  }
-}
-
 .card_timestamp {
   display: flex;
   flex-direction: column;
@@ -441,6 +433,52 @@ h3.section-header {
   }
 }
 
+.section-filters {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 0.5em;
+  margin: 1em 0;
+}
+
+.section-filters > div {
+  position: relative;
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+
+  span {
+    cursor: pointer;
+    display: inline-block;
+    width: 100%;
+    text-align: center;
+    padding: 0.25em;
+    font-weight: bold;
+    background-color: forestgreen;
+  }
+
+  span:hover {
+    background-color: #22aa22;
+  }
+
+  input[type='checkbox'] {
+    cursor: pointer;
+    position: absolute;
+    opacity: 0;
+
+    &:checked + span {
+      background-color: #444;
+
+      &:hover {
+        background-color: #555;
+      }
+    }
+
+    &:focus-visible + span {
+      outline: 1px solid $accentCol;
+    }
+  }
+}
+
 .card_actions {
   padding: 0.5em;
 
@@ -475,19 +513,6 @@ h3.section-header {
   }
 }
 
-.section-inputs {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 0.5em;
-  margin: 1em 0;
-}
-
-.quick-actions div {
-  display: flex;
-  margin: 1em 0;
-  gap: 1em;
-}
-
 .slider {
   display: flex;
   align-items: center;
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 3569faa..c9877a5 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -1,10 +1,10 @@
 <template>
   <section class="station_table">
     <Loading
-      v-if="apiStore.dataStatuses.connection == Status.Loading && displayedStations.length == 0"
+      v-if="apiStore.dataStatuses.connection == Status.Loading && filteredStationList.length == 0"
     />
 
-    <div class="table_wrapper" v-else-if="displayedStations.length > 0">
+    <div class="table_wrapper" v-else-if="filteredStationList.length > 0">
       <table>
         <thead>
           <tr>
@@ -20,8 +20,8 @@
 
                 <img
                   class="sort-icon"
-                  v-if="sorterActive.headerName == headerName"
-                  :src="`/images/icon-arrow-${sorterActive.dir == 1 ? 'asc' : 'desc'}.svg`"
+                  v-if="activeSorter.headerName == headerName"
+                  :src="`/images/icon-arrow-${activeSorter.dir == 1 ? 'asc' : 'desc'}.svg`"
                   alt="sort icon"
                 />
               </span>
@@ -43,8 +43,8 @@
 
                 <img
                   class="sort-icon"
-                  v-if="sorterActive.headerName == headerName"
-                  :src="`/images/icon-arrow-${sorterActive.dir == 1 ? 'asc' : 'desc'}.svg`"
+                  v-if="activeSorter.headerName == headerName"
+                  :src="`/images/icon-arrow-${activeSorter.dir == 1 ? 'asc' : 'desc'}.svg`"
                   alt="sort icon"
                 />
               </span>
@@ -54,7 +54,7 @@
 
         <tbody>
           <tr
-            v-for="station in displayedStations"
+            v-for="station in filteredStationList"
             :class="{ 'last-selected': lastSelectedStationName == station.name }"
             :key="station.name"
             @click.left="setScenery(station.name)"
@@ -309,20 +309,21 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, inject, computed } from 'vue';
+import StationStatusBadge from '../Global/StationStatusBadge.vue';
 import dateMixin from '../../mixins/dateMixin';
 import styleMixin from '../../mixins/styleMixin';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';
 import { useMainStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
-import { HeadIdsTypes, headIconsIds, headIds } from '../../scripts/data/stationHeaderNames';
-import StationStatusBadge from '../Global/StationStatusBadge.vue';
-import { Station, Status } from '../../typings/common';
+import { Status } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
 import { useTooltipStore } from '../../store/tooltipStore';
+import { filterStations, sortStations } from '../../scripts/utils/stationFilterUtils';
+import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
 
 export default defineComponent({
   emits: ['toggleDonationModal'],
+
   components: { Loading, StationStatusBadge },
   mixins: [styleMixin, dateMixin],
 
@@ -332,35 +333,36 @@ export default defineComponent({
     lastSelectedStationName: ''
   }),
 
-  computed: {
-    sorterActive() {
-      return this.stationFiltersStore.sorterActive;
-    },
-
-    displayedStations() {
-      return this.stationFiltersStore.filteredStationList;
-    }
-  },
-
   setup() {
     const mainStore = useMainStore();
     const apiStore = useApiStore();
     const tooltipStore = useTooltipStore();
 
-    const stationFiltersStore = useStationFiltersStore();
+    const filters = inject('StationsView_filters') as Record<string, any>;
+    const activeSorter = inject('StationsView_activeSorter') as ActiveSorter;
+
+    const filteredStationList = computed(() =>
+      mainStore.allStationInfo
+        .filter((station) => filterStations(station, filters))
+        .sort((a, b) => sortStations(a, b, activeSorter))
+    );
+    // const areFiltersAtDefault = computed(() => {
+
+    // })
 
     return {
       Status: Status.Data,
-      stationFiltersStore,
       mainStore,
       apiStore,
-      tooltipStore
+      tooltipStore,
+      filteredStationList,
+      activeSorter
     };
   },
 
   methods: {
     setScenery(name: string) {
-      const station = this.displayedStations.find((station) => station.name === name);
+      const station = this.filteredStationList.find((station) => station.name === name);
 
       if (!station) return;
 
@@ -388,10 +390,14 @@ export default defineComponent({
       window.open(url, '_blank');
     },
 
-    changeSorter(headerName: HeadIdsTypes) {
+    changeSorter(headerName: HeadIdsType) {
       if (headerName == 'general') return;
 
-      this.stationFiltersStore.changeSorter(headerName);
+      if (headerName == this.activeSorter.headerName)
+        this.activeSorter.dir = -1 * this.activeSorter.dir;
+      else this.activeSorter.dir = 1;
+
+      this.activeSorter.headerName = headerName;
     }
   }
 });
diff --git a/src/components/StationsView/typings.ts b/src/components/StationsView/typings.ts
index aa23860..545980c 100644
--- a/src/components/StationsView/typings.ts
+++ b/src/components/StationsView/typings.ts
@@ -5,56 +5,29 @@ export interface FilterOption {
   defaultValue: boolean;
 }
 
-export interface Filter {
-  [key: string]: boolean | number | string;
-  default: boolean;
-  notDefault: boolean;
-  real: boolean;
-  fictional: boolean;
-  SPK: boolean;
-  SCS: boolean;
-  SPE: boolean;
-  SUP: boolean;
-  noSUP: boolean;
-  ASDEK: boolean;
-  noASDEK: boolean;
-  ręczne: boolean;
-  'ręczne+SPK': boolean;
-  'ręczne+SCS': boolean;
-  mechaniczne: boolean;
-  'mechaniczne+SPK': boolean;
-  'mechaniczne+SCS': boolean;
-  SBL: boolean;
-  PBL: boolean;
-  współczesna: boolean;
-  kształtowa: boolean;
-  historyczna: boolean;
-  mieszana: boolean;
-  minLevel: number;
-  maxLevel: number;
-  minOneWayCatenary: number;
-  minOneWay: number;
-  minTwoWayCatenary: number;
-  minTwoWay: number;
-  minVmax: number;
-  maxVmax: number;
-  'no-1track': boolean;
-  'no-2track': boolean;
-  'include-selected': boolean;
-  free: boolean;
-  occupied: boolean;
-  nonPublic: boolean;
-  unavailable: boolean;
-  abandoned: boolean;
-  endingStatus: boolean;
-  afkStatus: boolean;
-  noSpaceStatus: boolean;
-  unavailableStatus: boolean;
-  unsignedStatus: boolean;
-  authors: string;
-  onlineFromHours: number;
-  withActiveTimetables: boolean;
-  withoutActiveTimetables: boolean;
-  junction: boolean;
-  nonJunction: boolean;
+export const headIds = [
+  'station',
+  'min-lvl',
+  'status',
+  'dispatcher',
+  'dispatcher-lvl',
+  'routes-single',
+  'routes-double',
+  'general'
+] as const;
+
+export const headIconsIds = [
+  'user',
+  'like',
+  'spawn',
+  'timetableAll',
+  'timetableUnconfirmed',
+  'timetableConfirmed'
+] as const;
+
+export type HeadIdsType = (typeof headIds)[number] | (typeof headIconsIds)[number];
+
+export interface ActiveSorter {
+  headerName: HeadIdsType;
+  dir: number;
 }
diff --git a/src/components/StationsView/utils.ts b/src/components/StationsView/utils.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/locales/en.json b/src/locales/en.json
index c0143cb..2922047 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -174,9 +174,9 @@
 
     "sections": {
       "quick": "QUICK FILTERS",
-      "station-type": "STATION TYPE",
+      "stationType": "STATION TYPE",
       "reality": "SCENERY REALITY",
-      "package-access": "IN-GAME AVAILABILITY",
+      "packageAccess": "IN-GAME AVAILABILITY",
       "access": "GENERAL AVAILABILITY",
       "control": "CONTROLS",
       "signals": "SIGNALLING",
@@ -197,11 +197,11 @@
 
     "title": "STATION FILTERS",
     "default": "IN-GAME",
-    "not-default": "ADDITIONAL",
+    "notDefault": "ADDITIONAL",
     "real": "REAL",
     "fictional": "FICTIONAL",
     "unavailable": "UNSUPPORTED",
-    "non-public": "NON-PUBLIC",
+    "nonPublic": "NON-PUBLIC",
     "abandoned": "ABANDONED",
 
     "SPK": "SPK",
@@ -211,7 +211,6 @@
     "SCS-R": "SCS + MANUAL",
     "SCS-M": "SCS + MECH.",
     "SPE": "SPE",
-
     "manual": "MANUAL",
     "mechanical": "MECHANICAL",
 
@@ -238,14 +237,14 @@
     "nonJunction": "OTHER",
 
     "sliders": {
-      "min-lvl": "MIN. REQUIRED DISPATCHER LEVEL",
-      "max-lvl": "MAX. REQUIRED DISPATCHER LEVEL",
-      "min-vmax": "MIN. SCENERY ROUTE SPEED",
-      "max-vmax": "MAX. SCENERY ROUTE SPEED",
-      "routes-1t-cat": "MIN. CATENARY SINGLE TRACK ROUTES",
-      "routes-1t-other": "MIN. OTHER SINGLE TRACK ROUTES",
-      "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES",
-      "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES"
+      "minLevel": "MIN. REQUIRED DISPATCHER LEVEL",
+      "maxLevel": "MAX. REQUIRED DISPATCHER LEVEL",
+      "minVmax": "MIN. SCENERY ROUTE SPEED",
+      "maxVmax": "MAX. SCENERY ROUTE SPEED",
+      "minOneWayCatenary": "MIN. CATENARY SINGLE TRACK ROUTES",
+      "minOneWay": "MIN. OTHER SINGLE TRACK ROUTES",
+      "minTwoWayCatenary": "MIN. CATENARY DOUBLE TRACK ROUTES",
+      "minTwoWay": "MIN. OTHER DOUBLE TRACK ROUTES"
     },
 
     "authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 9ad41ee..b01ee45 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -171,9 +171,9 @@
 
     "sections": {
       "quick": "SZYBKIE FILTRY",
-      "station-type": "RODZAJ STACJI",
+      "stationType": "RODZAJ STACJI",
       "reality": "FIKCYJNOŚĆ SCENERII",
-      "package-access": "DOSTĘPNOŚĆ W PACZCE",
+      "packageAccess": "DOSTĘPNOŚĆ W PACZCE",
       "access": "DOSTĘPNOŚĆ OGÓLNA",
       "control": "TYP STEROWANIA",
       "signals": "TYP SYGNALIZACJI",
@@ -194,11 +194,11 @@
 
     "title": "FILTRUJ STACJE",
     "default": "DOMYŚLNA",
-    "not-default": "POZA PACZKĄ",
+    "notDefault": "POZA PACZKĄ",
     "real": "REALNA",
     "fictional": "FIKCYJNA",
     "unavailable": "NIEDOSTĘPNA",
-    "non-public": "NIEPUBLICZNA",
+    "nonPublic": "NIEPUBLICZNA",
     "abandoned": "WYCOFANA",
 
     "SPK": "SPK",
@@ -234,14 +234,14 @@
     "nonJunction": "INNE",
 
     "sliders": {
-      "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
-      "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
-      "min-vmax": "MIN. PRĘDKOŚĆ SZLAKOWA",
-      "max-vmax": "MAKS. PRĘDKOŚĆ SZLAKOWA",
-      "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
-      "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
-      "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
-      "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
+      "minLevel": "MIN. WYMAGANY POZIOM DYŻURNEGO",
+      "maxLevel": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
+      "minVmax": "MIN. PRĘDKOŚĆ SZLAKOWA",
+      "maxVmax": "MAKS. PRĘDKOŚĆ SZLAKOWA",
+      "minOneWayCatenary": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
+      "minOneWay": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
+      "minTwoWayCatenary": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
+      "minTwoWay": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
     },
 
     "authors-search": "SZUKAJ AUTORA (uwzględnia inne filtry):",
diff --git a/src/managers/stationFilterManager.ts b/src/managers/stationFilterManager.ts
new file mode 100644
index 0000000..500fa20
--- /dev/null
+++ b/src/managers/stationFilterManager.ts
@@ -0,0 +1,116 @@
+import StorageManager from './storageManager';
+
+export const sections = [
+  'status',
+  'timetables',
+  'reality',
+  'packageAccess',
+  'stationType',
+  'access',
+  'control',
+  'blockades',
+  'signals',
+  'addons'
+] as const;
+
+export const initFilters = {
+  default: false,
+  notDefault: false,
+  real: false,
+  fictional: false,
+  SPK: false,
+  SCS: false,
+  SPE: false,
+  SUP: false,
+  noSUP: false,
+  ASDEK: false,
+  noASDEK: false,
+  manual: false,
+  'SPK-R': false,
+  'SCS-R': false,
+  mechanical: false,
+  'SPK-M': false,
+  'SCS-M': false,
+  modern: false,
+  semaphores: false,
+  historical: false,
+  mixed: false,
+  SBL: false,
+  PBL: false,
+  'include-selected': false,
+  'no-1track': false,
+  'no-2track': false,
+  free: true,
+  occupied: false,
+  nonPublic: false,
+  unavailable: true,
+  abandoned: true,
+  afkStatus: false,
+  endingStatus: false,
+  noSpaceStatus: false,
+  unavailableStatus: false,
+  unsignedStatus: false,
+  withActiveTimetables: false,
+  withoutActiveTimetables: false,
+  junction: false,
+  nonJunction: false,
+  maxVmax: 200,
+  minVmax: 0,
+  onlineFromHours: 0,
+  minLevel: 0,
+  maxLevel: 20,
+  minOneWayCatenary: 0,
+  minOneWay: 0,
+  minTwoWayCatenary: 0,
+  minTwoWay: 0,
+  authors: ''
+};
+
+export const initSliders = [
+  { id: 'maxVmax', minRange: 0, maxRange: 200, step: 10 },
+  { id: 'minVmax', minRange: 0, maxRange: 200, step: 10 },
+  { id: 'minLevel', minRange: 0, maxRange: 20, step: 1 },
+  { id: 'maxLevel', minRange: 0, maxRange: 20, step: 1 },
+  { id: 'minOneWayCatenary', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minOneWay', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 }
+];
+
+export type StationFilter = keyof typeof initFilters;
+export type StationFilterSection = (typeof sections)[number];
+
+export const filtersSections: Record<StationFilterSection, StationFilter[]> = {
+  status: ['free', 'occupied', 'endingStatus', 'afkStatus', 'noSpaceStatus', 'unavailableStatus'],
+  timetables: ['withActiveTimetables', 'withoutActiveTimetables'],
+  reality: ['real', 'fictional'],
+  packageAccess: ['default', 'notDefault'],
+  stationType: ['junction', 'nonJunction'],
+  access: ['nonPublic', 'unavailable', 'abandoned'],
+  addons: ['SUP', 'ASDEK', 'noSUP', 'noASDEK'],
+  control: ['SPK', 'SCS', 'SPE', 'SPK-M', 'SCS-M', 'mechanical', 'SPK-R', 'SCS-R', 'manual'],
+  blockades: ['SBL', 'PBL'],
+  signals: ['modern', 'semaphores', 'mixed', 'historical']
+};
+
+export function setupFilters(currentFilters: Record<string, any>) {
+  if (!StorageManager.isRegistered('options_saved')) return;
+
+  Object.keys(currentFilters).forEach((filterKey) => {
+    const savedValue = StorageManager.getValue(filterKey);
+
+    if (savedValue != null) {
+      if (typeof currentFilters[filterKey] == 'boolean')
+        currentFilters[filterKey] = savedValue === 'true';
+      else if (typeof currentFilters[filterKey] == 'number')
+        currentFilters[filterKey] = Number(savedValue);
+      else currentFilters[filterKey] = savedValue.toString();
+    }
+  });
+}
+
+export function areFiltersAtDefault(currentFilters: Record<string, any>) {
+  return Object.keys(currentFilters).every(
+    (filterKey) => currentFilters[filterKey] === initFilters[filterKey as keyof typeof initFilters]
+  );
+}
diff --git a/src/managers/storageManager.ts b/src/managers/storageManager.ts
index 38a5071..5675524 100644
--- a/src/managers/storageManager.ts
+++ b/src/managers/storageManager.ts
@@ -34,6 +34,10 @@ export default class StorageManager {
     window.localStorage.removeItem(key);
   }
 
+  static getValue(key: string) {
+    return window.localStorage.getItem(key);
+  }
+
   static getBooleanValue(key: string): boolean {
     return window.localStorage.getItem(key) === 'true' ? true : false;
   }
diff --git a/src/scripts/data/stationHeaderNames.ts b/src/scripts/data/stationHeaderNames.ts
index 29483f4..8b13789 100644
--- a/src/scripts/data/stationHeaderNames.ts
+++ b/src/scripts/data/stationHeaderNames.ts
@@ -1,21 +1 @@
-export const headIds = [
-  'station',
-  'min-lvl',
-  'status',
-  'dispatcher',
-  'dispatcher-lvl',
-  'routes-single',
-  'routes-double',
-  'general'
-] as const;
 
-export const headIconsIds = [
-  'user',
-  'like',
-  'spawn',
-  'timetableAll',
-  'timetableUnconfirmed',
-  'timetableConfirmed'
-] as const;
-
-export type HeadIdsTypes = (typeof headIds)[number] | (typeof headIconsIds)[number];
diff --git a/src/scripts/utils/stationFilterUtils.ts b/src/scripts/utils/stationFilterUtils.ts
index d483f89..0babe50 100644
--- a/src/scripts/utils/stationFilterUtils.ts
+++ b/src/scripts/utils/stationFilterUtils.ts
@@ -1,6 +1,5 @@
-import { Filter } from '../../components/StationsView/typings';
-import { Status } from '../../typings/common';
-import { HeadIdsTypes } from '../data/stationHeaderNames';
+import { ActiveSorter } from '../../components/StationsView/typings';
+import { ActiveScenery, StationGeneralInfo, Status } from '../../typings/common';
 import { Station } from '../../typings/common';
 
 const dispatcherStatusPriority = [
@@ -14,11 +13,137 @@ const dispatcherStatusPriority = [
   undefined
 ];
 
-export const sortStations = (
-  a: Station,
-  b: Station,
-  sorter: { headerName: HeadIdsTypes; dir: number }
-) => {
+const filtersAssociations: Record<string, string> = {
+  mechaniczne: 'mechanical',
+  ręczne: 'manual',
+  'mechaniczne+SPK': 'SPK-M',
+  'ręczne+SPK': 'SPK-R',
+  'mechaniczne+SCS': 'SCS-M',
+  'ręczne+SCS': 'SCS-R',
+  współczesna: 'modern',
+  historyczna: 'historical',
+  kształtowa: 'semaphores',
+  mieszana: 'mixed'
+};
+
+function filterStatusSection(
+  filters: Record<string, any>,
+  { dispatcherStatus, dispatcherTimestamp }: ActiveScenery
+) {
+  return (
+    (filters['endingStatus'] && dispatcherStatus == Status.ActiveDispatcher.ENDING) ||
+    (filters['unavailableStatus'] &&
+      (dispatcherStatus == Status.ActiveDispatcher.UNAVAILABLE ||
+        dispatcherStatus == Status.ActiveDispatcher.NOT_LOGGED_IN)) ||
+    (filters['afkStatus'] && dispatcherStatus == Status.ActiveDispatcher.AFK) ||
+    (filters['noSpaceStatus'] && dispatcherStatus == Status.ActiveDispatcher.NO_SPACE) ||
+    (filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE) ||
+    (filters['onlineFromHours'] > 0 &&
+      (dispatcherTimestamp ?? 0) <= Date.now() + filters['onlineFromHours'] * 3600000)
+  );
+}
+
+function filterTimetablesSection(filters: Record<string, any>, station: Station) {
+  return (
+    (filters['withoutActiveTimetables'] &&
+      (!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0)) ||
+    (filters['withActiveTimetables'] &&
+      station.onlineInfo &&
+      (station.onlineInfo.scheduledTrainCount.all != 0 ||
+        station.onlineInfo.dispatcherStatus == Status.ActiveDispatcher.FREE))
+  );
+}
+
+function filterAccessibilitySection(filters: Record<string, any>, station: Station) {
+  if (
+    filters['nonPublic'] &&
+    (!station.generalInfo || station.generalInfo.availability == 'nonPublic')
+  )
+    return true;
+
+  if (!station.generalInfo) return false;
+
+  const { availability } = station.generalInfo;
+
+  return (
+    (filters['unavailable'] && availability == 'unavailable' && !station.onlineInfo) ||
+    (filters['abandoned'] && availability == 'abandoned' && !station.onlineInfo) ||
+    (filters['default'] && availability == 'default') ||
+    (filters['notDefault'] &&
+      availability != 'default' &&
+      availability != 'abandoned' &&
+      availability != 'unavailable')
+  );
+}
+
+function filterRealitySection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (filters['real'] && generalInfo.lines) || (filters['fictional'] && !generalInfo.lines);
+}
+
+function filterProgramsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    (filters['SUP'] && generalInfo.SUP) ||
+    (filters['noSUP'] && !generalInfo.SUP) ||
+    (filters['ASDEK'] && generalInfo.ASDEK) ||
+    (filters['noASDEK'] && !generalInfo.ASDEK)
+  );
+}
+
+function filterControlsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.controlType] == true ||
+    filters[filtersAssociations[generalInfo.controlType]] == true
+  );
+}
+
+function filterSignalsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.signalType] == true ||
+    filters[filtersAssociations[generalInfo.signalType]] == true ||
+    (filters['SBL'] && generalInfo.routes.sblNames.length > 0) ||
+    (filters['PBL'] && generalInfo.routes.sblNames.length == 0)
+  );
+}
+
+function filterStationType(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const singleTracks = generalInfo.routes.single.filter((r) => !r.isInternal);
+  const doubleTracks = generalInfo.routes.double.filter((r) => !r.isInternal);
+
+  let isJunction = singleTracks.length > 0 && doubleTracks.length > 0;
+
+  return (filters['junction'] && isJunction) || (filters['nonJunction'] && !isJunction);
+}
+
+function filterSliderValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const { availability, reqLevel, routes } = generalInfo;
+
+  const otherAvailability =
+    availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
+
+  return (
+    filters['minLevel'] > reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['maxLevel'] < reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['minVmax'] > routes.maxRouteSpeed ||
+    filters['maxVmax'] < routes.minRouteSpeed ||
+    (filters['no-1track'] && routes.single.length != 0) ||
+    (filters['no-2track'] && routes.double.length != 0) ||
+    filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length ||
+    filters['minOneWay'] > routes.singleOtherNames.length ||
+    filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length ||
+    filters['minTwoWay'] > routes.doubleOtherNames.length
+  );
+}
+
+function filterInputValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters['authors'].length > 3 &&
+    !generalInfo.authors
+      ?.map((a) => a.toLocaleLowerCase())
+      .includes(filters['authors'].toLocaleLowerCase())
+  );
+}
+
+export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
   let diff = 0;
 
   switch (sorter.headerName) {
@@ -110,132 +235,40 @@ export const sortStations = (
   return a.name.localeCompare(b.name);
 };
 
-export const filterStations = (station: Station, filters: Filter) => {
+export const filterStations = (station: Station, filters: Record<string, any>) => {
   if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
     return false;
 
-  if (station.onlineInfo) {
-    const { dispatcherStatus } = station.onlineInfo;
+  // Scenery Timetables section
+  if (filterTimetablesSection(filters, station)) return false;
 
-    const excludeEnding =
-      dispatcherStatus == Status.ActiveDispatcher.ENDING && filters['endingStatus'];
+  // Scenery Accessibility section
+  if (filterAccessibilitySection(filters, station)) return false;
 
-    const excludeNotSigned =
-      (dispatcherStatus == Status.ActiveDispatcher.NOT_LOGGED_IN ||
-        dispatcherStatus == Status.ActiveDispatcher.UNAVAILABLE) &&
-      filters['unavailableStatus'];
-
-    const excludeAFK = dispatcherStatus == Status.ActiveDispatcher.AFK && filters['afkStatus'];
-
-    const excludeNoSpace =
-      dispatcherStatus == Status.ActiveDispatcher.NO_SPACE && filters['noSpaceStatus'];
-
-    const excludeOccupied = filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE;
-
-    const excludeActiveTTs =
-      (dispatcherStatus == Status.ActiveDispatcher.FREE ||
-        station.onlineInfo.scheduledTrainCount.all != 0) &&
-      filters['withActiveTimetables'];
-
-    if (
-      excludeEnding ||
-      excludeAFK ||
-      excludeNoSpace ||
-      excludeNotSigned ||
-      excludeOccupied ||
-      excludeActiveTTs
-    )
-      return false;
-
-    if (
-      filters['onlineFromHours'] > 0 &&
-      dispatcherStatus <= Date.now() + filters['onlineFromHours'] * 3600000
-    )
-      return false;
-  }
-
-  const excludeNoActiveTTs =
-    filters['withoutActiveTimetables'] &&
-    (!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0);
-
-  if (excludeNoActiveTTs) return false;
-
-  if (
-    (station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) &&
-    filters['nonPublic']
-  )
-    return false;
+  // Scenery Status section
+  if (station.onlineInfo && filterStatusSection(filters, station.onlineInfo)) return false;
 
   if (station.generalInfo) {
-    const { routes, availability, controlType, lines, reqLevel, signalType, SUP, ASDEK, authors } =
-      station.generalInfo;
+    // Scenery Reality section
+    if (filterRealitySection(filters, station.generalInfo)) return false;
 
-    if (availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo)
-      return false;
-    if (availability == 'abandoned' && filters['abandoned'] && !station.onlineInfo) return false;
-    if (availability == 'default' && filters['default']) return false;
+    // Scenery Additional Programs section
+    if (filterProgramsSection(filters, station.generalInfo)) return false;
 
-    if (
-      availability != 'default' &&
-      filters['notDefault'] &&
-      !(availability == 'abandoned' || availability == 'unavailable')
-    )
-      return false;
+    // Scenery Controls section
+    if (filterControlsSection(filters, station.generalInfo)) return false;
 
-    if (filters['real'] && lines) return false;
-    if (filters['fictional'] && !lines) return false;
+    // Scenery Signalling section(s)
+    if (filterSignalsSection(filters, station.generalInfo)) return false;
 
-    const otherAvailability =
-      availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
+    // Scenery Station Type section
+    if (filterStationType(filters, station.generalInfo)) return false;
 
-    if (reqLevel + (otherAvailability ? 1 : 0) < filters['minLevel']) return false;
-    if (reqLevel + (otherAvailability ? 1 : 0) > filters['maxLevel']) return false;
+    // Scenery sliders
+    if (filterSliderValues(filters, station.generalInfo)) return false;
 
-    if (filters['minVmax'] > station.generalInfo.routes.maxRouteSpeed) return false;
-    if (filters['maxVmax'] < station.generalInfo.routes.minRouteSpeed) return false;
-
-    if (
-      filters['no-1track'] &&
-      (routes.singleElectrifiedNames.length != 0 || routes.singleOtherNames.length != 0)
-    )
-      return false;
-
-    if (
-      filters['no-2track'] &&
-      (routes.doubleElectrifiedNames.length != 0 || routes.doubleOtherNames.length != 0)
-    )
-      return false;
-
-    if (routes.singleElectrifiedNames.length < filters['minOneWayCatenary']) return false;
-    if (routes.singleOtherNames.length < filters['minOneWay']) return false;
-
-    if (routes.doubleElectrifiedNames.length < filters['minTwoWayCatenary']) return false;
-    if (routes.doubleOtherNames.length < filters['minTwoWay']) return false;
-
-    if (filters[controlType]) return false;
-    if (filters[signalType]) return false;
-
-    if (filters['SUP'] && SUP) return false;
-    if (filters['noSUP'] && !SUP) return false;
-
-    if (filters['ASDEK'] && ASDEK) return false;
-    if (filters['noASDEK'] && !ASDEK) return false;
-
-    if (filters['SBL'] && routes.sblNames.length > 0) return false;
-    if (filters['PBL'] && routes.sblNames.length == 0) return false;
-
-    if (
-      filters['authors'].length > 3 &&
-      !authors?.map((a) => a.toLocaleLowerCase()).includes(filters['authors'].toLocaleLowerCase())
-    )
-      return false;
-
-    const singleTracks = routes.single.filter((r) => !r.isInternal);
-    const doubleTracks = routes.double.filter((r) => !r.isInternal);
-
-    let isJunction = singleTracks.length > 0 && doubleTracks.length > 0;
-    if (filters['junction'] && isJunction) return false;
-    if (filters['nonJunction'] && !isJunction) return false;
+    // Scenery Authors section
+    if (filterInputValues(filters, station.generalInfo)) return false;
   }
 
   return true;
diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts
index 191ddba..eab1d5b 100644
--- a/src/store/stationFiltersStore.ts
+++ b/src/store/stationFiltersStore.ts
@@ -2,72 +2,15 @@ import { defineStore } from 'pinia';
 import inputData from '../data/options.json';
 import { useMainStore } from './mainStore';
 import { filterStations, sortStations } from '../scripts/utils/stationFilterUtils';
-import { HeadIdsTypes } from '../scripts/data/stationHeaderNames';
 import StorageManager from '../managers/storageManager';
-import { Filter } from '../components/StationsView/typings';
-
-const filterInitStates: Filter = {
-  default: false,
-  notDefault: false,
-  real: false,
-  fictional: false,
-  SPK: false,
-  SCS: false,
-  SPE: false,
-  SUP: false,
-  noSUP: false,
-  ASDEK: false,
-  noASDEK: false,
-  ręczne: false,
-  'ręczne+SPK': false,
-  'ręczne+SCS': false,
-  mechaniczne: false,
-  'mechaniczne+SPK': false,
-  'mechaniczne+SCS': false,
-  współczesna: false,
-  kształtowa: false,
-  historyczna: false,
-  mieszana: false,
-  SBL: false,
-  PBL: false,
-  'include-selected': false,
-  'no-1track': false,
-  'no-2track': false,
-  free: true,
-  occupied: false,
-  ending: false,
-  nonPublic: false,
-  unavailable: true,
-  abandoned: true,
-  afkStatus: false,
-  endingStatus: false,
-  noSpaceStatus: false,
-  unavailableStatus: false,
-  unsignedStatus: false,
-  withActiveTimetables: false,
-  withoutActiveTimetables: false,
-
-  junction: false,
-  nonJunction: false,
-
-  maxVmax: 200,
-  minVmax: 0,
-  authors: '',
-  onlineFromHours: 0,
-  minLevel: 0,
-  maxLevel: 20,
-  minOneWayCatenary: 0,
-  minOneWay: 0,
-  minTwoWayCatenary: 0,
-  minTwoWay: 0
-};
+import { HeadIdsType } from '../components/StationsView/typings';
 
 export const useStationFiltersStore = defineStore('stationFiltersStore', {
   state() {
     return {
       inputs: inputData,
-      filters: { ...filterInitStates },
-      sorterActive: { headerName: 'station' as HeadIdsTypes, dir: 1 },
+      // filters: { ...filterInitStates },
+      sorterActive: { headerName: 'station' as HeadIdsType, dir: 1 },
       lastClickedFilterId: ''
     };
   },
@@ -112,19 +55,19 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', {
       if (StorageManager.isRegistered('options_saved')) StorageManager.setValue(name, value);
     },
 
-    resetFilters() {
-      this.filters = { ...filterInitStates };
+    // resetFilters() {
+    //   // this.filters = { ...filterInitStates };
 
-      this.inputs.options.forEach((option) => {
-        option.value = option.defaultValue;
-        StorageManager.setBooleanValue(option.name, !option.defaultValue);
-      });
+    //   this.inputs.options.forEach((option) => {
+    //     option.value = option.defaultValue;
+    //     StorageManager.setBooleanValue(option.name, !option.defaultValue);
+    //   });
 
-      this.inputs.sliders.forEach((slider) => {
-        slider.value = slider.defaultValue;
-        StorageManager.setNumericValue(slider.name, slider.defaultValue);
-      });
-    },
+    //   this.inputs.sliders.forEach((slider) => {
+    //     slider.value = slider.defaultValue;
+    //     StorageManager.setNumericValue(slider.name, slider.defaultValue);
+    //   });
+    // },
 
     resetSectionOptions(section: string) {
       this.inputs.options
@@ -135,7 +78,7 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', {
         });
     },
 
-    changeSorter(headerName: HeadIdsTypes) {
+    changeSorter(headerName: HeadIdsType) {
       if (headerName == this.sorterActive.headerName)
         this.sorterActive.dir = -1 * this.sorterActive.dir;
       else this.sorterActive.dir = 1;
diff --git a/src/typings/common.ts b/src/typings/common.ts
index 3be1cf6..59c4a4b 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -78,35 +78,30 @@ export interface Train {
 export interface Station {
   name: string;
 
-  generalInfo?: {
-    name: string;
-    url: string;
-    abbr: string;
-    hash?: string;
-
-    reqLevel: number;
-    // supportersOnly: boolean;
-
-    lines: string;
-    project: string;
-    projectUrl?: string;
-
-    signalType: string;
-    controlType: string;
-
-    SUP: boolean;
-    ASDEK: boolean;
-    authors?: string[];
-
-    availability: Availability;
-    routes: StationRoutes;
-
-    checkpoints: string[];
-  };
+  generalInfo?: StationGeneralInfo;
 
   onlineInfo?: ActiveScenery;
 }
 
+export interface StationGeneralInfo {
+  name: string;
+  url: string;
+  abbr: string;
+  hash?: string;
+  reqLevel: number;
+  lines: string;
+  project: string;
+  projectUrl?: string;
+  signalType: string;
+  controlType: string;
+  SUP: boolean;
+  ASDEK: boolean;
+  authors?: string[];
+  availability: Availability;
+  routes: StationRoutes;
+  checkpoints: string[];
+}
+
 export interface StationRoutes {
   single: StationRoutesInfo[];
   double: StationRoutesInfo[];
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index 6a4c20d..a749199 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -30,10 +30,17 @@
 import { defineComponent } from 'vue';
 import StationTable from '../components/StationsView/StationTable.vue';
 import StationFilterCard from '../components/StationsView/StationFilterCard.vue';
-import { useStationFiltersStore } from '../store/stationFiltersStore';
 import { useMainStore } from '../store/mainStore';
 import DonationModal from '../components/Global/DonationModal.vue';
 import StationStats from '../components/StationsView/StationStats.vue';
+import { initFilters, setupFilters } from '../managers/stationFilterManager';
+import { filterStations, sortStations } from '../scripts/utils/stationFilterUtils';
+import { reactive } from 'vue';
+import { provide } from 'vue';
+import { ActiveSorter } from '../components/StationsView/typings';
+import { onMounted } from 'vue';
+
+const filterInitStates = { ...initFilters };
 
 export default defineComponent({
   components: {
@@ -47,12 +54,19 @@ export default defineComponent({
     filterCardOpen: false,
     isDonationModalOpen: false,
 
-    filterStore: useStationFiltersStore(),
-    store: useMainStore()
+    mainStore: useMainStore()
   }),
 
-  mounted() {
-    this.filterStore.setupFilters();
+  setup() {
+    const filters = reactive(filterInitStates);
+    const activeSorter = reactive({ headerName: 'station', dir: 1 }) as ActiveSorter;
+
+    provide('StationsView_filters', filters);
+    provide('StationsView_activeSorter', activeSorter);
+
+    onMounted(() => {
+      setupFilters(filters);
+    });
   },
 
   methods: {

From 56e40bd84b3390694ef12cbb918330a82aed740d Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 21 May 2024 16:17:41 +0200
Subject: [PATCH 07/13] bump: version (1.24.2)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2c4c44a..84ba1cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stacjownik",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "private": true,
   "scripts": {
     "dev": "vite",

From 9fc602e08f96603b86f60e5571450c2aafb0b2ed Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Wed, 22 May 2024 15:41:33 +0200
Subject: [PATCH 08/13] chore: filters improvements

---
 .../StationsView/StationFilterCard.vue        | 104 ++++---
 src/components/StationsView/StationTable.vue  |  27 +-
 src/components/StationsView/utils.ts          | 275 ++++++++++++++++++
 src/components/TrainsView/TrainTable.vue      |   6 +-
 src/locales/en.json                           |   6 +-
 src/locales/pl.json                           |   6 +-
 src/managers/stationFilterManager.ts          |   9 +-
 src/scripts/data/stationHeaderNames.ts        |   1 -
 src/scripts/utils/stationFilterUtils.ts       | 275 ------------------
 src/store/stationFiltersStore.ts              |  89 ------
 src/views/SceneryView.vue                     |   2 +-
 src/views/StationsView.vue                    |   1 -
 12 files changed, 381 insertions(+), 420 deletions(-)
 delete mode 100644 src/scripts/data/stationHeaderNames.ts
 delete mode 100644 src/scripts/utils/stationFilterUtils.ts
 delete mode 100644 src/store/stationFiltersStore.ts

diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue
index 19b7ac4..2a6d822 100644
--- a/src/components/StationsView/StationFilterCard.vue
+++ b/src/components/StationsView/StationFilterCard.vue
@@ -4,7 +4,7 @@
       <button class="card-button btn--filled btn--image" @click="toggleCard">
         <img class="button_icon" src="/images/icon-filter2.svg" alt="filter icon" />
         <p>[F] {{ $t('options.filters') }}</p>
-        <span class="active-indicator" v-if="!areFiltersAtDefaultComp"></span>
+        <span class="active-indicator" v-if="changedFilters.length != 0"></span>
       </button>
 
       <label for="scenery-search">
@@ -33,6 +33,12 @@
           <div class="card_title flex">{{ $t('filters.title') }}</div>
           <p class="card_info" v-html="$t('filters.desc')"></p>
 
+          <div class="changed-filters" v-if="changedFilters.length > 0">
+            {{ $t('filters.changed-filters-count') }} <b>{{ changedFilters.length }}</b>
+          </div>
+
+          <div class="changed-filters" v-else>{{ $t('filters.no-changed-filters') }}</div>
+
           <section class="card_options">
             <div
               class="option-section"
@@ -40,33 +46,31 @@
               :key="sectionKey"
             >
               <h3 class="text--primary">
+                <span class="active-indicator" v-if="!areSectionFiltersDefault(sectionKey)"></span>
                 {{ $t(`filters.sections.${sectionKey}`) }}
-
-                <button @click="resetSectionOptions(sectionKey)">RESET</button>
+                <button @click="resetSectionFilters(sectionKey)">RESET</button>
               </h3>
 
               <hr />
 
-              <!-- 
-                  @dblclick="handleDbClick"
-
-               -->
               <div class="section-filters">
-                <div
-                  v-for="filter in sectionFilters"
-                  @click="() => (filters[filter] = !filters[filter])"
+                <label
+                  v-for="filterKey in sectionFilters"
+                  @click="() => (filters[filterKey] = !filters[filterKey])"
+                  @dblclick="setSingleSectionFilter(sectionKey, filterKey)"
+                  :for="filterKey"
                 >
                   <input
-                    :checked="filters[filter]"
-                    v-model="filters[filter]"
+                    :checked="filters[filterKey]"
+                    v-model="filters[filterKey]"
                     type="checkbox"
                     :class="sectionKey"
-                    :name="filter"
+                    :name="filterKey"
                   />
                   <span>
-                    {{ $t(`filters.${filter}`) }}
+                    {{ $t(`filters.${filterKey}`) }}
                   </span>
-                </div>
+                </label>
               </div>
             </div>
           </section>
@@ -143,8 +147,8 @@
 
             <button
               class="btn--action"
-              :disabled="areFiltersAtDefaultComp"
-              :data-disabled="areFiltersAtDefaultComp"
+              :disabled="changedFilters.length == 0"
+              :data-disabled="changedFilters.length == 0"
               @click="resetFilters"
             >
               [R] {{ $t('filters.reset') }}
@@ -170,11 +174,14 @@ import {
   filtersSections,
   initSliders,
   initFilters,
-  areFiltersAtDefault
+  getChangedFilters
 } from '../../managers/stationFilterManager';
 
 import { StationFilterSection } from '../../managers/stationFilterManager';
 import { computed } from 'vue';
+import { watch } from 'vue';
+
+const STORAGE_KEY = 'options_saved';
 
 export default defineComponent({
   components: { FilterOption },
@@ -182,7 +189,6 @@ export default defineComponent({
 
   data: () => ({
     saveOptions: false,
-    STORAGE_KEY: 'options_saved',
 
     filtersSections,
     initSliders,
@@ -205,18 +211,27 @@ export default defineComponent({
 
     const filters = inject('StationsView_filters') as Record<string, any>;
 
-    const areFiltersAtDefaultComp = computed(() => areFiltersAtDefault(filters));
+    const changedFilters = computed(() => getChangedFilters(filters));
+
+    // Save filters to persistent storage
+    watch(filters, (value) => {
+      if (!StorageManager.isRegistered(STORAGE_KEY)) return;
+
+      Object.keys(value).forEach((filterKey) => {
+        StorageManager.setValue(filterKey, filters[filterKey]);
+      });
+    });
 
     return {
       isVisible,
       store,
       filters,
-      areFiltersAtDefaultComp
+      changedFilters
     };
   },
 
   mounted() {
-    this.saveOptions = StorageManager.isRegistered(this.STORAGE_KEY);
+    this.saveOptions = StorageManager.isRegistered(STORAGE_KEY);
 
     if (StorageManager.isRegistered('onlineFromHours') && this.saveOptions) {
       this.minimumHours = StorageManager.getNumericValue('onlineFromHours');
@@ -301,11 +316,11 @@ export default defineComponent({
       this.saveOptions = !this.saveOptions;
 
       if (!this.saveOptions) {
-        StorageManager.unregisterStorage(this.STORAGE_KEY);
+        StorageManager.unregisterStorage(STORAGE_KEY);
         return;
       }
 
-      StorageManager.registerStorage(this.STORAGE_KEY);
+      StorageManager.registerStorage(STORAGE_KEY);
 
       Object.keys(this.filters).forEach((filterKey) => {
         StorageManager.setValue(filterKey, this.filters[filterKey]);
@@ -323,9 +338,21 @@ export default defineComponent({
       });
     },
 
-    resetSectionOptions(key: string) {
-      filtersSections[key as StationFilterSection].forEach((filter) => {
-        this.filters[filter] = (initFilters as any)[filter];
+    areSectionFiltersDefault(sectionKey: StationFilterSection) {
+      return filtersSections[sectionKey].every((filterKey) => {
+        return this.filters[filterKey] == initFilters[filterKey];
+      });
+    },
+
+    resetSectionFilters(sectionKey: StationFilterSection) {
+      filtersSections[sectionKey].forEach((filterKey) => {
+        this.filters[filterKey] = initFilters[filterKey];
+      });
+    },
+
+    setSingleSectionFilter(sectionKey: StationFilterSection, chosenKey: string) {
+      filtersSections[sectionKey].forEach((filterKey) => {
+        if (filterKey != chosenKey) this.filters[filterKey] = initFilters[filterKey];
       });
     },
 
@@ -360,6 +387,11 @@ h3.section-header {
   padding: 0.5em;
 }
 
+.changed-filters {
+  background-color: #111;
+  padding: 0.5em;
+}
+
 .card_controls {
   display: flex;
   gap: 0.5em;
@@ -440,7 +472,7 @@ h3.section-header {
   margin: 1em 0;
 }
 
-.section-filters > div {
+.section-filters > label {
   position: relative;
   user-select: none;
   -webkit-user-select: none;
@@ -516,19 +548,15 @@ h3.section-header {
 .slider {
   display: flex;
   align-items: center;
+  gap: 0.25em;
 
   margin-bottom: 1em;
 
   &-value {
     color: $accentCol;
-    margin-right: 0.5em;
     padding: 0.1em 0.2em;
   }
 
-  &-content {
-    flex-grow: 2;
-  }
-
   &-input {
     -webkit-appearance: none;
     appearance: none;
@@ -537,7 +565,6 @@ h3.section-header {
     outline: none;
 
     min-width: 25%;
-    max-width: 120px;
 
     &:focus-visible ~ * {
       color: gold;
@@ -612,5 +639,14 @@ h3.section-header {
   .card_controls > button.card-button > p {
     display: none;
   }
+
+  .slider {
+    flex-wrap: wrap;
+    justify-content: center;
+
+    &-input {
+      width: 90%;
+    }
+  }
 }
 </style>
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index c9877a5..81ad005 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -302,8 +302,13 @@
     </div>
 
     <div class="no-stations" v-else>
-      {{ $t('sceneries.no-stations') }} (region: <b>{{ mainStore.region.name }}</b
-      >)
+      <div>
+        {{ $t('sceneries.no-stations') }} (region: <b>{{ mainStore.region.name }}</b
+        >)
+      </div>
+      <div class="text--primary" v-if="getChangedFilters(filters).length != 0">
+        {{ $t('sceneries.active-filters') }}
+      </div>
     </div>
   </section>
 </template>
@@ -311,15 +316,16 @@
 <script lang="ts">
 import { defineComponent, inject, computed } from 'vue';
 import StationStatusBadge from '../Global/StationStatusBadge.vue';
+import Loading from '../Global/Loading.vue';
 import dateMixin from '../../mixins/dateMixin';
 import styleMixin from '../../mixins/styleMixin';
-import { useMainStore } from '../../store/mainStore';
-import Loading from '../Global/Loading.vue';
-import { Status } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
+import { useMainStore } from '../../store/mainStore';
+import { Status } from '../../typings/common';
 import { useTooltipStore } from '../../store/tooltipStore';
-import { filterStations, sortStations } from '../../scripts/utils/stationFilterUtils';
+import { getChangedFilters } from '../../managers/stationFilterManager';
 import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
+import { filterStations, sortStations } from './utils';
 
 export default defineComponent({
   emits: ['toggleDonationModal'],
@@ -330,7 +336,8 @@ export default defineComponent({
   data: () => ({
     headIconsIds,
     headIds,
-    lastSelectedStationName: ''
+    lastSelectedStationName: '',
+    getChangedFilters
   }),
 
   setup() {
@@ -346,15 +353,13 @@ export default defineComponent({
         .filter((station) => filterStations(station, filters))
         .sort((a, b) => sortStations(a, b, activeSorter))
     );
-    // const areFiltersAtDefault = computed(() => {
-
-    // })
 
     return {
       Status: Status.Data,
       mainStore,
       apiStore,
       tooltipStore,
+      filters,
       filteredStationList,
       activeSorter
     };
@@ -419,7 +424,7 @@ $rowCol: #424242;
 
 .no-stations {
   text-align: center;
-  font-size: 1.5em;
+  font-size: 1.25em;
 
   padding: 1em;
 
diff --git a/src/components/StationsView/utils.ts b/src/components/StationsView/utils.ts
index e69de29..0babe50 100644
--- a/src/components/StationsView/utils.ts
+++ b/src/components/StationsView/utils.ts
@@ -0,0 +1,275 @@
+import { ActiveSorter } from '../../components/StationsView/typings';
+import { ActiveScenery, StationGeneralInfo, Status } from '../../typings/common';
+import { Station } from '../../typings/common';
+
+const dispatcherStatusPriority = [
+  Status.ActiveDispatcher.UNKNOWN,
+  Status.ActiveDispatcher.INVALID,
+  Status.ActiveDispatcher.NOT_LOGGED_IN,
+  Status.ActiveDispatcher.UNAVAILABLE,
+  Status.ActiveDispatcher.AFK,
+  Status.ActiveDispatcher.ENDING,
+  Status.ActiveDispatcher.NO_SPACE,
+  undefined
+];
+
+const filtersAssociations: Record<string, string> = {
+  mechaniczne: 'mechanical',
+  ręczne: 'manual',
+  'mechaniczne+SPK': 'SPK-M',
+  'ręczne+SPK': 'SPK-R',
+  'mechaniczne+SCS': 'SCS-M',
+  'ręczne+SCS': 'SCS-R',
+  współczesna: 'modern',
+  historyczna: 'historical',
+  kształtowa: 'semaphores',
+  mieszana: 'mixed'
+};
+
+function filterStatusSection(
+  filters: Record<string, any>,
+  { dispatcherStatus, dispatcherTimestamp }: ActiveScenery
+) {
+  return (
+    (filters['endingStatus'] && dispatcherStatus == Status.ActiveDispatcher.ENDING) ||
+    (filters['unavailableStatus'] &&
+      (dispatcherStatus == Status.ActiveDispatcher.UNAVAILABLE ||
+        dispatcherStatus == Status.ActiveDispatcher.NOT_LOGGED_IN)) ||
+    (filters['afkStatus'] && dispatcherStatus == Status.ActiveDispatcher.AFK) ||
+    (filters['noSpaceStatus'] && dispatcherStatus == Status.ActiveDispatcher.NO_SPACE) ||
+    (filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE) ||
+    (filters['onlineFromHours'] > 0 &&
+      (dispatcherTimestamp ?? 0) <= Date.now() + filters['onlineFromHours'] * 3600000)
+  );
+}
+
+function filterTimetablesSection(filters: Record<string, any>, station: Station) {
+  return (
+    (filters['withoutActiveTimetables'] &&
+      (!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0)) ||
+    (filters['withActiveTimetables'] &&
+      station.onlineInfo &&
+      (station.onlineInfo.scheduledTrainCount.all != 0 ||
+        station.onlineInfo.dispatcherStatus == Status.ActiveDispatcher.FREE))
+  );
+}
+
+function filterAccessibilitySection(filters: Record<string, any>, station: Station) {
+  if (
+    filters['nonPublic'] &&
+    (!station.generalInfo || station.generalInfo.availability == 'nonPublic')
+  )
+    return true;
+
+  if (!station.generalInfo) return false;
+
+  const { availability } = station.generalInfo;
+
+  return (
+    (filters['unavailable'] && availability == 'unavailable' && !station.onlineInfo) ||
+    (filters['abandoned'] && availability == 'abandoned' && !station.onlineInfo) ||
+    (filters['default'] && availability == 'default') ||
+    (filters['notDefault'] &&
+      availability != 'default' &&
+      availability != 'abandoned' &&
+      availability != 'unavailable')
+  );
+}
+
+function filterRealitySection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (filters['real'] && generalInfo.lines) || (filters['fictional'] && !generalInfo.lines);
+}
+
+function filterProgramsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    (filters['SUP'] && generalInfo.SUP) ||
+    (filters['noSUP'] && !generalInfo.SUP) ||
+    (filters['ASDEK'] && generalInfo.ASDEK) ||
+    (filters['noASDEK'] && !generalInfo.ASDEK)
+  );
+}
+
+function filterControlsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.controlType] == true ||
+    filters[filtersAssociations[generalInfo.controlType]] == true
+  );
+}
+
+function filterSignalsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.signalType] == true ||
+    filters[filtersAssociations[generalInfo.signalType]] == true ||
+    (filters['SBL'] && generalInfo.routes.sblNames.length > 0) ||
+    (filters['PBL'] && generalInfo.routes.sblNames.length == 0)
+  );
+}
+
+function filterStationType(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const singleTracks = generalInfo.routes.single.filter((r) => !r.isInternal);
+  const doubleTracks = generalInfo.routes.double.filter((r) => !r.isInternal);
+
+  let isJunction = singleTracks.length > 0 && doubleTracks.length > 0;
+
+  return (filters['junction'] && isJunction) || (filters['nonJunction'] && !isJunction);
+}
+
+function filterSliderValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const { availability, reqLevel, routes } = generalInfo;
+
+  const otherAvailability =
+    availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
+
+  return (
+    filters['minLevel'] > reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['maxLevel'] < reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['minVmax'] > routes.maxRouteSpeed ||
+    filters['maxVmax'] < routes.minRouteSpeed ||
+    (filters['no-1track'] && routes.single.length != 0) ||
+    (filters['no-2track'] && routes.double.length != 0) ||
+    filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length ||
+    filters['minOneWay'] > routes.singleOtherNames.length ||
+    filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length ||
+    filters['minTwoWay'] > routes.doubleOtherNames.length
+  );
+}
+
+function filterInputValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters['authors'].length > 3 &&
+    !generalInfo.authors
+      ?.map((a) => a.toLocaleLowerCase())
+      .includes(filters['authors'].toLocaleLowerCase())
+  );
+}
+
+export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
+  let diff = 0;
+
+  switch (sorter.headerName) {
+    case 'station':
+      return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+
+    case 'min-lvl':
+      diff = (a.generalInfo?.reqLevel || 0) - (b.generalInfo?.reqLevel || 0);
+      break;
+
+    case 'status':
+      diff =
+        (a.onlineInfo?.dispatcherTimestamp ??
+          dispatcherStatusPriority.indexOf(a.onlineInfo?.dispatcherStatus)) -
+        (b.onlineInfo?.dispatcherTimestamp ??
+          dispatcherStatusPriority.indexOf(b.onlineInfo?.dispatcherStatus));
+      break;
+
+    case 'dispatcher':
+      if (
+        (a.onlineInfo?.dispatcherName.toLowerCase() || '') >
+        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+      )
+        return sorter.dir;
+      if (
+        (a.onlineInfo?.dispatcherName.toLowerCase() || '') <
+        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+      )
+        return -sorter.dir;
+      break;
+
+    case 'dispatcher-lvl':
+      diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
+      break;
+
+    case 'routes-single':
+      diff =
+        (a.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
+        (b.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
+      break;
+
+    case 'routes-double':
+      diff =
+        (a.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
+        (b.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
+      break;
+
+    case 'user':
+      diff =
+        (b.onlineInfo?.stationTrains ? b.onlineInfo.stationTrains.length : -1) -
+        (a.onlineInfo?.stationTrains ? a.onlineInfo.stationTrains.length : -1);
+      break;
+
+    case 'like':
+      diff =
+        (a.onlineInfo ? a.onlineInfo.dispatcherRate : -Infinity) -
+        (b.onlineInfo ? b.onlineInfo.dispatcherRate : -Infinity);
+      break;
+
+    case 'spawn':
+      diff =
+        (a.onlineInfo ? a.onlineInfo.spawns.length : -1) -
+        (b.onlineInfo ? b.onlineInfo.spawns.length : -1);
+      break;
+
+    case 'timetableConfirmed':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.confirmed ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.confirmed ?? -1);
+      break;
+
+    case 'timetableUnconfirmed':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1);
+      break;
+
+    case 'timetableAll':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.all ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.all ?? -1);
+      break;
+
+    default:
+      break;
+  }
+
+  if (diff != 0) return Math.sign(diff) * sorter.dir;
+  return a.name.localeCompare(b.name);
+};
+
+export const filterStations = (station: Station, filters: Record<string, any>) => {
+  if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
+    return false;
+
+  // Scenery Timetables section
+  if (filterTimetablesSection(filters, station)) return false;
+
+  // Scenery Accessibility section
+  if (filterAccessibilitySection(filters, station)) return false;
+
+  // Scenery Status section
+  if (station.onlineInfo && filterStatusSection(filters, station.onlineInfo)) return false;
+
+  if (station.generalInfo) {
+    // Scenery Reality section
+    if (filterRealitySection(filters, station.generalInfo)) return false;
+
+    // Scenery Additional Programs section
+    if (filterProgramsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Controls section
+    if (filterControlsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Signalling section(s)
+    if (filterSignalsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Station Type section
+    if (filterStationType(filters, station.generalInfo)) return false;
+
+    // Scenery sliders
+    if (filterSliderValues(filters, station.generalInfo)) return false;
+
+    // Scenery Authors section
+    if (filterInputValues(filters, station.generalInfo)) return false;
+  }
+
+  return true;
+};
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index a3be347..03ea588 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -8,7 +8,8 @@
       <Loading v-else-if="apiStore.dataStatuses.connection == Status.Loading" key="loading" />
 
       <div class="table-warning" key="no-trains" v-else-if="trains.length == 0">
-        {{ $t('trains.no-trains') }}
+        {{ $t('trains.no-trains') }} (region: <b>{{ store.region.name }}</b
+        >)
       </div>
 
       <transition-group name="list-anim" tag="ul">
@@ -108,8 +109,7 @@ export default defineComponent({
   text-align: center;
 
   padding: 1em 0;
-
-  font-size: 1.5em;
+  font-size: 1.25em;
 
   background: #1a1a1a;
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index 2922047..234b9ac 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -187,6 +187,9 @@
       "spawns": "OPEN SPAWNS"
     },
 
+    "changed-filters-count": "Changed filters:",
+    "no-changed-filters": "No changed filters",
+
     "all-available": "ALL AVAILABLE",
     "all-free": "CURRENTLY FREE",
 
@@ -297,7 +300,8 @@
       "single-track-routes-other": "Not electrified single-track routes count:  "
     },
     "no-stations": "No stations to show here!",
-    "scenery-search": "Search for scenery..."
+    "scenery-search": "Search for scenery...",
+    "active-filters": "Attention! You got active filters!"
   },
   "station-stats": {
     "u-factor": "U-factor",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index b01ee45..892d035 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -184,6 +184,9 @@
       "spawns": "OTWARTE SPAWNY"
     },
 
+    "changed-filters-count": "Zmienione filtry:",
+    "no-changed-filters": "Brak zmienionych filtrów",
+
     "all-available": "WSZYSTKIE DOSTĘPNE",
     "all-free": "WSZYSTKIE WOLNE",
 
@@ -291,7 +294,8 @@
       "single-track-routes-other": "Liczba niezelektryfikowanych szlaków jednotorowych: "
     },
     "no-stations": "Brak stacji do wyświetlenia!",
-    "scenery-search": "Wyszukaj scenerię..."
+    "scenery-search": "Wyszukaj scenerię...",
+    "active-filters": "Uwaga! Masz obecnie aktywne filtry!"
   },
   "station-stats": {
     "u-factor": "Współczynnik Ugla",
diff --git a/src/managers/stationFilterManager.ts b/src/managers/stationFilterManager.ts
index 500fa20..a920da4 100644
--- a/src/managers/stationFilterManager.ts
+++ b/src/managers/stationFilterManager.ts
@@ -109,8 +109,11 @@ export function setupFilters(currentFilters: Record<string, any>) {
   });
 }
 
-export function areFiltersAtDefault(currentFilters: Record<string, any>) {
-  return Object.keys(currentFilters).every(
-    (filterKey) => currentFilters[filterKey] === initFilters[filterKey as keyof typeof initFilters]
+export function getChangedFilters(currentFilters: Record<string, any>): string[] {
+  return (
+    Object.keys(currentFilters).filter(
+      (filterKey) =>
+        currentFilters[filterKey] !== initFilters[filterKey as keyof typeof initFilters]
+    ) ?? []
   );
 }
diff --git a/src/scripts/data/stationHeaderNames.ts b/src/scripts/data/stationHeaderNames.ts
deleted file mode 100644
index 8b13789..0000000
--- a/src/scripts/data/stationHeaderNames.ts
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/scripts/utils/stationFilterUtils.ts b/src/scripts/utils/stationFilterUtils.ts
deleted file mode 100644
index 0babe50..0000000
--- a/src/scripts/utils/stationFilterUtils.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import { ActiveSorter } from '../../components/StationsView/typings';
-import { ActiveScenery, StationGeneralInfo, Status } from '../../typings/common';
-import { Station } from '../../typings/common';
-
-const dispatcherStatusPriority = [
-  Status.ActiveDispatcher.UNKNOWN,
-  Status.ActiveDispatcher.INVALID,
-  Status.ActiveDispatcher.NOT_LOGGED_IN,
-  Status.ActiveDispatcher.UNAVAILABLE,
-  Status.ActiveDispatcher.AFK,
-  Status.ActiveDispatcher.ENDING,
-  Status.ActiveDispatcher.NO_SPACE,
-  undefined
-];
-
-const filtersAssociations: Record<string, string> = {
-  mechaniczne: 'mechanical',
-  ręczne: 'manual',
-  'mechaniczne+SPK': 'SPK-M',
-  'ręczne+SPK': 'SPK-R',
-  'mechaniczne+SCS': 'SCS-M',
-  'ręczne+SCS': 'SCS-R',
-  współczesna: 'modern',
-  historyczna: 'historical',
-  kształtowa: 'semaphores',
-  mieszana: 'mixed'
-};
-
-function filterStatusSection(
-  filters: Record<string, any>,
-  { dispatcherStatus, dispatcherTimestamp }: ActiveScenery
-) {
-  return (
-    (filters['endingStatus'] && dispatcherStatus == Status.ActiveDispatcher.ENDING) ||
-    (filters['unavailableStatus'] &&
-      (dispatcherStatus == Status.ActiveDispatcher.UNAVAILABLE ||
-        dispatcherStatus == Status.ActiveDispatcher.NOT_LOGGED_IN)) ||
-    (filters['afkStatus'] && dispatcherStatus == Status.ActiveDispatcher.AFK) ||
-    (filters['noSpaceStatus'] && dispatcherStatus == Status.ActiveDispatcher.NO_SPACE) ||
-    (filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE) ||
-    (filters['onlineFromHours'] > 0 &&
-      (dispatcherTimestamp ?? 0) <= Date.now() + filters['onlineFromHours'] * 3600000)
-  );
-}
-
-function filterTimetablesSection(filters: Record<string, any>, station: Station) {
-  return (
-    (filters['withoutActiveTimetables'] &&
-      (!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0)) ||
-    (filters['withActiveTimetables'] &&
-      station.onlineInfo &&
-      (station.onlineInfo.scheduledTrainCount.all != 0 ||
-        station.onlineInfo.dispatcherStatus == Status.ActiveDispatcher.FREE))
-  );
-}
-
-function filterAccessibilitySection(filters: Record<string, any>, station: Station) {
-  if (
-    filters['nonPublic'] &&
-    (!station.generalInfo || station.generalInfo.availability == 'nonPublic')
-  )
-    return true;
-
-  if (!station.generalInfo) return false;
-
-  const { availability } = station.generalInfo;
-
-  return (
-    (filters['unavailable'] && availability == 'unavailable' && !station.onlineInfo) ||
-    (filters['abandoned'] && availability == 'abandoned' && !station.onlineInfo) ||
-    (filters['default'] && availability == 'default') ||
-    (filters['notDefault'] &&
-      availability != 'default' &&
-      availability != 'abandoned' &&
-      availability != 'unavailable')
-  );
-}
-
-function filterRealitySection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  return (filters['real'] && generalInfo.lines) || (filters['fictional'] && !generalInfo.lines);
-}
-
-function filterProgramsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  return (
-    (filters['SUP'] && generalInfo.SUP) ||
-    (filters['noSUP'] && !generalInfo.SUP) ||
-    (filters['ASDEK'] && generalInfo.ASDEK) ||
-    (filters['noASDEK'] && !generalInfo.ASDEK)
-  );
-}
-
-function filterControlsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  return (
-    filters[generalInfo.controlType] == true ||
-    filters[filtersAssociations[generalInfo.controlType]] == true
-  );
-}
-
-function filterSignalsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  return (
-    filters[generalInfo.signalType] == true ||
-    filters[filtersAssociations[generalInfo.signalType]] == true ||
-    (filters['SBL'] && generalInfo.routes.sblNames.length > 0) ||
-    (filters['PBL'] && generalInfo.routes.sblNames.length == 0)
-  );
-}
-
-function filterStationType(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  const singleTracks = generalInfo.routes.single.filter((r) => !r.isInternal);
-  const doubleTracks = generalInfo.routes.double.filter((r) => !r.isInternal);
-
-  let isJunction = singleTracks.length > 0 && doubleTracks.length > 0;
-
-  return (filters['junction'] && isJunction) || (filters['nonJunction'] && !isJunction);
-}
-
-function filterSliderValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  const { availability, reqLevel, routes } = generalInfo;
-
-  const otherAvailability =
-    availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
-
-  return (
-    filters['minLevel'] > reqLevel + (otherAvailability ? 1 : 0) ||
-    filters['maxLevel'] < reqLevel + (otherAvailability ? 1 : 0) ||
-    filters['minVmax'] > routes.maxRouteSpeed ||
-    filters['maxVmax'] < routes.minRouteSpeed ||
-    (filters['no-1track'] && routes.single.length != 0) ||
-    (filters['no-2track'] && routes.double.length != 0) ||
-    filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length ||
-    filters['minOneWay'] > routes.singleOtherNames.length ||
-    filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length ||
-    filters['minTwoWay'] > routes.doubleOtherNames.length
-  );
-}
-
-function filterInputValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
-  return (
-    filters['authors'].length > 3 &&
-    !generalInfo.authors
-      ?.map((a) => a.toLocaleLowerCase())
-      .includes(filters['authors'].toLocaleLowerCase())
-  );
-}
-
-export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
-  let diff = 0;
-
-  switch (sorter.headerName) {
-    case 'station':
-      return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
-
-    case 'min-lvl':
-      diff = (a.generalInfo?.reqLevel || 0) - (b.generalInfo?.reqLevel || 0);
-      break;
-
-    case 'status':
-      diff =
-        (a.onlineInfo?.dispatcherTimestamp ??
-          dispatcherStatusPriority.indexOf(a.onlineInfo?.dispatcherStatus)) -
-        (b.onlineInfo?.dispatcherTimestamp ??
-          dispatcherStatusPriority.indexOf(b.onlineInfo?.dispatcherStatus));
-      break;
-
-    case 'dispatcher':
-      if (
-        (a.onlineInfo?.dispatcherName.toLowerCase() || '') >
-        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
-      )
-        return sorter.dir;
-      if (
-        (a.onlineInfo?.dispatcherName.toLowerCase() || '') <
-        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
-      )
-        return -sorter.dir;
-      break;
-
-    case 'dispatcher-lvl':
-      diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
-      break;
-
-    case 'routes-single':
-      diff =
-        (a.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
-        (b.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
-      break;
-
-    case 'routes-double':
-      diff =
-        (a.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
-        (b.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
-      break;
-
-    case 'user':
-      diff =
-        (b.onlineInfo?.stationTrains ? b.onlineInfo.stationTrains.length : -1) -
-        (a.onlineInfo?.stationTrains ? a.onlineInfo.stationTrains.length : -1);
-      break;
-
-    case 'like':
-      diff =
-        (a.onlineInfo ? a.onlineInfo.dispatcherRate : -Infinity) -
-        (b.onlineInfo ? b.onlineInfo.dispatcherRate : -Infinity);
-      break;
-
-    case 'spawn':
-      diff =
-        (a.onlineInfo ? a.onlineInfo.spawns.length : -1) -
-        (b.onlineInfo ? b.onlineInfo.spawns.length : -1);
-      break;
-
-    case 'timetableConfirmed':
-      diff =
-        (a.onlineInfo?.scheduledTrainCount.confirmed ?? -1) -
-        (b.onlineInfo?.scheduledTrainCount.confirmed ?? -1);
-      break;
-
-    case 'timetableUnconfirmed':
-      diff =
-        (a.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1) -
-        (b.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1);
-      break;
-
-    case 'timetableAll':
-      diff =
-        (a.onlineInfo?.scheduledTrainCount.all ?? -1) -
-        (b.onlineInfo?.scheduledTrainCount.all ?? -1);
-      break;
-
-    default:
-      break;
-  }
-
-  if (diff != 0) return Math.sign(diff) * sorter.dir;
-  return a.name.localeCompare(b.name);
-};
-
-export const filterStations = (station: Station, filters: Record<string, any>) => {
-  if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
-    return false;
-
-  // Scenery Timetables section
-  if (filterTimetablesSection(filters, station)) return false;
-
-  // Scenery Accessibility section
-  if (filterAccessibilitySection(filters, station)) return false;
-
-  // Scenery Status section
-  if (station.onlineInfo && filterStatusSection(filters, station.onlineInfo)) return false;
-
-  if (station.generalInfo) {
-    // Scenery Reality section
-    if (filterRealitySection(filters, station.generalInfo)) return false;
-
-    // Scenery Additional Programs section
-    if (filterProgramsSection(filters, station.generalInfo)) return false;
-
-    // Scenery Controls section
-    if (filterControlsSection(filters, station.generalInfo)) return false;
-
-    // Scenery Signalling section(s)
-    if (filterSignalsSection(filters, station.generalInfo)) return false;
-
-    // Scenery Station Type section
-    if (filterStationType(filters, station.generalInfo)) return false;
-
-    // Scenery sliders
-    if (filterSliderValues(filters, station.generalInfo)) return false;
-
-    // Scenery Authors section
-    if (filterInputValues(filters, station.generalInfo)) return false;
-  }
-
-  return true;
-};
diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts
deleted file mode 100644
index eab1d5b..0000000
--- a/src/store/stationFiltersStore.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { defineStore } from 'pinia';
-import inputData from '../data/options.json';
-import { useMainStore } from './mainStore';
-import { filterStations, sortStations } from '../scripts/utils/stationFilterUtils';
-import StorageManager from '../managers/storageManager';
-import { HeadIdsType } from '../components/StationsView/typings';
-
-export const useStationFiltersStore = defineStore('stationFiltersStore', {
-  state() {
-    return {
-      inputs: inputData,
-      // filters: { ...filterInitStates },
-      sorterActive: { headerName: 'station' as HeadIdsType, dir: 1 },
-      lastClickedFilterId: ''
-    };
-  },
-
-  getters: {
-    areFiltersAtDefault: (state) => {
-      return Object.keys(state.filters).every((f) => state.filters[f] === filterInitStates[f]);
-    },
-
-    filteredStationList: (state) => {
-      const store = useMainStore();
-
-      return store.allStationInfo
-        .filter((station) => filterStations(station, state.filters))
-        .sort((a, b) => sortStations(a, b, state.sorterActive));
-    }
-  },
-
-  actions: {
-    setupFilters() {
-      if (!StorageManager.isRegistered('options_saved')) return;
-
-      this.inputs.options.forEach((option) => {
-        if (!StorageManager.isRegistered(option.name)) return;
-        const savedValue = StorageManager.getBooleanValue(option.name);
-
-        this.filters[option.name] = savedValue;
-        option.value = !savedValue;
-      });
-
-      this.inputs.sliders.forEach((slider) => {
-        if (!StorageManager.isRegistered(slider.name)) return;
-        const savedValue = StorageManager.getNumericValue(slider.name);
-
-        this.filters[slider.name] = savedValue;
-        slider.value = savedValue;
-      });
-    },
-
-    changeFilterValue(name: string, value: any) {
-      this.filters[name] = value;
-      if (StorageManager.isRegistered('options_saved')) StorageManager.setValue(name, value);
-    },
-
-    // resetFilters() {
-    //   // this.filters = { ...filterInitStates };
-
-    //   this.inputs.options.forEach((option) => {
-    //     option.value = option.defaultValue;
-    //     StorageManager.setBooleanValue(option.name, !option.defaultValue);
-    //   });
-
-    //   this.inputs.sliders.forEach((slider) => {
-    //     slider.value = slider.defaultValue;
-    //     StorageManager.setNumericValue(slider.name, slider.defaultValue);
-    //   });
-    // },
-
-    resetSectionOptions(section: string) {
-      this.inputs.options
-        .filter((option) => option.section == section)
-        .forEach((option) => {
-          option.value = option.defaultValue;
-          StorageManager.setBooleanValue(option.name, !option.defaultValue);
-        });
-    },
-
-    changeSorter(headerName: HeadIdsType) {
-      if (headerName == this.sorterActive.headerName)
-        this.sorterActive.dir = -1 * this.sorterActive.dir;
-      else this.sorterActive.dir = 1;
-
-      this.sorterActive.headerName = headerName;
-    }
-  }
-});
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index 054d54a..43764d9 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -200,7 +200,7 @@ button.back-btn {
 
     display: inline-block;
 
-    font-size: 1.5em;
+    font-size: 1.25em;
 
     button {
       margin: 1em auto;
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index a749199..eb7e876 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -34,7 +34,6 @@ import { useMainStore } from '../store/mainStore';
 import DonationModal from '../components/Global/DonationModal.vue';
 import StationStats from '../components/StationsView/StationStats.vue';
 import { initFilters, setupFilters } from '../managers/stationFilterManager';
-import { filterStations, sortStations } from '../scripts/utils/stationFilterUtils';
 import { reactive } from 'vue';
 import { provide } from 'vue';
 import { ActiveSorter } from '../components/StationsView/typings';

From a529d6e9ebee7b245001572a2ecbb5fabcad4faf Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 23 May 2024 14:08:42 +0200
Subject: [PATCH 09/13] chore: changed no stations message

---
 src/components/StationsView/StationTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 81ad005..8f328da 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -306,8 +306,9 @@
         {{ $t('sceneries.no-stations') }} (region: <b>{{ mainStore.region.name }}</b
         >)
       </div>
+
       <div class="text--primary" v-if="getChangedFilters(filters).length != 0">
-        {{ $t('sceneries.active-filters') }}
+        ⚠ {{ $t('sceneries.active-filters') }}
       </div>
     </div>
   </section>
@@ -425,10 +426,9 @@ $rowCol: #424242;
 .no-stations {
   text-align: center;
   font-size: 1.25em;
-
   padding: 1em;
-
   background: #1a1a1a;
+  line-height: 1.5em;
 }
 
 table {

From 4c1fcf710b749198590f5007e5a33c0eaaf74057 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 23 May 2024 15:01:30 +0200
Subject: [PATCH 10/13] refactor: global modals to cards

---
 src/App.vue                                   | 16 ++--
 .../App/{UpdateModal.vue => UpdateCard.vue}   | 33 ++++---
 .../Global/{AnimatedModal.vue => Card.vue}    | 25 +++---
 .../{DonationModal.vue => DonationCard.vue}   | 89 +++++++++----------
 src/components/StationsView/StationTable.vue  |  8 +-
 src/components/TrainsView/TrainModal.vue      | 14 ---
 src/views/StationsView.vue                    | 18 ++--
 7 files changed, 94 insertions(+), 109 deletions(-)
 rename src/components/App/{UpdateModal.vue => UpdateCard.vue} (78%)
 rename src/components/Global/{AnimatedModal.vue => Card.vue} (74%)
 rename src/components/Global/{DonationModal.vue => DonationCard.vue} (80%)

diff --git a/src/App.vue b/src/App.vue
index cd5efe9..a2c9683 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app_container">
-    <UpdateModal
-      :update-modal-open="isUpdateModalOpen"
-      @toggle-modal="() => (isUpdateModalOpen = false)"
+    <UpdateCard
+      :is-update-card-open="isUpdateCardOpen"
+      @toggle-card="() => (isUpdateCardOpen = false)"
     />
 
     <Tooltip />
@@ -27,7 +27,7 @@
       &copy;
       <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
       {{ new Date().getUTCFullYear() }} |
-      <button class="btn--text" @click="() => (isUpdateModalOpen = true)">
+      <button class="btn--text" @click="() => (isUpdateCardOpen = true)">
         v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}
       </button>
 
@@ -56,7 +56,7 @@ import StatusIndicator from './components/App/StatusIndicator.vue';
 import AppHeader from './components/App/AppHeader.vue';
 import TrainModal from './components/TrainsView/TrainModal.vue';
 import Tooltip from './components/Tooltip/Tooltip.vue';
-import UpdateModal from './components/App/UpdateModal.vue';
+import UpdateCard from './components/App/UpdateCard.vue';
 
 import StorageManager from './managers/storageManager';
 
@@ -68,7 +68,7 @@ export default defineComponent({
     StatusIndicator,
     AppHeader,
     TrainModal,
-    UpdateModal,
+    UpdateCard,
     Tooltip
   },
 
@@ -78,7 +78,7 @@ export default defineComponent({
     apiStore: useApiStore(),
     tooltipStore: useTooltipStore(),
 
-    isUpdateModalOpen: false,
+    isUpdateCardOpen: false,
 
     currentLang: 'pl',
     isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
@@ -130,7 +130,7 @@ export default defineComponent({
           releaseURL: releaseData.html_url
         };
 
-        this.isUpdateModalOpen =
+        this.isUpdateCardOpen =
           storageVersion != version || import.meta.env.VITE_UPDATE_TEST === 'test';
       } catch (error) {
         console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
diff --git a/src/components/App/UpdateModal.vue b/src/components/App/UpdateCard.vue
similarity index 78%
rename from src/components/App/UpdateModal.vue
rename to src/components/App/UpdateCard.vue
index 23d5124..37f1207 100644
--- a/src/components/App/UpdateModal.vue
+++ b/src/components/App/UpdateCard.vue
@@ -1,12 +1,12 @@
 <template>
-  <AnimatedModal :is-open="updateModalOpen" @toggle-modal="toggleModal(false)">
-    <div class="modal-content">
+  <Card :is-open="isUpdateCardOpen" @toggle-card="toggleCard(false)">
+    <div class="content">
       <h1 style="margin-bottom: 0.5em">🚀 {{ $t('update.title') }}</h1>
 
       <div class="features-body" v-if="htmlChangelog != ''" v-html="htmlChangelog"></div>
       <div class="no-features" v-else>{{ $t('update.no-data') }}</div>
 
-      <button class="btn btn--action" ref="confirm-btn" @click="toggleModal(false)">
+      <button class="btn btn--action" ref="confirm-btn" @click="toggleCard(false)">
         {{ $t('update.confirm') }}
       </button>
 
@@ -16,7 +16,7 @@
         <span v-html="$t('update.info-2')"></span>
       </p>
     </div>
-  </AnimatedModal>
+  </Card>
 </template>
 
 <script lang="ts">
@@ -25,21 +25,21 @@ import { useMainStore } from '../../store/mainStore';
 import { version } from '../../../package.json';
 import { Converter } from 'showdown';
 
-import AnimatedModal from '../Global/AnimatedModal.vue';
+import Card from '../Global/Card.vue';
 
 const converter = new Converter();
 
 export default defineComponent({
-  components: { AnimatedModal },
+  components: { Card },
 
   props: {
-    updateModalOpen: {
+    isUpdateCardOpen: {
       type: Boolean,
       required: true
     }
   },
 
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   data() {
     return {
@@ -49,7 +49,7 @@ export default defineComponent({
   },
 
   watch: {
-    updateModalOpen(val: boolean) {
+    isUpdateCardOpen(val: boolean) {
       this.$nextTick(() => {
         if (val) (this.$refs['confirm-btn'] as HTMLElement).focus();
       });
@@ -65,29 +65,33 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     }
   }
 });
 </script>
 
 <style lang="scss" scoped>
+@import '../../styles/variables';
+
 ::v-deep(h1) {
   text-align: center;
+  color: $accentCol;
 }
 
 ::v-deep(h2) {
   padding: 0.25em 0;
+  border-bottom: 1px solid #aaa;
 }
 
 ::v-deep(ul) {
-  list-style: inside;
-  padding: 0.5em;
+  list-style: initial;
+  padding: 1em;
   line-height: 1.5em;
 }
 
-.modal-content {
+.content {
   display: grid;
   grid-template-rows: auto 1fr auto;
   gap: 0.5em;
@@ -95,6 +99,7 @@ export default defineComponent({
   min-height: 700px;
   overflow: auto;
   text-align: justify;
+  max-width: 700px;
 }
 
 .no-features {
diff --git a/src/components/Global/AnimatedModal.vue b/src/components/Global/Card.vue
similarity index 74%
rename from src/components/Global/AnimatedModal.vue
rename to src/components/Global/Card.vue
index af32698..06e9eed 100644
--- a/src/components/Global/AnimatedModal.vue
+++ b/src/components/Global/Card.vue
@@ -1,11 +1,11 @@
 <template>
   <transition name="modal-anim" tag="div">
-    <div class="modal" v-if="isOpen">
-      <div class="modal-background" @click="toggleModal(false)"></div>
-      <div class="modal-wrapper" ref="wrapper" tabindex="0">
+    <div class="card" v-if="isOpen">
+      <div class="card-background" @click="toggleCard(false)"></div>
+      <div class="card-body" ref="wrapper" tabindex="0">
         <slot></slot>
       </div>
-      <div class="tab-exit" ref="exit" tabindex="0" @focus="toggleModal(false)"></div>
+      <div class="tab-exit" ref="exit" tabindex="0" @focus="toggleCard(false)"></div>
     </div>
   </transition>
 </template>
@@ -15,7 +15,7 @@ import { defineComponent } from 'vue';
 import { useMainStore } from '../../store/mainStore';
 
 export default defineComponent({
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   props: {
     isOpen: Boolean
@@ -36,8 +36,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     }
   }
 });
@@ -46,7 +46,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
 
-.modal {
+.card {
   position: fixed;
   top: 0;
   left: 0;
@@ -56,7 +56,7 @@ export default defineComponent({
   z-index: 200;
 }
 
-.modal-background {
+.card-background {
   position: absolute;
   top: 0;
   left: 0;
@@ -68,7 +68,7 @@ export default defineComponent({
   background-color: rgba(0, 0, 0, 0.55);
 }
 
-.modal-wrapper {
+.card-body {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -77,12 +77,11 @@ export default defineComponent({
   overflow: auto;
   max-height: 95vh;
 
+  box-shadow: 0 0 15px 10px #0e0e0e;
+
   & > :slotted(div) {
     background-color: #1a1a1a;
-    box-shadow: 0 0 15px 10px #0e0e0e;
-
     width: 95vw;
-    max-width: 850px;
   }
 }
 </style>
diff --git a/src/components/Global/DonationModal.vue b/src/components/Global/DonationCard.vue
similarity index 80%
rename from src/components/Global/DonationModal.vue
rename to src/components/Global/DonationCard.vue
index f2b90b0..a1d0fc4 100644
--- a/src/components/Global/DonationModal.vue
+++ b/src/components/Global/DonationCard.vue
@@ -1,12 +1,7 @@
 <template>
-  <AnimatedModal
-    class="donation-modal"
-    :isOpen="isModalOpen"
-    @toggleModal="toggleModal"
-    @keydown.esc="toggleModal(false)"
-  >
-    <div class="modal_content">
-      <div class="modal_main">
+  <Card :isOpen="isCardOpen" @toggleCard="toggleCard" @keydown.esc="toggleCard(false)">
+    <div class="body">
+      <div class="content">
         <h1 v-html="$t('donations.header')"></h1>
         <div class="donators-slider" v-if="donatorList.length != 0">
           <span v-html="$t('donations.donator-title', { count: donatorList.length })"></span>
@@ -61,9 +56,9 @@
         </i>
       </div>
 
-      <div class="modal_actions">
+      <div class="actions">
         <a
-          class="modal-action a-button btn--image coffee"
+          class="action a-button btn--image coffee"
           href="https://buycoffee.to/spythere"
           target="_blank"
           ref="action"
@@ -73,7 +68,7 @@
         </a>
 
         <a
-          class="modal-action a-button btn--image paypal"
+          class="action a-button btn--image paypal"
           href="https://www.paypal.com/donate/?hosted_button_id=EDB3SKFAHXFTW"
           target="_blank"
         >
@@ -81,30 +76,30 @@
           {{ $t('donations.action-paypal') }}
         </a>
 
-        <button class="modal-action btn--image exit" @click="toggleModal(false)">
+        <button class="action btn--image exit" @click="toggleCard(false)">
           <img src="/images/icon-exit.svg" alt="dollar donation icon" />
           {{ $t('donations.action-exit') }}
         </button>
       </div>
     </div>
-  </AnimatedModal>
+  </Card>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import AnimatedModal from './AnimatedModal.vue';
 import { useApiStore } from '../../store/apiStore';
+import Card from './Card.vue';
 
 export default defineComponent({
-  components: { AnimatedModal },
+  components: { Card },
   props: {
-    isModalOpen: Boolean
+    isCardOpen: Boolean
   },
 
-  emits: ['toggleModal'],
+  emits: ['toggleCard'],
 
   watch: {
-    isModalOpen(val: boolean) {
+    isCardOpen(val: boolean) {
       this.running = val;
       this.lastUpdate = Date.now();
 
@@ -138,8 +133,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleModal(value: boolean) {
-      this.$emit('toggleModal', value);
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
     },
 
     runUpdate() {
@@ -157,53 +152,53 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
 
-.modal_content {
+.body {
   display: grid;
   grid-template-rows: 1fr auto;
   gap: 1em;
 
   font-size: 1.1em;
 
-  & > div {
-    padding: 1em;
-  }
-
-  h1 {
-    font-size: 1.95em;
-    text-align: center;
-  }
-
-  p {
-    text-align: justify;
-  }
-
-  a.discord {
-    text-decoration: underline;
-  }
+  max-width: 820px;
 }
 
-.modal_main {
+.content {
   overflow: auto;
   overflow-x: hidden;
-
-  img {
-    max-height: 20px;
-    margin-right: 5px;
-    vertical-align: text-bottom;
-  }
+  padding: 1em;
 }
 
-.modal_actions {
+img {
+  max-height: 20px;
+  margin-right: 5px;
+  vertical-align: text-bottom;
+}
+
+h1 {
+  font-size: 1.95em;
+  text-align: center;
+}
+
+p {
+  text-align: justify;
+}
+
+a.discord {
+  text-decoration: underline;
+}
+
+.actions {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
   gap: 0.5em;
+  padding: 1em;
 
   form button {
     width: 100%;
   }
 }
 
-.modal_actions > .modal-action {
+.actions > .action {
   &.paypal {
     $btnColor: #254069;
 
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 8f328da..b06478e 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -122,7 +122,7 @@
               <span v-if="station.onlineInfo?.dispatcherName">
                 <b
                   v-if="apiStore.donatorsData.includes(station.onlineInfo.dispatcherName)"
-                  @click.stop="openDonationModal"
+                  @click.stop="openDonationCard"
                   data-tooltip-type="DonatorTooltip"
                   :data-tooltip-content="$t('donations.dispatcher-message')"
                 >
@@ -329,7 +329,7 @@ import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
 import { filterStations, sortStations } from './utils';
 
 export default defineComponent({
-  emits: ['toggleDonationModal'],
+  emits: ['toggleDonationCard'],
 
   components: { Loading, StationStatusBadge },
   mixins: [styleMixin, dateMixin],
@@ -384,8 +384,8 @@ export default defineComponent({
       });
     },
 
-    openDonationModal(e: Event) {
-      this.$emit('toggleDonationModal', true);
+    openDonationCard(e: Event) {
+      this.$emit('toggleDonationCard', true);
       this.mainStore.modalLastClickedTarget = e.target;
       this.tooltipStore.hide();
     },
diff --git a/src/components/TrainsView/TrainModal.vue b/src/components/TrainsView/TrainModal.vue
index 40ccc4c..f5d1570 100644
--- a/src/components/TrainsView/TrainModal.vue
+++ b/src/components/TrainsView/TrainModal.vue
@@ -40,20 +40,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
-@import '../../styles/card.scss';
-
-.top-info-bar-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all 150ms ease-in-out;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translate(-50%, -50%) scale(0.8);
-    opacity: 0;
-  }
-}
 
 .train-modal {
   position: fixed;
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index eb7e876..ff97c5a 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -11,16 +11,16 @@
         <button
           class="btn-donation btn--image"
           ref="btn"
-          @click="isDonationModalOpen = true"
-          @focus="isDonationModalOpen = false"
+          @click="isDonationCardOpen = true"
+          @focus="isDonationCardOpen = false"
         >
           <img src="/images/icon-dollar.svg" alt="dollar donation icon" />
           <span>{{ $t('donations.button-title') }}</span>
         </button>
       </div>
 
-      <DonationModal :isModalOpen="isDonationModalOpen" @toggleModal="toggleDonationModal" />
-      <StationTable @toggleDonationModal="toggleDonationModal" />
+      <DonationCard :is-card-open="isDonationCardOpen" @toggle-card="toggleDonationCard" />
+      <StationTable @toggle-donation-card="toggleDonationCard" />
       <StationStats />
     </div>
   </section>
@@ -31,7 +31,7 @@ import { defineComponent } from 'vue';
 import StationTable from '../components/StationsView/StationTable.vue';
 import StationFilterCard from '../components/StationsView/StationFilterCard.vue';
 import { useMainStore } from '../store/mainStore';
-import DonationModal from '../components/Global/DonationModal.vue';
+import DonationCard from '../components/Global/DonationCard.vue';
 import StationStats from '../components/StationsView/StationStats.vue';
 import { initFilters, setupFilters } from '../managers/stationFilterManager';
 import { reactive } from 'vue';
@@ -46,12 +46,12 @@ export default defineComponent({
     StationTable,
     StationFilterCard,
     StationStats,
-    DonationModal
+    DonationCard
   },
 
   data: () => ({
     filterCardOpen: false,
-    isDonationModalOpen: false,
+    isDonationCardOpen: false,
 
     mainStore: useMainStore()
   }),
@@ -69,8 +69,8 @@ export default defineComponent({
   },
 
   methods: {
-    toggleDonationModal(value: boolean) {
-      this.isDonationModalOpen = value;
+    toggleDonationCard(value: boolean) {
+      this.isDonationCardOpen = value;
     }
   }
 });

From 8aa23468b30a7600e30df25b671b5e5cd89ddbdc Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 23 May 2024 15:53:18 +0200
Subject: [PATCH 11/13] chore: changed station stats median to avg

---
 src/components/StationsView/StationStats.vue | 32 ++++++++------------
 src/locales/en.json                          |  2 +-
 src/locales/pl.json                          |  2 +-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/components/StationsView/StationStats.vue b/src/components/StationsView/StationStats.vue
index 4ee718b..ba8552a 100644
--- a/src/components/StationsView/StationStats.vue
+++ b/src/components/StationsView/StationStats.vue
@@ -21,8 +21,8 @@
 
       <div>
         &bull;
-        {{ $t('station-stats.med-timetable-count') }}
-        <b>{{ medTimetableCount }}</b>
+        {{ $t('station-stats.avg-timetable-count') }}
+        <b>{{ avgTimetableCount.toFixed(2) }}</b>
       </div>
 
       <div>
@@ -89,27 +89,19 @@ export default defineComponent({
       return activeDispatchers.length != 0 ? activeTrains.length / activeDispatchers.length : 0;
     },
 
-    medTimetableCount() {
-      const scheduledTrainsArr = this.mainStore.activeSceneryList
-        .reduce<number[]>((acc, sc) => {
-          if (sc.region != this.mainStore.region.id) return acc;
+    avgTimetableCount() {
+      const regionSceneries = this.mainStore.activeSceneryList.filter((sc) => {
+        return sc.region == this.mainStore.region.id;
+      });
 
-          acc.push(sc.scheduledTrainCount.all);
+      const timetableCountSum = regionSceneries.reduce((acc, sc) => {
+        acc += sc.scheduledTrainCount.all;
+        return acc;
+      }, 0);
 
-          return acc;
-        }, [])
-        .sort((a, b) => Math.sign(a - b));
+      if (regionSceneries.length == 0) return 0;
 
-      if (scheduledTrainsArr.length == 0) return 0;
-
-      if (scheduledTrainsArr.length % 2 == 0) {
-        let v1 = scheduledTrainsArr[scheduledTrainsArr.length / 2];
-        let v2 = scheduledTrainsArr[scheduledTrainsArr.length / 2 - 1];
-
-        return (v1 + v2) / 2;
-      }
-
-      return scheduledTrainsArr[~~(scheduledTrainsArr.length / 2)];
+      return timetableCountSum / regionSceneries.length;
     },
 
     trackCount() {
diff --git a/src/locales/en.json b/src/locales/en.json
index 234b9ac..2e3d8eb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -306,7 +306,7 @@
   "station-stats": {
     "u-factor": "U-factor",
     "u-factor-tooltip": "(?) Current server traffic factor (driver count divided by dispatcher count)",
-    "med-timetable-count": "Median of scenery timetables:",
+    "avg-timetable-count": "Average count of scenery timetables:",
     "single-track-count": "Single track routes:",
     "double-track-count": "Double track routes:",
     "cross-sceneries": "Cross-track sceneries (1-track <-> 2-track)",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 892d035..1f233b4 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -300,7 +300,7 @@
   "station-stats": {
     "u-factor": "Współczynnik Ugla",
     "u-factor-tooltip": "(?) Współczynnik ruchu na serwerze (liczba maszynistów online dzielona na liczbę dyżurnych ruchu)",
-    "med-timetable-count": "Mediana rozkładów jazdy na sceneriach:",
+    "avg-timetable-count": "Średnia liczba rozkładów jazdy na sceneriach:",
     "single-track-count": "Szlaki jednotorowe:",
     "double-track-count": "Szlaki dwutorowe:",
     "cross-sceneries": "Scenerie przejściowe (1-tor <-> 2-tor):",

From f0c02bf12ea52b8b6bbe9ebbfc228fccfcb4cb2f Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Fri, 24 May 2024 13:43:29 +0200
Subject: [PATCH 12/13] chore: pwa adjustments

---
 vite.config.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vite.config.ts b/vite.config.ts
index 2452fc7..b629cac 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,6 +7,10 @@ export default defineConfig({
     port: 5001,
     open: true
   },
+  preview: {
+    port: 4001,
+    open: true
+  },
   publicDir: 'public',
   plugins: [
     vue(),
@@ -36,6 +40,10 @@ export default defineConfig({
               cacheName: 'spythere-static-cache',
               cacheableResponse: {
                 statuses: [0, 200]
+              },
+              expiration: {
+                maxEntries: 100,
+                maxAgeSeconds: 60 * 60 * 8
               }
             }
           }

From 29de1b3c4b65df1bbf4bcda8b74b131c0c26ddef Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Fri, 24 May 2024 13:52:42 +0200
Subject: [PATCH 13/13] chore: scenery view layout

---
 src/views/SceneryView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index 43764d9..11501f0 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -233,7 +233,7 @@ button.back-btn {
   background-color: #181818;
   padding: 1em 0.5em;
 
-  height: 95vh;
+  height: 100vh;
   min-height: 750px;
   max-height: 1000px;
   overflow: auto;
@@ -246,7 +246,7 @@ button.back-btn {
   background: #181818;
   padding: 1em 0.5em;
 
-  height: 95vh;
+  height: 100vh;
   min-height: 750px;
   max-height: 1000px;