From e0548e593c0b460d331a2605cd0a6067b94eab65 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:38:17 +0200 Subject: [PATCH 1/7] fix: stats header font size --- src/components/StationsView/StationStats.vue | 8 ++++---- src/components/TrainsView/TrainStats.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/StationsView/StationStats.vue b/src/components/StationsView/StationStats.vue index d693e3b..a73a4e8 100644 --- a/src/components/StationsView/StationStats.vue +++ b/src/components/StationsView/StationStats.vue @@ -14,10 +14,10 @@
-

+

Open filters icon {{ $t('station-stats.title') }} -

+
@@ -245,7 +245,7 @@ export default defineComponent({ @use '../../styles/badge'; @use '../../styles/responsive'; -h1.stats-title img { +.stats-title img { vertical-align: text-bottom; } @@ -279,7 +279,7 @@ h1.stats-title img { } @include responsive.smallScreen { - h1.stats-title { + .stats-title { text-align: center; } diff --git a/src/components/TrainsView/TrainStats.vue b/src/components/TrainsView/TrainStats.vue index 1f76a7d..1c73f55 100644 --- a/src/components/TrainsView/TrainStats.vue +++ b/src/components/TrainsView/TrainStats.vue @@ -13,10 +13,10 @@
-

+

Open filters icon {{ $t('train-stats.title') }} -

+
@@ -229,7 +229,7 @@ export default defineComponent({ @use '../../styles/badge'; @use '../../styles/responsive'; -h1 img { +.stats-title img { vertical-align: text-bottom; } @@ -257,7 +257,7 @@ h3 { text-align: center; } - h1 { + .stats-title { text-align: center; } } From 324ca3de4db06f834baa8b5bcd97e6de157fd223 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:38:42 +0200 Subject: [PATCH 2/7] chore: config adjustments --- tsconfig.node.json | 4 +- yarn.lock | 262 ++++++++++++++++++++++----------------------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/tsconfig.node.json b/tsconfig.node.json index 9d31e2a..06680a3 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "module": "ESNext", - "moduleResolution": "Node", + "module": "nodenext", + "moduleResolution": "nodenext", "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"] diff --git a/yarn.lock b/yarn.lock index dfac02b..c657f05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1401,110 +1401,110 @@ estree-walker "^2.0.2" picomatch "^4.0.2" -"@rollup/rollup-android-arm-eabi@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.0.tgz#939c1be9625d428d8513e4ab60d406fe8db23718" - integrity sha512-lVgpeQyy4fWN5QYebtW4buT/4kn4p4IJ+kDNB4uYNT5b8c8DLJDg6titg20NIg7E8RWwdWZORW6vUFfrLyG3KQ== +"@rollup/rollup-android-arm-eabi@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.1.tgz#7d41dc45adcfcb272504ebcea9c8a5b2c659e963" + integrity sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag== -"@rollup/rollup-android-arm64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.0.tgz#b74005775903f7a8f4e363d2840c1dcef3776ff3" - integrity sha512-2O73dR4Dc9bp+wSYhviP6sDziurB5/HCym7xILKifWdE9UsOe2FtNcM+I4xZjKrfLJnq5UR8k9riB87gauiQtw== +"@rollup/rollup-android-arm64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.1.tgz#6c708fae2c9755e994c42d56c34a94cb77020650" + integrity sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw== -"@rollup/rollup-darwin-arm64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.0.tgz#8c04603cdcf1ec0cd6b27152b3827e49295f2962" - integrity sha512-vwSXQN8T4sKf1RHr1F0s98Pf8UPz7pS6P3LG9NSmuw0TVh7EmaE+5Ny7hJOZ0M2yuTctEsHHRTMi2wuHkdS6Hg== +"@rollup/rollup-darwin-arm64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.1.tgz#85ccf92ab114e434c83037a175923a525635cbb4" + integrity sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw== -"@rollup/rollup-darwin-x64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.0.tgz#19ec976f1cc663def2692cd7ffb32981f2b0b733" - integrity sha512-cQp/WG8HE7BCGyFVuzUg0FNmupxC+EPZEwWu2FCGGw5WDT1o2/YlENbm5e9SMvfDFR6FRhVCBePLqj0o8MN7Vw== +"@rollup/rollup-darwin-x64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.1.tgz#0af089f3d658d05573208dabb3a392b44d7f4630" + integrity sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw== -"@rollup/rollup-freebsd-arm64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.0.tgz#a96b4ad8346229f6fcbd9d57f1c53040b037c2da" - integrity sha512-UR1uTJFU/p801DvvBbtDD7z9mQL8J80xB0bR7DqW7UGQHRm/OaKzp4is7sQSdbt2pjjSS72eAtRh43hNduTnnQ== +"@rollup/rollup-freebsd-arm64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.1.tgz#46c22a16d18180e99686647543335567221caa9c" + integrity sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA== -"@rollup/rollup-freebsd-x64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.0.tgz#fa565a282bc57967ee6668607b181678bdd74e4a" - integrity sha512-G/DKyS6PK0dD0+VEzH/6n/hWDNPDZSMBmqsElWnCRGrYOb2jC0VSupp7UAHHQ4+QILwkxSMaYIbQ72dktp8pKA== +"@rollup/rollup-freebsd-x64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.1.tgz#819ffef2f81891c266456952962a13110c8e28b5" + integrity sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ== -"@rollup/rollup-linux-arm-gnueabihf@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.0.tgz#dfc88f7295e1f98d77f25296be787e8a5d6ced75" - integrity sha512-u72Mzc6jyJwKjJbZZcIYmd9bumJu7KNmHYdue43vT1rXPm2rITwmPWF0mmPzLm9/vJWxIRbao/jrQmxTO0Sm9w== +"@rollup/rollup-linux-arm-gnueabihf@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.1.tgz#7fe283c14793e607e653a3214b09f8973f08262a" + integrity sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg== -"@rollup/rollup-linux-arm-musleabihf@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.0.tgz#32cd70c87455ca031f0361090cf17da5a2ef66d5" - integrity sha512-S4UefYdV0tnynDJV1mdkNawp0E5Qm2MtSs330IyHgaccOFrwqsvgigUD29uT+B/70PDY1eQ3t40+xf6wIvXJyg== +"@rollup/rollup-linux-arm-musleabihf@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.1.tgz#066e92eb22ea30560414ec800a6d119ba0b435ac" + integrity sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw== -"@rollup/rollup-linux-arm64-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.0.tgz#0e7e1fe7241e3384f6c6b4ccdbcfa8ad8c78b869" - integrity sha512-1EhkSvUQXJsIhk4msxP5nNAUWoB4MFDHhtc4gAYvnqoHlaL9V3F37pNHabndawsfy/Tp7BPiy/aSa6XBYbaD1g== +"@rollup/rollup-linux-arm64-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.1.tgz#480d518ea99a8d97b2a174c46cd55164f138cc37" + integrity sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw== -"@rollup/rollup-linux-arm64-musl@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.0.tgz#5d421f2f3e4a84786c4dfd9ce97e595c9b59e7f4" - integrity sha512-EtBDIZuDtVg75xIPIK1l5vCXNNCIRM0OBPUG+tbApDuJAy9mKago6QxX+tfMzbCI6tXEhMuZuN1+CU8iDW+0UQ== +"@rollup/rollup-linux-arm64-musl@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.1.tgz#ed7db3b8999b60dd20009ddf71c95f3af49423c8" + integrity sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w== -"@rollup/rollup-linux-loongarch64-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.0.tgz#a0fb5c7d0e88319e18acfd9436f19ee39354b027" - integrity sha512-BGYSwJdMP0hT5CCmljuSNx7+k+0upweM2M4YGfFBjnFSZMHOLYR0gEEj/dxyYJ6Zc6AiSeaBY8dWOa11GF/ppQ== +"@rollup/rollup-linux-loongarch64-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.1.tgz#16a6927a35f5dbc505ff874a4e1459610c0c6f46" + integrity sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q== -"@rollup/rollup-linux-ppc64-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.0.tgz#a65b598af12f25210c3295da551a6e3616ea488d" - integrity sha512-I1gSMzkVe1KzAxKAroCJL30hA4DqSi+wGc5gviD0y3IL/VkvcnAqwBf4RHXHyvH66YVHxpKO8ojrgc4SrWAnLg== +"@rollup/rollup-linux-ppc64-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.1.tgz#a006700469be0041846c45b494c35754e6a04eea" + integrity sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q== -"@rollup/rollup-linux-riscv64-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.0.tgz#10ba776214ae2857c5bf4389690dabb2fbaf7d98" - integrity sha512-bSbWlY3jZo7molh4tc5dKfeSxkqnf48UsLqYbUhnkdnfgZjgufLS/NTA8PcP/dnvct5CCdNkABJ56CbclMRYCA== +"@rollup/rollup-linux-riscv64-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.1.tgz#0fcc45b2ec8a0e54218ca48849ea6d596f53649c" + integrity sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ== -"@rollup/rollup-linux-riscv64-musl@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.0.tgz#c2a46cbaa329d5f21e5808f5a66bb9c78cf68aac" - integrity sha512-LSXSGumSURzEQLT2e4sFqFOv3LWZsEF8FK7AAv9zHZNDdMnUPYH3t8ZlaeYYZyTXnsob3htwTKeWtBIkPV27iQ== +"@rollup/rollup-linux-riscv64-musl@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.1.tgz#d6e617eec9fe6f5859ee13fad435a16c42b469f2" + integrity sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg== -"@rollup/rollup-linux-s390x-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.0.tgz#a07447be069d64462e30c66611be20c4513963ed" - integrity sha512-CxRKyakfDrsLXiCyucVfVWVoaPA4oFSpPpDwlMcDFQvrv3XY6KEzMtMZrA+e/goC8xxp2WSOxHQubP8fPmmjOQ== +"@rollup/rollup-linux-s390x-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.1.tgz#b147760d63c6f35b4b18e6a25a2a760dd3ea0c05" + integrity sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg== -"@rollup/rollup-linux-x64-gnu@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.0.tgz#8887c58bd51242754ae9c56947d6e883332dcc74" - integrity sha512-8PrJJA7/VU8ToHVEPu14FzuSAqVKyo5gg/J8xUerMbyNkWkO9j2ExBho/68RnJsMGNJq4zH114iAttgm7BZVkA== +"@rollup/rollup-linux-x64-gnu@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.1.tgz#fc0be1da374f85e7e85dccaf1ff12d7cfc9fbe3d" + integrity sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA== -"@rollup/rollup-linux-x64-musl@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.0.tgz#6403fda72a2b3b9fbbeeff93d14f1c45ef9775f3" - integrity sha512-SkE6YQp+CzpyOrbw7Oc4MgXFvTw2UIBElvAvLCo230pyxOLmYwRPwZ/L5lBe/VW/qT1ZgND9wJfOsdy0XptRvw== +"@rollup/rollup-linux-x64-musl@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.1.tgz#54c79932e0f9a3c992b034c82325be3bcde0d067" + integrity sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg== -"@rollup/rollup-openharmony-arm64@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.0.tgz#52809afccaff47e731b965a0c16e5686be819d5f" - integrity sha512-PZkNLPfvXeIOgJWA804zjSFH7fARBBCpCXxgkGDRjjAhRLOR8o0IGS01ykh5GYfod4c2yiiREuDM8iZ+pVsT+Q== +"@rollup/rollup-openharmony-arm64@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.1.tgz#fc48e74d413623ac02c1d521bec3e5e784488fdc" + integrity sha512-RDsLm+phmT3MJd9SNxA9MNuEAO/J2fhW8GXk62G/B4G7sLVumNFbRwDL6v5NrESb48k+QMqdGbHgEtfU0LCpbA== -"@rollup/rollup-win32-arm64-msvc@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.0.tgz#23fe00ddbb40b27a3889bc1e99e6310d97353ad5" - integrity sha512-q7cIIdFvWQoaCbLDUyUc8YfR3Jh2xx3unO8Dn6/TTogKjfwrax9SyfmGGK6cQhKtjePI7jRfd7iRYcxYs93esg== +"@rollup/rollup-win32-arm64-msvc@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.1.tgz#8ce3d1181644406362cf1e62c90e88ab083e02bb" + integrity sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ== -"@rollup/rollup-win32-ia32-msvc@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.0.tgz#520b588076b593413d919912d69dfd5728a1f305" - integrity sha512-XzNOVg/YnDOmFdDKcxxK410PrcbcqZkBmz+0FicpW5jtjKQxcW1BZJEQOF0NJa6JO7CZhett8GEtRN/wYLYJuw== +"@rollup/rollup-win32-ia32-msvc@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.1.tgz#dd2dfc896eac4b2689d55f01c6d51c249263f805" + integrity sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A== -"@rollup/rollup-win32-x64-msvc@4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.0.tgz#d81efe6a12060c7feddf9805e2a94c3ab0679f48" - integrity sha512-xMmiWRR8sp72Zqwjgtf3QbZfF1wdh8X2ABu3EaozvZcyHJeU0r+XAnXdKgs4cCAp6ORoYoCygipYP1mjmbjrsg== +"@rollup/rollup-win32-x64-msvc@4.50.1": + version "4.50.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.1.tgz#13f758c97b9fbbac56b6928547a3ff384e7cfb3e" + integrity sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA== "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" @@ -1549,9 +1549,9 @@ integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== "@vite-pwa/assets-generator@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@vite-pwa/assets-generator/-/assets-generator-1.0.0.tgz#d5764f633464ce3a437d79d48f6f2e0680d35226" - integrity sha512-tWRF/tsqGkND5+dDVnJz7DzQkIRjtTRRYvA3y6l4FwTwK47OK72p1X7ResSz6T7PimIZMuFd+arsB8NRIG+Sww== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@vite-pwa/assets-generator/-/assets-generator-1.0.1.tgz#89338aa471f8f2b3761cc21e4ba9c4f71ab7147f" + integrity sha512-p2KHvsyuv/njmLSwDjpok0CFYKmAdV5ckWjVSxktNXbKAuHX3+WCTy4X3LuwWl0RGsCWBPerSUVNvE/02D565w== dependencies: cac "^6.7.14" colorette "^2.0.20" @@ -2138,9 +2138,9 @@ ejs@^3.1.6: jake "^10.8.5" electron-to-chromium@^1.5.211: - version "1.5.214" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.214.tgz#f7bbdc0796124292d4b8a34a49e968c5e6430763" - integrity sha512-TpvUNdha+X3ybfU78NoQatKvQEm1oq3lf2QbnmCEdw+Bd9RuIAY+hJTvq1avzHM0f7EJfnH3vbCnbzKzisc/9Q== + version "1.5.215" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.215.tgz#200c8d69b1270af6126837b6b1f95077c3a347b1" + integrity sha512-TIvGp57UpeNetj/wV/xpFNpWGb0b/ROw372lHPx5Aafx02gjTBtWnEEcaSX3W2dLM3OSdGGyHX/cHl01JQsLaQ== entities@^4.5.0: version "4.5.0" @@ -2310,7 +2310,7 @@ fast-uri@^3.0.1: resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa" integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA== -fdir@^6.4.4, fdir@^6.5.0: +fdir@^6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg== @@ -2862,9 +2862,9 @@ magic-string@^0.25.0, magic-string@^0.25.7: sourcemap-codec "^1.4.8" magic-string@^0.30.18: - version "0.30.18" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.18.tgz#905bfbbc6aa5692703a93db26a9edcaa0007d2bb" - integrity sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ== + version "0.30.19" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.19.tgz#cebe9f104e565602e5d2098c5f2e79a77cc86da9" + integrity sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw== dependencies: "@jridgewell/sourcemap-codec" "^1.5.5" @@ -3162,33 +3162,33 @@ rollup@^2.43.1: fsevents "~2.3.2" rollup@^4.43.0: - version "4.50.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.50.0.tgz#6f237f598b7163ede33ce827af8534c929aaa186" - integrity sha512-/Zl4D8zPifNmyGzJS+3kVoyXeDeT/GrsJM94sACNg9RtUE0hrHa1bNPtRSrfHTMH5HjRzce6K7rlTh3Khiw+pw== + version "4.50.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.50.1.tgz#6f0717c34aacc65cc727eeaaaccc2afc4e4485fd" + integrity sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA== dependencies: "@types/estree" "1.0.8" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.50.0" - "@rollup/rollup-android-arm64" "4.50.0" - "@rollup/rollup-darwin-arm64" "4.50.0" - "@rollup/rollup-darwin-x64" "4.50.0" - "@rollup/rollup-freebsd-arm64" "4.50.0" - "@rollup/rollup-freebsd-x64" "4.50.0" - "@rollup/rollup-linux-arm-gnueabihf" "4.50.0" - "@rollup/rollup-linux-arm-musleabihf" "4.50.0" - "@rollup/rollup-linux-arm64-gnu" "4.50.0" - "@rollup/rollup-linux-arm64-musl" "4.50.0" - "@rollup/rollup-linux-loongarch64-gnu" "4.50.0" - "@rollup/rollup-linux-ppc64-gnu" "4.50.0" - "@rollup/rollup-linux-riscv64-gnu" "4.50.0" - "@rollup/rollup-linux-riscv64-musl" "4.50.0" - "@rollup/rollup-linux-s390x-gnu" "4.50.0" - "@rollup/rollup-linux-x64-gnu" "4.50.0" - "@rollup/rollup-linux-x64-musl" "4.50.0" - "@rollup/rollup-openharmony-arm64" "4.50.0" - "@rollup/rollup-win32-arm64-msvc" "4.50.0" - "@rollup/rollup-win32-ia32-msvc" "4.50.0" - "@rollup/rollup-win32-x64-msvc" "4.50.0" + "@rollup/rollup-android-arm-eabi" "4.50.1" + "@rollup/rollup-android-arm64" "4.50.1" + "@rollup/rollup-darwin-arm64" "4.50.1" + "@rollup/rollup-darwin-x64" "4.50.1" + "@rollup/rollup-freebsd-arm64" "4.50.1" + "@rollup/rollup-freebsd-x64" "4.50.1" + "@rollup/rollup-linux-arm-gnueabihf" "4.50.1" + "@rollup/rollup-linux-arm-musleabihf" "4.50.1" + "@rollup/rollup-linux-arm64-gnu" "4.50.1" + "@rollup/rollup-linux-arm64-musl" "4.50.1" + "@rollup/rollup-linux-loongarch64-gnu" "4.50.1" + "@rollup/rollup-linux-ppc64-gnu" "4.50.1" + "@rollup/rollup-linux-riscv64-gnu" "4.50.1" + "@rollup/rollup-linux-riscv64-musl" "4.50.1" + "@rollup/rollup-linux-s390x-gnu" "4.50.1" + "@rollup/rollup-linux-x64-gnu" "4.50.1" + "@rollup/rollup-linux-x64-musl" "4.50.1" + "@rollup/rollup-openharmony-arm64" "4.50.1" + "@rollup/rollup-win32-arm64-msvc" "4.50.1" + "@rollup/rollup-win32-ia32-msvc" "4.50.1" + "@rollup/rollup-win32-x64-msvc" "4.50.1" fsevents "~2.3.2" safe-array-concat@^1.1.3: @@ -3557,13 +3557,13 @@ terser@^5.17.4: commander "^2.20.0" source-map-support "~0.5.20" -tinyglobby@^0.2.10, tinyglobby@^0.2.14: - version "0.2.14" - resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d" - integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ== +tinyglobby@^0.2.10, tinyglobby@^0.2.15: + version "0.2.15" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2" + integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ== dependencies: - fdir "^6.4.4" - picomatch "^4.0.2" + fdir "^6.5.0" + picomatch "^4.0.3" to-data-view@^1.1.0: version "1.1.0" @@ -3683,9 +3683,9 @@ unicode-match-property-ecmascript@^2.0.0: unicode-property-aliases-ecmascript "^2.0.0" unicode-match-property-value-ecmascript@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71" - integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa" + integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg== unicode-property-aliases-ecmascript@^2.0.0: version "2.1.0" @@ -3729,16 +3729,16 @@ vite-plugin-pwa@^1.0.0: workbox-window "^7.3.0" vite@^7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.4.tgz#354944affb55e1aff0157406b74e0d0a3232df9a" - integrity sha512-X5QFK4SGynAeeIt+A7ZWnApdUyHYm+pzv/8/A57LqSGcI88U6R6ipOs3uCesdc6yl7nl+zNO0t8LmqAdXcQihw== + version "7.1.5" + resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.5.tgz#4dbcb48c6313116689be540466fc80faa377be38" + integrity sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ== dependencies: esbuild "^0.25.0" fdir "^6.5.0" picomatch "^4.0.3" postcss "^8.5.6" rollup "^4.43.0" - tinyglobby "^0.2.14" + tinyglobby "^0.2.15" optionalDependencies: fsevents "~2.3.3" From 23ca33264c19f51db1f38ab23fd50b0cd6f9207e Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:38:56 +0200 Subject: [PATCH 3/7] chore: PWA caching --- vite.config.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index 9e17924..0ea2f10 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -21,11 +21,9 @@ export default defineConfig({ vue(), VitePWA({ registerType: 'autoUpdate', - includeAssets: ['/images/*.{png,svg,jpg}', '/fonts/*.{woff,woff2}'], - workbox: { disableDevLogs: true, - globPatterns: ['**/*.{js,css,html,png,svg,jpg}'], + globPatterns: ['**/*.{js,css,html,png,svg,jpg,ico,woff,woff2,ttf}'], cleanupOutdatedCaches: true, runtimeCaching: [ { @@ -36,7 +34,7 @@ export default defineConfig({ cacheName: 'stacjownik-api-cache', cacheableResponse: { statuses: [0, 200] } } - } + }, ] }, devOptions: { enabled: true, suppressWarnings: true } From 16f272bd7d293f0607855d75d6cd7c6ffa57c9d3 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:43:20 +0200 Subject: [PATCH 4/7] chore: added SCS+SPK station filter --- src/locales/en.json | 1 + src/locales/pl.json | 1 + src/managers/stationFilterManager.ts | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index a670d44..9e42b8d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -271,6 +271,7 @@ "SCS": "SCS", "SCS-R": "SCS + MANUAL", "SCS-M": "SCS + MECH.", + "SCS-SPK": "SCS + SPK", "SPE": "SPE", "manual": "MANUAL", "mechanical": "MECHANICAL", diff --git a/src/locales/pl.json b/src/locales/pl.json index d6d915e..1779755 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -269,6 +269,7 @@ "SCS": "SCS", "SCS-R": "SCS + RĘCZNE", "SCS-M": "SCS + MECH.", + "SCS-SPK": "SCS + SPK", "SPE": "SPE", "manual": "RĘCZNE", "SUP": "SUP (RASP-UZK)", diff --git a/src/managers/stationFilterManager.ts b/src/managers/stationFilterManager.ts index ecd730d..c346010 100644 --- a/src/managers/stationFilterManager.ts +++ b/src/managers/stationFilterManager.ts @@ -31,6 +31,7 @@ export const initFilters = { mechanical: false, 'SPK-M': false, 'SCS-M': false, + 'SCS-SPK': false, modern: false, semaphores: false, historical: false, @@ -95,7 +96,7 @@ export const filtersSections: Record = { stationType: ['junction', 'nonJunction'], access: ['nonPublic', 'unavailable', 'abandoned'], addons: ['SUP', 'ASDEK', 'noSUP', 'noASDEK'], - control: ['SPK', 'SCS', 'SPE', 'SPK-M', 'SCS-M', 'mechanical', 'SPK-R', 'SCS-R', 'manual'], + control: ['SPK', 'SCS', 'SPE', 'SCS-SPK', 'SPK-M', 'SCS-M', 'mechanical', 'SPK-R', 'SCS-R', 'manual'], blockades: ['SBL', 'PBL'], signals: ['modern', 'semaphores', 'mixed', 'historical'] }; From 1d13e31d793f99f340994e319fbbc7e9fd587512 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:51:44 +0200 Subject: [PATCH 5/7] chore: restored station filtering by non-electric double track routes --- src/components/StationsView/utils.ts | 8 +++++--- src/managers/stationFilterManager.ts | 11 ++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/StationsView/utils.ts b/src/components/StationsView/utils.ts index b7ea8c2..b32ee90 100644 --- a/src/components/StationsView/utils.ts +++ b/src/components/StationsView/utils.ts @@ -132,13 +132,15 @@ function filterSliderValues(filters: Record, generalInfo: StationGe filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length || filters['minOneWay'] > routes.singleOtherNames.length || filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length || - // filters['minTwoWay'] > routes.doubleOtherNames.length || + filters['minTwoWay'] > routes.doubleOtherNames.length || filters['minOneWayCatenaryInt'] > internalRoutes.filter((r) => r.routeTracks == 1 && r.isElectric == true).length || filters['minOneWayInt'] > internalRoutes.filter((r) => r.routeTracks == 1 && r.isElectric == false).length || filters['minTwoWayCatenaryInt'] > - internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == true).length + internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == true).length || + filters['minTwoWayInt'] > + internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == false).length ); } @@ -243,7 +245,7 @@ export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => { return a.name.localeCompare(b.name); }; -export const filterStations = (station: Station, filters: Record) => { +export const filterStations = (station: Station, filters: Record) => { if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1)) return false; diff --git a/src/managers/stationFilterManager.ts b/src/managers/stationFilterManager.ts index c346010..2c33518 100644 --- a/src/managers/stationFilterManager.ts +++ b/src/managers/stationFilterManager.ts @@ -62,11 +62,12 @@ export const initFilters = { maxLevel: 20, minOneWay: 0, minOneWayCatenary: 0, - minTwoWayCatenary: 0, minOneWayInt: 0, minOneWayCatenaryInt: 0, + minTwoWay: 0, + minTwoWayCatenary: 0, + minTwoWayInt: 0, minTwoWayCatenaryInt: 0, - // minTwoWay: 0, authors: '' }; @@ -77,12 +78,12 @@ export const sliderStates = [ { id: 'maxLevel', minRange: 0, maxRange: 20, step: 1 }, { id: 'minOneWay', minRange: 0, maxRange: 5, step: 1 }, { id: 'minOneWayCatenary', minRange: 0, maxRange: 5, step: 1 }, - { id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 }, { id: 'minOneWayInt', minRange: 0, maxRange: 5, step: 1 }, { id: 'minOneWayCatenaryInt', minRange: 0, maxRange: 5, step: 1 }, + { id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 }, + { id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 }, + { id: 'minTwoWayInt', minRange: 0, maxRange: 5, step: 1 }, { id: 'minTwoWayCatenaryInt', minRange: 0, maxRange: 5, step: 1 }, - // { id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 }, - // { id: 'minTwoWayInt', minRange: 0, maxRange: 5, step: 1 } ]; export type StationFilter = keyof typeof initFilters; From bf9799e0c36821ae56410d13d847fe682fc67b18 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 14:52:04 +0200 Subject: [PATCH 6/7] bump: v1.30.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0fde2ae..fd3b7e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.30.5", + "version": "1.30.6", "private": true, "type": "module", "scripts": { From 6d1ef26ac1a125740a66dc9decd346a1dec8665b Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 14 Sep 2025 15:10:48 +0200 Subject: [PATCH 7/7] chore: added a display of the timetable max speed in the active train info & tooltip --- src/components/Tooltip/TrainInfoTooltip.vue | 15 +++- src/components/TrainsView/TrainInfo.vue | 58 ++----------- src/mixins/trainInfoMixin.ts | 90 ++++++++++++--------- src/styles/_global.scss | 6 ++ 4 files changed, 78 insertions(+), 91 deletions(-) diff --git a/src/components/Tooltip/TrainInfoTooltip.vue b/src/components/Tooltip/TrainInfoTooltip.vue index ea40ed3..294bba0 100644 --- a/src/components/Tooltip/TrainInfoTooltip.vue +++ b/src/components/Tooltip/TrainInfoTooltip.vue @@ -9,6 +9,17 @@
{{ trainInfo.stockList[0] }} • {{ trainInfo.length }}m • {{ (trainInfo.mass / 1000).toFixed(2) }}t + + • vRJ: + {{ + trainInfo.timetableData?.trainMaxSpeed || + getStockSpeedLimit(trainInfo.stockList, trainInfo.mass) + }}km/h + + + • vMax: + {{ getStockSpeedLimit(trainInfo.stockList, trainInfo.mass) }}km/h +
@@ -46,9 +57,7 @@ export default defineComponent({ return this.mainStore.trainList.find((t) => t.id === this.tooltipStore.content); }, - lastSceneryStatus() { - - } + lastSceneryStatus() {} } }); diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index 55b0720..bca5787 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -135,7 +135,11 @@ speed icon {{ train.speed }} km/h - + + • vRJ: {{ train.timetableData.trainMaxSpeed }} km/h + + + • { - const [vehicleName, vehicleCargo] = stockName.split(':'); - - const vehicleData = this.apiStore.vehiclesData?.find((v) => v.name == vehicleName); - - if (!vehicleData) return acc; - - let vehicleSpeed = vehicleData.group.speed; - - if (vehicleData.type == 'wagon-freight') { - isPassenger = false; - - if (vehicleCargo !== undefined && vehicleData.group.speedLoaded) { - vehicleSpeed = vehicleData.group.speedLoaded; - } - } - - return Math.min(vehicleSpeed, acc); - }, Infinity); - - // Check the head vehicle speed limit - const headLocoName = this.train.stockList[0]; - const headLocoVehicleData = this.apiStore.vehiclesData?.find((v) => v.name == headLocoName); - - // Omit speed check for head vehicle if there's no data for it - if (!headLocoName || !headLocoVehicleData || !headLocoVehicleData.group.massSpeeds) - return vehicleMaxSpeed; - - const massSpeeds = - headLocoVehicleData.group.massSpeeds[ - this.train.stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo' - ]; - - // Omit speed check if there's no data on mass speeds - if (!massSpeeds) return vehicleMaxSpeed; - - // Number type for locomotives alone - if (typeof massSpeeds === 'number') return massSpeeds; - - // Record type for passenger or cargo, find the closest range - const massKey = Object.keys(massSpeeds).findLast( - (massKey) => this.train.mass >= Number(massKey) - ); - - const massMaxSpeed = massKey ? massSpeeds[massKey] : Infinity; - - return Math.min(massMaxSpeed, vehicleMaxSpeed); + return this.getStockSpeedLimit(this.train.stockList, this.train.mass); }, + journalRouteLocation() { return { path: '/journal/timetables', diff --git a/src/mixins/trainInfoMixin.ts b/src/mixins/trainInfoMixin.ts index ecaae14..bac9a93 100644 --- a/src/mixins/trainInfoMixin.ts +++ b/src/mixins/trainInfoMixin.ts @@ -1,45 +1,10 @@ import { defineComponent } from 'vue'; import { Train, TrainStop } from '../typings/common'; +import { useApiStore } from '../store/apiStore'; export default defineComponent({ data: () => ({ - STATS: { - main: [ - { - name: 'speed', - unit: 'km/h' - }, - { - name: 'length', - unit: 'm' - }, - { - name: 'mass', - unit: 't', - multiplier: 0.001 - } - ], - - position: [ - { - name: 'scenery', - prop: 'currentStationName' - }, - { - name: 'route', - prop: 'connectedTrack' - }, - { - name: 'signal', - prop: 'signal' - }, - { - name: 'distance', - prop: 'distance', - unit: 'm' - } - ] - } + apiStore: useApiStore() }), methods: { @@ -150,6 +115,57 @@ export default defineComponent({ if (distance < 1000) return `${distance}m`; return `${(distance / 1000).toPrecision(2)}km`; + }, + + getStockSpeedLimit(stockList: string[], trainMass: number) { + let isPassenger = true; + + // Check the whole consist speed limit + const vehicleMaxSpeed = stockList.reduce((acc, stockName, i) => { + const [vehicleName, vehicleCargo] = stockName.split(':'); + + const vehicleData = this.apiStore.vehiclesData?.find((v) => v.name == vehicleName); + + if (!vehicleData) return acc; + + let vehicleSpeed = vehicleData.group.speed; + + if (vehicleData.type == 'wagon-freight') { + isPassenger = false; + + if (vehicleCargo !== undefined && vehicleData.group.speedLoaded) { + vehicleSpeed = vehicleData.group.speedLoaded; + } + } + + return Math.min(vehicleSpeed, acc); + }, Infinity); + + // Check the head vehicle speed limit + const headLocoName = stockList[0]; + const headLocoVehicleData = this.apiStore.vehiclesData?.find((v) => v.name == headLocoName); + + // Omit speed check for head vehicle if there's no data for it + if (!headLocoName || !headLocoVehicleData || !headLocoVehicleData.group.massSpeeds) + return vehicleMaxSpeed; + + const massSpeeds = + headLocoVehicleData.group.massSpeeds[ + stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo' + ]; + + // Omit speed check if there's no data on mass speeds + if (!massSpeeds) return vehicleMaxSpeed; + + // Number type for locomotives alone + if (typeof massSpeeds === 'number') return massSpeeds; + + // Record type for passenger or cargo, find the closest range + const massKey = Object.keys(massSpeeds).findLast((massKey) => trainMass >= Number(massKey)); + + const massMaxSpeed = massKey ? massSpeeds[massKey] : Infinity; + + return Math.min(massMaxSpeed, vehicleMaxSpeed); } } }); diff --git a/src/styles/_global.scss b/src/styles/_global.scss index a9a2d64..da5e6ac 100644 --- a/src/styles/_global.scss +++ b/src/styles/_global.scss @@ -225,6 +225,12 @@ ul { } } +.font { + &--italic { + font-style: italic; + } +} + button, a.a-button { cursor: pointer;