Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 21:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zmiana w funkcjonowaniu filtrów, zmiany estetyczne

Browse Source
This commit is contained in:
Spythere
2020-09-01 20:49:15 +02:00
parent c7950ac757
commit 3febe562bf
10 changed files with 562 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/store/modules/stationsModule.ts
+79 -167
View File
@@ -1,14 +1,14 @@
import { Module, VuexModule, Mutation, Action } from "vuex-module-decorators";
import axios from "axios";
import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators';
import axios from 'axios';
import data from "@/data/stations.json";
import Station from "@/scripts/interfaces/Station";
import data from '@/data/stations.json';
import Station from '@/scripts/interfaces/Station';
const stationsOnlineURL =
"https://api.td2.info.pl:9640/?method=getStationsOnline";
const trainsOnlineURL = "https://api.td2.info.pl:9640/?method=getTrainsOnline";
'https://api.td2.info.pl:9640/?method=getStationsOnline';
const trainsOnlineURL = 'https://api.td2.info.pl:9640/?method=getTrainsOnline';
const dispatchersOnlineURL =
"https://api.td2.info.pl:9640/?method=readFromSWDR&value=getDispatcherStatusList%3B1";
'https://api.td2.info.pl:9640/?method=readFromSWDR&value=getDispatcherStatusList%3B1';
enum ConnState {
Loading = 0,
@@ -18,14 +18,13 @@ enum ConnState {
interface TimetableResponseData {
stopPoints:
| {
arrivalTime: string;
arrivalDelay: number;
departureTime: string;
departureDelay: number;
pointNameRAW: string;
}[]
| [];
{
arrivalTime: string;
arrivalDelay: number;
departureTime: string;
departureDelay: number;
pointNameRAW: string;
}[];
trainInfo: {
timetableId: number;
trainCategoryCode: string;
@@ -53,127 +52,54 @@ let onlineTrainsData: {
isOnline: number;
region: string;
trainNo: number;
station: { stationName: string };
station: {
stationName: string;
};
}[];
const filterInitStates = {
default: false,
notDefault: false,
nonPublic: false,
SPK: false,
SCS: false,
ręczne: false,
mechaniczne: false,
współczesna: false,
kształtowa: false,
historyczna: false,
mieszana: false,
minLevel: 0,
minOneWayCatenary: 0,
minOneWay: 0,
minTwoWayCatenary: 0,
minTwoWay: 0,
"no-1track": false,
"no-2track": false,
free: true,
occupied: false,
ending: false,
};
const queryStations = axios.get(stationsOnlineURL);
const queryTrains = axios.get(trainsOnlineURL);
const queryDispatchers = axios.get(dispatchersOnlineURL);
const getStationLabel = (stationStatus: any) => {
if (!stationStatus) return "NIEZALOGOWANY";
if (!stationStatus) return 'NIEZALOGOWANY';
const statusCode = stationStatus[2];
const statusTimestamp = stationStatus[3];
switch (statusCode) {
case 0:
if (statusTimestamp - Date.now() > 21000000) return "BEZ LIMITU";
if (statusTimestamp - Date.now() > 21000000) return 'BEZ LIMITU';
return `DO ${new Date(statusTimestamp).toLocaleTimeString("en-US", {
return `DO ${new Date(statusTimestamp).toLocaleTimeString('en-US', {
hour12: false,
hour: "2-digit",
minute: "2-digit",
hour: '2-digit',
minute: '2-digit',
})}`;
case 1:
return "Z/W";
return 'Z/W';
case 2:
if (statusTimestamp == 0) return "KOŃCZY";
if (statusTimestamp == 0) return 'KOŃCZY';
break;
case 3:
return "BRAK MIEJSCA";
return 'BRAK MIEJSCA';
default:
break;
}
return "NIEDOSTĘPNY";
return 'NIEDOSTĘPNY';
};
const getOpenSpawns = (spawnString: string) => {
if (!spawnString) return "";
if (!spawnString) return '';
return spawnString
.split(";")
.map((v) => (v.split(",")[6] ? v.split(",")[6] : v.split(",")[0]));
};
const filterStations = (stations, filters) => {
return stations.filter((station) => {
if ((station.nonPublic || !station.reqLevel) && filters["nonPublic"])
return false;
if (!station.reqLevel || station.reqLevel == "-1") return true;
if (station.online && station.occupiedTo == "KOŃCZY" && filters["ending"])
return false;
if (station.online && filters["occupied"]) return false;
if (!station.online && filters["free"]) return false;
if (station.default && filters["default"]) return false;
if (!station.default && filters["notDefault"]) return false;
if (station.reqLevel < filters["minLevel"]) return false;
if (
filters["no-1track"] &&
(station.routes.oneWay.catenary != 0 ||
station.routes.oneWay.noCatenary != 0)
)
return false;
if (
filters["no-2track"] &&
(station.routes.twoWay.catenary != 0 ||
station.routes.twoWay.noCatenary != 0)
)
return false;
if (station.routes.oneWay.catenary < filters["minOneWayCatenary"])
return false;
if (station.routes.oneWay.noCatenary < filters["minOneWay"]) return false;
if (station.routes.twoWay.catenary < filters["minTwoWayCatenary"])
return false;
if (station.routes.twoWay.noCatenary < filters["minTwoWay"]) return false;
if (filters[station.controlType]) return false;
if (filters[station.signalType]) return false;
if (filters["SPK"] && station.controlType.includes("SPK")) return false;
if (filters["SCS"] && station.controlType.includes("SCS")) return false;
if (filters["mechaniczne"] && station.controlType.includes("mechaniczne"))
return false;
if (filters["ręczne"] && station.controlType.includes("ręczne"))
return false;
return true;
});
.split(';')
.map(v => (v.split(',')[6] ? v.split(',')[6] : v.split(',')[0]));
};
@Module
@@ -184,24 +110,20 @@ export default class StationsModule extends VuexModule {
private stationsConnectionState: ConnState = ConnState.Loading;
private stations: Station[] = [];
private filteredStations: {}[] = [];
private filters: any = { ...filterInitStates };
get getConnectionState() {
return this.stationsConnectionState;
}
get getOnlineInfo() {
return { trainCount: this.trainCount, stationCount: this.stationCount };
return {
trainCount: this.trainCount,
stationCount: this.stationCount,
};
}
get getStationList() {
return this.filteredStations;
}
get getFilters() {
return this.filters;
return this.stations;
}
@Mutation
@@ -213,22 +135,22 @@ export default class StationsModule extends VuexModule {
private updateStations(updatedStations) {
this.stations = this.stations.reduce((acc, station) => {
const onlineStationData = updatedStations.find(
(uStation) => uStation.stationName === station.stationName
uStation => uStation.stationName === station.stationName
);
if (!onlineStationData) {
acc.push({
...station,
stationProject: "",
spawnString: "",
stationHash: "",
stationProject: '',
spawnString: '',
stationHash: '',
maxUsers: 0,
currentUsers: 0,
dispatcherName: "",
dispatcherName: '',
dispatcherRate: 0,
dispatcherExp: -1,
dispatcherId: 0,
occupiedTo: "WOLNA",
occupiedTo: 'WOLNA',
statusTimestamp: 0,
scheduledTrains: [],
online: false,
@@ -237,7 +159,11 @@ export default class StationsModule extends VuexModule {
return acc;
}
acc.push({ ...station, ...onlineStationData, online: true });
acc.push({
...station,
...onlineStationData,
online: true,
});
// updatedStations = updatedStations.filter(
// (updated: any) => updated.stationName !== station.stationName
@@ -249,66 +175,48 @@ export default class StationsModule extends VuexModule {
// Dodawanie do listy online potencjalnych scenerii niewpisanych do bazy
updatedStations.forEach((updated: any) => {
const alreadyInList: any = this.stations.find(
(station) => station.stationName === updated.stationName
station => station.stationName === updated.stationName
);
if (!alreadyInList) {
this.stations.push({ ...updated, online: true, reqLevel: "-1" });
this.stations.push({
...updated,
online: true,
reqLevel: '-1',
});
}
});
this.filteredStations = filterStations(this.stations, this.filters);
this.stationCount = this.stations.filter(
(station) => station.online
).length;
this.stationCount = this.stations.filter(station => station.online).length;
this.trainCount = onlineTrainsData.filter(
(train) => train.isOnline && train.region === "eu"
train => train.isOnline && train.region === 'eu'
).length;
this.stationsConnectionState = ConnState.Connected;
}
@Mutation
private resetFilterList() {
this.filters = { ...filterInitStates };
this.filteredStations = filterStations(this.stations, this.filters);
}
@Mutation
private changeFilter({ filterName, value }) {
this.filters[filterName] = value;
this.filteredStations = filterStations(this.stations, this.filters);
}
@Mutation
private mutateStations(stations) {
this.stations = stations;
}
@Action({ commit: "changeFilter" })
setFilter(payload: { filterName: string; value: number | boolean }) {
return payload;
}
@Action({ commit: "resetFilterList" })
resetFilters() {}
@Action({ commit: "mutateStations" })
@Action({
commit: 'mutateStations',
})
async loadStations() {
return await data.map((stationData) => ({
stationProject: "",
spawnString: "",
stationHash: "",
return await data.map(stationData => ({
stationProject: '',
spawnString: '',
stationHash: '',
maxUsers: 0,
currentUsers: 0,
dispatcherName: "",
dispatcherName: '',
dispatcherRate: 0,
dispatcherExp: -1,
dispatcherId: 0,
online: false,
occupiedTo: "WOLNA",
occupiedTo: 'WOLNA',
statusTimestamp: 0,
scheduledTrains: [],
...stationData,
@@ -317,43 +225,47 @@ export default class StationsModule extends VuexModule {
@Action
async initStations() {
this.context.dispatch("loadStations");
this.context.dispatch("fetchOnlineStations");
this.context.dispatch('loadStations');
this.context.dispatch('fetchOnlineStations');
}
@Action({ commit: "updateStations" })
@Action({
commit: 'updateStations',
})
async fetchOnlineStations() {
return await Promise.all([
axios.get(stationsOnlineURL),
axios.get(trainsOnlineURL),
axios.get(dispatchersOnlineURL),
])
.then(async (response) => {
.then(async response => {
onlineStationsData = response[0].data.message;
onlineTrainsData = await response[1].data.message;
onlineDispatchersData = await response[2].data.message;
const updatedStations = await Promise.all(
onlineStationsData
.filter((station) => station.region === "eu" && station.isOnline)
.map(async (station) => {
.filter(station => station.region === 'eu' && station.isOnline)
.map(async station => {
const stationStatus = onlineDispatchersData.find(
(status) =>
status[0] == station.stationHash && status[1] == "eu"
status => status[0] == station.stationHash && status[1] == 'eu'
);
const statusLabel = getStationLabel(stationStatus);
const statusTimestamp = stationStatus ? stationStatus[3] : -1;
const trains = onlineTrainsData.filter(
(train) =>
train.region === "eu" &&
train =>
train.region === 'eu' &&
train.isOnline &&
train.station.stationName === station.stationName
);
const stationData = data.find(
(s) => s.stationName === station.stationName
) || { stationName: station.stationName, stationURL: "" };
s => s.stationName === station.stationName
) || {
stationName: station.stationName,
stationURL: '',
};
return {
...stationData,
@@ -374,7 +286,7 @@ export default class StationsModule extends VuexModule {
return updatedStations;
})
.catch(() => {
this.context.commit("setConnectionState", ConnState.Error);
this.context.commit('setConnectionState', ConnState.Error);
});
}
}