Compare commits

...

106 Commits

Author SHA1 Message Date
Spythere b7abeb4c34 Version 1.9.0
v1.9.0
2025-03-11 20:57:28 +01:00
Spythere 5440b0831d chore: shortening bookmarked stock string preview 2025-03-11 20:17:33 +01:00
Spythere fc344684cc bump: v1.9.0 2025-03-09 23:39:26 +01:00
Spythere 8c61e260d4 chore: added OpenGraph metadata 2025-03-09 17:27:47 +01:00
Spythere f4f6512969 chore: minor stock naming improvements 2025-03-09 16:48:22 +01:00
Spythere b9b1e438b9 chore: updated missing locales 2025-03-09 16:40:33 +01:00
Spythere 1eb5f3de9e chore: minor stock generator improvements; code cleanup 2025-03-09 16:36:31 +01:00
Spythere 862aebb158 restruct: stock list components 2025-03-09 15:40:32 +01:00
Spythere 82a016dca7 chore: updated locales, expanded storage entry format 2025-03-08 21:07:59 +01:00
Spythere 744804d445 fix: responsiveness 2025-03-08 20:37:00 +01:00
Spythere 13a9baa175 chore: inputs section button layout 2025-03-08 20:24:28 +01:00
Spythere 01bb9f9c2e hotfix: build data 2025-03-08 02:23:39 +01:00
Spythere 80b0226a16 chore: removed loco count checking 2025-03-08 02:15:27 +01:00
Spythere 7596b7ec2c chore: improved stock actions layout; added stock bookmarking 2025-03-08 02:14:43 +01:00
Spythere 90e257127c chore: moved stock computations to store 2025-03-07 15:11:34 +01:00
Spythere 72f28abf10 chore: updated icons, storage tab layout 2025-03-07 14:34:10 +01:00
Spythere ff6622bc29 feat: loading data from clipboard; error detection 2025-03-07 14:04:58 +01:00
Spythere c9459eb8f4 restruct: updated scss @import rules to @use; package upgrade 2025-03-04 16:16:28 +01:00
Spythere f51886e45a Merge pull request #41 from Spythere/development
chore: updated vehicle data for 2024.3.1 simulator version
2024-12-23 16:24:16 +01:00
Spythere 91803d3fef chore: added functionality for not found vehicle images 2024-12-23 16:20:38 +01:00
Spythere 61972c35e6 chore: updated new vehicles speed limits and compatible version 2024-12-23 15:58:07 +01:00
Spythere 466ec2084b Merge pull request #40 from Spythere/development
v1.8.13
2024-12-04 14:37:44 +01:00
Spythere 75b04ad247 chore: fixed navigation & route links issues 2024-12-04 14:30:56 +01:00
Spythere a3a0fb358c bump: v1.8.13 2024-12-02 18:37:05 +01:00
Spythere b602819179 chore: added more advanced routing to elements 2024-12-02 17:54:46 +01:00
Spythere 346d20fc08 restruct: types organization 2024-12-02 17:03:33 +01:00
Spythere 56ae593d5e chore: added new wiki list filters 2024-11-29 01:30:12 +01:00
Spythere 4f6b79c686 Merge pull request #39 from Spythere/development
chore: updated compatible simulator version
2024-10-24 21:38:31 +02:00
Spythere 4f89b932fb chore: updated compatible simulator version 2024-10-24 21:38:03 +02:00
Spythere 2106675a0a Merge pull request #38 from Spythere/development
v1.8.12
2024-10-22 21:31:37 +02:00
Spythere 1b68e0174d bump: v1.8.12 2024-10-22 20:54:35 +02:00
Spythere b47f692ac1 fix: typos; updated images api source 2024-10-22 20:54:24 +02:00
Spythere b6d776d94e Merge pull request #37 from Spythere/development
v1.8.11
2024-08-21 19:54:09 +02:00
Spythere 3a97f6a7ac bump: v1.8.11 2024-08-21 19:48:26 +02:00
Spythere c03e524f37 fix: wiki vehicles filtering 2024-08-21 19:48:07 +02:00
Spythere 89e947d462 Merge pull request #36 from Spythere/development
v1.8.10
2024-08-10 14:24:57 +02:00
Spythere f286933a81 fix: order of categories listing 2024-08-09 14:57:10 +02:00
Spythere 9bc5f083eb hotfix 2024-08-09 14:48:17 +02:00
Spythere a48cc17c08 hotfix: removed package lock 2024-08-09 14:46:07 +02:00
Spythere 9098ffbfbc bump: v1.8.10 2024-08-09 14:41:12 +02:00
Spythere 603b55b44f chore: categories update for number generator 2024-08-09 14:40:49 +02:00
Spythere ad94c93932 chore: gh workflows update 2024-08-09 14:39:21 +02:00
Spythere e7eb7c4010 Merge pull request #35 from Spythere/development
New thumbnails
2024-07-09 16:18:56 +02:00
Spythere e2c2d1b99d chore: new thumbnails 2024-07-09 16:18:11 +02:00
Spythere 9756914434 Merge pull request #34 from Spythere/development
1.8.9
2024-06-13 17:02:51 +02:00
Spythere 0b397ee31d bump: 1.8.9 2024-06-08 15:46:48 +02:00
Spythere d726c8424e chore: vite config update 2024-06-08 15:46:34 +02:00
Spythere 6b0c6d63a4 refactor: adjusted to new API format 2024-06-08 15:44:35 +02:00
Spythere 1723a1b0bd Merge pull request #33 from Spythere/development
hotfix: caching
2024-05-31 20:27:56 +02:00
Spythere 86ba9112de hotfix: caching 2024-05-31 20:26:35 +02:00
Spythere cd41e46ef5 Merge pull request #32 from Spythere/development
chore: version bump
2024-05-16 23:28:07 +02:00
Spythere 32d5f0269b chore: version bump 2024-05-16 23:27:47 +02:00
Spythere 1750e406e0 Merge pull request #31 from Spythere/development
v1.8.8
2024-05-16 23:25:47 +02:00
Spythere 7457d59dea chore: updated weight & speed docs url 2024-05-16 21:38:21 +02:00
Spythere 2578f5c8d4 chore: changed thumbnails & previews source 2024-05-16 21:09:39 +02:00
Spythere 6af6764c30 chore: speed limits update (201E) 2024-05-16 20:26:57 +02:00
Spythere 50102c6127 Merge pull request #30 from Spythere/development
chore: new train categories
2024-05-13 19:25:31 +02:00
Spythere 210c49fb04 chore: new train categories 2024-05-13 19:25:09 +02:00
Spythere bc3db163b1 Merge pull request #29 from Spythere/development
bump(version): 1.8.7
2024-05-13 19:16:04 +02:00
Spythere b364586ebc bump(version): 1.8.7 2024-05-13 19:15:19 +02:00
Spythere f3509ef217 Merge pull request #28 from Spythere/development
1.8.7
2024-05-13 19:14:59 +02:00
Spythere d584d99f4c chore: changed cold start requirements 2024-05-13 19:11:15 +02:00
Spythere 078c941910 chore: fixed preview image loading 2024-05-13 19:04:46 +02:00
Spythere 76670ceb29 Merge pull request #27 from Spythere/development
1.8.6
2024-05-13 16:12:46 +02:00
Spythere 4cdd8ea06a bump(version): 1.8.6 2024-05-13 15:58:39 +02:00
Spythere 454ae138f7 chore: config fix 2024-05-13 15:57:49 +02:00
Spythere 640c5e262b chore: stock upload fix 2024-05-13 15:52:06 +02:00
Spythere 7416d7d59f chore: pwa caching fixes 2024-05-13 15:51:48 +02:00
Spythere ca1255b37e Merge pull request #26 from Spythere/development
1.8.5 (hotfix)
2024-04-16 20:32:43 +02:00
Spythere de0a8520f3 fix(workflows): color prop 2024-04-16 20:31:42 +02:00
Spythere e51919896f Merge pull request #25 from Spythere/development
1.8.5
2024-04-16 20:16:17 +02:00
Spythere f9cd9a2a33 chore(wiki): preserving scroll state 2024-04-16 20:06:23 +02:00
Spythere 897d6d0c36 chore(stock): stock tab design 2024-04-16 19:54:51 +02:00
Spythere b241b60657 chore(numgen): EC/EN categories added 2024-04-16 19:37:09 +02:00
Spythere 1f1bef1cc9 chore(numgen): changed select responsiveness 2024-04-16 00:42:58 +02:00
Spythere 05f8a0ca68 fix(locales): sort casing 2024-04-16 00:28:56 +02:00
Spythere 541572e415 refactor: stock & vehicle typings 2024-04-15 18:32:19 +02:00
Spythere 61c7f15fcf chore(wiki): changed inputs order 2024-04-15 16:41:27 +02:00
Spythere 1da1645c51 chore(preview): cleanup 2024-04-15 16:40:19 +02:00
Spythere 8dc670b631 chore(preview): adjustments in image loading & fallback 2024-04-15 16:39:46 +02:00
Spythere 3424f9a952 chore(pwa): image caching changes 2024-04-15 16:36:30 +02:00
Spythere 4079426506 chore(workflows): added release discord webhook notification 2024-04-15 15:11:03 +02:00
Spythere 35f2a5ca09 chore(wiki): design improvements 2024-04-14 22:08:32 +02:00
Spythere b840a6cd46 fix(stock): keydown number bug 2024-04-14 21:45:51 +02:00
Spythere 1aca0f7ed1 fix(wiki): crashing input regex 2024-04-14 21:33:57 +02:00
Spythere b009bc03e8 bump(version): 1.8.5 2024-04-14 00:13:16 +02:00
Spythere baa39a5a99 chore: wiki list tab revamp 2024-04-14 00:13:01 +02:00
Spythere 99cbde3828 chore: config port change 2024-04-14 00:12:47 +02:00
Spythere e72b73ccf0 fix: global styles fix 2024-04-14 00:09:52 +02:00
Spythere 75e34d9f75 chore(wiki): change table to grid layout - wip 2024-04-13 19:26:52 +02:00
Spythere 13aa1acc54 Merge pull request #24 from Spythere/development
Wersja 1.8.4
2024-04-10 16:32:03 +02:00
Spythere 966181c977 fix: wiki list table height 2024-04-10 16:25:11 +02:00
Spythere 06eb4bc607 fix: button bg color 2024-04-10 16:18:32 +02:00
Spythere c07a16d245 fix: main container responsiveness 2024-04-10 16:12:08 +02:00
Spythere 7e67e34526 chore: wiki list tab sizing 2024-04-10 15:35:51 +02:00
Spythere 6cfc535dec chore: packages update 2024-04-09 16:32:23 +02:00
Spythere d072692db7 chore: pwa vehicles cache 2024-04-09 14:47:56 +02:00
Spythere 6255efd98d fix: http url 2024-04-08 23:44:37 +02:00
Spythere 9c59c30f12 chore(api): url changes 2024-04-08 23:40:24 +02:00
Spythere 31302cc053 chorse: changed api data to stored locally 2024-04-08 22:20:18 +02:00
Spythere 26fd0c67e4 feat: team & sponsor restrictions added 2024-04-07 22:00:09 +02:00
Spythere d98ec94a66 chore: service worker changes, got rid of excessive console logs 2024-04-07 18:54:03 +02:00
Spythere 28485cc28c real stock card exit btn; hotfixes 2024-04-06 16:19:04 +02:00
Spythere b14c7a9502 cargo count sorting fix 2024-04-06 16:08:05 +02:00
Spythere 90e78e5ac5 wiki list lazy load (intersection obs.) 2024-04-06 15:45:39 +02:00
Spythere 27f02e2c2b api & naming changes 2024-04-06 14:54:54 +02:00
81 changed files with 8343 additions and 10063 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: npm ci && npm run build - run: yarn && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0 - uses: FirebaseExtended/action-hosting-deploy@v0
with: with:
repoToken: '${{ secrets.GITHUB_TOKEN }}' repoToken: '${{ secrets.GITHUB_TOKEN }}'
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: npm ci && npm run build - run: yarn && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0 - uses: FirebaseExtended/action-hosting-deploy@v0
with: with:
repoToken: '${{ secrets.GITHUB_TOKEN }}' repoToken: '${{ secrets.GITHUB_TOKEN }}'
@@ -0,0 +1,17 @@
on:
release:
types: [published]
jobs:
github-releases-to-discord:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Github Releases To Discord
uses: SethCohen/github-releases-to-discord@v1.13.1
with:
webhook_url: ${{ secrets.WEBHOOK_URL }}
color: "15844367"
footer_title: "Changelog - Pojazdownik"
footer_timestamp: true
-3
View File
@@ -26,6 +26,3 @@ node_modules
# Dev files # Dev files
stockInfoDev.json stockInfoDev.json
# Lock files
yarn.lock
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"hosting": { "hosting": {
"public": "dist", "public": "dist",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"], "ignore": [],
"rewrites": [ "rewrites": [
{ {
"source": "**", "source": "**",
+29 -1
View File
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<title>Pojazdownik</title> <title>Pojazdownik</title>
<meta name="description" content="Edytor pociągów online do symulatora Train Driver 2" /> <meta name="description" content="Edytor składów online dla symulatora Train Driver 2" />
<link rel="icon" href="/favicon.ico" sizes="any" /> <link rel="icon" href="/favicon.ico" sizes="any" />
<link rel="icon" href="/favicon.svg" type="image/svg+xml" /> <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
@@ -16,6 +16,34 @@
<meta name="msapplication-TileColor" content="#da532c" /> <meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#111" /> <meta name="theme-color" content="#111" />
<!-- Static OpenGraph meta -->
<meta name="description" content="Edytor składów online dla symulatora Train Driver 2" />
<meta property="og:url" content="https://pojazdownik-td2.web.app/" />
<meta property="og:type" content="website" />
<meta property="og:title" content="Pojazdownik" />
<meta
property="og:description"
content="Edytor składów online dla symulatora Train Driver 2"
/>
<meta
property="og:image"
content="https://raw.githubusercontent.com/Spythere/api/refs/heads/main/thumbnails/pojazdownik-banner.png"
/>
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:site_name" content="Pojazdownik" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="Pojazdownik" />
<meta
name="twitter:description"
content="Edytor składów online dla symulatora Train Driver 2"
/>
<meta
name="twitter:image"
content="https://raw.githubusercontent.com/Spythere/api/refs/heads/main/thumbnails/pojazdownik-banner.png"
/>
</head> </head>
<body> <body>
<noscript> <noscript>
-8047
View File
File diff suppressed because it is too large Load Diff
+7 -4
View File
@@ -1,25 +1,28 @@
{ {
"name": "pojazdownik", "name": "pojazdownik",
"version": "1.8.3.1", "version": "1.9.0",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vue-tsc --noEmit && vite build", "build": "vue-tsc --noEmit && vite build",
"preview": "yarn build && vite preview --port 4174", "preview": "yarn build && vite preview",
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false", "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"format": "prettier --write src/" "format": "prettier --write src/"
}, },
"dependencies": { "dependencies": {
"@heroicons/vue": "^2.2.0",
"axios": "^1.4.0", "axios": "^1.4.0",
"pinia": "^2.0.17", "pinia": "^2.0.17",
"prettier": "^3.0.3", "prettier": "^3.0.3",
"vue": "^3.2.37", "vue": "^3.2.37",
"vue-i18n": "9" "vue-i18n": "9.11.0",
"vue-router": "4"
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "^1.3.3", "@rushstack/eslint-patch": "^1.3.3",
"@types/node": "^22.13.9",
"@vite-pwa/assets-generator": "^0.2.3", "@vite-pwa/assets-generator": "^0.2.3",
"@vitejs/plugin-vue": "^5.0.3", "@vitejs/plugin-vue": "^5.0.3",
"@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-prettier": "^9.0.0",
@@ -31,6 +34,6 @@
"typescript": "^5.0.2", "typescript": "^5.0.2",
"vite": "^5.0.12", "vite": "^5.0.12",
"vite-plugin-pwa": "^0.17.5", "vite-plugin-pwa": "^0.17.5",
"vue-tsc": "^1.2.0" "vue-tsc": "^2.2.8"
} }
} }
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>

After

Width:  |  Height:  |  Size: 256 B

Before

Width:  |  Height:  |  Size: 1020 B

After

Width:  |  Height:  |  Size: 1020 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 932 B

Before

Width:  |  Height:  |  Size: 953 B

After

Width:  |  Height:  |  Size: 953 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

+42 -11
View File
@@ -1,7 +1,8 @@
<template> <template>
<AppModals /> <AppModals />
<ImageFullscreenPreview v-if="store.vehiclePreviewSrc" /> <ImageFullscreenPreview v-if="store.vehiclePreviewSrc" />
<AppContainerView />
<router-view></router-view>
</template> </template>
<script lang="ts"> <script lang="ts">
@@ -14,34 +15,64 @@ import AppModals from './components/app/AppModals.vue';
export default defineComponent({ export default defineComponent({
components: { ImageFullscreenPreview, AppContainerView, AppModals }, components: { ImageFullscreenPreview, AppContainerView, AppModals },
data() { data() {
return { return { store: useStore() };
store: useStore(),
};
}, },
async created() { created() {
this.store.handleRouting(); this.loadStockDataFromStorage();
this.store.setupAPIData(); this.store.setupAPIData();
}, },
computed: {
currentStockString() {
return this.store.stockString;
},
},
watch: {
currentStockString(val: string) {
if (val != this.store.chosenStorageStockString) {
this.store.chosenStorageStockName = '';
}
},
},
methods: {
loadStockDataFromStorage() {
const savedData = localStorage.getItem('savedStockData');
if (!savedData) {
localStorage.setItem('savedStockData', JSON.stringify({}));
return;
}
try {
this.store.storageStockData = JSON.parse(savedData);
} catch (error) {
console.error(
'Wystąpił błąd podczas przetwarzania danych o składach z localStorage!',
error
);
}
},
},
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
@import './styles/global.scss';
/* APP */ /* APP */
#app { #app {
margin: 0 auto; margin: 0 auto;
color: $textColor; color: global.$textColor;
font-size: 1em; font-size: 1em;
padding: 0; padding: 0;
@media screen and (max-width: $breakpointMd) { @media screen and (max-width: global.$breakpointMd) {
font-size: calc(0.7rem + 0.75vw); font-size: calc(0.7rem + 0.75vw);
} }
@media screen and (orientation: landscape) and (max-width: $breakpointMd) { @media screen and (orientation: landscape) and (max-width: global.$breakpointMd) {
font-size: calc(0.75rem + 0.4vw); font-size: calc(0.75rem + 0.4vw);
} }
} }
+2 -2
View File
@@ -8,8 +8,8 @@
</template> </template>
</i18n-t> </i18n-t>
<div class="text--grayed" v-if="store.vehiclesAPIData"> <div class="text--grayed" v-if="store.vehiclesData">
{{ $t('footer.version-check', { version: store.vehiclesAPIData.simulatorVersion }) }} {{ $t('footer.version-check', { version: store.compatibleSimulatorVersion }) }}
</div> </div>
<div> <div>
+8 -9
View File
@@ -3,7 +3,7 @@
<LogoSection /> <LogoSection />
<InputsSection /> <InputsSection />
<TrainImageSection /> <TrainImageSection />
<StockSection /> <TabsSection />
</main> </main>
</template> </template>
@@ -12,16 +12,14 @@ import { defineComponent } from 'vue';
import LogoSection from '../sections/LogoSection.vue'; import LogoSection from '../sections/LogoSection.vue';
import InputsSection from '../sections/InputsSection.vue'; import InputsSection from '../sections/InputsSection.vue';
import TrainImageSection from '../sections/TrainImageSection.vue'; import TrainImageSection from '../sections/TrainImageSection.vue';
import StockSection from '../sections/StockSection.vue'; import TabsSection from '../sections/TabsSection.vue';
export default defineComponent({ export default defineComponent({
components: { LogoSection, InputsSection, TrainImageSection, StockSection }, components: { LogoSection, InputsSection, TrainImageSection, TabsSection },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss';
main { main {
display: grid; display: grid;
gap: 1em; gap: 1em;
@@ -32,18 +30,19 @@ main {
grid-template-columns: 1fr 2fr; grid-template-columns: 1fr 2fr;
grid-template-rows: auto 360px minmax(300px, 1fr); grid-template-rows: auto 360px minmax(300px, 1fr);
background-color: darken($color: $bgColor, $amount: 5); background-color: global.$bgColorDarker;
border-radius: 1em; border-radius: 1em;
min-height: 950px;
padding: 1em; padding: 1em;
} }
@media screen and (max-width: $breakpointMd) { @media screen and (max-width: global.$breakpointMd) {
main { main {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
grid-template-columns: 1fr; gap: 1em;
grid-template-rows: 1fr;
} }
} }
</style> </style>
+26 -26
View File
@@ -9,8 +9,8 @@
{{ $t('realstock.title') }} {{ $t('realstock.title') }}
<a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a> <a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a>
</h1> </h1>
<button class="btn exit-btn" @click="store.isRealStockListCardOpen = false"> <button class="btn action-exit" @click="store.isRealStockListCardOpen = false">
&Cross; <img src="/images/icon-exit.svg" alt="" />
</button> </button>
</div> </div>
@@ -23,7 +23,7 @@
<datalist id="readyStockDataList"> <datalist id="readyStockDataList">
<option <option
v-for="stock in store.realCompositionList" v-for="stock in filteredCompositionList"
:value="stock.stockId" :value="stock.stockId"
:key="stock.name" :key="stock.name"
> >
@@ -39,7 +39,7 @@
<datalist id="readyStockStringList"> <datalist id="readyStockStringList">
<option <option
v-for="stockType in computedAvailableStockTypes" v-for="stockType in availableCompositionTypes"
:value="stockType" :value="stockType"
:key="stockType" :key="stockType"
> >
@@ -47,14 +47,14 @@
</option> </option>
</datalist> </datalist>
<button class="btn" @click="resetStockFilters"> <button class="btn action-reset" @click="resetStockFilters">
{{ $t('realstock.action-reset') }} {{ $t('realstock.action-reset') }}
</button> </button>
</div> </div>
</div> </div>
<ul class="card_list" ref="list" @scroll="onListScroll"> <ul class="card_list" ref="list" @scroll="onListScroll">
<li v-for="rStock in computedReadyStockList" :key="rStock.stockId"> <li v-for="rStock in filteredCompositionList" :key="rStock.stockId">
<!-- :data-last-selected="store.ch === rStock.stockId" --> <!-- :data-last-selected="store.ch === rStock.stockId" -->
<div <div
class="stock-title" class="stock-title"
@@ -76,7 +76,7 @@
<div class="thumbnail-container"> <div class="thumbnail-container">
<div>{{ stockType }}</div> <div>{{ stockType }}</div>
<img <img
:src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockType}.png`" :src="`https://stacjownik.spythere.eu/static/thumbnails/${stockType}.png`"
:title="stockType" :title="stockType"
style="opacity: 0" style="opacity: 0"
@error="(e) => onStockItemError(e, stockType)" @error="(e) => onStockItemError(e, stockType)"
@@ -100,13 +100,13 @@ import { useStore } from '../../store';
import imageMixin from '../../mixins/imageMixin'; import imageMixin from '../../mixins/imageMixin';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { IRealComposition } from '../../types'; import { IRealComposition, VehicleGroupType } from '../../types/common.types';
function getVehicleType(stockType: string) { function getVehicleType(stockType: string): VehicleGroupType {
if (/^E/.test(stockType)) return 'loco-e'; if (/^E/.test(stockType)) return 'loco-electric';
if (/^S/.test(stockType)) return 'loco-s'; if (/^S/.test(stockType)) return 'loco-diesel';
return 'car-passenger'; return 'wagon-passenger';
} }
export default defineComponent({ export default defineComponent({
@@ -141,7 +141,7 @@ export default defineComponent({
}, },
computed: { computed: {
computedReadyStockList(): IRealComposition[] { filteredCompositionList() {
return this.store.realCompositionList return this.store.realCompositionList
.filter( .filter(
(rc) => (rc) =>
@@ -155,7 +155,7 @@ export default defineComponent({
.filter((_, i) => i <= this.visibleIndexesTo); .filter((_, i) => i <= this.visibleIndexesTo);
}, },
computedAvailableStockTypes() { availableCompositionTypes() {
return this.store.realCompositionList return this.store.realCompositionList
.reduce((acc, rs) => { .reduce((acc, rs) => {
rs.stockString.split(';').forEach((s) => { rs.stockString.split(';').forEach((s) => {
@@ -169,7 +169,7 @@ export default defineComponent({
}, },
watch: { watch: {
computedReadyStockList(curr, prev) { filteredCompositionList(curr, prev) {
if (curr.length < prev.length) { if (curr.length < prev.length) {
this.visibleIndexesTo = 20; this.visibleIndexesTo = 20;
(this.$refs['list'] as HTMLElement).scrollTo({ (this.$refs['list'] as HTMLElement).scrollTo({
@@ -220,15 +220,15 @@ export default defineComponent({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss'; .action-exit {
display: flex;
.exit-btn { background-color: #333;
font-size: 1.2em; border-radius: 0.25em;
margin: 0.25em 0; padding: 0.5em;
} }
.btn { .action-reset {
background-color: #444; background-color: #333;
} }
.card_content { .card_content {
@@ -247,7 +247,7 @@ export default defineComponent({
z-index: 100; z-index: 100;
@media screen and (max-width: $breakpointSm) { @media screen and (max-width: global.$breakpointSm) {
height: 80vh; height: 80vh;
} }
} }
@@ -279,7 +279,7 @@ export default defineComponent({
width: 35%; width: 35%;
} }
@media screen and (max-width: $breakpointSm) { @media screen and (max-width: global.$breakpointSm) {
flex-wrap: wrap; flex-wrap: wrap;
input { input {
@@ -307,7 +307,7 @@ ul {
padding: 0.1em; padding: 0.1em;
&[data-last-selected='true'] .stock-title { &[data-last-selected='true'] .stock-title {
border: 1px solid $accentColor; border: 1px solid global.$accentColor;
} }
.stock-title { .stock-title {
@@ -323,7 +323,7 @@ ul {
background: #222; background: #222;
} }
@media screen and (max-width: $breakpointSm) { @media screen and (max-width: global.$breakpointSm) {
grid-template-columns: 1fr; grid-template-columns: 1fr;
// grid-template-rows: 1fr 1fr; // grid-template-rows: 1fr 1fr;
} }
+17 -3
View File
@@ -1,18 +1,20 @@
<template> <template>
<label> <label>
<input type="checkbox" v-model="model" /> <input type="checkbox" :data-disabled="disabled" :disabled="disabled" v-model="model" />
<div><slot /></div> <div><slot /></div>
</label> </label>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
const model = defineModel(); const model = defineModel();
defineProps({
disabled: Boolean,
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
label { label {
cursor: pointer;
text-transform: uppercase; text-transform: uppercase;
transition: color 200ms; transition: color 200ms;
} }
@@ -20,6 +22,7 @@ label {
div { div {
padding: 0.25em 0.5em; padding: 0.25em 0.5em;
color: white; color: white;
cursor: pointer;
background-color: #222; background-color: #222;
border-radius: 0.25em; border-radius: 0.25em;
@@ -54,5 +57,16 @@ input {
content: '\2714'; content: '\2714';
} }
} }
&:disabled {
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
+ div {
opacity: 0.55;
cursor: auto;
}
}
} }
</style> </style>
+36 -53
View File
@@ -1,15 +1,15 @@
<template> <template>
<section class="inputs-section"> <section class="inputs-section">
<div class="input_container"> <div class="input_container">
<h2 class="input_header">{{ $t('inputs.title') }}</h2>
<div class="input_list type"> <div class="input_list type">
<label for="cargo-select">{{ $t('inputs.vehicles-title') }}</label>
<div class="vehicle-types locos"> <div class="vehicle-types locos">
<button <button
v-for="locoType in locomotiveTypeList" v-for="locoType in locomotiveTypeList"
:key="locoType.id" :key="locoType.id"
class="btn btn--choice" class="btn btn--choice"
:data-selected="locoType.id == store.chosenLocoPower" :data-selected="locoType.id == store.chosenLocoGroup"
@click="selectLocoType(locoType.id)" @click="selectLocoType(locoType.id)"
> >
{{ $t(`inputs.${locoType.id}`) }} {{ $t(`inputs.${locoType.id}`) }}
@@ -28,18 +28,21 @@
{{ $t('inputs.input-vehicle') }} {{ $t('inputs.input-vehicle') }}
</option> </option>
<option v-for="loco in locoOptions" :value="loco" :key="loco.type"> <option v-for="loco in locoOptions" :value="loco" :key="loco.type">
{{ loco.type }}<b v-if="loco.isSponsorsOnly">*</b> {{ loco.type
}}<b v-if="loco.sponsorOnlyTimestamp && loco.sponsorOnlyTimestamp > Date.now()">*</b>
</option> </option>
</select> </select>
</div> </div>
<div class="input_list type"> <div class="input_list type">
<label for="cargo-select">{{ $t('inputs.carwagons-title') }}</label>
<div class="vehicle-types carwagons"> <div class="vehicle-types carwagons">
<button <button
v-for="carType in carTypeList" v-for="carType in carTypeList"
:key="carType.id" :key="carType.id"
class="btn btn--choice" class="btn btn--choice"
:data-selected="carType.id == store.chosenCarUseType" :data-selected="carType.id == store.chosenCarGroup"
@click="selectCarWagonType(carType.id)" @click="selectCarWagonType(carType.id)"
> >
{{ $t(`inputs.${carType.id}`) }} {{ $t(`inputs.${carType.id}`) }}
@@ -59,7 +62,8 @@
</option> </option>
<option v-for="car in carOptions" :value="car" :key="car.type"> <option v-for="car in carOptions" :value="car" :key="car.type">
{{ car.type }}<b v-if="car.isSponsorsOnly">*</b> {{ car.type
}}<b v-if="car.sponsorOnlyTimestamp && car.sponsorOnlyTimestamp > Date.now()">*</b>
</option> </option>
</select> </select>
</div> </div>
@@ -70,7 +74,7 @@
id="cargo-select" id="cargo-select"
:disabled=" :disabled="
(store.chosenCar && !store.chosenCar.loadable) || (store.chosenCar && !store.chosenCar.loadable) ||
(store.chosenCar && store.chosenCar.useType == 'car-passenger') || (store.chosenCar && store.chosenCar.group == 'wagon-passenger') ||
!store.chosenCar !store.chosenCar
" "
data-select="cargo" data-select="cargo"
@@ -84,6 +88,7 @@
<option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable"> <option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable">
{{ $t('inputs.no-cargo-available') }} {{ $t('inputs.no-cargo-available') }}
</option> </option>
<option :value="null" v-else>{{ $t('inputs.cargo-empty') }}</option> <option :value="null" v-else>{{ $t('inputs.cargo-empty') }}</option>
<option v-for="cargo in store.chosenCar?.cargoTypes" :value="cargo" :key="cargo.id"> <option v-for="cargo in store.chosenCar?.cargoTypes" :value="cargo" :key="cargo.id">
@@ -123,6 +128,7 @@ import imageMixin from '../../mixins/imageMixin';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockPreviewMixin from '../../mixins/stockPreviewMixin'; import stockPreviewMixin from '../../mixins/stockPreviewMixin';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { LocoGroupType, WagonGroupType } from '../../types/common.types';
export default defineComponent({ export default defineComponent({
mixins: [imageMixin, stockPreviewMixin, stockMixin], mixins: [imageMixin, stockPreviewMixin, stockMixin],
@@ -130,34 +136,16 @@ export default defineComponent({
data: () => ({ data: () => ({
store: useStore(), store: useStore(),
locomotiveTypeList: [ locomotiveTypeList: [
{ { id: 'loco-electric', desc: 'ELEKTRYCZNE' },
id: 'loco-e', { id: 'loco-diesel', desc: 'SPALINOWE' },
desc: 'ELEKTRYCZNE', { id: 'unit-electric', desc: 'ELEKTR. ZESPOŁY TRAKCYJNE' },
}, { id: 'unit-diesel', desc: 'SPAL. ZESPOŁY TRAKCYJNE' },
{ ] as { id: LocoGroupType; desc: string }[],
id: 'loco-s',
desc: 'SPALINOWE',
},
{
id: 'loco-ezt',
desc: 'ELEKTR. ZESPOŁY TRAKCYJNE',
},
{
id: 'loco-szt',
desc: 'SPAL. ZESPOŁY TRAKCYJNE',
},
],
carTypeList: [ carTypeList: [
{ { id: 'wagon-passenger', desc: 'PASAŻERSKIE' },
id: 'car-passenger', { id: 'wagon-freight', desc: 'TOWAROWE' },
desc: 'PASAŻERSKIE', ] as { id: WagonGroupType; desc: string }[],
},
{
id: 'car-cargo',
desc: 'TOWAROWE',
},
],
}), }),
computed: { computed: {
@@ -165,14 +153,14 @@ export default defineComponent({
return this.store.locoDataList return this.store.locoDataList
.slice() .slice()
.sort((a, b) => (a.type > b.type ? 1 : -1)) .sort((a, b) => (a.type > b.type ? 1 : -1))
.filter((loco) => loco.power == this.store.chosenLocoPower); .filter((loco) => loco.group == this.store.chosenLocoGroup);
}, },
carOptions() { carOptions() {
return this.store.carDataList return this.store.carDataList
.slice() .slice()
.sort((a, b) => (a.type > b.type ? 1 : -1)) .sort((a, b) => (a.type > b.type ? 1 : -1))
.filter((car) => car.useType == this.store.chosenCarUseType); .filter((car) => car.group == this.store.chosenCarGroup);
}, },
}, },
@@ -192,10 +180,7 @@ export default defineComponent({
removeVehicle() { removeVehicle() {
if (this.store.stockList.length == 0) return; if (this.store.stockList.length == 0) return;
const lastStock = this.store.stockList.slice(-1)[0]; this.store.stockList.splice(-1);
if (lastStock.count > 1) lastStock.count--;
else this.store.stockList.splice(-1);
}, },
switchVehicles() { switchVehicles() {
@@ -209,14 +194,14 @@ export default defineComponent({
this.store.stockList[this.store.chosenStockListIndex] = stockObject; this.store.stockList[this.store.chosenStockListIndex] = stockObject;
}, },
selectLocoType(locoTypeId: string) { selectLocoType(locoGroupType: LocoGroupType) {
this.store.chosenLocoPower = locoTypeId; this.store.chosenLocoGroup = locoGroupType;
this.store.chosenVehicle = this.locoOptions[0]; this.store.chosenVehicle = this.locoOptions[0];
this.store.chosenLoco = this.locoOptions[0]; this.store.chosenLoco = this.locoOptions[0];
}, },
selectCarWagonType(carWagonTypeId: string) { selectCarWagonType(wagonGroupType: WagonGroupType) {
this.store.chosenCarUseType = carWagonTypeId; this.store.chosenCarGroup = wagonGroupType;
this.store.chosenVehicle = this.carOptions[0]; this.store.chosenVehicle = this.carOptions[0];
this.store.chosenCar = this.carOptions[0]; this.store.chosenCar = this.carOptions[0];
this.store.chosenCargo = null; this.store.chosenCargo = null;
@@ -239,8 +224,6 @@ export default defineComponent({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global';
.inputs-section { .inputs-section {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -254,16 +237,12 @@ export default defineComponent({
max-width: 380px; max-width: 380px;
} }
.input_header {
margin-bottom: 1em;
}
button.btn--choice { button.btn--choice {
font-size: 0.9em; font-size: 0.9em;
padding: 0.3em 0.6em; padding: 0.3em 0.6em;
&[data-selected='true'] { &[data-selected='true'] {
background-color: $accentColor; background-color: global.$accentColor;
color: black; color: black;
} }
@@ -281,12 +260,12 @@ button.btn--choice {
display: block; display: block;
font-weight: bold; font-weight: bold;
color: $accentColor; color: global.$accentColor;
margin-bottom: 0.3em; margin-bottom: 0.3em;
} }
select:focus { select:focus {
border-color: $accentColor; border-color: global.$accentColor;
} }
} }
@@ -305,9 +284,13 @@ button.btn--choice {
gap: 0.25em; gap: 0.25em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
button {
width: 100%;
}
} }
@media screen and (max-width: $breakpointMd) { @media screen and (max-width: global.$breakpointMd) {
.inputs-section { .inputs-section {
justify-content: center; justify-content: center;
text-align: center; text-align: center;
+3 -12
View File
@@ -21,14 +21,8 @@ export default {
data() { data() {
return { return {
localeActions: [ localeActions: [
{ { name: 'POLSKI', locale: 'pl' },
name: 'POLSKI', { name: 'ENGLISH', locale: 'en' },
locale: 'pl',
},
{
name: 'ENGLISH',
locale: 'en',
},
], ],
}; };
}, },
@@ -46,12 +40,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss';
.logo-section { .logo-section {
grid-row: 1; grid-row: 1;
grid-column: 1; grid-column: 1;
margin-bottom: 1.5em;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -67,7 +58,7 @@ export default {
button[data-selected='true'] { button[data-selected='true'] {
font-weight: bold; font-weight: bold;
color: $accentColor; color: global.$accentColor;
text-decoration: underline; text-decoration: underline;
} }
} }
-142
View File
@@ -1,142 +0,0 @@
<template>
<section class="stock-section">
<div class="section_modes">
<button
v-for="(id, i) in sectionModes"
:key="id"
class="btn"
ref="sectionButtonRefs"
@click="chooseSection(id)"
:data-selected="store.stockSectionMode == id"
>
<span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${id}`) }}
<span v-if="id == 'stock-list'">({{ store.stockList.length }})</span>
</button>
</div>
<transition name="tab-change" mode="out-in">
<keep-alive>
<component :is="chosenSectionComponent"></component>
</keep-alive>
</transition>
</section>
</template>
<script lang="ts" setup>
import { computed, onMounted, ref } from 'vue';
import { useStore } from '../../store';
import StockListTab from '../tabs/StockListTab.vue';
import StockGeneratorTab from '../tabs/StockGeneratorTab.vue';
import NumberGeneratorTab from '../tabs/NumberGeneratorTab.vue';
import WikiListTab from '../tabs/WikiListTab.vue';
const sectionButtonRefs = ref([]);
const store = useStore();
type SectionMode = typeof store.stockSectionMode;
const sectionModes: SectionMode[] = [
'stock-list',
'wiki-list',
'number-generator',
'stock-generator',
];
onMounted(() => {
window.addEventListener('keydown', (e) => {
if (e.target instanceof HTMLInputElement) return;
if (/[1234]/.test(e.key)) {
const keyNum = Number(e.key);
store.stockSectionMode = sectionModes[keyNum - 1];
(sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement)?.focus();
}
});
});
const chosenSectionComponent = computed(() => {
switch (store.stockSectionMode) {
case 'stock-list':
return StockListTab;
case 'wiki-list':
return WikiListTab;
case 'stock-generator':
return StockGeneratorTab;
case 'number-generator':
return NumberGeneratorTab;
default:
return StockListTab;
}
});
function chooseSection(sectionId: SectionMode) {
store.stockSectionMode = sectionId;
}
</script>
<style lang="scss">
@import '../../styles/global.scss';
// Tab change animation
.tab-change {
&-enter-from,
&-leave-to {
opacity: 0;
}
&-enter-active,
&-leave-active {
transition: all 100ms ease-in-out;
}
}
// Section styles
.stock-section {
grid-row: 1 / 4;
grid-column: 2;
overflow: hidden;
padding: 1px;
}
.section_modes {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 0.5em;
margin-bottom: 1em;
button {
position: relative;
border-radius: 0.5em 0.5em 0 0;
&::after {
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
content: '';
width: 0;
height: 2px;
transition: all 100ms;
background-color: $accentColor;
}
&[data-selected='true']::after {
width: 100%;
}
}
}
@media screen and (max-width: 650px) {
.section_modes {
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
}
}
</style>
+117
View File
@@ -0,0 +1,117 @@
<template>
<section class="tabs-section">
<div class="tabs-modes">
<router-link
v-for="(route, i) in routes"
:key="route.name"
class="link-btn"
:to="route.href"
:style="{ 'grid-area': route.name }"
>
<span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${route.name}`) }}
<span class="text--grayed" v-if="route.name == 'stock'"
>({{ store.stockList.length }})</span
>
</router-link>
</div>
<transition name="tab-change" mode="out-in">
<keep-alive>
<component :is="route.meta.viewMode"></component>
</keep-alive>
</transition>
</section>
</template>
<script lang="ts" setup>
import { onMounted } from 'vue';
import { useStore } from '../../store';
import { useRoute, useRouter } from 'vue-router';
const store = useStore();
const route = useRoute();
const router = useRouter();
const routes = [
{
name: 'stock',
href: '/',
},
{
name: 'wiki',
href: '/wiki',
},
{
name: 'storage',
href: '/storage',
},
{
name: 'numgen',
href: '/numgen',
},
{
name: 'stockgen',
href: '/stockgen',
},
];
onMounted(() => {
window.addEventListener('keydown', (e) => {
if (e.target instanceof HTMLInputElement) return;
if (/^[12345]$/.test(e.key)) {
const keyNum = Number(e.key);
router.push(routes[keyNum - 1].href);
}
});
});
</script>
<style lang="scss">
// Tab change animation
.tab-change {
&-enter-from,
&-leave-to {
opacity: 0;
}
&-enter-active,
&-leave-active {
transition: all 100ms ease-in-out;
}
}
// Section styles
.tabs-section {
grid-row: 1 / 4;
grid-column: 2;
overflow: hidden;
padding: 1px;
}
.tabs-modes {
display: grid;
grid-template-areas:
'stock stock wiki wiki storage storage'
'numgen numgen numgen stockgen stockgen stockgen';
grid-template-columns: repeat(6, 1fr);
// grid-template-rows: 1fr 1fr;
padding: 1px;
gap: 0.5em;
margin-bottom: 1em;
}
@media screen and (max-width: global.$breakpointSm) {
.tabs-modes {
grid-template-areas:
'stock wiki'
'storage storage'
'numgen stockgen';
grid-template-columns: repeat(2, 1fr);
}
}
</style>
+114 -58
View File
@@ -1,68 +1,89 @@
<template> <template>
<section class="train-image-section"> <section class="train-image-section">
<div class="train-image__content" :class="{ sponsor: store.chosenVehicle?.isSponsorsOnly }"> <div v-if="store.chosenVehicle">
<div class="image-wrapper">
<img <img
tabindex="0" :src="getThumbnailURL(store.chosenVehicle.type, 'small')"
:src=" :data-preview-available="isDataPreviewAvailable"
store.chosenVehicle :data-sponsor-only="
? getThumbnailURL(store.chosenVehicle.type, 'small') store.chosenVehicle.sponsorOnlyTimestamp &&
: '/images/placeholder.jpg' store.chosenVehicle.sponsorOnlyTimestamp > Date.now()
" "
:data-team-only="store.chosenVehicle.teamOnly"
@click="onImageClick" @click="onImageClick"
@keydown.enter="onImageClick" @keydown.enter="onImageClick"
@load="onImageLoad"
@error="onImageError" @error="onImageError"
type="image/jpeg" tabindex="0"
/> />
</div> </div>
<div class="train-image__info" v-if="store.chosenVehicle"> <div class="image-info">
<b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull; <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
<b style="color: #ccc"> <b style="color: #ccc">
{{ {{
$t( $t(
`preview.${isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType}` `preview.${isTractionUnit(store.chosenVehicle) ? store.chosenVehicle.group : store.chosenVehicle.group}`
) )
}} }}
</b> </b>
<div style="color: #ccc"> <div style="color: #ccc">
<div> <div>
{{ store.chosenVehicle.length }}m | {{ (store.chosenVehicle.weight / 1000).toFixed(1) }}t {{ store.chosenVehicle.length }}m |
| {{ store.chosenVehicle.maxSpeed }} km/h {{ (store.chosenVehicle.weight / 1000).toFixed(1) }}t |
{{ store.chosenVehicle.maxSpeed }} km/h
</div> </div>
<div v-if="isLocomotive(store.chosenVehicle)"> <div v-if="isTractionUnit(store.chosenVehicle)">
{{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }} {{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}
</div> </div>
<div v-else> <div v-else>
{{ {{
store.chosenVehicle.useType == 'car-cargo' store.chosenVehicle.group == 'wagon-freight'
? $t(`usage.${store.chosenVehicle.constructionType}`) ? $t(`usage.${store.chosenVehicle.constructionType}`)
: `${$t('preview.construction')} ${store.chosenVehicle.constructionType}` : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
}} }}
</div> </div>
<b style="color: salmon" v-if="store.chosenVehicle.isSponsorsOnly">{{ <b
v-if="
store.chosenVehicle.sponsorOnlyTimestamp &&
store.chosenVehicle.sponsorOnlyTimestamp > Date.now()
"
class="sponsor-only"
>
{{
$t('preview.sponsor-only', [ $t('preview.sponsor-only', [
new Date(store.chosenVehicle.sponsorsOnlyTimestamp).toLocaleDateString( new Date(store.chosenVehicle.sponsorOnlyTimestamp).toLocaleDateString(
$i18n.locale == 'pl' ? 'pl-PL' : 'en-GB' $i18n.locale == 'pl' ? 'pl-PL' : 'en-GB'
), ),
]) ])
}}</b> }}
</b>
<b v-if="store.chosenVehicle.teamOnly" class="team-only">{{ $t('preview.team-only') }}</b>
</div>
</div> </div>
</div> </div>
<div class="train-image__info" v-else>{{ $t('preview.desc') }}</div> <div v-else>
<img src="/images/placeholder.jpg" alt="placeholder image" />
<div class="image-info">{{ $t('preview.desc') }}</div>
</div>
</section> </section>
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, defineComponent } from 'vue'; import { computed, defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import { isLocomotive } from '../../utils/vehicleUtils'; import { isTractionUnit } from '../../utils/vehicleUtils';
import { ILocomotive, IVehicle } from '../../types';
import imageMixin from '../../mixins/imageMixin'; import imageMixin from '../../mixins/imageMixin';
import { watch } from 'vue';
import { storeToRefs } from 'pinia';
import { Ref } from 'vue';
import { ref } from 'vue';
export default defineComponent({ export default defineComponent({
mixins: [imageMixin], mixins: [imageMixin],
@@ -75,110 +96,145 @@ export default defineComponent({
setup() { setup() {
const store = useStore(); const store = useStore();
const { chosenVehicle } = storeToRefs(store);
const imageStatus = ref('none') as Ref<'none' | 'loading' | 'loaded' | 'error'>;
watch(chosenVehicle, () => {
imageStatus.value = 'loading';
});
return { return {
store, store,
imageStatus,
chosenVehicle: computed(() => store.chosenVehicle), chosenVehicle: computed(() => store.chosenVehicle),
}; };
}, },
watch: { computed: {
chosenVehicle(vehicle: IVehicle, prevVehicle: IVehicle) { isDataPreviewAvailable() {
if (vehicle && vehicle.type != prevVehicle?.type) { return this.imageStatus == 'loaded' && this.store.chosenVehicle != null;
this.store.imageLoading = true;
}
}, },
}, },
methods: { methods: {
onImageLoad() { isTractionUnit,
this.store.imageLoading = false;
},
onImageError(e: Event) { onImageError(e: Event) {
const el = e.target as HTMLImageElement; const el = e.target as HTMLImageElement;
if (el.src == '/images/placeholder.jpg') return; if (el.src == '/images/no-vehicle-image.png') return;
el.src = '/images/placeholder.jpg'; el.src = '/images/no-vehicle-image.png';
this.imageStatus = 'error';
}, },
isLocomotive(vehicle: IVehicle): vehicle is ILocomotive { onImageLoad(e: Event) {
return isLocomotive(vehicle); if (this.imageStatus == 'error') return;
this.imageStatus = 'loaded';
}, },
onImageClick(e: Event) { onImageClick(e: Event) {
const target = e.target as HTMLElement; const target = e.target as HTMLImageElement;
const chosenVehicle = this.store.chosenVehicle; const chosenVehicle = this.store.chosenVehicle;
if (!chosenVehicle) return; if (!chosenVehicle) return;
this.store.lastFocusedElement = target; this.store.lastFocusedElement = target;
if (this.isDataPreviewAvailable) {
this.store.vehiclePreviewSrc = this.getThumbnailURL(chosenVehicle.type, 'large'); this.store.vehiclePreviewSrc = this.getThumbnailURL(chosenVehicle.type, 'large');
}
}, },
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss';
.train-image-section { .train-image-section {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center;
text-align: center; text-align: center;
grid-row: 3; min-height: 250px;
grid-column: 1;
margin-top: 1em; & > div {
height: 22em; position: relative;
max-width: 100%;
width: 380px;
} }
.train-image {
&__content {
&.sponsor img {
border: 1px solid salmon;
} }
img { img {
max-width: 380px;
width: 100%; width: 100%;
height: 100%;
border: 1px solid white;
&[data-preview-available='true'] {
border: 1px solid white;
cursor: zoom-in; cursor: zoom-in;
} }
&[data-sponsor-only='true'] {
border: 1px solid global.$sponsorColor;
}
&[data-team-only='true'] {
border: 1px solid global.$teamColor;
} }
} }
.train-image__info { .image-wrapper {
position: relative;
min-height: 220px;
}
.loading-placeholder {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
background-color: #2b2b2b;
padding: 1em;
font-size: 1.2em;
}
.image-info {
font-size: 1.1em; font-size: 1.1em;
padding: 0.5em; padding: 0.5em;
margin: 0.5em auto; // margin: 0.5em auto;
line-height: 1.35; line-height: 1.35;
width: 100%; width: 100%;
max-width: 380px; max-width: 380px;
background-color: $secondaryColor; background-color: global.$secondaryColor;
font-weight: bold; font-weight: bold;
} }
// Transition animations .placeholder {
.img-message-anim { height: 250px;
&-enter-from,
&-leave-to { background-color: global.$bgColor;
opacity: 0;
} }
&-enter-active, .sponsor-only {
&-leave-active { color: global.$sponsorColor;
transition: opacity 75ms ease-in 100ms;
}
} }
@media screen and (max-width: $breakpointMd) { .team-only {
color: global.$teamColor;
}
@media screen and (max-width: global.$breakpointMd) {
.train-image-section { .train-image-section {
justify-content: center; justify-content: center;
} }
+29 -37
View File
@@ -6,9 +6,10 @@
</div> </div>
<div class="tab_content"> <div class="tab_content">
<div class="category-select"> <div class="inputs">
<label for="category"> {{ $t('numgen.train-category') }}</label> <label>
<select id="category" v-model="chosenCategory" @change="randomizeTrainNumber()"> <span>{{ $t('numgen.train-category') }}</span>
<select v-model="chosenCategory" @change="randomizeTrainNumber()">
<option :value="null" disabled> <option :value="null" disabled>
{{ $t('numgen.train-category') }} {{ $t('numgen.train-category') }}
</option> </option>
@@ -20,12 +21,11 @@
{{ $t(`numgen.categories.${category}`) }} {{ $t(`numgen.categories.${category}`) }}
</option> </option>
</select> </select>
</div> </label>
<div class="regions-select"> <label>
<div> <span>{{ $t('numgen.start-region') }}</span>
<label for="begin-region"> {{ $t('numgen.start-region') }}</label> <select v-model="beginRegionName" @change="randomizeTrainNumber()">
<select id="begin-region" v-model="beginRegionName" @change="randomizeTrainNumber()">
<option :value="null" disabled> <option :value="null" disabled>
{{ $t('numgen.start-region') }} {{ $t('numgen.start-region') }}
</option> </option>
@@ -33,11 +33,11 @@
{{ name }} {{ name }}
</option> </option>
</select> </select>
</div> </label>
<div> <label>
<label for="end-region"> {{ $t('numgen.end-region') }}</label> <span> {{ $t('numgen.end-region') }}</span>
<select id="end-region" v-model="endRegionName" @change="randomizeTrainNumber()"> <select v-model="endRegionName" @change="randomizeTrainNumber()">
<option :value="null" disabled> <option :value="null" disabled>
{{ $t('numgen.end-region') }} {{ $t('numgen.end-region') }}
</option> </option>
@@ -45,7 +45,7 @@
{{ name }} {{ name }}
</option> </option>
</select> </select>
</div> </label>
</div> </div>
<div class="generated-number" @click="copyNumber"> <div class="generated-number" @click="copyNumber">
@@ -224,14 +224,7 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/tab.scss'; @use '../../styles/tab';
@import '../../styles/global.scss';
label {
display: block;
font-weight: bold;
margin-bottom: 0.5em;
}
.category-select { .category-select {
select { select {
@@ -242,23 +235,22 @@ label {
margin-bottom: 1em; margin-bottom: 1em;
} }
.regions-select { .inputs {
display: flex; display: grid;
align-items: center; grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
justify-content: center;
flex-wrap: wrap;
gap: 0.5em; gap: 0.5em;
div {
width: 100%;
} }
select { .inputs > label {
width: 100%; display: flex;
} flex-direction: column;
gap: 0.25em;
label { span {
display: block; color: #ccc;
margin-bottom: 0.5em; font-weight: bold;
} }
} }
@@ -271,7 +263,7 @@ label {
margin: 0.5em 0; margin: 0.5em 0;
padding: 0.5em; padding: 0.5em;
background-color: $secondaryColor; background-color: global.$secondaryColor;
} }
.category-rules { .category-rules {
@@ -289,13 +281,13 @@ label {
margin: 0.25em 0; margin: 0.25em 0;
} }
@media screen and (max-width: $breakpointMd) { @media screen and (max-width: global.$breakpointMd) {
.number-generator { .number-generator {
min-height: 100vh; min-height: 100vh;
} }
} }
@media screen and (max-width: $breakpointSm) { @media screen and (max-width: global.$breakpointSm) {
.regions-select { .regions-select {
flex-wrap: wrap; flex-wrap: wrap;
} }
+50 -36
View File
@@ -1,9 +1,5 @@
<template> <template>
<div class="stock-generator tab"> <div class="stock-generator tab">
<div class="tab_header">
<h2>{{ $t('stockgen.title') }}</h2>
</div>
<div class="tab_content"> <div class="tab_content">
<div> <div>
<h2>{{ $t('stockgen.properties-title') }}</h2> <h2>{{ $t('stockgen.properties-title') }}</h2>
@@ -12,19 +8,19 @@
{{ $t('stockgen.properties-desc') }} {{ $t('stockgen.properties-desc') }}
</b> </b>
<div class="tab_attributes"> <div class="inputs">
<label> <label>
{{ $t('stockgen.input-mass') }} <span>{{ $t('stockgen.input-mass') }}</span>
<input type="number" v-model="maxTons" step="100" max="4000" min="0" /> <input type="number" v-model="maxTons" step="100" max="4000" min="0" />
</label> </label>
<label> <label>
{{ $t('stockgen.input-length') }} <span>{{ $t('stockgen.input-length') }}</span>
<input type="number" v-model="maxLength" step="25" max="650" min="0" /> <input type="number" v-model="maxLength" step="25" max="650" min="0" />
</label> </label>
<label> <label>
{{ $t('stockgen.input-carcount') }} <span>{{ $t('stockgen.input-carcount') }}</span>
<input type="number" v-model="maxCarCount" step="1" max="60" min="1" /> <input type="number" v-model="maxCarCount" step="1" max="60" min="1" />
</label> </label>
</div> </div>
@@ -118,12 +114,14 @@ import { defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { ICargo, ICarWagon, IStock } from '../../types'; import { ICargo, ICarWagon, IStock } from '../../types/common.types';
import warningsMixin from '../../mixins/warningsMixin'; import { isTractionUnit } from '../../utils/vehicleUtils';
import generatorDataJSON from '../../data/generatorData.json';
export default defineComponent({ export default defineComponent({
name: 'stock-generator', name: 'stock-generator',
mixins: [stockMixin, warningsMixin], mixins: [stockMixin],
data() { data() {
return { return {
@@ -150,15 +148,13 @@ export default defineComponent({
}, },
computedCargoData() { computedCargoData() {
if (!this.store.vehiclesAPIData?.generator.cargo) return []; const cargoGeneratorData = generatorDataJSON.cargo;
const cargoGeneratorData = this.store.vehiclesAPIData.generator.cargo;
return Object.keys(cargoGeneratorData) return Object.keys(cargoGeneratorData)
.sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`))) .sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`)))
.map((v) => ({ .map((v) => ({
name: v, name: v,
cargoList: cargoGeneratorData[v], cargoList: cargoGeneratorData[v as keyof typeof generatorDataJSON.cargo],
})); }));
}, },
}, },
@@ -187,8 +183,8 @@ export default defineComponent({
if (!this.isCarGroupingEnabled) return false; if (!this.isCarGroupingEnabled) return false;
stockList.sort((s1, s2) => { stockList.sort((s1, s2) => {
return (s1.constructionType + s1.cargo?.id).localeCompare( return (s1.vehicleRef.constructionType + s1.cargo?.id).localeCompare(
s2.constructionType + s2.cargo?.id s2.vehicleRef.constructionType + s2.cargo?.id
); );
}); });
}, },
@@ -196,7 +192,7 @@ export default defineComponent({
generateStock(empty = false) { generateStock(empty = false) {
const generatedChosenStockList = this.chosenCargoTypes.reduce( const generatedChosenStockList = this.chosenCargoTypes.reduce(
(acc, type) => { (acc, type) => {
this.store.vehiclesAPIData?.generator.cargo[type] generatorDataJSON.cargo[type as keyof typeof generatorDataJSON.cargo]
.filter((c) => !this.excludedCarTypes.includes(c.split(':')[0])) .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
.forEach((c) => { .forEach((c) => {
const [type, cargoType] = c.split(':'); const [type, cargoType] = c.split(':');
@@ -227,19 +223,17 @@ export default defineComponent({
return acc; return acc;
}, },
[] as { [] as { constructionType: string; carPool: { carWagon: ICarWagon; cargo?: ICargo }[] }[]
constructionType: string;
carPool: { carWagon: ICarWagon; cargo?: ICargo }[];
}[]
); );
let bestGeneration: { stockList: IStock[]; value: number } = { let bestGeneration: { stockList: IStock[]; value: number } = { stockList: [], value: 0 };
stockList: [],
value: 0,
};
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
this.store.stockList.splice(this.store.stockList[0]?.isLoco ? 1 : 0); this.store.stockList.splice(
this.store.stockList.length > 0 && isTractionUnit(this.store.stockList[0].vehicleRef)
? 1
: 0
);
let carCount = 0; let carCount = 0;
const maxWeight = const maxWeight =
@@ -276,10 +270,9 @@ export default defineComponent({
const bestStockList = bestGeneration.stockList; const bestStockList = bestGeneration.stockList;
this.groupStock(bestStockList);
this.store.stockList = bestGeneration.stockList; this.store.stockList = bestGeneration.stockList;
this.store.stockSectionMode = 'stock-list'; this.groupStock(bestStockList);
this.$router.push('/');
}, },
previewCar(type: string) { previewCar(type: string) {
@@ -290,7 +283,7 @@ export default defineComponent({
this.store.chosenLoco = null; this.store.chosenLoco = null;
this.store.chosenCargo = null; this.store.chosenCargo = null;
if (c) this.store.chosenCarUseType = c?.useType; if (c) this.store.chosenCarGroup = c?.group;
}, },
toggleCargoChosen(cargoType: string, vehicles: string[]) { toggleCargoChosen(cargoType: string, vehicles: string[]) {
@@ -321,8 +314,7 @@ export default defineComponent({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss'; @use '@/styles/tab';
@import '../../styles/tab.scss';
h2 { h2 {
margin-top: 0; margin-top: 0;
@@ -343,7 +335,7 @@ h2 {
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
background-color: $secondaryColor; background-color: global.$secondaryColor;
&[data-excluded='true'] { &[data-excluded='true'] {
background-color: gray; background-color: gray;
@@ -357,7 +349,7 @@ h2 {
padding: 5px; padding: 5px;
transform: translate(-8px, -50%); transform: translate(-8px, -50%);
background-color: $bgColor; background-color: global.$bgColor;
color: white; color: white;
} }
} }
@@ -369,6 +361,28 @@ h2 {
gap: 1em; gap: 1em;
} }
.inputs {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(12em, 1fr));
flex-wrap: wrap;
gap: 0.5em;
}
.inputs > label {
display: flex;
flex-direction: column;
gap: 0.25em;
span {
color: #ccc;
}
input[type='text'] {
background-color: white;
}
}
.generator_options { .generator_options {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -376,7 +390,7 @@ h2 {
} }
.generator_warning { .generator_warning {
background-color: $accentColor; background-color: global.$accentColor;
padding: 0.5em; padding: 0.5em;
text-align: justify; text-align: justify;
font-weight: bold; font-weight: bold;
+28 -621
View File
@@ -1,645 +1,52 @@
<template> <template>
<section class="stock-list-tab"> <section class="stock-list-tab">
<div class="tab_header"> <div class="tab_content">
<h2>{{ $t('stocklist.title') }}</h2> <!-- Stock Actions -->
<StockActions />
<!-- Stock Specs -->
<StockSpecs />
<!-- Stock Spawn Settings -->
<StockSpawnSettings />
<!-- Stock Warnings -->
<StockWarnings />
<!-- Stock List -->
<StockList />
</div> </div>
<div class="stock_actions">
<button class="btn btn--image" @click="clickFileInput">
<input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
<img src="/images/icon-upload.svg" alt="upload icon" />
{{ $t('stocklist.action-upload') }}
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="downloadStock"
>
<img src="/images/icon-download.svg" alt="download icon" />
{{ $t('stocklist.action-download') }}
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="copyToClipboard"
>
<img src="/images/icon-copy.svg" alt="copy icon" />
{{ $t('stocklist.action-copy') }}
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="resetStock"
>
<img src="/images/icon-reset.svg" alt="reset icon" />
{{ $t('stocklist.action-reset') }}
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="shuffleCars"
>
<img src="/images/icon-shuffle.svg" alt="shuffle icon" />
{{ $t('stocklist.action-shuffle') }}
</button>
</div>
<div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="moveUpStock(store.chosenStockListIndex)"
>
<img :src="getIconURL('higher')" alt="move up vehicle" />
{{ $t('stocklist.action-move-up') }}
</button>
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="moveDownStock(store.chosenStockListIndex)"
>
<img :src="getIconURL('lower')" alt="move down vehicle" />
{{ $t('stocklist.action-move-down') }}
</button>
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="removeStock(store.chosenStockListIndex)"
>
<img :src="getIconURL('remove')" alt="remove vehicle" />
{{ $t('stocklist.action-remove') }}
</button>
</div>
<div class="stock_specs">
<b class="real-stock-info" v-if="chosenRealComposition">
<span class="text--accent">
<img :src="getIconURL(chosenRealComposition.type)" :alt="chosenRealComposition.type" />
{{ chosenRealComposition.number }} {{ chosenRealComposition.name }}
</span>
|
</b>
<span>
{{ $t('stocklist.mass') }}
<span class="text--accent">{{ (store.totalWeight / 1000).toFixed(1) }}t</span>
({{ $t('stocklist.mass-accepted') }}:
<span class="text--accent">{{
store.acceptableWeight ? `${~~(store.acceptableWeight / 1000)}t` : '-'
}}</span
>) - {{ $t('stocklist.length') }}:
<span class="text--accent">{{ store.totalLength }}m</span>
- {{ $t('stocklist.vmax') }}
<span tabindex="0" :data-tooltip="$t('stocklist.disclaimer')">(?)</span>:
<span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
</span>
</div>
<div class="stock_spawn-settings">
<Checkbox v-if="store.stockSupportsColdStart" v-model="store.isColdStart">
{{ $t('stocklist.coldstart-info') }}
</Checkbox>
<Checkbox v-if="store.stockSupportsDoubleManning" v-model="store.isDoubleManned">
{{ $t('stocklist.doublemanning-info') }}
</Checkbox>
</div>
<div class="stock_warnings" v-if="stockHasWarnings">
<div class="warning" v-if="locoNotSuitable">
(!) {{ $t('stocklist.warning-not-suitable') }}
</div>
<div class="warning" v-if="trainTooLong && store.isTrainPassenger">
(!) {{ $t('stocklist.warning-passenger-too-long') }}
</div>
<div class="warning" v-if="trainTooLong && !store.isTrainPassenger">
(!) {{ $t('stocklist.warning-freight-too-long') }}
</div>
<div class="warning" v-if="trainTooHeavy">
(!)
<i18n-t keypath="stocklist.warning-too-heavy">
<template #href>
<a
target="_blank"
href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE"
>
{{ $t('stocklist.acceptable-mass-docs') }}
</a>
</template>
</i18n-t>
</div>
<div class="warning" v-if="tooManyLocomotives">
{{ $t('stocklist.warning-too-many-locos') }}
</div>
</div>
<StockThumbnails :onListItemClick="onListItemClick" />
<!-- Stock list -->
<ul ref="stock_list">
<li v-if="stockIsEmpty" class="list-empty">
<div class="stock-info">{{ $t('stocklist.list-empty') }}</div>
</li>
<TransitionGroup name="stock-list-anim" v-else>
<li
v-for="(stock, i) in store.stockList"
:key="stock.id"
:class="{ loco: stock.isLoco }"
tabindex="0"
@click="onListItemClick(i)"
@keydown.enter="onListItemClick(i)"
@keydown.w="moveUpStock(i)"
@keydown.s="moveDownStock(i)"
@keydown.backspace="removeStock(i)"
ref="itemRefs"
>
<div
class="stock-info"
@dragstart="onDragStart(i)"
@drop="onDrop($event, i)"
@dragover="allowDrop"
draggable="true"
>
<span class="stock-info__no" :data-selected="i == store.chosenStockListIndex">
<span v-if="i == store.chosenStockListIndex">&bull;&nbsp;</span>
{{ i + 1 }}.
</span>
<span class="stock-info__type" :class="{ sponsor: stock.isSponsorsOnly }">
{{ stock.isLoco ? stock.type : getCarSpecFromType(stock.type) }}
</span>
<span class="stock-info__cargo" v-if="stock.cargo">
{{ stock.cargo.id }}
</span>
<span class="stock-info__length">{{ stock.length }}m</span>
<span class="stock-info__mass"
>{{ ((stock.weight + (stock.cargo?.weight ?? 0)) / 1000).toFixed(1) }}t</span
>
<span class="stock-info__speed">{{ stock.maxSpeed }}km/h</span>
</div>
</li>
</TransitionGroup>
</ul>
</section> </section>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../../store'; import StockActions from './stock-list/StockActions.vue';
import StockSpecs from './stock-list/StockSpecs.vue';
import warningsMixin from '../../mixins/warningsMixin'; import StockSpawnSettings from './stock-list/StockSpawnSettings.vue';
import imageMixin from '../../mixins/imageMixin'; import StockWarnings from './stock-list/StockWarnings.vue';
import stockPreviewMixin from '../../mixins/stockPreviewMixin'; import StockList from './stock-list/StockList.vue';
import StockThumbnails from '../utils/StockThumbnails.vue';
import stockMixin from '../../mixins/stockMixin';
import Checkbox from '../common/Checkbox.vue';
export default defineComponent({ export default defineComponent({
name: 'stock-list', name: 'stock-list',
components: { StockThumbnails, Checkbox },
mixins: [warningsMixin, imageMixin, stockMixin, stockPreviewMixin], components: {
StockActions,
setup() { StockSpecs,
const store = useStore(); StockSpawnSettings,
StockWarnings,
return { StockList,
store,
};
},
data: () => ({
imageOffsetY: 0,
draggedVehicleID: -1,
stockActions: [{}],
}),
computed: {
stockString() {
if (this.store.stockList.length == 0) return '';
const includeColdStart = this.store.isColdStart && this.store.stockSupportsColdStart;
const includeDoubleManned =
this.store.isDoubleManned && this.store.stockSupportsDoubleManning;
return this.store.stockList
.map((stock, i) => {
let stockTypeStr =
stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
if (i == 0 && (includeColdStart || includeDoubleManned))
return `${stockTypeStr},${includeColdStart ? 'c' : ''}${includeDoubleManned ? 'd' : ''}`;
return stockTypeStr;
})
.join(';');
},
stockIsEmpty() {
return this.store.stockList.length == 0;
},
chosenStockVehicle() {
return this.store.chosenStockListIndex == -1
? undefined
: this.store.stockList[this.store.chosenStockListIndex];
},
stockHasWarnings() {
return (
this.tooManyLocomotives || this.trainTooHeavy || this.trainTooLong || this.locoNotSuitable
);
},
chosenRealComposition() {
const currentStockString = this.store.stockList.map((s) => s.type).join(';');
return this.store.realCompositionList.find((rc) => rc.stockString == currentStockString);
},
},
methods: {
copyToClipboard() {
navigator.clipboard.writeText(this.stockString);
setTimeout(() => {
alert(this.$t('stocklist.alert-copied'));
}, 20);
},
clickFileInput() {
(this.$refs['conFile'] as HTMLInputElement).click();
},
onListItemClick(stockID: number) {
const stock = this.store.stockList[stockID];
this.store.chosenStockListIndex =
this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type
? -1
: stockID;
if (this.store.chosenStockListIndex == -1) {
this.store.chosenVehicle = null;
return;
}
if (this.store.swapVehicles) this.store.swapVehicles = false;
this.previewStock(stock);
},
getCarSpecFromType(typeStr: string) {
const specArray = typeStr.split('_');
if (specArray.length == 0) return null;
/* 111a_Grafitti_1 */
if (specArray.length == 3) return `${specArray[0]} ${specArray[1]}-${specArray[2]}`;
/* 111a_PKP_Bnouz_01 */
return `${specArray[0]} ${specArray[2]}-${specArray[3]} (${specArray[1]})`;
},
resetStock() {
this.store.stockList.length = 0;
this.store.chosenStockListIndex = -1;
},
addStock(index: number) {
if (index == -1) return;
this.store.stockList[index].count++;
},
subStock(index: number) {
if (index == -1) return;
if (this.store.stockList[index].count < 2) return;
this.store.stockList[index].count--;
},
removeStock(index: number) {
if (index == -1) return;
this.store.stockList = this.store.stockList.filter((stock, i) => i != index);
if (this.store.stockList.length < index + 1) this.store.chosenStockListIndex = -1;
},
moveUpStock(index: number) {
if (index < 1) return;
const tempStock = this.store.stockList[index];
this.store.stockList[index] = this.store.stockList[index - 1];
this.store.stockList[index - 1] = tempStock;
this.store.chosenStockListIndex = index - 1;
},
moveDownStock(index: number) {
if (index == -1) return;
if (index > this.store.stockList.length - 2) return;
const tempStock = this.store.stockList[index];
this.store.stockList[index] = this.store.stockList[index + 1];
this.store.stockList[index + 1] = tempStock;
this.store.chosenStockListIndex = index + 1;
},
shuffleCars() {
const availableIndexes = this.store.stockList.reduce((acc, stock, i) => {
if (!stock.isLoco) acc.push(i);
return acc;
}, [] as number[]);
for (let i = 0; i < this.store.stockList.length; i++) {
if (!availableIndexes.includes(i)) continue;
availableIndexes.splice(i, -1);
const randAvailableIndex =
availableIndexes[Math.floor(Math.random() * availableIndexes.length)];
const tempSwap = this.store.stockList[randAvailableIndex];
this.store.stockList[randAvailableIndex] = this.store.stockList[i];
this.store.stockList[i] = tempSwap;
}
},
downloadStock() {
if (this.store.stockList.length == 0) return alert(this.$t('stocklist.alert-empty'));
const defaultName = `${this.chosenRealComposition ? this.chosenRealComposition.stockId + ' ' : ''}${this.store.stockList[0].type} ${(this.store.totalWeight / 1000).toFixed(1)}t; ${
this.store.totalLength
}m; vmax ${this.store.maxStockSpeed}`;
const fileName = prompt(this.$t('stocklist.prompt-file'), defaultName);
if (!fileName) return;
const blob = new Blob([this.stockString]);
const file = fileName + '.con';
var e = document.createEvent('MouseEvents'),
a = document.createElement('a');
a.download = file;
a.href = window.URL.createObjectURL(blob);
a.dataset.downloadurl = ['', a.download, a.href].join(':');
e.initEvent('click', true, false);
a.dispatchEvent(e);
},
uploadStock() {
const inputEl = this.$refs['conFile'] as HTMLInputElement;
const files = inputEl.files;
if (files?.length != 1) return;
if (!/\.con$/.test(files[0].name)) return;
const reader = new FileReader();
reader.readAsText(files[0]);
reader.onload = (res) => {
const stockString = res.target?.result;
if (!stockString || typeof stockString !== 'string') return;
this.loadStockFromString(stockString);
};
reader.onerror = (err) => console.log(err);
inputEl.value = '';
},
onDragStart(vehicleIndex: number) {
this.draggedVehicleID = vehicleIndex;
},
onDrop(e: DragEvent, vehicleIndex: number) {
e.preventDefault();
let targetEl = (this.$refs['itemRefs'] as Element[])[vehicleIndex];
if (!targetEl) return;
const tempVehicle = this.store.stockList[vehicleIndex];
this.store.stockList[vehicleIndex] = this.store.stockList[this.draggedVehicleID];
this.store.stockList[this.draggedVehicleID] = tempVehicle;
this.store.chosenStockListIndex = vehicleIndex;
},
allowDrop(e: DragEvent) {
e.preventDefault();
},
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global'; @use '@/styles/tab';
@import '../../styles/tab.scss';
.stock-list-tab { .tab_content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 0.5em; gap: 0.5em;
} }
.warning {
padding: 0.25em;
background: $accentColor;
color: black;
font-weight: bold;
a {
color: black;
text-decoration: underline;
}
}
.stock_controls {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5em;
padding: 0.5em;
background-color: #353a57;
&[data-disabled='true'] {
opacity: 0.8;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
pointer-events: none;
}
}
.stock_actions {
display: grid;
gap: 0.5em;
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
button {
width: 100%;
input {
opacity: 0;
width: 0;
height: 0;
}
}
}
.stock_spawn-settings {
display: flex;
gap: 0.5em;
}
.real-stock-info {
img {
height: 1.3ch;
}
}
ul {
position: relative;
overflow: auto;
max-height: 500px;
}
ul > li {
display: flex;
align-items: center;
justify-content: space-between;
min-width: 500px;
margin: 0.25em 0;
outline: none;
cursor: pointer;
&:focus-visible {
outline: 1px solid white;
}
&.list-empty {
background-color: $secondaryColor;
border-radius: 0.5em;
padding: 0.75em;
}
}
li > .stock-info {
display: flex;
color: white;
font-weight: 700;
transition: color 100ms;
& > span {
padding: 0.5em;
margin-right: 0.25em;
display: flex;
justify-content: center;
align-items: center;
}
}
.sponsor {
color: salmon;
}
.stock-info {
&__no,
&__type {
background-color: $secondaryColor;
}
&__count {
background-color: #e04e3e;
}
&__no {
min-width: 3.5em;
text-align: right;
&[data-selected='true'] {
color: $accentColor;
}
}
&__cargo {
background-color: #333;
}
&__length,
&__mass,
&__speed {
background-color: #555;
}
}
.stock-list-anim {
&-move, /* apply transition to moving elements */
&-enter-active,
&-leave-active {
transition: all 250ms ease;
}
&-enter-from {
opacity: 0;
transform: translateY(-25px);
}
&-leave-to {
opacity: 0;
}
&-leave-active {
position: absolute;
}
}
@media screen and (max-width: $breakpointMd) {
ul {
min-height: auto;
}
}
</style> </style>
+237
View File
@@ -0,0 +1,237 @@
<template>
<section class="tab storage-tab">
<div class="tab_header">
<h2>{{ $t('storage.title') }}</h2>
<h3>{{ $t('storage.subtitle') }}</h3>
</div>
<div class="tab_content">
<div class="storage-list-wrapper">
<transition-group name="storage-list-anim" tag="ul" class="storage-list">
<li v-for="storageEntry in storageStockDataList" :key="storageEntry.id">
<div class="storage-item-top">
<h3>
{{ storageEntry.id }}
</h3>
<div class="storage-item-top-actions">
<button class="btn btn--icon" @click="chooseStorageStock(storageEntry.id)">
<ArrowRightEndOnRectangleIcon style="width: 25px" />
</button>
<button class="btn btn--icon" @click="toggleStorageEntryExpand(storageEntry.id)">
<ChevronDownIcon
v-if="!expandedEntries.includes(storageEntry.id)"
style="width: 25px"
/>
<ChevronUpIcon v-else style="width: 25px" />
</button>
<button class="btn btn--icon" @click="removeStockIndexFromStorage(storageEntry.id)">
<TrashIcon style="width: 25px" />
</button>
</div>
</div>
<div class="storage-item-expandable" v-if="expandedEntries.includes(storageEntry.id)">
<i>
{{ $t('storage.created-at') }}
{{ new Date(storageEntry.createdAt).toLocaleString($i18n.locale) }}</i
>
<i v-if="storageEntry.updatedAt">
&bull; {{ $t('storage.updated-at') }}
{{ new Date(storageEntry.updatedAt).toLocaleString($i18n.locale) }}</i
>
<div style="margin-top: 0.5em">
<i>{{ $t('storage.stock-title') }} </i>
{{ shortenStockString(storageEntry.stockString) }}
</div>
</div>
</li>
<li v-if="Object.keys(storageStockDataList).length == 0" class="storage-no-entries">
{{ $t('storage.no-entires') }}
</li>
</transition-group>
</div>
</div>
</section>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import {
ArrowRightEndOnRectangleIcon,
ChevronDownIcon,
ChevronUpIcon,
FolderArrowDownIcon,
TrashIcon,
} from '@heroicons/vue/20/solid';
import { useStore } from '../../store';
import stockMixin from '../../mixins/stockMixin';
export default defineComponent({
components: {
ChevronDownIcon,
ChevronUpIcon,
FolderArrowDownIcon,
TrashIcon,
ArrowRightEndOnRectangleIcon,
},
mixins: [stockMixin],
data: () => ({
store: useStore(),
expandedEntries: [] as string[],
}),
computed: {
storageStockDataList() {
return Object.values(this.store.storageStockData)
.sort((a, b) => (b.updatedAt ?? b.createdAt) - (a.updatedAt ?? a.createdAt))
.map((data) => ({
...data,
isExpanded: false,
}));
},
},
methods: {
shortenStockString(stockString: string) {
return Array.from(
stockString.split(';').reduce(
(acc, s) => {
const stockName = s.split(/:|,/)[0];
acc.set(stockName, (acc.get(stockName) ?? 0) + 1);
return acc;
},
new Map() as Map<string, number>
)
).map(([stockName, count]) => `${count}x ${stockName.replace(/_/g, ' ')}`).join(', ');
},
removeStockIndexFromStorage(stockName: string) {
let removeConfirm = confirm(this.$t('storage.remove-confirm'));
if (!removeConfirm) return;
delete this.store.storageStockData[stockName];
this.store.chosenStorageStockName = '';
this.store.chosenStorageStockString = '';
try {
localStorage.setItem('savedStockData', JSON.stringify(this.store.storageStockData));
} catch (error) {
console.error('Wystąpił błąd podczas usuwania składu z localStorage!', error);
}
},
chooseStorageStock(stockName: string) {
try {
this.loadStockFromString(this.store.storageStockData[stockName].stockString);
this.store.chosenStorageStockName = stockName;
this.store.chosenStorageStockString = this.store.storageStockData[stockName].stockString;
this.$router.push('/');
} catch (error) {
console.log(error);
}
},
toggleStorageEntryExpand(stockName: string) {
const stockIndex = this.expandedEntries.indexOf(stockName);
if (stockIndex == -1) this.expandedEntries.push(stockName);
else this.expandedEntries.splice(stockIndex, 1);
},
},
});
</script>
<style lang="scss" scoped>
@use '@/styles/tab';
.tab_actions {
grid-template-columns: repeat(2, 1fr);
}
.storage-list-wrapper {
position: relative;
height: 730px;
overflow: auto;
}
ul.storage-list {
display: flex;
flex-direction: column;
gap: 0.5em;
margin-top: 0.5em;
}
ul.storage-list > li {
padding: 0.5em;
background-color: global.$secondaryColor;
&[data-current='true'] {
background-color: #3b3b3b;
}
}
.storage-item-top {
display: flex;
align-items: center;
}
.storage-item-top > h3 {
font-size: 1.2em;
width: 100%;
text-align: left;
margin: 0;
}
.storage-item-top-actions {
display: flex;
gap: 0.5em;
& > button {
background-color: #333;
}
}
.storage-item-expandable {
margin-top: 0.5em;
}
.storage-no-entries {
padding: 1em;
font-size: 1.15em;
font-weight: bold;
text-align: center;
}
.storage-list-anim {
&-move,
&-enter-active,
&-leave-active {
transition: all 120ms ease-in-out;
}
&-enter-from {
opacity: 0;
transform: translateY(-25px);
}
&-leave-to {
opacity: 0;
}
&-leave-active {
position: absolute;
width: 100%;
}
}
</style>
+243 -238
View File
@@ -1,92 +1,95 @@
<template> <template>
<section class="wiki-list tab"> <section class="wiki-list tab">
<div class="tab_header">
<h2>{{ $t('wiki.title') }}</h2>
</div>
<div class="tab_content"> <div class="tab_content">
<div class="actions-panel"> <div class="actions">
<div class="actions-panel_vehicles"> <div class="action action-input">
<button <label for="search-vehicle">
class="btn" {{ $t('wiki.labels.search-vehicle') }}
:data-chosen="currentFilterMode == 'tractions'" <button class="reset-btn" @click="resetSearchInput">
@click="toggleFilter('tractions')" <img src="/images/icon-exit.svg" alt="reset vehicle input icon" />
>
{{ $t('wiki.action-vehicles') }}
</button>
<button
class="btn"
:data-chosen="currentFilterMode == 'carriages'"
@click="toggleFilter('carriages')"
>
{{ $t('wiki.action-carriages') }}
</button> </button>
</label>
<input
type="text"
id="search-vehicle"
name="search-vehicle"
:placeholder="$t('wiki.labels.search-vehicle-placeholder')"
v-model="searchedVehicleTypeName"
/>
</div> </div>
<div class="actions-panel_search"> <div class="action action-select">
<input type="text" :placeholder="$t('wiki.search')" v-model="searchedVehicleTypeName" /> <label for="filter-type">{{ $t('wiki.labels.vehicles') }}</label>
<select name="filter-type" id="filter-type" v-model="filterType">
<option v-for="filter in filters" :key="filter" :value="filter">
{{ $t(`wiki.filters.${filter}`) }}
</option>
</select>
</div>
<div class="action action-select">
<label for="sorter-type">{{ $t('wiki.labels.sort-by') }}</label>
<select name="sorter-type" id="sorter-type" v-model="sorterType">
<option v-for="sorter in sorters" :key="sorter" :value="sorter">
{{ $t(`wiki.sort-by.${sorter}`) }}
</option>
</select>
</div>
<div class="action action-select">
<label for="sorter-direction">{{ $t('wiki.labels.sort-direction') }}</label>
<select name="sorter-direction" id="sorter-direction" v-model="sorterDirection">
<option value="asc">{{ $t('wiki.sort-direction.asc') }}</option>
<option value="desc">{{ $t('wiki.sort-direction.desc') }}</option>
</select>
</div> </div>
</div> </div>
<div class="table-wrapper" ref="table-wrapper"> <ul class="vehicles" ref="vehicles">
<table> <li
<thead> v-for="vehicle in computedVehicles"
<tr>
<th v-for="header in visibleHeaders" @click="toggleSorter(header)" :key="header.id">
{{ $t(`wiki.header.${header.id}`) }}
<span v-if="currentSorter.id == header.id">
{{ currentSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
</span>
</th>
</tr>
</thead>
<tbody>
<tr
v-for="{ vehicle, show } in computedTableData"
tabindex="0"
v-show="show"
:key="vehicle.type" :key="vehicle.type"
:data-preview="vehicle.type === store.chosenVehicle?.type"
@click="previewVehicle(vehicle)" @click="previewVehicle(vehicle)"
@keydown.enter="previewVehicle(vehicle)"
@dblclick="addVehicle(vehicle)" @dblclick="addVehicle(vehicle)"
@keydown.enter="onVehicleSelect(vehicle)"
tabindex="0"
> >
<td style="width: 120px">
<img <img
loading="lazy"
width="120" width="120"
:src="getThumbnailURL(vehicle.type, 'small')" :src="getThumbnailURL(vehicle.type, 'small')"
:alt="`${vehicle.type}`" @error="onThumbnailImageError"
loading="lazy"
@error="(e) => ((e.target as HTMLElement).style.display = 'none')"
/> />
</td>
<td :data-sponsoronly="vehicle.isSponsorsOnly"> <span>
{{ vehicle.type }} <span
</td> class="vehicle-name"
:class="{
'sponsor-only':
vehicle.sponsorOnlyTimestamp && vehicle.sponsorOnlyTimestamp > Date.now(),
'team-only': vehicle.teamOnly,
}"
>
<b>{{ vehicle.type.replace(/_/g, ' ') }}</b>
</span>
<td v-if="isLocomotive(vehicle)"> <div class="vehicle-group">
{{ $t(`wiki.${vehicle.power}`) }} {{ $t(`wiki.${vehicle.group}`) }} |
</td> {{ isTractionUnit(vehicle) ? vehicle.cabinType : vehicle.constructionType }}
<td v-else>{{ $t(`wiki.${vehicle.useType}`) }}</td> </div>
<td>{{ vehicle.constructionType }}</td> <div class="vehicle-props">
<td>{{ vehicle.length }}m</td> {{ vehicle.length }}m | {{ (vehicle.weight / 1000).toFixed(1) }}t |
<td>{{ (vehicle.weight / 1000).toFixed(1) }}t</td> {{ vehicle.maxSpeed }}km/h
<td>{{ vehicle.maxSpeed }}km/h</td> </div>
</span>
</li>
</ul>
<td v-if="currentFilterMode == 'carriages'"> <div class="no-vehicles-warning" v-if="computedVehicles.length == 0">
{{ !isLocomotive(vehicle) ? vehicle.cargoTypes.length : '---' }} {{ $t('wiki.no-vehicles') }}
</td>
<td v-if="currentFilterMode == 'tractions'">
{{ isLocomotive(vehicle) ? (vehicle.coldStart ? `&check;` : '&cross;') : '---' }}
</td>
</tr>
</tbody>
<span ref="table-bottom"></span>
</table>
</div> </div>
</div> </div>
</section> </section>
@@ -96,44 +99,27 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockPreviewMixin from '../../mixins/stockPreviewMixin'; import stockPreviewMixin from '../../mixins/stockPreviewMixin';
import { IVehicle } from '../../types'; import { IVehicle } from '../../types/common.types';
import { isLocomotive } from '../../utils/vehicleUtils'; import { isTractionUnit } from '../../utils/vehicleUtils';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import imageMixin from '../../mixins/imageMixin'; import imageMixin from '../../mixins/imageMixin';
type SorterID = const sorters = ['type', 'group', 'length', 'weight', 'maxSpeed'] as const;
| 'type'
| 'constructionType'
| 'image'
| 'length'
| 'weight'
| 'maxSpeed'
| 'cargoCount'
| 'group'
| 'coldStart';
interface IWikiHeader { enum VehicleFilter {
id: SorterID; AllVehicles = 'vehicles-all',
sortable: boolean; AllTractions = 'vehicles-tractions-all',
for: 'all' | 'carriages' | 'tractions'; ElectricTraction = 'vehicles-tractions-electric',
DieselTraction = 'vehicles-tractions-diesel',
EmuTraction = 'vehicles-tractions-emu',
DmuTraction = 'vehicles-tractions-dmu',
AllWagons = 'vehicles-wagons-all',
PassengerWagons = 'vehicles-wagons-passenger',
FreightWagons = 'vehicles-wagons-freight',
} }
interface IWikiRow { type SorterType = (typeof sorters)[number];
vehicle: IVehicle; type SorterDirection = 'asc' | 'desc';
show: boolean;
}
const headers: IWikiHeader[] = [
{ id: 'image', sortable: false, for: 'all' },
{ id: 'type', sortable: true, for: 'all' },
{ id: 'group', sortable: true, for: 'all' },
{ id: 'constructionType', sortable: true, for: 'all' },
{ id: 'length', sortable: true, for: 'all' },
{ id: 'weight', sortable: true, for: 'all' },
{ id: 'maxSpeed', sortable: true, for: 'all' },
{ id: 'coldStart', sortable: true, for: 'tractions' },
{ id: 'cargoCount', sortable: true, for: 'carriages' },
];
export default defineComponent({ export default defineComponent({
mixins: [stockPreviewMixin, stockMixin, imageMixin], mixins: [stockPreviewMixin, stockMixin, imageMixin],
@@ -141,204 +127,223 @@ export default defineComponent({
data() { data() {
return { return {
store: useStore(), store: useStore(),
headers, observer: null as IntersectionObserver | null,
scrollTop: 0, sorters: sorters,
filters: Object.values(VehicleFilter),
searchedVehicleTypeName: '', searchedVehicleTypeName: '',
currentSorter: { sorterType: 'type' as SorterType,
id: 'type' as SorterID, sorterDirection: 'asc' as SorterDirection,
direction: 1,
},
currentFilterMode: 'all' as 'all' | 'tractions' | 'carriages', filterType: VehicleFilter.AllVehicles,
lastScrollTop: 0,
}; };
}, },
activated() { deactivated() {
const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement; this.lastScrollTop = (this.$refs['vehicles'] as HTMLUListElement)?.scrollTop || 0;
},
tableWrapperRef.scrollTo({ activated() {
top: this.scrollTop, (this.$refs['vehicles'] as HTMLUListElement)?.scrollTo({ top: this.lastScrollTop });
},
watch: {
computedVehicles() {
const vehiclesRef = this.$refs['vehicles'] as HTMLElement;
vehiclesRef.scrollTo({
top: 0,
}); });
}, },
},
methods: { methods: {
isLocomotive, isTractionUnit,
toggleFilter(name: typeof this.currentFilterMode) { onThumbnailImageError(e: Event) {
this.currentFilterMode = this.currentFilterMode == name ? 'all' : name; const el = e.target as HTMLImageElement;
if (el.src == '/images/no-vehicle-image.png') return;
el.src = '/images/no-vehicle-image.png';
}, },
toggleSorter(header: IWikiHeader) { onVehicleSelect(vehicle: IVehicle) {
if (!header.sortable) return; if (this.store.chosenVehicle?.type === vehicle.type) this.addVehicle(vehicle);
this.previewVehicle(vehicle);
if (header.id == this.currentSorter.id) this.currentSorter.direction *= -1;
this.currentSorter.id = header.id;
}, },
sortTableRows(row1: IWikiRow, row2: IWikiRow) { resetSearchInput() {
if (!row1.show) return 0; this.searchedVehicleTypeName = '';
},
const { id, direction } = this.currentSorter; filterVehicles(v: IVehicle) {
if (
this.searchedVehicleTypeName != '' &&
!v.type.toLocaleLowerCase().includes(this.searchedVehicleTypeName.toLocaleLowerCase())
)
return false;
switch (id) { switch (this.filterType) {
case VehicleFilter.AllTractions:
return isTractionUnit(v);
case VehicleFilter.ElectricTraction:
return isTractionUnit(v) && v.group == 'loco-electric';
case VehicleFilter.DieselTraction:
return isTractionUnit(v) && v.group == 'loco-diesel';
case VehicleFilter.EmuTraction:
return isTractionUnit(v) && v.group == 'unit-electric';
case VehicleFilter.DmuTraction:
return isTractionUnit(v) && v.group == 'unit-diesel';
case VehicleFilter.AllWagons:
return !isTractionUnit(v);
case VehicleFilter.PassengerWagons:
return !isTractionUnit(v) && v.group == 'wagon-passenger';
case VehicleFilter.FreightWagons:
return !isTractionUnit(v) && v.group == 'wagon-freight';
}
return true;
},
sortVehicles(v1: IVehicle, v2: IVehicle) {
const direction = this.sorterDirection == 'asc' ? 1 : -1;
switch (this.sorterType) {
case 'type': case 'type':
case 'constructionType':
case 'group': case 'group':
return direction == 1 return direction * v1[this.sorterType].localeCompare(v2[this.sorterType]);
? row1.vehicle[id].localeCompare(row2.vehicle[id])
: row2.vehicle[id].localeCompare(row1.vehicle[id]);
case 'weight': case 'weight':
case 'length': case 'length':
case 'maxSpeed': case 'maxSpeed':
return Math.sign(row1.vehicle[id] - row2.vehicle[id]) * direction; return Math.sign(v1[this.sorterType] - v2[this.sorterType]) * direction;
case 'cargoCount':
return (
(!isLocomotive(row1.vehicle) ? Math.sign(row1.vehicle.cargoTypes.length || -1) : -1) -
(!isLocomotive(row2.vehicle) ? (row2.vehicle.cargoTypes.length || -1) * direction : -1)
);
case 'coldStart':
return (
((isLocomotive(row1.vehicle) && row1.vehicle.coldStart ? 1 : -1) -
(isLocomotive(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
direction
);
default: default:
break; return v1.type.localeCompare(v2.type) * direction;
} }
return direction == 1
? row1.vehicle.type.localeCompare(row2.vehicle.type)
: row2.vehicle.type.localeCompare(row1.vehicle.type);
}, },
}, },
computed: { computed: {
computedTableData(): IWikiRow[] { computedVehicles() {
return this.store.vehicleDataList return this.store.vehicleDataList.filter(this.filterVehicles).sort(this.sortVehicles);
.map((vehicle) => ({
vehicle,
show:
new RegExp(`${this.searchedVehicleTypeName.trim()}`, 'i').test(vehicle.type) &&
(this.currentFilterMode == 'all' ||
(this.currentFilterMode == 'tractions' && isLocomotive(vehicle)) ||
(this.currentFilterMode == 'carriages' && !isLocomotive(vehicle))),
}))
.sort((a, b) => this.sortTableRows(a, b));
},
visibleHeaders() {
const filtersActive = this.currentFilterMode;
return this.headers.filter((header) => header.for == 'all' || header.for == filtersActive);
},
areTractionVehiclesShown() {
return this.currentFilterMode == 'all' || this.currentFilterMode == 'tractions';
},
areCarriagesShown() {
return this.currentFilterMode == 'all' || this.currentFilterMode == 'carriages';
}, },
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/tab.scss'; @use '@/styles/tab';
.actions-panel { .actions {
display: flex; display: grid;
justify-content: space-between; grid-template-columns: repeat(auto-fit, minmax(10em, 1fr));
align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
gap: 0.5em; gap: 0.5em;
margin: 0.5em 0;
} }
.actions-panel_vehicles { .action {
display: flex;
flex-direction: column;
gap: 0.5em;
label {
color: #ccc;
position: relative;
}
}
.action.action-input label {
display: flex;
align-items: center;
justify-content: space-between;
}
.reset-btn {
display: flex;
background-color: #161c2e;
border-radius: 0.25em;
}
.vehicles {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
gap: 0.5em;
overflow: auto;
max-height: 730px;
margin-top: 0.75em;
padding: 0.25em;
}
.vehicles > li {
display: flex; display: flex;
gap: 0.5em; gap: 0.5em;
}
.actions-panel_search { background-color: #161c2e;
input {
width: auto;
}
}
.table-wrapper {
overflow: auto;
height: 750px;
max-height: 95vh;
}
.wiki-list table {
border-collapse: collapse;
width: 100%;
thead {
position: sticky;
top: 0;
}
th {
background-color: #111;
padding: 0.5em; padding: 0.5em;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
}
tr { min-height: 75px;
cursor: pointer; cursor: pointer;
background-color: #333;
&:first-child { &[data-preview='true'] {
min-width: 120px; background-color: #435288;
} }
&:nth-child(odd) { & > span {
background-color: #444; display: flex;
} flex-direction: column;
justify-content: space-between;
&:hover { overflow: hidden;
background-color: #666;
} }
} }
td { .vehicle-name {
overflow: hidden;
text-wrap: nowrap;
text-overflow: ellipsis;
}
.sponsor-only {
color: global.$sponsorColor;
&::after {
content: '*';
}
}
.team-only {
color: global.$teamColor;
&::after {
content: '*';
}
}
.vehicle-props {
color: #ccc;
}
.no-vehicles-warning {
text-align: center; text-align: center;
height: 70px; padding: 1em;
padding: 0.25em; background-color: #161c2e;
&[data-sponsoronly='true'] {
color: salmon;
}
}
} }
@media screen and (max-width: $breakpointMd) { @media screen and (max-width: global.$breakpointSm) {
.wiki-list table {
th {
min-width: 100px;
}
img {
max-width: 100px;
}
}
}
@media screen and (max-width: $breakpointSm) {
.actions-panel { .actions-panel {
align-items: stretch; align-items: stretch;
flex-direction: column; flex-direction: column;
@@ -0,0 +1,344 @@
<template>
<div class="stock_actions">
<div class="actions-top">
<button
class="btn btn--image"
@click="clickFileInput"
:data-button-tooltip="$t('stocklist.action-upload-file')"
>
<input type="file" @change="uploadStockFromFile" ref="conFile" accept=".con,.txt" />
<FolderPlusIcon />
</button>
<button
class="btn btn--image"
@click="uploadStockFromClipboard"
:data-button-tooltip="$t('stocklist.action-upload-clipboard')"
>
<ClipboardDocumentCheckIcon />
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="downloadStock"
:data-button-tooltip="$t('stocklist.action-download')"
>
<ArrowDownTrayIcon />
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="copyToClipboard"
:data-button-tooltip="$t('stocklist.action-copy')"
>
<DocumentDuplicateIcon />
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="saveStockDataToStorage"
:data-button-tooltip="$t('stocklist.action-bookmark')"
>
<BookmarkIcon />
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="resetStock"
:data-button-tooltip="$t('stocklist.action-reset')"
>
<ArrowUturnLeftIcon />
</button>
<button
class="btn btn--image"
:data-disabled="stockIsEmpty"
:disabled="stockIsEmpty"
@click="shuffleCars"
:data-button-tooltip="$t('stocklist.action-shuffle')"
>
<ArrowPathIcon />
</button>
</div>
<div class="actions-bottom" :data-disabled="store.chosenStockListIndex == -1">
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="stockListUtils.moveUpStock(store.chosenStockListIndex)"
>
<ChevronUpIcon />
{{ $t('stocklist.action-move-up') }}
</button>
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="stockListUtils.moveDownStock(store.chosenStockListIndex)"
>
<ChevronDownIcon />
{{ $t('stocklist.action-move-down') }}
</button>
<button
class="btn btn--image"
:tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
@click="stockListUtils.removeStock(store.chosenStockListIndex)"
>
<TrashIcon />
{{ $t('stocklist.action-remove') }}
</button>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useStore } from '../../../store';
import { isTractionUnit } from '../../../utils/vehicleUtils';
import { useFileUtils } from '../../../utils/fileUtils';
import stockMixin from '../../../mixins/stockMixin';
import { useStockListUtils } from '../../../utils/stockListUtils';
import {
ArrowDownTrayIcon,
ArrowPathIcon,
ArrowUturnLeftIcon,
BookmarkIcon,
ChevronDownIcon,
ChevronUpIcon,
ClipboardDocumentCheckIcon,
DocumentDuplicateIcon,
FolderPlusIcon,
TrashIcon,
} from '@heroicons/vue/20/solid';
export default defineComponent({
mixins: [stockMixin],
components: {
ArrowDownTrayIcon,
ArrowPathIcon,
ArrowUturnLeftIcon,
BookmarkIcon,
ChevronDownIcon,
ChevronUpIcon,
ClipboardDocumentCheckIcon,
DocumentDuplicateIcon,
FolderPlusIcon,
TrashIcon,
},
data: () => ({
store: useStore(),
}),
setup() {
const fileUtils = useFileUtils();
const stockListUtils = useStockListUtils();
return {
fileUtils,
stockListUtils,
};
},
computed: {
stockIsEmpty() {
return this.store.stockList.length == 0;
},
},
methods: {
copyToClipboard() {
navigator.clipboard.writeText(this.store.stockString);
setTimeout(() => {
alert(this.$t('stocklist.alert-copied'));
}, 20);
},
clickFileInput() {
(this.$refs['conFile'] as HTMLInputElement).click();
},
resetStock() {
this.store.stockList.length = 0;
this.store.chosenStockListIndex = -1;
},
shuffleCars() {
const availableIndexes = this.store.stockList.reduce((acc, stock, i) => {
if (!isTractionUnit(stock.vehicleRef)) acc.push(i);
return acc;
}, [] as number[]);
for (let i = 0; i < this.store.stockList.length; i++) {
if (!availableIndexes.includes(i)) continue;
availableIndexes.splice(i, -1);
const randAvailableIndex =
availableIndexes[Math.floor(Math.random() * availableIndexes.length)];
const tempSwap = this.store.stockList[randAvailableIndex];
this.store.stockList[randAvailableIndex] = this.store.stockList[i];
this.store.stockList[i] = tempSwap;
}
},
downloadStock() {
if (this.store.stockList.length == 0) return alert(this.$t('stocklist.alert-empty'));
const defaultName = this.fileUtils.getCurrentStockFileName();
const fileName = prompt(this.$t('stocklist.prompt-file'), defaultName);
if (!fileName) return;
const blob = new Blob([this.store.stockString]);
const file = fileName + '.con';
var e = document.createEvent('MouseEvents'),
a = document.createElement('a');
a.download = file;
a.href = window.URL.createObjectURL(blob);
a.dataset.downloadurl = ['', a.download, a.href].join(':');
e.initEvent('click', true, false);
a.dispatchEvent(e);
},
uploadStockFromFile() {
const inputEl = this.$refs['conFile'] as HTMLInputElement;
const files = inputEl.files;
if (files?.length != 1) return;
if (!/\.con$/.test(files[0].name)) return;
const reader = new FileReader();
reader.readAsText(files[0]);
reader.onload = (res) => {
const stockString = res.target?.result;
if (!stockString || typeof stockString !== 'string') return;
this.loadStockFromString(stockString);
};
reader.onerror = (err) => console.error(err);
inputEl.value = '';
},
saveStockDataToStorage() {
if (this.store.stockList.length == 0) return;
const defaultName = this.fileUtils.getCurrentStockFileName();
const entryName = prompt(this.$t('stocklist.prompt-bookmark'), defaultName);
if (!entryName) return;
if (entryName in this.store.storageStockData) {
const overwriteDataConfirm = confirm(this.$t('stocklist.prompt-bookmark-overwrite'));
if (!overwriteDataConfirm) return;
this.store.storageStockData[entryName]['updatedAt'] = Date.now();
this.store.storageStockData[entryName]['stockString'] = this.store.stockString;
} else {
this.store.storageStockData[entryName] = {
id: entryName,
createdAt: Date.now(),
stockString: this.store.stockString,
};
}
try {
localStorage.setItem('savedStockData', JSON.stringify(this.store.storageStockData));
this.store.chosenStorageStockName = entryName;
this.store.chosenStorageStockString = this.store.stockString;
} catch (error) {
console.error('Wystąpił błąd podczas zapisywania składu do localStorage!', error);
}
},
async uploadStockFromClipboard() {
try {
const content = await navigator.clipboard.readText();
this.loadStockFromString(content);
} catch (error) {
switch (error) {
case 'stock-loading-error':
alert(this.$t('stocklist.stock-loading-error'));
break;
default:
alert(this.$t('stocklist.stock-clipboard-error'));
break;
}
}
},
},
});
</script>
<style lang="scss" scoped>
.stock_actions {
display: flex;
flex-direction: column;
gap: 0.5em;
}
.actions-bottom {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5em;
padding: 0.5em;
background-color: #353a57;
&[data-disabled='true'] {
opacity: 0.8;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
pointer-events: none;
}
}
.actions-top {
display: grid;
gap: 0.5em;
grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
button {
width: 100%;
&[data-button-tooltip] {
font-size: 0.85em;
}
input {
opacity: 0;
width: 0;
height: 0;
}
}
}
</style>
@@ -0,0 +1,261 @@
<template>
<div class="list-wrapper">
<StockThumbnails :onListItemClick="onListItemClick" />
<div v-if="stockIsEmpty" class="list-empty">
<div class="stock-info">{{ $t('stocklist.list-empty') }}</div>
</div>
<ul v-else>
<transition-group name="stock-list-anim">
<li
v-for="(stock, i) in store.stockList"
:key="stock.id"
:class="{ loco: isTractionUnit(stock.vehicleRef) }"
tabindex="0"
@click="onListItemClick(i)"
@keydown.enter="onListItemClick(i)"
@keydown.w="stockListUtils.moveUpStock(i)"
@keydown.s="stockListUtils.moveDownStock(i)"
@keydown.backspace="stockListUtils.removeStock(i)"
ref="itemRefs"
>
<div
class="stock-info"
@dragstart="onDragStart(i)"
@drop="onDrop($event, i)"
@dragover="allowDrop"
draggable="true"
>
<span class="stock-info-no" :data-selected="i == store.chosenStockListIndex">
<span v-if="i == store.chosenStockListIndex">&bull;&nbsp;</span>
{{ i + 1 }}.
</span>
<span
class="stock-info-type"
:data-sponsor-only="
stock.vehicleRef.sponsorOnlyTimestamp &&
stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
"
:data-team-only="stock.vehicleRef.teamOnly"
>
{{
isTractionUnit(stock.vehicleRef)
? stock.vehicleRef.type
: getCarSpecFromType(stock.vehicleRef.type)
}}
</span>
<span class="stock-info-cargo" v-if="stock.cargo">
{{ stock.cargo.id }}
</span>
<span class="stock-info-length">{{ stock.vehicleRef.length }}m</span>
<span class="stock-info-mass">
{{ ((stock.vehicleRef.weight + (stock.cargo?.weight ?? 0)) / 1000).toFixed(1) }}t
</span>
<span class="stock-info-speed">{{ stock.vehicleRef.maxSpeed }}km/h</span>
</div>
</li>
</transition-group>
</ul>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useStore } from '../../../store';
import { isTractionUnit } from '../../../utils/vehicleUtils';
import { useStockListUtils } from '../../../utils/stockListUtils';
import stockPreviewMixin from '../../../mixins/stockPreviewMixin';
import StockThumbnails from './StockThumbnails.vue';
export default defineComponent({
mixins: [stockPreviewMixin],
components: { StockThumbnails },
setup() {
const stockListUtils = useStockListUtils();
return { stockListUtils };
},
data: () => ({
store: useStore(),
draggedVehicleID: -1,
}),
computed: {
stockIsEmpty() {
return this.store.stockList.length == 0;
},
},
methods: {
isTractionUnit,
onDragStart(vehicleIndex: number) {
this.draggedVehicleID = vehicleIndex;
},
onDrop(e: DragEvent, vehicleIndex: number) {
e.preventDefault();
let targetEl = (this.$refs['itemRefs'] as Element[])[vehicleIndex];
if (!targetEl) return;
const tempVehicle = this.store.stockList[vehicleIndex];
this.store.stockList[vehicleIndex] = this.store.stockList[this.draggedVehicleID];
this.store.stockList[this.draggedVehicleID] = tempVehicle;
this.store.chosenStockListIndex = vehicleIndex;
},
allowDrop(e: DragEvent) {
e.preventDefault();
},
onListItemClick(stockID: number) {
const stock = this.store.stockList[stockID];
this.store.chosenStockListIndex =
this.store.chosenStockListIndex == stockID &&
this.store.chosenVehicle?.type == stock.vehicleRef.type
? -1
: stockID;
if (this.store.chosenStockListIndex == -1) {
this.store.chosenVehicle = null;
return;
}
if (this.store.swapVehicles) this.store.swapVehicles = false;
this.previewStock(stock);
},
getCarSpecFromType(typeStr: string) {
const specArray = typeStr.split('_');
if (specArray.length == 0) return null;
/* 111a_Grafitti_1 */
if (specArray.length == 3) return `${specArray[0]} ${specArray[1]}-${specArray[2]}`;
/* 111a_PKP_Bnouz_01 */
return `${specArray[0]} ${specArray[2]}-${specArray[3]} (${specArray[1]})`;
},
},
});
</script>
<style lang="scss" scoped>
.list-wrapper {
position: relative;
}
.list-empty {
background-color: global.$secondaryColor;
border-radius: 0.5em;
padding: 0.75em;
font-weight: bold;
}
ul {
overflow-y: scroll;
height: 500px;
}
ul > li {
display: flex;
align-items: center;
justify-content: space-between;
min-width: 500px;
margin: 0.25em 0;
outline: none;
cursor: pointer;
&:focus-visible {
outline: 1px solid white;
}
}
li > .stock-info {
display: flex;
gap: 0.25em;
color: white;
font-weight: 700;
transition: color 100ms;
& > span {
padding: 0.5em;
}
}
.stock-info-no,
.stock-info-type {
background-color: global.$secondaryColor;
&[data-team-only='true'] {
color: global.$teamColor;
}
&[data-sponsor-only='true'] {
color: global.$sponsorColor;
}
}
.stock-info-no {
min-width: 3.5em;
text-align: right;
&[data-selected='true'] {
color: global.$accentColor;
}
}
.stock-info-cargo {
background-color: #333;
}
.stock-info-length,
.stock-info-mass,
.stock-info-speed {
background-color: #555;
}
.stock-list-anim {
&-move, /* apply transition to moving elements */
&-enter-active,
&-leave-active {
transition: all 250ms ease;
}
&-enter-from {
opacity: 0;
transform: translateY(-25px);
}
&-leave-to {
opacity: 0;
}
&-leave-active {
position: absolute;
}
}
@media screen and (max-width: global.$breakpointMd) {
ul {
min-height: auto;
}
}
</style>
@@ -0,0 +1,32 @@
<template>
<div class="stock_spawn-settings">
<Checkbox :disabled="!store.stockSupportsColdStart" v-model="store.isColdStart">
{{ $t('stocklist.coldstart-info') }}
</Checkbox>
<Checkbox :disabled="!store.stockSupportsDoubleManning" v-model="store.isDoubleManned">
{{ $t('stocklist.doublemanning-info') }}
</Checkbox>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useStore } from '../../../store';
import Checkbox from '../../common/Checkbox.vue';
export default defineComponent({
components: { Checkbox },
data: () => ({
store: useStore(),
}),
});
</script>
<style scoped>
.stock_spawn-settings {
display: flex;
gap: 0.5em;
}
</style>
@@ -0,0 +1,72 @@
<template>
<div class="stock_specs">
<div v-if="store.chosenStorageStockName || chosenRealComposition">
<b class="bookmarked-stock-info" v-if="store.chosenStorageStockName">
<span
class="text--accent"
:title="store.chosenStorageStockName.length > 41 ? store.chosenStorageStockName : ''"
>
<BookmarkIcon />
{{ store.chosenStorageStockName.slice(0, 40) }}
{{ store.chosenStorageStockName.length > 41 ? '...' : '' }}
</span>
</b>
<span v-if="store.chosenStorageStockName && chosenRealComposition"> | </span>
<b class="real-stock-info" v-if="chosenRealComposition">
<span class="text--accent">
<img :src="getIconURL(chosenRealComposition.type)" :alt="chosenRealComposition.type" />
{{ chosenRealComposition.number }} {{ chosenRealComposition.name }}
</span>
</b>
</div>
<span>
{{ $t('stocklist.mass') }}
<span class="text--accent">{{ (store.totalWeight / 1000).toFixed(1) }}t</span>
({{ $t('stocklist.mass-accepted') }}:
<span class="text--accent">{{
store.acceptableWeight ? `${~~(store.acceptableWeight / 1000)}t` : '-'
}}</span
>) - {{ $t('stocklist.length') }}:
<span class="text--accent">{{ store.totalLength }}m</span>
- {{ $t('stocklist.vmax') }}
<span tabindex="0" :data-tooltip="$t('stocklist.disclaimer')">(?)</span>:
<span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
</span>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useStore } from '../../../store';
import imageMixin from '../../../mixins/imageMixin';
import { BookmarkIcon } from '@heroicons/vue/20/solid';
export default defineComponent({
components: { BookmarkIcon },
mixins: [imageMixin],
data: () => ({
store: useStore(),
}),
computed: {
chosenRealComposition() {
const currentStockString = this.store.stockList.map((s) => s.vehicleRef.type).join(';');
return this.store.realCompositionList.find((rc) => rc.stockString == currentStockString);
},
},
});
</script>
<style scoped>
.bookmarked-stock-info,
.real-stock-info {
svg,
img {
height: 1.3ch;
}
}
</style>
@@ -0,0 +1,228 @@
<template>
<div class="stock-thumbnails" ref="thumbnailsRef">
<ul>
<li
class="thumbnail-item"
v-for="(stock, stockIndex) in store.stockList"
:key="stockIndex"
:data-selected="store.chosenStockListIndex == stockIndex"
:data-sponsor-only="
stock.vehicleRef.sponsorOnlyTimestamp &&
stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
"
:data-team-only="stock.vehicleRef.teamOnly"
draggable="true"
@dragstart="onDragStart(stockIndex)"
@drop="onDrop($event, stockIndex)"
@dragover="allowDrop"
@click="onListItemClick(stockIndex)"
>
<div class="stock-text">
<p>
{{ stock.vehicleRef.type.replace(/_/g, ' ') }}
</p>
</div>
<span>
<img
v-for="thumbnail in getVehicleThumbnails(stock.vehicleRef.type)"
draggable="false"
style="min-width: 200px"
:src="`https://stacjownik.spythere.eu/static/thumbnails/${thumbnail.src}.png`"
:alt="stock.vehicleRef.type"
:title="stock.vehicleRef.type"
@load="($event) => (($event.target as HTMLImageElement).style.minWidth = 'auto')"
@error="
($event) =>
(($event.target as HTMLImageElement).src = `/images/${thumbnail.fallbackSrc}.png`)
"
height="70"
/>
</span>
</li>
</ul>
</div>
</template>
<script setup lang="ts">
import { Ref, computed, nextTick, ref, watch } from 'vue';
import { useStore } from '../../../store';
const store = useStore();
const emit = defineEmits(['listItemClick']);
const thumbnailsRef = ref() as Ref<HTMLElement>;
const draggedIndex = ref(-1);
const onListItemClick = (index: number) => {
emit('listItemClick', index);
};
watch(
computed(() => store.chosenStockListIndex),
(index) => {
if (index < 0) return;
nextTick(() => {
(thumbnailsRef.value as HTMLElement)
.querySelector(`li:nth-child(${index + 1})`)
?.scrollIntoView({
block: 'nearest',
inline: 'start',
behavior: 'smooth',
});
});
}
);
// Dragging images
const onDragStart = (vehicleIndex: number) => {
draggedIndex.value = vehicleIndex;
};
const onDrop = (e: DragEvent, vehicleIndex: number) => {
e.preventDefault();
let targetEl = thumbnailsRef.value.querySelector(`li:nth-child(${vehicleIndex + 1})`);
if (!targetEl && draggedIndex.value != -1) return;
const tempVehicle = store.stockList[vehicleIndex];
store.stockList[vehicleIndex] = store.stockList[draggedIndex.value];
store.stockList[draggedIndex.value] = tempVehicle;
store.chosenStockListIndex = vehicleIndex;
};
const allowDrop = (e: DragEvent) => {
e.preventDefault();
};
const getVehicleThumbnails = (vehicleString: string) => {
const [vehicleName, vehicleCargo] = vehicleString.split(':');
const thumbnails: { src: string; fallbackSrc: string }[] = [];
// Generowanie członów EN57
if (vehicleName.startsWith('EN57')) {
thumbnails.push(
{ src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
{ src: vehicleName + 's', fallbackSrc: 'unknown_ezt-s' },
{ src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
);
}
// Generowanie członów EN71
else if (vehicleName.startsWith('EN71')) {
thumbnails.push(
{ src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
{ src: vehicleName + 'sa', fallbackSrc: 'unknown_ezt-sa' },
{ src: vehicleName + 'sb', fallbackSrc: 'unknown_ezt-sb' },
{ src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
);
}
// Generowanie pojazdów i członów 2EN57
else if (vehicleString.startsWith('2EN57')) {
const [firstVehicleNumber, secondVehicleNumber] = vehicleString
.replace('2EN57-', '')
.split('+');
thumbnails.push(
{ src: `EN57-${firstVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
{ src: `EN57-${firstVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
{ src: `EN57-${firstVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' },
{ src: `EN57-${secondVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
{ src: `EN57-${secondVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
{ src: `EN57-${secondVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' }
);
}
// Generowanie członów Gor77
else if (vehicleString.startsWith('Gor77')) {
thumbnails.push(
{ src: vehicleName + '-A', fallbackSrc: 'unknown_Gor77-A' },
{ src: vehicleName + '-B', fallbackSrc: 'unknown_Gor77-B' },
{ src: vehicleName + '-C', fallbackSrc: 'unknown_Gor77-C' },
{ src: vehicleName + '-D', fallbackSrc: 'unknown_Gor77-D' }
);
}
// Generowanie członów ET41
else if (vehicleString.startsWith('ET41')) {
thumbnails.push(
{ src: vehicleName + '-A', fallbackSrc: 'unknown_ET41-A' },
{ src: vehicleName + '-B', fallbackSrc: 'unknown_ET41-B' }
);
}
// Generowanie pozostałych pojazdów
else {
let fallbackVehicleImage = 'unknown_cargo';
if (/^(EP|EU)/.test(vehicleName)) fallbackVehicleImage = 'unknown_train';
else if (/^(SM42)/.test(vehicleName)) fallbackVehicleImage = 'unknown_SM42';
else if (/(\d{3}a|(Bau|Gor)\d{2}|304C)_/.test(vehicleName))
fallbackVehicleImage = 'unknown_passenger';
thumbnails.push({ src: vehicleName, fallbackSrc: fallbackVehicleImage });
}
return thumbnails;
};
</script>
<style lang="scss" scoped>
.stock-thumbnails {
overflow: auto;
background-color: #353a57;
height: auto;
}
ul {
display: flex;
align-items: flex-end;
min-height: 110px;
}
.thumbnail-item {
cursor: pointer;
font-size: 0.85em;
text-align: center;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
&[data-selected='true'] {
background-color: rebeccapurple;
}
&[data-sponsor-only='true'] > b {
color: global.$sponsorColor;
}
&[data-team-only='true'] > b {
color: global.$teamColor;
}
img {
max-height: 70px;
width: auto;
height: auto;
}
}
.stock-text {
font-weight: bold;
color: #ccc;
font-size: 0.9em;
}
.thumbnail-item > span {
display: flex;
justify-content: center;
align-items: flex-end;
cursor: crosshair;
}
</style>
@@ -0,0 +1,102 @@
<template>
<div class="stock_warnings" v-if="hasAnyWarnings">
<div class="warning" v-if="locoNotSuitable">(!) {{ $t('stocklist.warning-not-suitable') }}</div>
<div class="warning" v-if="lengthExceeded && store.isTrainPassenger">
(!) {{ $t('stocklist.warning-passenger-too-long') }}
</div>
<div class="warning" v-if="lengthExceeded && !store.isTrainPassenger">
(!) {{ $t('stocklist.warning-freight-too-long') }}
</div>
<div class="warning" v-if="teamOnlyVehicles.length > 0">
(!)
{{
$t('stocklist.warning-team-only-vehicle', [
teamOnlyVehicles.map((v) => v.vehicleRef.type).join(', '),
])
}}
</div>
<div class="warning" v-if="weightExceeded">
(!)
<i18n-t keypath="stocklist.warning-too-heavy">
<template #href>
<a
target="_blank"
href="https://docs.google.com/spreadsheets/d/1BvTU-U7huIaEheov22TrhTtROUM4MwVfdbq03GVAEM8"
>
{{ $t('stocklist.acceptable-mass-docs') }}
</a>
</template>
</i18n-t>
</div>
<!-- <div class="warning" v-if="locoCountExceeded">
{{ $t('stocklist.warning-too-many-locos') }}
</div> -->
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useStore } from '../../../store';
import { isTractionUnit } from '../../../utils/vehicleUtils';
export default defineComponent({
data: () => ({
store: useStore(),
}),
computed: {
teamOnlyVehicles() {
return this.store.stockList.filter((stock) => stock.vehicleRef.teamOnly);
},
hasAnyWarnings() {
return (
this.weightExceeded || this.lengthExceeded || this.locoNotSuitable || this.teamOnlyVehicles
);
},
lengthExceeded() {
return (
(this.store.totalLength > 350 && this.store.isTrainPassenger) ||
(this.store.totalLength > 650 && !this.store.isTrainPassenger)
);
},
weightExceeded() {
return this.store.acceptableWeight && this.store.totalWeight > this.store.acceptableWeight;
},
locoNotSuitable() {
return (
!this.store.isTrainPassenger &&
this.store.stockList.length > 1 &&
!this.store.stockList.every((stock) => isTractionUnit(stock.vehicleRef)) &&
this.store.stockList.some(
(stock) => isTractionUnit(stock.vehicleRef) && stock.vehicleRef.type.startsWith('EP')
)
);
},
},
});
</script>
<style lang="scss" scoped>
.warning {
padding: 0.25em;
margin: 0.25em 0;
background: global.$accentColor;
color: black;
font-weight: bold;
a {
color: black;
text-decoration: underline;
}
}
</style>
@@ -5,7 +5,7 @@
@keydown.esc="store.vehiclePreviewSrc = ''" @keydown.esc="store.vehiclePreviewSrc = ''"
tabindex="0" tabindex="0"
> >
<img :src="store.vehiclePreviewSrc" alt="preview" /> <img :src="store.vehiclePreviewSrc" alt="preview" @error="onImageError" />
</div> </div>
</template> </template>
@@ -23,6 +23,14 @@ export default defineComponent({
mounted() { mounted() {
this.$el.focus(); this.$el.focus();
}, },
methods: {
onImageError(event: Event) {
if(!event.target || !(event.target instanceof HTMLImageElement)) return
event.target.src = '/images/no-vehicle-image.png';
},
},
}); });
</script> </script>
-132
View File
@@ -1,132 +0,0 @@
<template>
<div class="stock-thumbnails" ref="thumbnailsRef">
<div
class="thumbnail-item"
v-for="(stock, stockIndex) in store.stockList"
:key="stockIndex"
:data-selected="store.chosenStockListIndex == stockIndex"
:data-sponsor="stock.isSponsorsOnly"
draggable="true"
@dragstart="onDragStart(stockIndex)"
@drop="onDrop($event, stockIndex)"
@dragover="allowDrop"
@click="onListItemClick(stockIndex)"
>
<b>
{{ stock.type }}
</b>
<img
draggable="false"
:src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
:alt="stock.type"
:title="stock.type"
@error="stockImageError($event, stock)"
/>
</div>
</div>
</template>
<script setup lang="ts">
import { Ref, computed, nextTick, ref, watch } from 'vue';
import { useStore } from '../../store';
import { IStock } from '../../types';
const store = useStore();
const emit = defineEmits(['listItemClick']);
const thumbnailsRef = ref() as Ref<HTMLElement>;
const draggedIndex = ref(-1);
const onListItemClick = (index: number) => {
emit('listItemClick', index);
};
const stockImageError = (e: Event, stock: IStock) => {
(e.target as HTMLImageElement).src = `images/${stock.useType}-unknown.png`;
};
watch(
computed(() => store.chosenStockListIndex),
(index) => {
if (index < 0) return;
nextTick(() => {
(thumbnailsRef.value as HTMLElement)
.querySelector(`div:nth-child(${index + 1})`)
?.scrollIntoView({
block: 'nearest',
inline: 'start',
behavior: 'smooth',
});
});
}
);
// Dragging images
const onDragStart = (vehicleIndex: number) => {
draggedIndex.value = vehicleIndex;
};
const onDrop = (e: DragEvent, vehicleIndex: number) => {
e.preventDefault();
let targetEl = thumbnailsRef.value.querySelector(`div:nth-child(${vehicleIndex + 1})`);
if (!targetEl && draggedIndex.value != -1) return;
const tempVehicle = store.stockList[vehicleIndex];
store.stockList[vehicleIndex] = store.stockList[draggedIndex.value];
store.stockList[draggedIndex.value] = tempVehicle;
store.chosenStockListIndex = vehicleIndex;
};
const allowDrop = (e: DragEvent) => {
e.preventDefault();
};
</script>
<style lang="scss" scoped>
.stock-thumbnails {
display: flex;
overflow: auto;
background-color: #353a57;
}
.thumbnail-item {
display: flex;
align-items: center;
justify-content: space-between;
flex-direction: column;
gap: 0.5em;
padding-top: 0.5em;
cursor: pointer;
min-height: 100px;
font-size: 0.85em;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
&[data-selected='true'] {
background-color: rebeccapurple;
}
b {
color: #ccc;
margin: 0 1em;
}
&[data-sponsor='true'] > b {
color: salmon;
}
img {
max-height: 60px;
}
}
</style>
+11 -18
View File
@@ -27,18 +27,8 @@
}, },
"categoriesRules": { "categoriesRules": {
"EI": [null, "00", "99"], "EI": [null, "00", "99"],
"MP": [null, "050", "169"], "EC": [null, "000", "049"],
"RO": [null, "200", "999"], "EN": [null, "000", "049"],
"RP": [null, "050", "169"],
"PW": ["6", "000", "899"],
"TK": ["3", "000", "899"],
"TM": ["4", "000", "899"],
"LT": ["5", "000", "899"]
},
"categoriesNextVersion": {
"EI": [null, "00", "99"],
"EC": [null, "001", "049"],
"EN": [null, "001", "049"],
"RO": [null, "200", "999"], "RO": [null, "200", "999"],
"RP": [null, "050", "169"], "RP": [null, "050", "169"],
@@ -53,19 +43,22 @@
"PW": ["6", "000", "899"], "PW": ["6", "000", "899"],
"PX": ["6", "000", "899"], "PX": ["6", "000", "899"],
"TC": ["0", "000", "899"], "TM": ["4", "000", "899"],
"TN": ["3", "000", "899"],
"TK": ["3", "000", "899"],
"TD": ["2", "000", "899"],
"TG": ["1", "000", "899"], "TG": ["1", "000", "899"],
"TR": ["1", "000", "899"], "TR": ["1", "000", "899"],
"TD": ["2", "000", "899"], "TC": ["0", "000", "899"],
"TK": ["3", "000", "899"],
"TN": ["3", "000", "899"],
"TM": ["4", "000", "899"],
"TS": ["5", "000", "899"], "TS": ["5", "000", "899"],
"TH": ["5", "000", "899"],
"LT": ["5", "000", "899"], "LT": ["5", "000", "899"],
"LP": ["6", "000", "899"], "LP": ["6", "000", "899"],
"LS": ["9", "000", "899"], "LS": ["9", "000", "899"],
"LZ": ["9", "000", "899"],
"ZN": ["9", "000", "899"] "ZN": ["9", "000", "899"],
"ZU": ["9", "000", "899"]
} }
} }
+71
View File
@@ -47,6 +47,26 @@
"cargo": null, "cargo": null,
"none": 160 "none": 160
}, },
"ET22": {
"passenger": {
"650000": 125
},
"cargo": {
"1200000": 100,
"3100000": 70
},
"none": 125
},
"201E": {
"passenger": {
"650000": 125
},
"cargo": {
"1200000": 100,
"3100000": 70
},
"none": 125
},
"ET41": { "ET41": {
"passenger": { "passenger": {
"700000": 125 "700000": 125
@@ -78,5 +98,56 @@
"2400000": 20 "2400000": 20
}, },
"none": 90 "none": 90
},
"M62": {
"passenger": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"cargo": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"none": 100
},
"ST44": {
"passenger": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"cargo": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"none": 100
},
"CTLR4C": {
"passenger": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"cargo": {
"500000": 100,
"800000": 80,
"1200000": 60,
"2000000": 40,
"3000000": 20
},
"none": 100
} }
} }
+57
View File
@@ -0,0 +1,57 @@
{
"cargo": {
"kontenery": ["627Z:all", "412Z:all"],
"chłodnia": ["202Lc:all"],
"drobnica": ["426S:all", "208Kf:all", "401Ka_PKP_Gags:all", "401Ka_PKPC_Gags:all"],
"węgiel": ["412W:coal_01", "413S:coal_413S", "429W:coal_01", "401Zb:coal_02"],
"ruda": ["412W:ore_01", "401Zl:ore_35", "429W:ore_01"],
"piasek": [
"412W:sand_01",
"412W:sand_02",
"413S:sand_413S",
"401Zl:sand_30",
"429W:sand_01",
"429W:sand_02",
"401Zb:sand_03",
"418Va:sand_418V",
"418Vb:sand_418V"
],
"kreda": ["413S:chalk_413S"],
"kamień": [
"412W:stone_01",
"412W:stone_50",
"401Zl:stone_25",
"429W:stone_01",
"401Zb:stone_02",
"418Va:stone_418V",
"418Vb:stone_418V"
],
"złom": ["412W:scrap_01", "412W:scrap_02", "429W:scrap_01", "429W:scrap_02"],
"paliwo": ["29R_CTLL:all", "29R_PKP:all", "445Rb:all"],
"melasa": ["29R_PLPOL:all"],
"żwir": ["441V"],
"koła": ["424Z:wheels_01"],
"drewno": ["424Z:woods_01", "424Z:woods_02"],
"szyny": ["424Z:rails_01"],
"kable": ["424Z:cables_01", "24Z:cables_Ks", "401Ze:cables_02"],
"kruszywo": ["59WS:all"],
"techniczne": ["209c", "304Ca", "102a_PKPE", "401Ka_PKP_XGa:all"],
"poczta": ["211K:all"],
"cement": [
"408S:cement_4",
"206S_CEMET:cement_3",
"206S_SPEED:cement_3",
"220S_CEMET:cement_3"
],
"wapno": ["408S:lime_4", "206S_CEMET:lime_3", "206S_SPEED:lime_3", "220S_CEMET:lime_3"],
"soda": ["408S:soda_4", "206S_CEMET:soda_3", "206S_SPEED:soda_3", "220S_CEMET:soda_3"],
"pszenica": ["206Sh_PKP_Ugpps:wheat_3", "206Sh_PKPC_Ugpps:wheat_3"],
"kukurydza": ["206Sh_PKP_Ugpps:corn_3", "206Sh_PKPC_Ugpps:corn_3"],
"pasza": ["206Sh_PKP_Ugpps:forage_3", "206Sh_PKPC_Ugpps:forage_3"],
"pojazdy": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"],
"karbid": ["421S:carbide_01"],
"wrażliwe": ["425S:all", "421S:carbide_01"],
"stal": ["401Ze:steel_01", "401Ze:steel_02"],
"gaz": ["WB117:all"]
}
}
+272
View File
@@ -0,0 +1,272 @@
{
"EIC 45_71006_71007 Sprewa": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01",
"IC 15100_15101 Słowiniec": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 15103 Podlasiak": "EP07-1039;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 15106_15107 Brda": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_01",
"IC 15155_15154 Lazur": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"IC 16150_16151 Śnieżka": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"IC 17100_17101 Zamenhof": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 17102_17103 Zielonogórzanin": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 17104_17105 Warta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 18100_18101 Gałczyński": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 18102_18103 Podlasiak": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 18104_18105 Rybak": "EP07-1043;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01",
"IC 18106_18107 Mewa": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 18112_18113 Noteć": "EP08-006v2;111a_PKPIC_B9nopuvz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 18153_18152 Parsęta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 19100_19101 Łodzianin": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01",
"IC 20100_20101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 21100_21101 Chełmianin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 22100_22101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 23100_23101 Jagiełło": "EP07-544;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 24100_24101 Sztygar": "EP07-1009;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 24105 Morcinek": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_01",
"IC 25100_25101 Kochanowski": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 26100_26101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 26102_26103 Bolko": "EP07-1054;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 26104_26105 Morcinek": "EP07-1039;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 27100_27101 Lubuszanin": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 31104_31105 Witos": "EP07-356;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 31106_31107 San": "EP07-1056;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 31110_31111 Marszałek Piłsudski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 32100_32101 Jagiełło": "EP07-1054;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 35102_35103 Kochanowski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 35150_35151 Halny": "EP07-391;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 35202_35203 Przebojowy pociąg RMF FM": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 36104_36105 Kossak": "EP07-1043;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 38100_38101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 38102_38103 Osterwa": "EP07-1025;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 38104_38105 Mehoffer": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 38172_38173 Przemyślanin": "EP08-006v2;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 38192_38193 Podhalanin": "EP07-1043;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
"IC 42100_42101 Sztygar": "EP07-544;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 42104 Morcinek": "EP07-1002;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 48150_48151 Gwarek": "EP07-384;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"IC 50104_50105 Niegocin": "EP07-391;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 51100_51101 Słowiniec": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 51102 Podlasiak": "EP07-335;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 51106_51107 Brda": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 51155_51154 Lazur": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
"IC 52100_52101 Kochanowski": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01\n",
"IC 53102_53103 Kochanowski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 53150_53151 Halny": "EP07-1043;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 55104_55105 Niegocin": "EP07-1031;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 56102_56103 Mamry": "EP07-1043;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
"IC 56104_56105 Jeziorak": "EP07-1038;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
"IC 57100_57101 Ukiel": "EP07-1048;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
"IC 57102_57103 Drwęca": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02\n",
"IC 57104_57105 Bachus": "EP07-174;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 57106_57107 Lednica": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 57108_57109 Stoczniowiec": "EP07-335;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
"IC 58100_58101 Albatros": "EP07-1039;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 58102_58103 Żuławy": "EP07-1038;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 58104_58105 Bryza": "EP07-1009;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01\n",
"IC 58106_58107 Gryf": "EP07-1009;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 58108_58109 Stańczyk": "EP07-444;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 60101 Mehoffer": "EP07-1025;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 60151 Śnieżka": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 61150_61151 Śnieżka": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 62100_62101 Hetman": "EP08-006;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
"IC 62102_62103 Bolko": "EP07-391;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 62104_62105 Morcinek": "EP07-1043;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 63104_63105 Kossak": "EU07-015;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 65102_65103 Mamry": "EP07-1031;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 65104_65105 Jeziorak": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01",
"IC 66100 Mehoffer": "EP07-1025;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01",
"IC 66150 Śnieżka": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 68100_68101 Bosman": "EP07-1002;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 68102_68103 Szkuner": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 68104_68105 Swarożyc": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 71100_71101 Zamenhof": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 71102_71103 Zielonogórzanin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 71104_71105 Warta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"IC 72100_72101 Lubuszanin": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"IC 75100_75101 Ukiel": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 75102_75103 Drwęca": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B10ou_01",
"IC 75104_75105 Bachus": "EP07-335;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 75106_75107 Lednica": "EP07-1031;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 75108_75109 Stoczniowiec": "EP07-1025;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 78101 Gałczyński": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 78103 Lubuszanin": "SM42-506;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 78103 Mewa": "SM42-506;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 80150 Rowokół": "EP07-1038;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"IC 81100_81101 Gałczyński": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 81102_81103 Podlasiak": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 81104_81105 Rybak": "EP07-480;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
"IC 81106_81107 Mewa": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 81112_81113 Noteć": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 81152_81153 Parsęta": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 83100_83101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 83102_83103 Osterwa": "EP07-444;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"IC 83104_83105 Mehoffer": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 83192_83193 Podhalanin": "EP07-1056;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 84150_84151 Gwarek": "EP07-1043;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 85100_85101 Albatros": "EP07-1038;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 85102_85103 Żuławy": "EP07-335;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;154a_PKPIC_B10mnouz_01",
"IC 85104_85105 Bryza": "EP07-480;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 85106_85107 Gryf": "EP07-444;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
"IC 85108_85109 Stańczyk": "EU07-077;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 86100_86101 Bosman": "EP07-544;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 86102_86103 Szkuner": "EP07-174;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 86104_86105 Swarożyc": "EP07-1056;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 87100 Gałczyński": "SM42-506;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 87102 Lubuszanin": "SM42-506;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
"IC 87172_87173 Przemyślanin": "EP07-1054;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
"IC 88151 Rowokół": "EP07-444;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"IC 91100_91101 Lodzianin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"TLK 10100_10101 Żubr": "EP07-1009;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 10110_10111 Żubr": "EP07-355;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 12110_12111 Nida": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 301_43004_43005 Galicja (PKPIC) R 301 Galicja (ČD) ": "EP07-480;112a_PKPIC_A9ou_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
"TLK 310_24000_24001 Roztocze (PKPIC) R 310 Roztocze (ČD)": "EP07-480;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
"TLK 31100_31101 Malinowski": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 31102_31103 Hańcza": "EP07-480;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"TLK 31106_31107 San": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 31110_31111 Wit Stwosz": "EP08-006;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
"TLK 31150_31151 Karłowicz": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 311_42000_42001 Roztocze (PKPIC) R 311 Roztocze (ČD) ": "EP07-480;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
"TLK 33100_33101 Malinowski": "EU07-324;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
"TLK 33104_33105 Łukasiewicz": "EP07-544;112a_PKPIC_A9ou_01;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
"TLK 35100_35101 Małopolska": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
"TLK 35106_35107 Artus": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
"TLK 35106_35107 ArtusV2": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01\n",
"TLK 35170_35171 Karpaty": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 35190_35191 Korsarz": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 36102_36103 Sudety": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 36170_36171 Pogórze": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02\n",
"TLK 37100_37101 Pułaski": "EU07-334;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01",
"TLK 37102_37103 Wybicki": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 37170_37171 Pogórze": "EP07-544;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 38106_38107 Zefir": "EU07-334;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 38154_38155 Lubomirski": "EP08-006;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
"TLK 38170_38171 Ustronie": "EP07-444;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 38190_38191 Bursztyn": "EP07-1031;110a_PKPIC_Bcdu_02;112a_PKPIC_A9ou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;110a_PKPIC_Bcdu_02",
"TLK 400_84070_84071 Wolin (PKPIC) R 400 Wolin (ČD)": "EU07-334;110a_PKPIC_Bcdu_02;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
"TLK 40160_40161 Pirat": "EP07-544;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;110a_PKPIC_Bcdu_02",
"TLK 401_48070_48071 Wolin (PKPIC) R 401 Wolin (ČD) ": "EP07-544;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
"TLK 402_54070_54071 Wydmy (PKPIC) R 402 Wydmy (ČD)": "EP07-1009;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 403_45070_45071 Wydmy (PKPIC) R 403 Wydmy (ČD) ": "EP07-1009;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
"TLK 405_48072_48073 Pirat (PKPIC) R 405 Pirat (ČD) ": "EP07-391;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;110a_PKPIC_Bcdu_02",
"TLK 41100_41101 Chemik": "EP07-355;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
"TLK 41102_41103 Wysocki": "EP07-444;111a_PKPIC_B9nopuvz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01",
"TLK 41104_41105 Kmicic": "EP07-1056;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
"TLK 44160_44161 Pirat": "EU07-334;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
"TLK 45100_45101 Doker ": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 45150_45151 Halny ": "EP07-1054;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 45170_45171 Rozewie ": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
"TLK 45190_45191 Rozewie ": "EP07-544;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 47100_47101 Spodek ": "EP07-1038;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 50150_50151 Gardno": "SM42-506;110a_PKPIC_Bcdu_02;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
"TLK 50160_50161 Korsarz": "EP07-1038;110a_PKPIC_Bcdu_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 50170_50171 Mierzeja": "SM42-506;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 51104_51105 Biebrza": "EP07-1025;111a_PKPIC_Bnouz_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_Bnouz_01",
"TLK 51112_51113 Kociewie": "EP07-1002;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
"TLK 51150_51151 Delfin": "EP07-335;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
"TLK 51152_51153 Wybrzeże": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 53100_53101 Małopolska": "EU07-545;EU07-015;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 53104_53105 Lubomirski": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 53106_53107 Artus V2": "EP07-335;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
"TLK 53170_53171 Karpaty": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 53190_53191 Korsarz": "EP07-1054;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 54100_54101 Doker": "EP07-1038;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 54150_54151 Halny": "EP07-174;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 54170_54171 Rozewie": "EP07-1025;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 55154 Wydmy": "EU07-545;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 55160_55161 Korsarz": "EU07-545;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 55162_55163 Rozewie": "SM42-506;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01",
"TLK 55170_55171 Mierzeja": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 56100_56101 Kormoran": "EP07-355;EP07-1038;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 58104_58105 Bryza": "EP07-1038;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 58110_58111 Bory Tucholskie": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
"TLK 64160_64161 Wolin": "EU07-015;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
"TLK 65100_65101 Kormoran": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 66166_66167 Rozewie": "EP07-391;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;110a_PKPIC_Bcdu_02",
"TLK 71106_71107 Konopnicka": "EP08-006v2;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 73100_73101 Pułaski": "EP07-1054;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
"TLK 73102_73103 Wybicki V2": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 73102_73103 Wybicki": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01",
"TLK 73170_73171 Pogórze": "EP07-444;110a_PKPIC_Bcdu_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
"TLK 74100_74101 Spodek": "EP07-544;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
"TLK 76106_76107 Konopnicka": "SM42-506;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 81114_81115 Pobrzeże": "EP08-006;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;Bau84_PKPIC_B10nou_01;111a_PKPIC_B10ou_01",
"TLK 81150_81151 Słupia": "EU07-015;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 81170_81171 Uznam": "EP07-480;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
"TLK 82100_82101 Staszic": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 82102_82103 Wyczółkowski": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 82104_82105 Zamoyski": "EP07-480;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 82170_82171 Mierzeja": "EP07-1009;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
"TLK 83100_83101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
"TLK 83106_83107 Zefir": "EP07-1054;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 83154_83155 Lubomirski": "EP08-006;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01;Bau84_PKPIC_B10nou_01",
"TLK 83170_83171 Ustronie V2": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
"TLK 83190_83191 Bursztyn": "EP07-1031;110a_PKPIC_Bcdu_02;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;112a_PKPIC_A9ou_01;110a_PKPIC_Bcdu_02",
"TLK 85104_85105 Bryza": "EP07-1038;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 86116_86117 Jamno": "EP07-1025;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
"TLK 88160_88161 Ustronie": "EU07-015;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
"TLK 91130_91131 Zosia": "EP07-544;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"TLK 91132_91133 Korczak": "EP07-1002;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
"iR 11121 Żubr": "EN57-1953",
"iR 11130 Żubr": "EN57-1953",
"iR 12121 Bystrzyca": "EN71-028",
"iR 12125 Cisy": "EN71-028",
"iR 13126 Jan Matejko": "EP07-370;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02",
"iR 31130 Semafor": "EN57-1953",
"iR 36120 Galicja V2": "EN57-1914",
"iR 36120 Galicja": "EN71-010",
"iR 36122 Łużyce": "EN57-1747",
"iR 40110 Torunianin": "EN71-028",
"iR 43127_6 Giewont": "EN57-1542",
"iR 43421 Orlik": "EN57-1542",
"iR 46121 Spodek": "EN57-1542",
"iR 46123 Ostrów Tumski": "EN57-1542",
"iR 46125 Oleńka": "EN57-1542",
"iR 46140 Szyndzielnia": "EN57-1542",
"iR 46142 Szyndzielnia": "EN57-1542",
"iR 48102 Pirania": "EP07-338;111a_PRREG_B10_01;112a_PKP_A9nou_01;111a_PRREG_B10_01;112a_PKP_A9nou_01",
"iR 51110 Flisak": "EP07-338;111a_PKPIC_B9ouv_01;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PRREG_B10_01",
"iR 51204 Szczeliniec": "EP07-135;111a_PRREG_B10_01;111a_PRREG_B10_01",
"iR 56110 Sokoliki": "EP07-424;111a_PRREG_B10_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_A9ou_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_A9ou_01",
"iR 57110 Mamry": "EN57-1542",
"iR 57112 Drwęca": "EN57-1542",
"iR 57112 Niegocin": "SM42-329;Gor89_PKP_B16mnopux_04;Gor89_PKP_B16mnopux_04;Gor89_PKP_B16mnopux_04",
"iR 57120 Lednica": "EN57-1542",
"iR 61122 Prosna": "EN57-1542",
"iR 61126 Piast": "EP07-338;111a_PKPIC_B9ouv_01;120a_PRREG_B51p_02;120a_PRREG_B51p_02;111a_PRREG_B10_01",
"iR 61128 Rudawy": "EP07-242;111a_PRREG_A9ou_01;111a_PRREG_A9ou_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01;111a_PKP_Bnouz_01",
"iR 62120 Łysica": "EN57-1747",
"iR 63120 Łużyce": "EN57-1542",
"iR 64102 Szyndzielnia": "EN57-1542",
"iR 64122 Oleńka": "EN57-1542",
"iR 64124 Lompa": "EN57-1953",
"iR 64126 Spodek": "EN57-1542",
"iR 65114 Mamry": "EP07-1008;111a_PRREG_B10_01;112a_PKP_A9nou_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01",
"iR 70111 Rusałka": "EN57-1542",
"iR 71110 Wielkopolska": "EN57-1747",
"iR 71120 Ner": "EU07-475;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01;Gor89_PKP_B16mnopux_05",
"iR 72112 Koziołek": "EN57-1542",
"iR 75110 Drwęca": "EN57-1542",
"iR 75112 Niegocin": "EU07-222;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
"iR 75116 Lednica": "EN57-1542",
"iR 77111 Rusałka": "EN57-1542",
"iR 78111 Delfin": "EN57-1542",
"iR 78113 Merkury": "EU07-368;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
"iR 78115 Wały Chrobrego": "EN57-1542",
"iR 78117 Wilda": "EU07-475;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
"iR 78510 Wolin": "EN57-1747",
"iR 81122 Portowiec": "EU07-222;111a_PKPIC_B9ouv_01;111a_Grafitti_1;111a_PRREG_B10_01;111a_PRREG_B10_01;111a_PRREG_A9ouy_01;111a_PKP_Brdu_01;111a_PKP_Brdu_01",
"iR 81522 Bosman": "EU07-222;111a_PKPIC_B9ouv_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PKP_Bdnu_02",
"iR 84522 Pirania": "EU07-222;120a_PRREG_B51p_02;111a_PRREG_B10_01;111a_PRREG_A9ou_01;111a_PKPIC_B9ouv_01",
"iR 87110 Merkury": "EU07-368;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PKPIC_B9ouv_01;111a_PKPIC_B9ouv_01",
"iR 87112 Wały Chrobrego": "EN57-1542",
"iR 87114 Delfin": "EN57-1542",
"iR 87116 Wilda": "SM42-302;Gor89_PKP_B16mnopux_01;Gor89_PKP_B16mnopux_01",
"iR 87512 Wolin": "2EN57-1542+1747",
"RE 14120 Chemik": "EN57-1747",
"RE 18122 Mewa": "EU07-222;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;112a_PKP_Adu_01;112a_PKP_Adu_01;112a_PKP_Adu_01",
"RE 26122 Bolko": "EU07-222;111a_PRREG_A9ou_02;112a_PKP_A9nou_01;111a_PRREG_A9ou_01;111a_PRREG_B10_01",
"RE 27120 Warta": "EU06-18;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
"RE 41120 Chemik": "EU07-222;111a_PKPIC_B9ouv_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
"RE 62122 Bolko": "EP07-1055;Gor89_PKP_B16mnopux_04;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01",
"RE 72110 Warta": "EU07-222;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
"RE 81120 Mewa": "EU07-222;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01"
}
-9
View File
@@ -1,9 +0,0 @@
export const enum EVehicleUseType {
LOCO_ELECTRICAL = 'loco-e',
LOCO_DIESEL = 'loco-s',
EMU = 'loco-ezt',
DMU = 'loco-szt',
CAR_PASSENGER = 'car-passenger',
CAR_CARGO = 'car-cargo',
}
+2 -2
View File
@@ -3,8 +3,8 @@ import axios from 'axios';
const http = axios.create({ const http = axios.create({
baseURL: baseURL:
import.meta.env.VITE_API_DEV === '1' && import.meta.env.DEV import.meta.env.VITE_API_DEV === '1' && import.meta.env.DEV
? 'http://localhost:5500' ? 'http://localhost:3001'
: 'https://static.spythere.eu', : 'https://stacjownik.spythere.eu',
}); });
export default http; export default http;
+198 -62
View File
@@ -12,15 +12,17 @@
"title": "CHOOSE A VEHICLE", "title": "CHOOSE A VEHICLE",
"input-vehicle": "Choose a traction unit", "input-vehicle": "Choose a traction unit",
"input-carwagon": "Choose a carriage", "input-carwagon": "Choose a carriage",
"cargo-title": "Cargo (only selected freight cars)", "vehicles-title": "Traction units",
"carwagons-title": "Car wagons",
"cargo-title": "Available cargo",
"no-cargo-available": "no cargo available", "no-cargo-available": "no cargo available",
"cargo-empty": "empty", "cargo-empty": "empty",
"loco-e": "ELECTR.", "loco-electric": "ELECTR.",
"loco-s": "DIESEL", "loco-diesel": "DIESEL",
"loco-ezt": "EMU", "unit-electric": "EMU",
"loco-szt": "DMU", "unit-diesel": "DMU",
"car-passenger": "PASSENGER", "wagon-passenger": "PASSENGER",
"car-cargo": "FREIGHT", "wagon-freight": "FREIGHT",
"action-add": "ADD NEW", "action-add": "ADD NEW",
"action-swap": "SWAP WITH", "action-swap": "SWAP WITH",
"real-stock": "POLISH TRAIN COMPOSITIONS" "real-stock": "POLISH TRAIN COMPOSITIONS"
@@ -30,20 +32,22 @@
"loading": "IMAGE LOADING...", "loading": "IMAGE LOADING...",
"desc": "Choose a railway vehicle above to see its preview", "desc": "Choose a railway vehicle above to see its preview",
"sponsor-only": "* SPONSORS ONLY UNTIL {0}", "sponsor-only": "* SPONSORS ONLY UNTIL {0}",
"loco-e": "ELECTRIC LOCO", "team-only": "* TD2 TEAM ONLY",
"loco-s": "DIESEL LOCO", "loco-electric": "ELECTRIC LOCO",
"loco-ezt": "ELECTRIC M.U.", "loco-diesel": "DIESEL LOCO",
"loco-szt": "DIESEL M.U.", "unit-electric": "ELECTRIC M.U.",
"car-passenger": "PASSENGER CARRIAGE", "unit-diesel": "DIESEL M.U.",
"car-cargo": "FREIGHT CARRIAGE", "wagon-passenger": "PASSENGER CARRIAGE",
"wagon-freight": "FREIGHT CARRIAGE",
"cabin": "Cabin type:", "cabin": "Cabin type:",
"construction": "Construction type:" "construction": "Construction type:"
}, },
"topbar": { "topbar": {
"stock-list": "STOCK", "stock": "STOCK",
"wiki-list": "VEHICLES", "wiki": "VEHICLES",
"number-generator": "NUMBER GEN.", "numgen": "NUMBER GEN.",
"stock-generator": "STOCK GEN." "stockgen": "STOCK GEN.",
"storage": "SAVED STOCKS"
}, },
"stocklist": { "stocklist": {
"title": "STOCK EDITOR", "title": "STOCK EDITOR",
@@ -51,16 +55,20 @@
"alert-copied": "The rolling stock has been copied to your clipboard!", "alert-copied": "The rolling stock has been copied to your clipboard!",
"alert-empty": "Lista pojazdów jest pusta!", "alert-empty": "Lista pojazdów jest pusta!",
"prompt-file": "Name a file and download it to the Presets folder (Documents/TTSK/TrainDriver2):", "prompt-file": "Name a file and download it to the Presets folder (Documents/TTSK/TrainDriver2):",
"prompt-bookmark": "Enter the name of this composition:",
"prompt-bookmark-overwrite": "A composition with this name is already bookmarked! Do you want to overwrite it?",
"vehicle-no": "VEHICLE NO.", "vehicle-no": "VEHICLE NO.",
"no-vehicle-chosen": "NO VEHICLE CHOSEN", "no-vehicle-chosen": "NO VEHICLE CHOSEN",
"action-move-up": "MOVE UP", "action-move-up": "MOVE UP",
"action-move-down": "MOVE DOWN", "action-move-down": "MOVE DOWN",
"action-remove": "REMOVE", "action-remove": "REMOVE",
"action-upload": "LOAD", "action-upload-file": "LOAD FILE",
"action-download": "DOWNLOAD", "action-upload-clipboard": "LOAD CLIPBOARD",
"action-copy": "COPY", "action-download": "DOWNLOAD TO FILE",
"action-copy": "COPY TO CLIPBOARD",
"action-reset": "RESET", "action-reset": "RESET",
"action-shuffle": "SHUFFLE", "action-shuffle": "SHUFFLE",
"action-bookmark": "BOOKMARK",
"mass": "Mass", "mass": "Mass",
"mass-accepted": "accepted", "mass-accepted": "accepted",
"length": "Length", "length": "Length",
@@ -68,12 +76,15 @@
"coldstart-info": "Locomotive cold start", "coldstart-info": "Locomotive cold start",
"doublemanning-info": "Double manning", "doublemanning-info": "Double manning",
"list-empty": "Stock list is empty!", "list-empty": "Stock list is empty!",
"warning-not-suitable": "EP07 & EP08 type locomotives are designed for passenger traffic only!", "warning-not-suitable": "EP series locomotives are designed for passenger traffic only!",
"warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!", "warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!",
"warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!", "warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!",
"warning-too-many-locos": "This train has too many traction units!", "warning-too-many-locos": "This train has too many traction units!",
"warning-too-heavy": "This train is too heavy! Check {href}", "warning-too-heavy": "This train is too heavy! Check {href}",
"acceptable-mass-docs": "acceptable rolling stock masses (PL)" "warning-team-only-vehicle": "There's at least one vehicle available only for TD2 team members in your stock composition! ({0})",
"acceptable-mass-docs": "acceptable rolling stock masses (PL)",
"stock-loading-error": "An error occurred: cannot parse data from the file - make sure it's in a proper format!",
"stock-clipboard-error": "An error occurred: cannot read data from the clipboard - make sure the site has been granted right permissions for this action!"
}, },
"stockgen": { "stockgen": {
"title": "FREIGHT TRAIN GENERATOR", "title": "FREIGHT TRAIN GENERATOR",
@@ -105,7 +116,6 @@
"action-random-region": "DRAW REGIONS", "action-random-region": "DRAW REGIONS",
"action-random-number": "DRAW LAST DIGITS", "action-random-number": "DRAW LAST DIGITS",
"action-random-category": "DRAW A CATEGORY", "action-random-category": "DRAW A CATEGORY",
"rules": { "rules": {
"first-digit": "First digit:", "first-digit": "First digit:",
"second-digit": "Second digit:", "second-digit": "Second digit:",
@@ -120,70 +130,196 @@
"for-region-end": "for the terminating construction region", "for-region-end": "for the terminating construction region",
"from-range": "from range of" "from-range": "from range of"
}, },
"categories": { "categories": {
"EI": "EI - domestic express", "EI": "EI - domestic express",
"EC": "EC - international express", "EC": "EC - international express",
"EN": "EN - domestic night express", "EN": "EN - domestic night express",
"MP": "MP - intervoivodeship bullet", "MP": "MP - intervoivodeship bullet",
"RP": "RP - voivodeship bullet",
"MO": "MO - intervoivodeship regio", "MO": "MO - intervoivodeship regio",
"RO": "RO - voivodeship regio",
"MM": "MM - international bullet", "MM": "MM - international bullet",
"MH": "MH - intervoivodeship bullet (night / hotel)", "MH": "MH - intervoivodeship night bullet",
"RP": "RP - voivodeship bullet",
"RM": "RM - international voivodeship regio", "RM": "RM - international voivodeship regio",
"RO": "RO - voivodeship regio",
"RA": "RA - voivodeship regio (urban)", "RA": "RA - voivodeship regio (urban)",
"PW": "PW - empty passenger", "PW": "PW - empty passenger",
"PX": "PX - empty passenger test drive", "PX": "PX - empty passenger test drive",
"TC": "TC - international freight (intermodal)", "TC": "TC - international freight (intermodal)",
"TG": "TG - international freight (cargo)", "TG": "TG - international freight (organized cargo)",
"TR": "TR - international freight (no cargo)", "TR": "TR - international freight (unorganized cargo)",
"TD": "TD - domestic freight (intermodal)", "TD": "TD - domestic freight (intermodal)",
"TM": "TM - domestic freight (cargo)", "TM": "TM - domestic freight (organized cargo)",
"TN": "TN - domestic freight (no cargo)", "TN": "TN - domestic freight (unorganized cargo)",
"TK": "TK - freight (stations & sidings service)", "TK": "TK - freight (for stations & sidings)",
"TS": "TS - empty freight test drive", "TS": "TS - empty freight test drive",
"TH": "TH - locomotive rolling stock (over 3 vehicles)",
"LT": "LT - locomotive only", "LT": "LT - freight locomotive only",
"LT-new": "LT - freight locomotive only",
"LP": "LP - passenger locomotive only", "LP": "LP - passenger locomotive only",
"LS": "LS - shunting locomotive", "LS": "LS - shunting locomotive only",
"LZ": "LS - shunting locomotive only",
"ZN": "ZN - inspection / diagnostic" "ZN": "ZN - inspection / diagnostic type",
"ZU": "ZU - other maintenance type"
} }
}, },
"wiki": { "wiki": {
"title": "LIST OF AVAILABLE VEHICLES", "title": "LIST OF AVAILABLE VEHICLES",
"action-vehicles": "TRACTION UNITS", "no-vehicles": "No vehicles to show with the selected filters!",
"action-carriages": "CARRIAGES", "labels": {
"search": "Search for a vehicle...", "vehicles": "Vehicles",
"header": { "sort-by": "Sort by",
"image": "Image", "sort-direction": "Sort direction",
"type": "Name", "search-vehicle": "Find a vehicle",
"group": "Type group", "search-vehicle-placeholder": "Input a vehicle name"
"constructionType": "Construction",
"coldStart": "Cold start",
"length": "Length",
"weight": "Mass",
"maxSpeed": "Speed",
"cargoCount": "Cargo count"
}, },
"loco-ezt": "EMU", "filters": {
"loco-szt": "DMU", "vehicles-all": "all",
"loco-s": "Diesel locomotive", "vehicles-tractions-all": "traction units - all",
"loco-e": "Electric locomotive", "vehicles-tractions-electric": "electric locomotives",
"car-passenger": "Passenger carriage", "vehicles-tractions-diesel": "diesel locomotives",
"car-cargo": "Frieght carriage" "vehicles-tractions-emu": "electric units",
"vehicles-tractions-dmu": "diesel units",
"vehicles-wagons-all": "wagons - all",
"vehicles-wagons-passenger": "wagons - passenger",
"vehicles-wagons-freight": "wagons - freight"
},
"sort-by": {
"type": "name",
"group": "type group",
"length": "length",
"weight": "mass",
"maxSpeed": "speed",
"coldStart": "cold start",
"cargoCount": "cargo count"
},
"sort-direction": {
"asc": "ascending",
"desc": "descending"
},
"unit-electric": "EMU",
"unit-diesel": "DMU",
"loco-diesel": "Diesel locomotive",
"loco-electric": "Electric locomotive",
"wagon-passenger": "Passenger carriage",
"wagon-freight": "Frieght carriage"
}, },
"realstock": { "realstock": {
"title": "POLISH TRAIN COMPOSITIONS by", "title": "POLISH TRAIN COMPOSITIONS by",
"search-name": "Search by name", "search-name": "Search by name",
"search-stock": "Search by vehicles", "search-stock": "Search by vehicles",
"action-reset": "RESET" "action-reset": "RESET"
},
"storage": {
"title": "BOOKMARKED COMPOSITIONS",
"subtitle": "Manage your rolling stock compositions saved locally in the browser memory",
"remove-confirm": "Are you sure you want to delete this entry?",
"no-entires": "No bookmarked compositions - save a new one in the Stock tab",
"created-at": "Created at:",
"updated-at": "Updated at:",
"stock-title": "Rolling stock:"
},
"cargo": {
"kontenery": "containers",
"chłodnia": "refrigerator",
"drobnica": "loose cargo",
"węgiel": "coal",
"ruda": "ore",
"piasek": "sand",
"kreda": "chalk",
"kamień": "stone",
"złom": "scrap",
"paliwo": "fuel",
"melasa": "molasses",
"żwir": "gravel",
"koła": "wheels",
"drewno": "wood",
"szyny": "rails",
"kable": "cables",
"kruszywo": "aggregate",
"techniczne": "technical",
"poczta": "mail",
"cement": "concrete",
"wapno": "lime",
"soda": "soda",
"pszenica": "wheat",
"kukurydza": "corn",
"pasza": "fodder",
"karbid": "carbide",
"pojazdy": "vehicles",
"wrażliwe": "sensitive",
"stal": "steel",
"gaz": "gas"
},
"usage": {
"Gor89": "passenger carriage",
"Gor77": "passenger carriage",
"Bau84": "passenger carriage",
"Bau84_CD": "passenger carriage",
"612a": "passenger carriage",
"504a": "passenger carriage",
"304c": "passenger carriage",
"159a": "passenger carriage",
"158a": "passenger carriage",
"154a": "passenger carriage",
"120a_PRREG": "passenger carriage",
"113a": "passenger carriage",
"113a_1": "passenger carriage",
"112a": "passenger carriage",
"112a_1": "passenger carriage",
"111a_PKP": "passenger carriage",
"111a_PKPIC": "passenger carriage",
"111a_PRREG": "passenger carriage",
"111a_Grafitti": "passenger carriage",
"110a": "passenger carriage",
"110a_PKP": "passenger carriage",
"110a_PKPIC": "passenger carriage",
"101a": "passenger carriage",
"102a": "passenger carriage",
"102A": "technical car",
"24Z": "copper wiring reels",
"202Lc": "refrigerator car",
"206S_CEMET": "cement, lime, soda",
"206S_SPEED": "cement, lime, soda",
"206Sh_PKP": "wheat, corn, fodder",
"206Sh_PKPC": "wheat, corn, fodder",
"220S_CEMET": "cement, lime, soda",
"211K": "express parcel car",
"220S": "cement, lime, soda",
"59WS": "loose cargo, limestone, mine waste",
"208Kf": "loose cargo, LCL",
"209c": "technical car",
"29R": "liquid paraffin products",
"29R_PLPOL": "molasses",
"304Ca": "special vehicle",
"401Ka": "loose cargo, LCL",
"401Ka_XGa": "utility car",
"401Zb_PKESA": "coal, stone, sand",
"401Zb_PKPC": "coal, stone, sand",
"401Ze_KLP": "concrete panels, cable reels, steel",
"401Ze_PNUIK": "concrete panels, cable reels, steel",
"401Ze_PKESA": "concrete panels, cable reels, steel",
"401Zl": "heavy loose cargo",
"408S": "cement, lime, fly ash, slag",
"412W": "loose cargo, coal",
"412Z": "containers",
"413S": "coal, chalk, sand",
"421S": "carbide, weather-sensitive loads",
"424Z": "vehicles, logs, rough timber",
"425S": "weather-sensitive loads",
"426Z": "solid cargo, vehicles",
"426S": "loose cargo",
"429W": "weatherproof cargo (coal, ore)",
"441V": "hard coal, gravel",
"627Z": "containers",
"WB117": "gas, gas mixtures",
"445Rb": "liquid paraffin products",
"418Va_AWT": "loose cargo (sand, stone)",
"418Va_BENET": "loose cargo (sand, stone)",
"418Va_TSS": "loose cargo (sand, stone)",
"418Vb_DB": "loose cargo (sand, stone)",
"418Vb_DOLWR": "loose cargo (sand, stone)",
"418Vb_PKPC": "loose cargo (sand, stone)",
"418Vb_WIEBE": "loose cargo (sand, stone)",
"418Vb_ZOS": "loose cargo (sand, stone)",
"418Vb_ZUE": "loose cargo (sand, stone)"
} }
} }
+200 -65
View File
@@ -9,18 +9,20 @@
"version-check": "Strona jest kompletna dla wersji {version} symulatora TD2" "version-check": "Strona jest kompletna dla wersji {version} symulatora TD2"
}, },
"inputs": { "inputs": {
"title": "WYBIERZ POJAZD SZYNOWY", "title": "WYBIERZ POJAZD",
"input-vehicle": "Wybierz pojazd trakcyjny", "input-vehicle": "Wybierz pojazd trakcyjny",
"input-carwagon": "Wybierz wagon", "input-carwagon": "Wybierz wagon",
"cargo-title": "Ładunek (tylko wybrane towarowe)", "vehicles-title": "Pojazdy trakcyjne",
"carwagons-title": "Wagony",
"cargo-title": "Dostępne ładunki",
"no-cargo-available": "brak dostępnych ładunków", "no-cargo-available": "brak dostępnych ładunków",
"cargo-empty": "próżny", "cargo-empty": "próżny",
"loco-e": "ELEKTR.", "loco-electric": "ELEKTR.",
"loco-s": "SPAL.", "loco-diesel": "SPAL.",
"loco-ezt": "EZT", "unit-electric": "EZT",
"loco-szt": "SZT", "unit-diesel": "SZT",
"car-passenger": "PASAŻERSKIE", "wagon-passenger": "PASAŻERSKIE",
"car-cargo": "TOWAROWE", "wagon-freight": "TOWAROWE",
"action-add": "DODAJ NOWY", "action-add": "DODAJ NOWY",
"action-swap": "ZAMIEŃ ZA", "action-swap": "ZAMIEŃ ZA",
"real-stock": "REALNE ZESTAWIENIA" "real-stock": "REALNE ZESTAWIENIA"
@@ -30,20 +32,22 @@
"loading": "ŁADOWANIE OBRAZU...", "loading": "ŁADOWANIE OBRAZU...",
"desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej", "desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej",
"sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}", "sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}",
"loco-e": "ELEKTROWÓZ", "team-only": "* TYLKO DLA ZESPOŁU TD2",
"loco-s": "SPALINOWÓZ", "loco-electric": "ELEKTROWÓZ",
"loco-ezt": "EZT", "loco-diesel": "SPALINOWÓZ",
"loco-szt": "SZT", "unit-electric": "EZT",
"car-passenger": "WAGON PASAŻERSKI", "unit-diesel": "SZT",
"car-cargo": "WAGON TOWAROWY", "wagon-passenger": "WAGON PASAŻERSKI",
"wagon-freight": "WAGON TOWAROWY",
"cabin": "Typ kabiny:", "cabin": "Typ kabiny:",
"construction": "Typ konstrukcji:" "construction": "Typ konstrukcji:"
}, },
"topbar": { "topbar": {
"stock-list": "SKŁAD", "stock": "SKŁAD",
"wiki-list": "POJAZDY", "wiki": "POJAZDY",
"number-generator": "GNR NUMERU", "numgen": "GNR NUMERU",
"stock-generator": "GNR SKŁADU" "stockgen": "GNR SKŁADU",
"storage": "ZAPISANE SKŁADY"
}, },
"stocklist": { "stocklist": {
"title": "EDYTOR SKŁADU", "title": "EDYTOR SKŁADU",
@@ -51,16 +55,20 @@
"alert-copied": "Skład został skopiowany do twojego schowka!", "alert-copied": "Skład został skopiowany do twojego schowka!",
"alert-empty": "Lista pojazdów jest pusta!", "alert-empty": "Lista pojazdów jest pusta!",
"prompt-file": "Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):", "prompt-file": "Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):",
"prompt-bookmark": "Nazwij skład do zapisania:",
"prompt-bookmark-overwrite": "Skład o tej nazwie jest już zapisany. Czy chcesz go podmienić?",
"vehicle-no": "POJAZD NR", "vehicle-no": "POJAZD NR",
"no-vehicle-chosen": "NIE WYBRANO POJAZDU", "no-vehicle-chosen": "NIE WYBRANO POJAZDU",
"action-move-up": "PRZENIEŚ WYŻEJ", "action-move-up": "PRZENIEŚ WYŻEJ",
"action-move-down": "PRZENIEŚ NIŻEJ", "action-move-down": "PRZENIEŚ NIŻEJ",
"action-remove": "USUŃ", "action-remove": "USUŃ",
"action-upload": "WCZYTAJ", "action-upload-file": "WCZYTAJ Z PLIKU",
"action-download": "POBIERZ", "action-upload-clipboard": "WCZYTAJ ZE SCHOWKA",
"action-copy": "SKOPIUJ", "action-download": "POBIERZ DO PLIKU",
"action-copy": "SKOPIUJ DO SCHOWKA",
"action-reset": "ZRESETUJ", "action-reset": "ZRESETUJ",
"action-shuffle": "PRZETASUJ", "action-shuffle": "PRZETASUJ",
"action-bookmark": "ZAPISZ",
"mass": "Masa", "mass": "Masa",
"mass-accepted": "dopuszczalna", "mass-accepted": "dopuszczalna",
"length": "Długość", "length": "Długość",
@@ -68,12 +76,15 @@
"coldstart-info": "Zimny start", "coldstart-info": "Zimny start",
"doublemanning-info": "Podwójna obsada", "doublemanning-info": "Podwójna obsada",
"list-empty": "Lista pojazdów jest pusta!", "list-empty": "Lista pojazdów jest pusta!",
"warning-not-suitable": "Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!", "warning-not-suitable": "Lokomotywy serii EP są przeznaczone jedynie do ruchu pasażerskiego!",
"warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!", "warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!",
"warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!", "warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!",
"warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!", "warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!",
"warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}", "warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}",
"acceptable-mass-docs": "dopuszczalne masy składów" "warning-team-only-vehicle": "W zestawieniu znajduje się co najmniej jeden pojazd dostępny tylko dla członków zespołu TD2! ({0})",
"acceptable-mass-docs": "dopuszczalne masy składów",
"stock-loading-error": "Wystąpił błąd: nie można przetworzyć danych ze schowka! Upewnij się, że są one w poprawnym formacie!",
"stock-clipboard-error": "Wystąpił błąd: nie można odczytać danych ze schowka! Upewnij się, że nadałeś uprawnienia stronie do tej akcji!"
}, },
"stockgen": { "stockgen": {
"title": "GENERATOR SKŁADU TOWAROWEGO", "title": "GENERATOR SKŁADU TOWAROWEGO",
@@ -95,8 +106,8 @@
"title": "GENERATOR NUMERU POCIĄGU", "title": "GENERATOR NUMERU POCIĄGU",
"subtitle": "Generuje realny numer pociągu na podstawie instrukcji Ir-11", "subtitle": "Generuje realny numer pociągu na podstawie instrukcji Ir-11",
"alert": "Numer został skopiowany do twojego schowka!", "alert": "Numer został skopiowany do twojego schowka!",
"start-region": "Początkowy obszar konstrukcyjny", "start-region": "Obszar początkowy",
"end-region": "Końcowy obszar konstrukcyjny", "end-region": "Obszar końcowy",
"train-category": "Kategoria pociągu", "train-category": "Kategoria pociągu",
"number-info": "Wygenerowany numer pociągu:", "number-info": "Wygenerowany numer pociągu:",
"warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne", "warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne",
@@ -105,7 +116,6 @@
"action-random-region": "LOSUJ OBSZARY", "action-random-region": "LOSUJ OBSZARY",
"action-random-number": "LOSUJ KOŃCÓWKĘ", "action-random-number": "LOSUJ KOŃCÓWKĘ",
"action-random-category": "LOSUJ KATEGORIĘ", "action-random-category": "LOSUJ KATEGORIĘ",
"rules": { "rules": {
"first-digit": "Pierwsza cyfra:", "first-digit": "Pierwsza cyfra:",
"second-digit": "Druga cyfra:", "second-digit": "Druga cyfra:",
@@ -120,70 +130,195 @@
"for-region-end": "dla końcowego obszaru konstrukcyjnego", "for-region-end": "dla końcowego obszaru konstrukcyjnego",
"from-range": "z przedziału" "from-range": "z przedziału"
}, },
"categories": { "categories": {
"EI": "EI - ekspres krajowy", "EI": "EI - ekspres krajowy",
"EC": "EC - ekspres międzynarodowy", "EC": "EC - ekspres międzynarodowy",
"EN": "EN - ekspres krajowy nocny", "EN": "EN - ekspres krajowy nocny",
"MP": "MP - międzywoj. pośpieszny",
"MP": "MP - międzywojewódzki pośpieszny",
"RP": "RP - wojewódzki pośpieszny", "RP": "RP - wojewódzki pośpieszny",
"MO": "MO - międzywojewódzki osobowy", "MO": "MO - międzywoj. osobowy",
"RO": "RO - wojewódzki osobowy", "RO": "RO - wojewódzki osobowy",
"MM": "MM - międzynar. pośpieszny",
"MM": "MM - międzynarodowy pośpieszny", "MH": "MH - międzywoj. pośpieszny hotelowy",
"MH": "MH - międzywoj. pośpieszny nocny / hotelowy", "RM": "RM - woj. osobowy międzynarodowy",
"RM": "RM - wojewódzki osobowy międzynarodowy", "RA": "RA - woj. osobowy aglomeracyjny",
"RA": "RA - wojewódzki osobowy algomeracyjny", "PW": "PW - pasażerski próżny - służbowy",
"PW": "PW - pasażerski próżny (\"służbowy\")",
"PX": "PX - pasażerski próżny próbny", "PX": "PX - pasażerski próżny próbny",
"TC": "TC - towarowy międzynarodowy intermodalny", "TC": "TC - towarowy międzynarodowy intermodalny",
"TG": "TG - towarowy międzynarodowy masowy", "TG": "TG - towarowy międzynarodowy masowy",
"TR": "TR - towarowy międzynarodowy niemasowy", "TR": "TR - towarowy międzynarodowy niemasowy",
"TD": "TD - towarowy krajowy intermodalny", "TD": "TD - towarowy krajowy intermodalny",
"TM": "TM - towarowy krajowy masowy", "TM": "TM - towarowy krajowy masowy",
"TN": "TN - towarowy krajowy niemasowy", "TN": "TN - towarowy krajowy niemasowy",
"TK": "TK - towarowy do obsługi stacji i bocznic", "TK": "TK - towarowy (stacje i bocznice)",
"TS": "TS - towarowy próżny próbny", "TS": "TS - towarowy próżny próbny",
"TH": "TH - skład lokomotyw (powyżej 3 pojazdów)",
"LT": "LT - lokomotywa luzem", "LT": "LT - lokomotywa towarowa luzem",
"LT-new": "LT - lokomotywa towarowa luzem",
"LP": "LP - lokomotywa pasażerska luzem", "LP": "LP - lokomotywa pasażerska luzem",
"LS": "LS - lokomotywa manewrowa", "LS": "LS - lokomotywa manewrowa luzem",
"LZ": "LZ - lokomotywa dla poc. utrzymaniowo-naprawczych",
"ZN": "ZN - inspekcyjny / diagnostyczny" "ZN": "ZN - inspekcyjny / diagnostyczny",
"ZU": "ZU - inny utrzymaniowy"
} }
}, },
"wiki": { "wiki": {
"title": "LISTA DOSTĘPNYCH POJAZDÓW", "title": "LISTA DOSTĘPNYCH POJAZDÓW",
"action-vehicles": "POJ. TRAKCYJNE", "no-vehicles": "Brak pojazdów do pokazania przy obecnych filtrach!",
"action-carriages": "WAGONY", "labels": {
"search": "Wyszukaj pojazd...", "vehicles": "Pojazdy",
"header": { "sort-by": "Sortuj wg",
"image": "Zdjęcie", "sort-direction": "Kierunek sortowania",
"type": "Nazwa", "search-vehicle": "Wyszukaj pojazd",
"group": "Rodzaj", "search-vehicle-placeholder": "Wpisz nazwę pojazdu"
"constructionType": "Konstrukcja",
"coldStart": "Zimny start",
"length": "Długość",
"weight": "Masa",
"maxSpeed": "Prędkość",
"cargoCount": "Ładunki"
}, },
"loco-ezt": "EZT", "filters": {
"loco-szt": "SZT", "vehicles-all": "wszystkie",
"loco-s": "Spalinowóz", "vehicles-tractions-all": "trakcyjne - wszystkie",
"loco-e": "Elektrowóz", "vehicles-tractions-electric": "elektrowozy",
"car-passenger": "Wagon pasażerski", "vehicles-tractions-diesel": "spalinowozy",
"car-cargo": "Wagon towarowy" "vehicles-tractions-emu": "EZT",
"vehicles-tractions-dmu": "SZT",
"vehicles-wagons-all": "wagony - wszystkie",
"vehicles-wagons-passenger": "wagony pasażerskie",
"vehicles-wagons-freight": "wagony towarowe"
},
"sort-by": {
"type": "nazwa",
"group": "rodzaj",
"length": "długość",
"weight": "masa",
"maxSpeed": "prędkość",
"coldStart": "zimny start",
"cargoCount": "ładunki"
},
"sort-direction": {
"asc": "rosnąco",
"desc": "malejąco"
},
"loco-diesel": "Spalinowóz",
"loco-electric": "Elektrowóz",
"unit-electric": "EZT",
"unit-diesel": "SZT",
"wagon-passenger": "Wagon pasażerski",
"wagon-freight": "Wagon towarowy"
}, },
"realstock": { "realstock": {
"title": "ZESTAWIENIA REALNE by", "title": "ZESTAWIENIA REALNE by",
"search-name": "Szukaj po nazwie", "search-name": "Szukaj po nazwie",
"search-stock": "Szukaj po pojazdach", "search-stock": "Szukaj po pojazdach",
"action-reset": "RESETUJ" "action-reset": "RESETUJ"
},
"storage": {
"title": "ZAPISANE SKŁADY",
"subtitle": "Zarządzaj składami zapisanymi lokalnie w pamięci przeglądarki",
"remove-confirm": "Czy na pewno chcesz usunąć ten wpis?",
"no-entires": "Brak zapisanych składów - dodaj nowy przez zakładkę ze Składem",
"created-at": "Stworzony:",
"updated-at": "Zaktualizowany:",
"stock-title": "Skład:"
},
"cargo": {
"kontenery": "kontenery",
"chłodnia": "chłodnia",
"drobnica": "drobnica",
"węgiel": "węgiel",
"ruda": "ruda",
"piasek": "piasek",
"kreda": "kreda",
"kamień": "kamień",
"złom": "złom",
"paliwo": "paliwo",
"melasa": "melasa",
"żwir": "żwir",
"koła": "koła",
"drewno": "drewno",
"szyny": "szyny",
"kable": "kable",
"kruszywo": "kruszywo",
"techniczne": "techniczne",
"poczta": "poczta",
"cement": "cement",
"wapno": "wapno",
"soda": "soda",
"pszenica": "pszenica",
"kukurydza": "kukurydza",
"pasza": "pasza",
"karbid": "karbid",
"pojazdy": "pojazdy",
"wrażliwe": "wrażliwe",
"stal": "stal",
"gaz": "gaz"
},
"usage": {
"Gor89": "wagon pasażerski",
"Gor77": "wagon pasażerski",
"Bau84": "wagon pasażerski",
"Bau84_CD": "wagon pasażerski",
"612a": "wagon pasażerski",
"504a": "wagon pasażerski",
"304c": "wagon pasażerski",
"159a": "wagon pasażerski",
"158a": "wagon pasażerski",
"154a": "wagon pasażerski",
"120a_PRREG": "wagon pasażerski",
"113a": "wagon pasażerski",
"113a_1": "wagon pasażerski",
"112a": "wagon pasażerski",
"112a_1": "wagon pasażerski",
"111a_PKP": "wagon pasażerski",
"111a_PKPIC": "wagon pasażerski",
"111a_PRREG": "wagon pasażerski",
"111a_Grafitti": "wagon pasażerski",
"110a": "wagon pasażerski",
"110a_PKP": "wagon pasażerski",
"110a_PKPIC": "wagon pasażerski",
"101a": "wagon pasażerski",
"102a": "wagon pasażerski",
"102A": "wagon techniczny (sieciowy)",
"24Z": "bębny z drutami miedzianymi",
"202Lc": "wagon chłodnia",
"206S_CEMET": "cement, wapno, soda",
"206S_SPEED": "cement, wapno, soda",
"206Sh_PKP": "pszenica, kukurydza, pasza",
"206Sh_PKPC": "pszenica, kukurydza, pasza",
"220S_CEMET": "cement, wapno, soda",
"211K": "wagon do przesyłek ekspresowych",
"59WS": "kruszywo, kamień wapienny, odpady kopalniane",
"208Kf": "drobnica, ładunki sypkie, ładunki sztukowe",
"209c": "wagon techniczny",
"29R": "produkty naftowe",
"29R_PLPOL": "melasa",
"304Ca": "pojazd specjalny",
"401Ka": "drobnica, ładunki sypkie, ładunki sztukowe",
"401Ka_XGa": "wagon gospodarczy",
"401Zb_PKESA": "węgiel, kamień, piasek",
"401Zb_PKPC": "węgiel, kamień, piasek",
"401Ze_KLP": "płyty betonowe, bębny kablowe, stal",
"401Ze_PNUIK": "płyty betonowe, bębny kablowe, stal",
"401Ze_PKESA": "płyty betonowe, bębny kablowe, stal",
"401Zl": "ładunki sypkie o dużej masie usypowej",
"408S": "cement, wapno, popioły lotne, żużel",
"412W": "drobnica, kruszywo, węgiel",
"412Z": "kontenery",
"413S": "węgiel, kreda, piasek",
"421S": "karbid, ładunki wrażliwe na czynniki atm.",
"424Z": "ładunki skupione, pojazdy, dłużyca",
"425S": "ładunki wrażliwe na czynniki atm.",
"426S": "drobnica",
"426Z": "ładunki skupione, pojazdy",
"429W": "towary masowe odporne na warunki atmosferyczne (węgiel, ruda)",
"441V": "węgiel kamienny, żwir",
"627Z": "kontenery",
"WB117": "gaz, mieszaniny gazów",
"445Rb": "produkty naftowe",
"418Va_AWT": "drobnica, ładunki sypkie (piasek, kamień)",
"418Va_BENET": "drobnica, ładunki sypkie (piasek, kamień)",
"418Va_TSS": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_DB": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_DOLWR": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_PKPC": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_WIEBE": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_ZOS": "drobnica, ładunki sypkie (piasek, kamień)",
"418Vb_ZUE": "drobnica, ładunki sypkie (piasek, kamień)"
} }
} }
+2 -1
View File
@@ -3,6 +3,7 @@ import { createPinia } from 'pinia';
import App from './App.vue'; import App from './App.vue';
import i18n from './i18n-setup'; import i18n from './i18n-setup';
import router from './router';
const pinia = createPinia(); const pinia = createPinia();
createApp(App).use(pinia).use(i18n).mount('#app'); createApp(App).use(pinia).use(i18n).use(router).mount('#app');
+16
View File
@@ -0,0 +1,16 @@
import http from '../http';
import { API } from '../types/api.types';
export class ApiManager {
static async fetchActiveData() {
try {
const responseData = (await http.get<API.ActiveData>('/api/getActiveData')).data;
return responseData;
} catch (error) {
console.error('Nie udało się pobrać zdalnej zawartości', error);
}
return null;
}
}
+1 -5
View File
@@ -7,11 +7,7 @@ export default defineComponent({
}, },
getThumbnailURL(vehicleType: string, size: 'small' | 'large') { getThumbnailURL(vehicleType: string, size: 'small' | 'large') {
return `${ return `https://stacjownik.spythere.eu/static/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
import.meta.env.VITE_API_DEV === '1'
? 'http://localhost:5500'
: 'https://static.spythere.eu'
}/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
}, },
}, },
}); });
+25 -22
View File
@@ -1,7 +1,7 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../store'; import { useStore } from '../store';
import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types'; import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types/common.types';
import { isLocomotive } from '../utils/vehicleUtils'; import { isTractionUnit } from '../utils/vehicleUtils';
export default defineComponent({ export default defineComponent({
setup() { setup() {
@@ -15,23 +15,11 @@ export default defineComponent({
return `${Math.random().toString(36).slice(5)}`; return `${Math.random().toString(36).slice(5)}`;
}, },
getStockObject(vehicle: IVehicle, cargo?: ICargo | null, count = 1): IStock { getStockObject(vehicle: IVehicle, cargo?: ICargo | null): IStock {
const isLoco = isLocomotive(vehicle);
return { return {
id: this.getStockId(), id: this.getStockId(),
type: vehicle.type, vehicleRef: vehicle,
length: vehicle.length, cargo: !isTractionUnit(vehicle) && vehicle.loadable && cargo ? cargo : undefined,
weight: vehicle.weight,
maxSpeed: vehicle.maxSpeed,
isLoco,
cargo: !isLoco && vehicle.loadable && cargo ? cargo : undefined,
count,
imgSrc: vehicle.imageSrc,
useType: isLoco ? vehicle.power : vehicle.useType,
isSponsorsOnly: vehicle.isSponsorsOnly,
constructionType: vehicle.constructionType,
sponsorsOnlyTimestamp: vehicle.sponsorsOnlyTimestamp,
}; };
}, },
@@ -40,14 +28,19 @@ export default defineComponent({
const stock = this.getStockObject(vehicle, cargo); const stock = this.getStockObject(vehicle, cargo);
if (stock.isLoco && !this.store.stockList[0]?.isLoco) this.store.stockList.unshift(stock); if (
isTractionUnit(stock.vehicleRef) &&
this.store.stockList.length > 0 &&
!isTractionUnit(this.store.stockList[0].vehicleRef)
)
this.store.stockList.unshift(stock);
else this.store.stockList.push(stock); else this.store.stockList.push(stock);
}, },
addLocomotive(loco: ILocomotive) { addLocomotive(loco: ILocomotive) {
const stockObj = this.getStockObject(loco); const stockObj = this.getStockObject(loco);
if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco) if (this.store.stockList.length > 0 && !isTractionUnit(this.store.stockList[0].vehicleRef))
this.store.stockList.unshift(stockObj); this.store.stockList.unshift(stockObj);
else this.store.stockList.push(stockObj); else this.store.stockList.push(stockObj);
}, },
@@ -60,6 +53,7 @@ export default defineComponent({
loadStockFromString(stockString: string) { loadStockFromString(stockString: string) {
const stockArray = stockString.trim().split(';'); const stockArray = stockString.trim().split(';');
let failureCount = 0;
this.store.stockList.length = 0; this.store.stockList.length = 0;
this.store.chosenVehicle = null; this.store.chosenVehicle = null;
@@ -74,9 +68,9 @@ export default defineComponent({
let vehicle: IVehicle | null = null; let vehicle: IVehicle | null = null;
let vehicleCargo: ICargo | null = null; let vehicleCargo: ICargo | null = null;
const isLoco = /^(EU|EP|ET|SM|EN|2EN|SN)/.test(type); const isTractionUnit = /^([a-zA-Z\d]{0,}-\d{0,})/.test(type);
if (isLoco) { if (isTractionUnit) {
const [locoType, spawnProps] = type.split(','); const [locoType, spawnProps] = type.split(',');
vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null; vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null;
@@ -92,10 +86,19 @@ export default defineComponent({
if (cargo) vehicleCargo = vehicle?.cargoTypes.find((c) => c.id == cargo) || null; if (cargo) vehicleCargo = vehicle?.cargoTypes.find((c) => c.id == cargo) || null;
} }
if (!vehicle) console.log('Brak pojazdu / rodzaj pojazdu źle wczytany:', type); if (!vehicle && type) {
failureCount++;
console.warn(`Wystąpił błąd - nie wczytano pojazdu o nazwie: ${type}`);
return;
}
this.addVehicle(vehicle, vehicleCargo); this.addVehicle(vehicle, vehicleCargo);
}); });
if (failureCount != 0 && failureCount == stockArray.length) {
console.warn('Wystąpił błąd - niepoprawny format');
throw 'stock-loading-error';
}
}, },
}, },
}); });
+13 -16
View File
@@ -1,7 +1,7 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../store'; import { useStore } from '../store';
import { ICarWagon, ILocomotive, IStock, IVehicle } from '../types'; import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types/common.types';
import { isLocomotive } from '../utils/vehicleUtils'; import { isTractionUnit } from '../utils/vehicleUtils';
export default defineComponent({ export default defineComponent({
setup() { setup() {
@@ -14,40 +14,37 @@ export default defineComponent({
methods: { methods: {
previewStock(stock: IStock) { previewStock(stock: IStock) {
if (this.store.chosenVehicle?.imageSrc != stock.imgSrc) this.store.imageLoading = true; const vehicleRef = stock.vehicleRef;
if (stock.isLoco) { this.store.chosenVehicle = vehicleRef;
const chosenLoco = this.store.locoDataList.find((v) => v.type == stock.type) || null;
this.store.chosenVehicle = chosenLoco; if (isTractionUnit(vehicleRef)) {
this.store.chosenLoco = chosenLoco; this.store.chosenLoco = vehicleRef;
this.store.chosenCargo = null; this.store.chosenCargo = null;
this.store.chosenLocoPower = stock.useType; this.store.chosenLocoGroup = vehicleRef.group as LocoGroupType;
} else { } else {
const chosenCar = this.store.carDataList.find((v) => v.type == stock.type) || null; this.store.chosenCar = vehicleRef;
this.store.chosenVehicle = chosenCar;
this.store.chosenCar = chosenCar;
this.store.chosenCargo = stock.cargo || null; this.store.chosenCargo = stock.cargo || null;
this.store.chosenCarUseType = stock.useType; this.store.chosenCarGroup = vehicleRef.group as WagonGroupType;
} }
}, },
previewLocomotive(loco: ILocomotive) { previewLocomotive(loco: ILocomotive) {
this.store.chosenLoco = loco; this.store.chosenLoco = loco;
this.store.chosenVehicle = loco; this.store.chosenVehicle = loco;
this.store.chosenLocoPower = loco.power; this.store.chosenLocoGroup = loco.group;
}, },
previewCarWagon(carWagon: ICarWagon) { previewCarWagon(carWagon: ICarWagon) {
this.store.chosenCar = carWagon; this.store.chosenCar = carWagon;
this.store.chosenCarUseType = carWagon.useType; this.store.chosenCarGroup = carWagon.group;
this.store.chosenVehicle = carWagon; this.store.chosenVehicle = carWagon;
this.store.chosenCargo = null; this.store.chosenCargo = null;
}, },
previewVehicle(vehicle: IVehicle) { previewVehicle(vehicle: IVehicle) {
if (isLocomotive(vehicle)) this.previewLocomotive(vehicle); if (isTractionUnit(vehicle)) this.previewLocomotive(vehicle);
else this.previewCarWagon(vehicle); else this.previewCarWagon(vehicle);
}, },
-42
View File
@@ -1,42 +0,0 @@
import { defineComponent } from 'vue';
import { useStore } from '../store';
export default defineComponent({
setup() {
const store = useStore();
return {
store,
};
},
computed: {
trainTooLong() {
return (
(this.store.totalLength > 350 && this.store.isTrainPassenger) ||
(this.store.totalLength > 650 && !this.store.isTrainPassenger)
);
},
trainTooHeavy() {
return this.store.acceptableWeight && this.store.totalWeight > this.store.acceptableWeight;
},
locoNotSuitable() {
return (
!this.store.isTrainPassenger &&
this.store.stockList.length > 1 &&
!this.store.stockList.every((stock) => stock.isLoco) &&
this.store.stockList.some((stock) => stock.isLoco && stock.type.startsWith('EP'))
);
},
tooManyLocomotives() {
return (
this.store.stockList.reduce((acc, stock) => {
if (stock.isLoco) acc += stock.count;
return acc;
}, 0) > 2
);
},
},
});
+61
View File
@@ -0,0 +1,61 @@
import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
import AppContainerView from './views/AppContainerView.vue';
import WikiListTab from './components/tabs/WikiListTab.vue';
import StockListTab from './components/tabs/StockListTab.vue';
import NumberGeneratorTab from './components/tabs/NumberGeneratorTab.vue';
import StockGeneratorTab from './components/tabs/StockGeneratorTab.vue';
import StorageTab from './components/tabs/StorageTab.vue';
const routes: RouteRecordRaw[] = [
{
path: '/',
component: AppContainerView,
meta: {
viewMode: StockListTab,
},
children: [
{
path: 'stock',
redirect: '/',
meta: {
viewMode: StockListTab,
},
},
{
path: 'wiki',
component: AppContainerView,
meta: {
viewMode: WikiListTab,
},
},
{
path: 'numgen',
component: AppContainerView,
meta: {
viewMode: NumberGeneratorTab,
},
},
{
path: 'stockgen',
component: AppContainerView,
meta: {
viewMode: StockGeneratorTab,
},
},
{
path: 'storage',
component: AppContainerView,
meta: {
viewMode: StorageTab,
},
},
],
},
];
const router = createRouter({
history: createWebHistory(),
routes,
});
export default router;
+58 -74
View File
@@ -1,24 +1,34 @@
import { import {
IVehiclesAPI, IVehiclesAPIResponse,
ICarWagon, ICarWagon,
ILocomotive, ILocomotive,
ICargo, ICargo,
IVehicle, IVehicle,
IStock, IStock,
IRealComposition, IRealComposition,
} from './types'; LocoGroupType,
WagonGroupType,
IVehicleData,
StorageStockEntry,
} from './types/common.types';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { import {
acceptableWeight, acceptableWeight,
carDataList, carDataList,
isTractionUnit,
isTrainPassenger, isTrainPassenger,
locoDataList, locoDataList,
maxStockSpeed, maxStockSpeed,
stockSupportsColdStart,
stockSupportsDoubleManning,
totalLength, totalLength,
totalWeight, totalWeight,
} from './utils/vehicleUtils'; } from './utils/vehicleUtils';
import http from './http';
import i18n from './i18n-setup'; import i18n from './i18n-setup';
import http from './http';
import realCompositionsJSON from './data/realCompositions.json';
export const useStore = defineStore({ export const useStore = defineStore({
id: 'store', id: 'store',
@@ -31,10 +41,8 @@ export const useStore = defineStore({
isColdStart: false, isColdStart: false,
isDoubleManned: false, isDoubleManned: false,
imageLoading: false, chosenLocoGroup: 'loco-electric' as LocoGroupType,
chosenCarGroup: 'wagon-passenger' as WagonGroupType,
chosenLocoPower: 'loco-e',
chosenCarUseType: 'car-passenger',
stockList: [] as IStock[], stockList: [] as IStock[],
cargoOptions: [] as any[][], cargoOptions: [] as any[][],
@@ -45,22 +53,26 @@ export const useStore = defineStore({
vehiclePreviewSrc: '', vehiclePreviewSrc: '',
stockSectionMode: 'stock-list',
isRandomizerCardOpen: false, isRandomizerCardOpen: false,
isRealStockListCardOpen: false, isRealStockListCardOpen: false,
vehiclesAPIData: undefined as IVehiclesAPI | undefined, vehiclesData: undefined as IVehicleData[] | undefined,
lastFocusedElement: null as HTMLElement | null, lastFocusedElement: null as HTMLElement | null,
storageStockData: {} as Record<string, StorageStockEntry>,
chosenStorageStockName: '',
chosenStorageStockString: '',
compatibleSimulatorVersion: '2024.3.1',
}), }),
getters: { getters: {
locoDataList: (state) => locoDataList(state.vehiclesAPIData), locoDataList: (state) => locoDataList(state.vehiclesData),
carDataList: (state) => carDataList(state.vehiclesAPIData), carDataList: (state) => carDataList(state.vehiclesData),
vehicleDataList: (state) => [ vehicleDataList: (state) => [
...locoDataList(state.vehiclesAPIData), ...locoDataList(state.vehiclesData),
...carDataList(state.vehiclesAPIData), ...carDataList(state.vehiclesData),
], ],
totalWeight: (state) => totalWeight(state.stockList), totalWeight: (state) => totalWeight(state.stockList),
totalLength: (state) => totalLength(state.stockList), totalLength: (state) => totalLength(state.stockList),
@@ -68,17 +80,41 @@ export const useStore = defineStore({
isTrainPassenger: (state) => isTrainPassenger(state.stockList), isTrainPassenger: (state) => isTrainPassenger(state.stockList),
acceptableWeight: (state) => acceptableWeight(state.stockList), acceptableWeight: (state) => acceptableWeight(state.stockList),
realCompositionList: (state) => { stockSupportsColdStart: (state) => stockSupportsColdStart(state.stockList),
if (!state.vehiclesAPIData) return []; stockSupportsDoubleManning: (state) => stockSupportsDoubleManning(state.stockList),
return Object.keys(state.vehiclesAPIData.realCompositions).reduce<IRealComposition[]>( stockString: (state) => {
(acc, key) => { if (state.stockList.length == 0) return '';
const coldStartActive = state.isColdStart && stockSupportsColdStart(state.stockList);
const doubleManningActive =
state.isDoubleManned && stockSupportsDoubleManning(state.stockList);
return state.stockList
.map((stock, i) => {
let stockTypeStr =
isTractionUnit(stock.vehicleRef) || !stock.cargo
? stock.vehicleRef.type
: `${stock.vehicleRef.type}:${stock.cargo.id}`;
if (i == 0 && (coldStartActive || doubleManningActive))
return `${stockTypeStr},${coldStartActive ? 'c' : ''}${doubleManningActive ? 'd' : ''}`;
return stockTypeStr;
})
.join(';');
},
realCompositionList: (state) => {
if (!state.vehiclesData) return [];
return Object.keys(realCompositionsJSON).reduce<IRealComposition[]>((acc, key) => {
const [type, number, ...name] = key.split(' '); const [type, number, ...name] = key.split(' ');
const obj = { const obj = {
number: number.replace(/_/g, '/'), number: number.replace(/_/g, '/'),
name: name.join(' '), name: name.join(' '),
stockString: state.vehiclesAPIData!.realCompositions[key], stockString: realCompositionsJSON[key as keyof typeof realCompositionsJSON],
type, type,
}; };
@@ -88,43 +124,15 @@ export const useStore = defineStore({
}); });
return acc; return acc;
}, }, []);
[]
);
},
stockSupportsColdStart: (state) => {
if (state.stockList.length == 0) return false;
if (!state.stockList[0].isLoco) return false;
const headingLoco = state.stockList[0];
return (
state.vehiclesAPIData?.vehicleProps.find(
(stock) => stock.type == headingLoco.constructionType
)?.coldStart ?? false
);
},
stockSupportsDoubleManning: (state) => {
if (state.stockList.length == 0) return false;
if (!state.stockList[0].isLoco) return false;
const headingLoco = state.stockList[0];
return (
state.vehiclesAPIData?.vehicleProps.find(
(stock) => stock.type == headingLoco.constructionType
)?.doubleManned ?? false
);
}, },
}, },
actions: { actions: {
async fetchVehiclesAPI() { async fetchVehiclesAPI() {
try { try {
const vehiclesData = (await http.get<IVehiclesAPI>('/vehicles.json')).data; const vehiclesData = (await http.get<IVehiclesAPIResponse>('/api/getVehicles')).data;
this.vehiclesAPIData = vehiclesData; this.vehiclesData = vehiclesData;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} }
@@ -132,30 +140,6 @@ export const useStore = defineStore({
async setupAPIData() { async setupAPIData() {
await this.fetchVehiclesAPI(); await this.fetchVehiclesAPI();
this.mergeBackendTranslations();
},
async mergeBackendTranslations() {
if (!this.vehiclesAPIData) return;
i18n.global.mergeLocaleMessage('pl', this.vehiclesAPIData.vehicleLocales.pl);
i18n.global.mergeLocaleMessage('en', this.vehiclesAPIData.vehicleLocales.en);
},
handleRouting() {
switch (window.location.pathname) {
case '/numgnr':
this.stockSectionMode = 'number-generator';
break;
case '/stockgnr':
this.stockSectionMode = 'stock-generator';
break;
case '/vehicles':
this.stockSectionMode = 'wiki-list';
break;
default:
break;
}
}, },
}, },
}); });
@@ -2,10 +2,14 @@ $breakpointMd: 960px;
$breakpointSm: 550px; $breakpointSm: 550px;
$bgColor: #2b3552; $bgColor: #2b3552;
$bgColorDarker: #1f263b;
$textColor: #fff; $textColor: #fff;
$secondaryColor: #1b1b1b; $secondaryColor: #1b1b1b;
$accentColor: #e4c428; $accentColor: #e4c428;
$sponsorColor: gold;
$teamColor: #ff4848;
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: src:
@@ -112,10 +116,17 @@ button {
&:hover { &:hover {
color: $accentColor; color: $accentColor;
} }
&:focus-visible {
outline: 1px solid $accentColor;
}
} }
[data-tooltip]:hover::after, [data-tooltip] {
[data-tooltip]:focus::after { cursor: pointer;
&:hover::after,
&:focus-visible::after {
position: absolute; position: absolute;
transform: translateX(10px); transform: translateX(10px);
@@ -126,12 +137,32 @@ button {
max-width: 300px; max-width: 300px;
z-index: 100; z-index: 100;
} }
[data-tooltip] {
cursor: pointer;
} }
.btn { [data-button-tooltip] {
position: relative;
&:hover::after,
&:focus-visible::after {
position: absolute;
width: 100%;
max-width: 300px;
top: 100%;
transform: translateY(5px);
border-radius: inherit;
content: attr(data-button-tooltip);
color: white;
background: #111;
padding: 0.5em;
z-index: 100;
}
}
.btn,
.link-btn {
padding: 0.4em 0.75em; padding: 0.4em 0.75em;
outline: none; outline: none;
@@ -181,9 +212,10 @@ button {
align-items: center; align-items: center;
gap: 0.5em; gap: 0.5em;
img { img,
width: 1.3em; svg {
vertical-align: middle; width: 20px;
height: 20px;
} }
} }
@@ -191,12 +223,25 @@ button {
font-weight: bold; font-weight: bold;
transition: all 250ms; transition: all 250ms;
background: none; background: none;
padding: 0; padding: 0.25em;
border-radius: 0;
&:focus-visible { &:focus-visible {
outline: 1px solid white; outline: 1px solid white;
} }
} }
&--icon {
display: flex;
justify-content: center;
align-items: center;
padding: 0.25em;
}
}
.link-btn.router-link-exact-active {
color: $accentColor;
} }
select, select,
@@ -207,12 +252,11 @@ input[type='number'] {
outline: none; outline: none;
padding: 0.25em 0.35em; padding: 0.25em 0.35em;
height: 100%;
color: white; color: white;
font-size: 1em; font-size: 1em;
width: 18em;
&:focus-visible { &:focus-visible {
border-color: $accentColor; border-color: $accentColor;
} }
+2 -2
View File
@@ -1,4 +1,4 @@
@import './global.scss'; @use 'global';
.tab { .tab {
height: 100%; height: 100%;
@@ -7,7 +7,7 @@
&_header { &_header {
padding: 0.5em 1em; padding: 0.5em 1em;
background-color: $secondaryColor; background-color: global.$secondaryColor;
text-align: center; text-align: center;
h2 { h2 {
-111
View File
@@ -1,111 +0,0 @@
export type IVehicle = ILocomotive | ICarWagon;
export type StockSectionMode = 'STOCK_LIST' | 'STOCK_GENERATOR';
export type TLocoGroup = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt';
export type TCarWagonGroup = 'car-passenger' | 'car-cargo';
export interface IStockProps {
type: string;
length: number;
// mass: number;
weight: number;
// cargo?: string | null;
cargoTypes: ICargo[] | null;
coldStart?: boolean;
doubleManned?: boolean;
}
export interface ICargo {
id: string;
weight: number;
}
export interface IVehiclesAPI {
simulatorVersion: string;
generator: {
cargo: {
[key: string]: string[];
};
};
vehicleInfo: {
'car-cargo': [string, string, boolean, number | null, string][];
'car-passenger': [string, string, boolean, number | null, string][];
'loco-e': [string, string, string, string, number | null][];
'loco-s': [string, string, string, string, number | null][];
'loco-szt': [string, string, string, string, number | null][];
'loco-ezt': [string, string, string, string, number | null][];
};
vehicleProps: IStockProps[];
vehicleLocales: {
pl: {
cargo: Record<string, string>;
usage: Record<string, string>;
};
en: {
cargo: Record<string, string>;
usage: Record<string, string>;
};
};
realCompositions: Record<string, string>;
}
export interface ILocomotive {
type: string;
power: TLocoGroup;
group: TLocoGroup;
constructionType: string;
cabinType: string;
maxSpeed: number;
isSponsorsOnly: boolean;
sponsorsOnlyTimestamp: number;
imageSrc: string;
weight: number;
length: number;
coldStart: boolean;
doubleManned: boolean;
}
export interface ICarWagon {
type: string;
useType: TCarWagonGroup;
group: TCarWagonGroup;
constructionType: string;
loadable: boolean;
isSponsorsOnly: boolean;
sponsorsOnlyTimestamp: number;
maxSpeed: number;
imageSrc: string;
weight: number;
length: number;
cargoTypes: ICargo[];
}
export interface IStock {
id: string;
type: string;
useType: string;
constructionType: string;
length: number;
// mass: number;
weight: number;
maxSpeed: number;
cargo?: ICargo;
isLoco: boolean;
isSponsorsOnly: boolean;
sponsorsOnlyTimestamp: number;
count: number;
imgSrc?: string;
}
export interface IRealComposition {
stockId: string;
stockString: string;
type: string;
number: string;
name: string;
}
+87
View File
@@ -0,0 +1,87 @@
// API namespace
export namespace API {
export interface ActiveData {
trains: Train[];
activeSceneries: ActiveScenery[];
}
}
export interface ActiveScenery {
dispatcherId: number;
dispatcherName: string;
dispatcherIsSupporter: boolean;
stationName: string;
stationHash: string;
region: string;
maxUsers: number;
currentUsers: number;
spawn: number;
lastSeen: number;
dispatcherExp: number;
nameFromHeader: string;
spawnString?: string;
networkConnectionString: string;
isOnline: number;
dispatcherRate: number;
dispatcherStatus: number;
}
export interface Train {
id: string;
trainNo: number;
mass: number;
speed: number;
length: number;
distance: number;
stockString: string;
driverName: string;
driverId: number;
driverIsSupporter: boolean;
driverLevel: number;
currentStationHash: string;
currentStationName: string;
signal: string;
connectedTrack: string;
online: number;
lastSeen: number;
region: string;
isTimeout: boolean;
timetable?: Timetable;
}
export interface Timetable {
SKR: boolean;
TWR: boolean;
hasDangerousCargo: boolean;
hasExtraDeliveries: boolean;
warningNotes: string;
category: string;
stopList: TimetableStop[];
route: string;
timetableId: number;
sceneries: string[];
path: string;
}
export interface TimetableStop {
stopName: string;
stopNameRAW: string;
stopType: string;
stopDistance: number;
pointId: string;
comments?: (null | string)[];
mainStop: boolean;
arrivalLine?: string;
arrivalTimestamp: number;
arrivalRealTimestamp: number;
arrivalDelay: number;
departureLine?: string;
departureTimestamp: number;
departureRealTimestamp: number;
departureDelay: number;
beginsHere: boolean;
terminatesHere: boolean;
confirmed: number;
stopped: number;
stopTime?: number;
}
+106
View File
@@ -0,0 +1,106 @@
export type IVehicle = ILocomotive | ICarWagon;
export type LocoGroupType = 'loco-electric' | 'loco-diesel' | 'unit-electric' | 'unit-diesel';
export type WagonGroupType = 'wagon-passenger' | 'wagon-freight';
export type VehicleGroupType = LocoGroupType | WagonGroupType;
export type RestrictionType = 'sponsorOnly' | 'teamOnly';
export interface IVehicleProps {
type: string;
speed: number;
length: number;
weight: number;
cargoTypes?: ICargo[];
coldStart?: boolean;
doubleManned?: boolean;
}
export interface ICargo {
id: string;
weight: number;
}
export type IVehiclesAPIResponse = IVehicleData[];
export interface ILocomotive {
type: string;
group: LocoGroupType;
constructionType: string;
cabinType: string;
maxSpeed: number;
weight: number;
length: number;
coldStart: boolean;
doubleManned: boolean;
sponsorOnlyTimestamp: number;
teamOnly: boolean;
}
export interface ICarWagon {
type: string;
group: WagonGroupType;
constructionType: string;
loadable: boolean;
maxSpeed: number;
weight: number;
length: number;
cargoTypes: ICargo[];
sponsorOnlyTimestamp: number;
teamOnly: boolean;
}
export interface IStock {
id: string;
vehicleRef: IVehicle;
cargo?: ICargo;
}
export interface IRealComposition {
stockId: string;
stockString: string;
type: string;
number: string;
name: string;
}
export interface IVehicleData {
id: number;
name: string;
type: string;
cabinName: string | null;
restrictions: IVehicleRestrictions | null;
vehicleGroupsId: number;
group: IVehicleGroup;
}
export interface IVehicleRestrictions {
sponsorOnly: number | null;
teamOnly: boolean | null;
}
export interface IVehicleGroup {
id: number;
name: string;
speed: number;
length: number;
weight: number;
cargoTypes: IVehicleCargoType[] | null;
locoProps: IVehicleLocoProps | null;
}
export interface IVehicleCargoType {
id: string;
weight: number;
}
export interface IVehicleLocoProps {
coldStart: boolean;
doubleManned: boolean;
}
export interface StorageStockEntry {
id: string;
createdAt: number;
updatedAt?: number;
stockString: string;
}
+27
View File
@@ -0,0 +1,27 @@
import { useStore } from '../store';
export const useFileUtils = () => {
const store = useStore();
function getCurrentStockFileName() {
let fileName = '';
const currentStockString = store.stockList.map((s) => s.vehicleRef.type).join(';');
const currentRealComp = store.realCompositionList.find(
(rc) => rc.stockString == currentStockString
);
// Append real composition to the name if chosen
if (currentRealComp != undefined) {
fileName += `${currentRealComp.stockId} `;
}
// Append default props
fileName += `${store.stockList[0].vehicleRef.type} ${(store.totalWeight / 1000).toFixed(1)}t; ${store.totalLength}m; vmax ${store.maxStockSpeed}`;
return fileName;
}
return { getCurrentStockFileName };
};
+38
View File
@@ -0,0 +1,38 @@
import { useStore } from '../store';
export const useStockListUtils = () => {
const store = useStore();
function removeStock(index: number) {
if (index == -1) return;
store.stockList = store.stockList.filter((stock, i) => i != index);
if (store.stockList.length < index + 1) store.chosenStockListIndex = -1;
}
function moveUpStock(index: number) {
if (index < 1) return;
const tempStock = store.stockList[index];
store.stockList[index] = store.stockList[index - 1];
store.stockList[index - 1] = tempStock;
store.chosenStockListIndex = index - 1;
}
function moveDownStock(index: number) {
if (index == -1) return;
if (index > store.stockList.length - 2) return;
const tempStock = store.stockList[index];
store.stockList[index] = store.stockList[index + 1];
store.stockList[index + 1] = tempStock;
store.chosenStockListIndex = index + 1;
}
return { removeStock, moveDownStock, moveUpStock };
};
+70 -71
View File
@@ -1,5 +1,12 @@
import { EVehicleUseType } from '../enums/EVehicleUseType'; import {
import { ICarWagon, ILocomotive, IStock, IVehiclesAPI, TCarWagonGroup, TLocoGroup } from '../types'; ICarWagon,
ILocomotive,
IStock,
IVehicleData,
IVehiclesAPIResponse,
LocoGroupType,
WagonGroupType,
} from '../types/common.types';
import { import {
MassLimitLocoType, MassLimitLocoType,
SpeedLimitLocoType, SpeedLimitLocoType,
@@ -7,109 +14,85 @@ import {
calculateSpeedLimit, calculateSpeedLimit,
} from './vehicleLimitsUtils'; } from './vehicleLimitsUtils';
export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive { export function isTractionUnit(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
return (vehicle as ILocomotive).power !== undefined; return (vehicle as ILocomotive).cabinType !== undefined;
} }
export function locoDataList(vehiclesData: IVehiclesAPI | undefined) { export function locoDataList(vehiclesData: IVehicleData[] | undefined) {
if (!vehiclesData) return []; if (!vehiclesData) return [];
return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehiclePower) => { return vehiclesData.reduce<ILocomotive[]>((acc, data) => {
if (!vehiclePower.startsWith('loco')) return acc; if (!data.cabinName) return acc;
const locoVehiclesData = vehiclesData.vehicleInfo[vehiclePower as TLocoGroup];
locoVehiclesData.forEach((loco) => {
// if (!loco[4]) return;
const [type, constructionType, cabinType, maxSpeed, sponsorsTimestamp] = loco;
const locoProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
acc.push({ acc.push({
power: vehiclePower as TLocoGroup, group: data.type as LocoGroupType,
group: vehiclePower as TLocoGroup, type: data.name,
type,
constructionType,
cabinType,
maxSpeed: Number(maxSpeed),
isSponsorsOnly: Number(sponsorsTimestamp) > Date.now(),
sponsorsOnlyTimestamp: Number(sponsorsTimestamp),
imageSrc: '',
length: constructionType: data.group.name,
locoProps?.length && type.startsWith('2EN') cabinType: data.cabinName,
? locoProps.length * 2
: locoProps?.length ?? 0,
weight: locoProps?.weight && type.startsWith('2EN') ? 253000 : locoProps?.weight ?? 0,
coldStart: locoProps?.coldStart ?? false, sponsorOnlyTimestamp: data.restrictions?.sponsorOnly ?? 0,
doubleManned: locoProps?.doubleManned ?? false, teamOnly: data.restrictions?.teamOnly ?? false,
});
maxSpeed: data.group.speed,
length: data.group.length,
weight: data.group.weight,
coldStart: data.group.locoProps?.coldStart ?? false,
doubleManned: data.group.locoProps?.doubleManned ?? false,
}); });
return acc; return acc;
}, [] as ILocomotive[]); }, []);
} }
export function carDataList(vehiclesData: IVehiclesAPI | undefined) { export function carDataList(vehiclesData: IVehicleData[] | undefined) {
if (!vehiclesData) return []; if (!vehiclesData) return [];
return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehicleUseType) => { return vehiclesData.reduce<ICarWagon[]>((acc, data) => {
if (!vehicleUseType.startsWith('car')) return acc; if (data.cabinName !== null) return acc;
const carVehiclesData = vehiclesData.vehicleInfo[vehicleUseType as TCarWagonGroup];
carVehiclesData.forEach((car) => {
const [type, constructionType, loadable, sponsorsOnlyTimestamp, maxSpeed] = car;
if (sponsorsOnlyTimestamp && Number(sponsorsOnlyTimestamp) <= Date.now()) return;
const carPropsData = vehiclesData.vehicleProps.find((v) =>
type.toString().startsWith(v.type)
);
acc.push({ acc.push({
useType: vehicleUseType as TCarWagonGroup, group: data.type as WagonGroupType,
group: vehicleUseType as TCarWagonGroup, type: data.name,
type, constructionType: data.group.name,
constructionType, loadable: data.group.cargoTypes !== null && data.group.cargoTypes.length > 0,
loadable, cargoTypes: data.group?.cargoTypes ?? [],
isSponsorsOnly: Number(sponsorsOnlyTimestamp) > Date.now(),
sponsorsOnlyTimestamp: Number(sponsorsOnlyTimestamp),
maxSpeed: Number(maxSpeed),
imageSrc: '',
cargoTypes: carPropsData?.cargoTypes ?? [],
weight: carPropsData?.weight || 0, sponsorOnlyTimestamp: data.restrictions?.sponsorOnly ?? 0,
length: carPropsData?.length || 0, teamOnly: data.restrictions?.teamOnly ?? false,
});
maxSpeed: data.group.speed,
length: data.group.length,
weight: data.group.weight,
}); });
return acc; return acc;
}, [] as ICarWagon[]); }, []);
} }
export function totalWeight(stockList: IStock[]) { export function totalWeight(stockList: IStock[]) {
return stockList.reduce( return stockList.reduce(
(acc, stock) => acc + (stock.weight + (stock.cargo?.weight ?? 0)) * stock.count, (acc, stock) => acc + (stock.vehicleRef.weight + (stock.cargo?.weight ?? 0)),
0 0
); );
} }
export function totalLength(stockList: IStock[]) { export function totalLength(stockList: IStock[]) {
return stockList.reduce((acc, stock) => acc + stock.length * stock.count, 0); return stockList.reduce((acc, stock) => acc + stock.vehicleRef.length, 0);
} }
export function maxStockSpeed(stockList: IStock[]) { export function maxStockSpeed(stockList: IStock[]) {
const stockSpeedLimit = stockList.reduce( const stockSpeedLimit = stockList.reduce(
(acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc), (acc, stock) => (stock.vehicleRef.maxSpeed < acc || acc == 0 ? stock.vehicleRef.maxSpeed : acc),
0 0
); );
const headingLoco = stockList[0]?.isLoco ? stockList[0] : undefined; const headingLoco =
stockList[0] && isTractionUnit(stockList[0].vehicleRef) ? stockList[0] : undefined;
if (!headingLoco) return stockSpeedLimit; if (!headingLoco) return stockSpeedLimit;
const locoType = headingLoco.type.split('-')[0]; const locoType = headingLoco.vehicleRef.type.split('-')[0];
if (/^(EN|2EN|SN)/.test(locoType)) return stockSpeedLimit; if (/^(EN|2EN|SN)/.test(locoType)) return stockSpeedLimit;
@@ -124,9 +107,9 @@ export function maxStockSpeed(stockList: IStock[]) {
} }
export function acceptableWeight(stockList: IStock[]) { export function acceptableWeight(stockList: IStock[]) {
if (stockList.length == 0 || !stockList[0].isLoco) return 0; if (stockList.length == 0 || !isTractionUnit(stockList[0].vehicleRef)) return 0;
const activeLocomotiveType = stockList[0].type.split('-')[0]; const activeLocomotiveType = stockList[0].vehicleRef.type.split('-')[0];
const locoMassLimit = calculateMassLimit( const locoMassLimit = calculateMassLimit(
activeLocomotiveType as MassLimitLocoType, activeLocomotiveType as MassLimitLocoType,
@@ -138,9 +121,25 @@ export function acceptableWeight(stockList: IStock[]) {
export function isTrainPassenger(stockList: IStock[]) { export function isTrainPassenger(stockList: IStock[]) {
if (stockList.length == 0) return false; if (stockList.length == 0) return false;
if (stockList.every((stock) => stock.isLoco)) return false; if (stockList.every((stock) => isTractionUnit(stock.vehicleRef))) return false;
return stockList return stockList
.filter((stock) => !stock.isLoco) .filter((stock) => !isTractionUnit(stock.vehicleRef))
.every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER); .every((stock) => stock.vehicleRef.group === 'wagon-passenger');
}
export function stockSupportsColdStart(stockList: IStock[]) {
return (
stockList.length == 1 &&
isTractionUnit(stockList[0].vehicleRef) &&
stockList[0].vehicleRef.coldStart
);
}
export function stockSupportsDoubleManning(stockList: IStock[]) {
return (
stockList.length != 0 &&
isTractionUnit(stockList[0].vehicleRef) &&
stockList[0].vehicleRef.doubleManned
);
} }
+19 -32
View File
@@ -2,53 +2,40 @@ import { defineConfig } from 'vite';
import vue from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue';
import { VitePWA } from 'vite-plugin-pwa'; import { VitePWA } from 'vite-plugin-pwa';
import path from 'path';
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
server: { server: { port: 2138 },
port: 2137, preview: { port: 4138 },
css: {
preprocessorOptions: {
scss: { additionalData: `@use '@/styles/global';`, silenceDeprecations: ['legacy-js-api'] },
},
},
resolve: {
alias: {
'@': path.resolve(__dirname, 'src'),
},
}, },
plugins: [ plugins: [
vue(), vue(),
VitePWA({ VitePWA({
registerType: 'autoUpdate', registerType: 'autoUpdate',
devOptions: { includeAssets: ['/images/*.{png,svg,jpg}', '/fonts/*.{woff,woff2,ttf}'],
suppressWarnings: true,
enabled: true, devOptions: { suppressWarnings: true, enabled: true },
},
workbox: { workbox: {
cleanupOutdatedCaches: true,
globPatterns: ['**/*.{js,css,html,jpg,png,svg,img,woff,woff2}'], globPatterns: ['**/*.{js,css,html,jpg,png,svg,img,woff,woff2}'],
runtimeCaching: [ runtimeCaching: [
{ {
urlPattern: /^https:\/\/rj.td2.info.pl\/dist\/img\/thumbnails\/.*/i, urlPattern: /^https:\/\/.*\.spythere\.eu\/.*/i,
handler: 'CacheFirst', handler: 'StaleWhileRevalidate',
options: { options: { cacheName: 'spythere-cache' },
cacheName: 'swdr-images-cache',
expiration: {
maxEntries: 50,
maxAgeSeconds: 60 * 60 * 24, // <== 1 day
},
cacheableResponse: {
statuses: [0, 200, 404],
},
},
},
{
urlPattern: /^https:\/\/static.spythere.eu\/.*/i,
handler: 'CacheFirst',
options: {
cacheName: 'spythere-api-cache',
expiration: {
maxEntries: 100,
maxAgeSeconds: 60 * 60 * 24, // <== 1 day
},
cacheableResponse: {
statuses: [200, 302],
},
},
}, },
], ],
}, },
+4814
View File
File diff suppressed because it is too large Load Diff