-
- {{ $t('station-stats.u-factor') }}
-
(?):
-
- {{ uFactor.toFixed(2) }}
-
- | {{ $t('station-stats.avg-timetable-count') }}
-
{{ avgTimetableCount.toFixed(2) }}
-
-
- {{ $t('station-stats.single-track-count') }}
-
{{ trackCount.oneWayElectric }} {{ $t('station-stats.electrified') }} /
-
{{ trackCount.oneWayOther }} {{ $t('station-stats.not-electrified') }} |
- {{ $t('station-stats.double-track-count') }}
{{ trackCount.twoWayElectric }}
- {{ $t('station-stats.electrified') }} /
{{ trackCount.twoWayOther }}
- {{ $t('station-stats.not-electrified') }} | {{ $t('station-stats.open-spawns') }}
-
{{ spawnCount.passenger }} - PAS /
{{ spawnCount.freight }} - TOW /
-
{{ spawnCount.loco }} - LUZ /
{{ spawnCount.all }} - ALL
+
+
+
+ •
+
{{ $t('station-stats.u-factor') }}
+ (?):
+
+
+
+ {{ uFactor.toFixed(2) }}
+
+
+
+
+ •
+ {{ $t('station-stats.med-timetable-count') }}
+ {{ medTimetableCount }}
+
+
+
+ •
+ {{ $t('station-stats.single-track-count') }}
+ {{ trackCount.oneWayElectric }} {{ $t('station-stats.electrified') }} /
+ {{ trackCount.oneWayOther }} {{ $t('station-stats.not-electrified') }}
+
+
+
+ •
+ {{ $t('station-stats.double-track-count') }}
+ {{ trackCount.twoWayElectric }} {{ $t('station-stats.electrified') }} /
+ {{ trackCount.twoWayOther }}
+ {{ $t('station-stats.not-electrified') }}
+
+
+
• {{ $t('station-stats.cross-sceneries') }} test
+
+
+ •
+ {{ $t('station-stats.open-spawns') }} {{ spawnCount.passenger }} - PAS /
+ {{ spawnCount.freight }} - TOW / {{ spawnCount.loco }} - LUZ /
+ {{ spawnCount.all }} - ALL
+
@@ -63,18 +88,28 @@ export default defineComponent({
return activeDispatchers.length != 0 ? activeTrains.length / activeDispatchers.length : 0;
},
- avgTimetableCount() {
- const scheduledTrainsTotal = this.mainStore.activeSceneryList.reduce
((acc, sc) => {
- if (sc.region != this.mainStore.region.id) return acc;
+ medTimetableCount() {
+ const scheduledTrainsArr = this.mainStore.activeSceneryList
+ .reduce((acc, sc) => {
+ if (sc.region != this.mainStore.region.id) return acc;
- acc += sc.scheduledTrainCount.all;
+ acc.push(sc.scheduledTrainCount.all);
- return acc;
- }, 0);
+ return acc;
+ }, [])
+ .sort((a, b) => Math.sign(a - b));
- return this.mainStore.activeSceneryList.length != 0
- ? scheduledTrainsTotal / this.mainStore.activeSceneryList.length
- : 0;
+ if (scheduledTrainsArr.length == 0) return 0;
+
+ let v1 = scheduledTrainsArr[scheduledTrainsArr.length / 2];
+
+ if (scheduledTrainsArr.length % 2 == 0) {
+ let v2 = scheduledTrainsArr[scheduledTrainsArr.length / 2 - 1];
+
+ return (v1 + v2) / 2;
+ }
+
+ return v1;
},
trackCount() {
@@ -133,19 +168,30 @@ export default defineComponent({
color: #ddd;
}
-[data-factor-low='true'] {
- color: #ddd;
+.stats-row {
+ display: flex;
+ justify-content: center;
+ flex-wrap: wrap;
+ text-wrap: pretty;
+ gap: 0.25em;
+ margin-top: 0.25em;
}
-[data-factor-mediocre='true'] {
- color: lightgreen;
-}
+.u-factor {
+ [data-factor-low='true'] {
+ color: #ddd;
+ }
-[data-factor-high='true'] {
- color: greenyellow;
-}
+ [data-factor-mediocre='true'] {
+ color: lightgreen;
+ }
-[data-factor-highest='true'] {
- color: rgb(22, 245, 22);
+ [data-factor-high='true'] {
+ color: greenyellow;
+ }
+
+ [data-factor-highest='true'] {
+ color: rgb(22, 245, 22);
+ }
}
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 9059faa..3569faa 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -406,7 +406,7 @@ $rowCol: #424242;
.station_table {
height: 80vh;
- min-height: 550px;
+ min-height: 700px;
overflow: auto;
font-weight: 500;
}
diff --git a/src/components/TrainsView/TrainOptions.vue b/src/components/TrainsView/TrainOptions.vue
index 5763527..5a0e3b6 100644
--- a/src/components/TrainsView/TrainOptions.vue
+++ b/src/components/TrainsView/TrainOptions.vue
@@ -81,7 +81,6 @@
-
@@ -223,9 +222,6 @@ export default defineComponent({
.filter-actions {
display: flex;
- gap: 0.5em;
- width: 100%;
-
margin-top: 1em;
> * {
diff --git a/src/locales/en.json b/src/locales/en.json
index 4443ce5..c30c1be 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -299,9 +299,10 @@
"station-stats": {
"u-factor": "U-factor",
"u-factor-tooltip": "(?) Current server traffic factor (driver count divided by dispatcher count)",
- "avg-timetable-count": "Average timetable count for one dispatcher:",
- "single-track-count": "Available single track routes:",
- "double-track-count": "Available double track routes:",
+ "med-timetable-count": "Median of scenery timetables:",
+ "single-track-count": "Single track routes:",
+ "double-track-count": "Double track routes:",
+ "cross-sceneries": "Cross-track sceneries (1-track <-> 2-track)",
"electrified": "(electrified)",
"not-electrified": "(not electr.)",
"open-spawns": "Open spawns:"
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 17573ae..8a33007 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -108,8 +108,8 @@
"filters": "FILTRY",
"donate": "WESPRZYJ",
- "search-button": "Szukaj",
- "reset-button": "Zresetuj",
+ "search-button": "SZUKAJ",
+ "reset-button": "ZRESETUJ",
"sort-title": "SORTUJ WG:",
"filter-title": "FILTRUJ WG:",
@@ -292,9 +292,10 @@
"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)",
- "avg-timetable-count": "Średnia liczba rozkładów jazdy na dyżurnego:",
- "single-track-count": "Dostępne szlaki jednotorowe:",
- "double-track-count": "Dostępne szlaki dwutorowe:",
+ "med-timetable-count": "Mediana 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):",
"electrified": "(zelektr.)",
"not-electrified": "(niezelektr.)",
"open-spawns": "Otwarte spawny:"
diff --git a/src/styles/global.scss b/src/styles/global.scss
index c6ce8e6..12fa47c 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -121,8 +121,6 @@ input {
height: 7px;
background-color: lightgreen;
border-radius: 50%;
-
- margin-left: 10px;
}
a {
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index d67209a..6a4c20d 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -84,6 +84,7 @@ export default defineComponent({
.stations-options {
display: flex;
justify-content: space-between;
+ flex-wrap: wrap;
gap: 0.5em;
margin-bottom: 0.5em;