From e21395730cba161280c84f873ea75d8600ce2494 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Fri, 23 Sep 2022 23:06:37 +0200 Subject: [PATCH 01/12] add route/stations Katowice-Ostrava related: #684 --- Path.json | 153 ++++++++++++++++++++++++++++++++++++++++ Station.json | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 345 insertions(+) diff --git a/Path.json b/Path.json index e8677914..3bbde148 100644 --- a/Path.json +++ b/Path.json @@ -40561,6 +40561,159 @@ } ] }, + { + "electrified": true, + "group": 0, + "maxSpeed": 140, + "neededEquipments": [ + "PL" + ], + "objects": [ + { + "start": "🇵🇱07331", + "end": "XPTY", + "length": 16, + "maxSpeed": 130, + "twistingFactor": 0.22 + }, + { + "start": "XPTY", + "end": "🇵🇱O3689421986", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O3689421986", + "end": "🇵🇱O1509288904", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O1509288904", + "end": "🇵🇱O3689549653", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O3689549653", + "end": "🇵🇱O2473137378", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O2473137378", + "end": "🇵🇱O3690981263", + "length": 3, + "twistingFactor": 0.13 + }, + { + "start": "🇵🇱O3690981263", + "end": "🇵🇱O2514287368", + "length": 1, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O2514287368", + "end": "🇵🇱O8088496654", + "length": 5, + "twistingFactor": 0.29 + }, + { + "start": "🇵🇱O8088496654", + "end": "🇵🇱O1875532846", + "length": 3, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O1875532846", + "end": "🇵🇱O655388124", + "length": 6, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O655388124", + "end": "🇵🇱O2182784360", + "length": 3, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O2182784360", + "end": "🇵🇱O1753725163", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇵🇱O1753725163", + "end": "XPZD", + "length": 6, + "maxSpeed": 120, + "twistingFactor": 0.29 + }, + { + "start": "XPZD", + "end": "XTPK", + "length": 5, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "PL", + "CZ" + ] + }, + { + "start": "XTPK", + "end": "🇨🇿5434534", + "length": 2, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "CZ" + ] + }, + { + "start": "🇨🇿5434534", + "end": "🇨🇿33274", + "length": 3, + "maxSpeed": 160, + "twistingFactor": 0.14, + "neededEquipments": [ + "CZ" + ] + }, + { + "start": "🇨🇿33274", + "end": "🇨🇿5434134", + "length": 4, + "maxSpeed": 160, + "twistingFactor": 0.13, + "neededEquipments": [ + "CZ" + ] + }, + { + "start": "🇨🇿5434134", + "end": "🇨🇿34124", + "length": 4, + "twistingFactor": 0.1, + "neededEquipments": [ + "CZ" + ] + }, + { + "start": "🇨🇿34124", + "end": "XTOH", + "length": 8, + "twistingFactor": 0.1, + "neededEquipments": [ + "CZ" + ] + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index 11360df6..76a0a7da 100644 --- a/Station.json +++ b/Station.json @@ -56309,6 +56309,198 @@ "group": 0, "x": 1703, "y": 249, + "proj": 3, + "platformLength": 400, + "platforms": 8 + }, + { + "name": "Tychy", + "ril100": "XPTY", + "group": 1, + "x": 1697, + "y": 270, + "proj": 3, + "platformLength": 6, + "platforms": 244 + }, + { + "name": "Tychy Żwaków", + "ril100": "🇵🇱O3689421986", + "group": 5, + "x": 1696, + "y": 274, + "proj": 3, + "platformLength": 217, + "platforms": 2 + }, + { + "name": "Kobiór", + "ril100": "🇵🇱O1509288904", + "group": 5, + "x": 1692, + "y": 281, + "proj": 3, + "platformLength": 200, + "platforms": 2 + }, + { + "name": "Piasek", + "ril100": "🇵🇱O3689549653", + "group": 5, + "x": 1695, + "y": 290, + "proj": 3, + "platformLength": 201, + "platforms": 2 + }, + { + "name": "Pszczyna", + "ril100": "🇵🇱O2473137378", + "group": 2, + "x": 1697, + "y": 296, + "proj": 3, + "platformLength": 305, + "platforms": 3 + }, + { + "name": "Goczałkowice", + "ril100": "🇵🇱O3690981263", + "group": 5, + "x": 1699, + "y": 301, + "proj": 3, + "platformLength": 202, + "platforms": 2 + }, + { + "name": "Goczałkowice Zdrój", + "ril100": "🇵🇱O2514287368", + "group": 5, + "x": 1701, + "y": 303, + "proj": 3, + "platformLength": 248, + "platforms": 2 + }, + { + "name": "Zabrzeg", + "ril100": "🇵🇱O8088496654", + "group": 5, + "x": 1696, + "y": 307, + "proj": 3, + "platformLength": 200, + "platforms": 2 + }, + { + "name": "Zabrzeg Czarnolesie", + "ril100": "🇵🇱O1875532846", + "group": 2, + "x": 1691, + "y": 308, + "proj": 3, + "platformLength": 211, + "platforms": 2 + }, + { + "name": "Chybie", + "ril100": "🇵🇱O655388124", + "group": 2, + "x": 1678, + "y": 310, + "proj": 3, + "platformLength": 300, + "platforms": 4 + }, + { + "name": "Drogomyśl", + "ril100": "🇵🇱O2182784360", + "group": 5, + "x": 1671, + "y": 311, + "proj": 3, + "platformLength": 120, + "platforms": 2 + }, + { + "name": "Pruchna", + "ril100": "🇵🇱O1753725163", + "group": 2, + "x": 1662, + "y": 312, + "proj": 3, + "platformLength": 200, + "platforms": 2 + }, + { + "name": "Zebrzydowice", + "ril100": "XPZD", + "group": 2, + "x": 1653, + "y": 314, + "proj": 3, + "platformLength": 390, + "platforms": 5 + }, + { + "name": "Petrovice u Karviné", + "ril100": "XTPK", + "group": 2, + "x": 1643, + "y": 310, + "proj": 3, + "platformLength": 405, + "platforms": 3 + }, + { + "name": "Závada", + "ril100": "🇨🇿5434534", + "group": 5, + "x": 1637, + "y": 309, + "proj": 3, + "platformLength": 68, + "platforms": 2 + }, + { + "name": "Dětmarovice", + "ril100": "🇨🇿33274", + "group": 2, + "x": 1631, + "y": 309, + "proj": 3, + "platformLength": 256, + "platforms": 4 + }, + { + "name": "Dolní Lutyně", + "ril100": "🇨🇿5434134", + "group": 5, + "x": 1624, + "y": 307, + "proj": 3, + "platformLength": 256, + "platforms": 2 + }, + { + "name": "Bohumín", + "ril100": "🇨🇿34124", + "group": 1, + "x": 1617, + "y": 309, + "proj": 3, + "platformLength": 448, + "platforms": 8 + }, + { + "name": "Ostrava hlavní nádraží", + "ril100": "XTOH", + "group": 1, + "x": 1605, + "y": 317, + "platformLength": 353, + "platforms": 8, "proj": 3 }, { From 50ef79fc2e00d21945bcdf52195b2229680a88c4 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sat, 24 Sep 2022 19:23:32 +0200 Subject: [PATCH 02/12] =?UTF-8?q?add=20stations/routes=20Ostrava-P=C5=99er?= =?UTF-8?q?ov,=20P=C5=99erov-Brno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Path.json | 232 +++++++++++++++++++++++++++++++++++ Station.json | 334 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 558 insertions(+), 8 deletions(-) diff --git a/Path.json b/Path.json index 3bbde148..d348ab07 100644 --- a/Path.json +++ b/Path.json @@ -40714,6 +40714,238 @@ } ] }, + { + "name": "SŽDC 001 Praha-Ostrava", + "group": 0, + "electrified": true, + "maxSpeed": 160, + "twistingFactor": 0.1, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTOH", + "end": "🇨🇿34454", + "length": 10, + "twistingFactor": 0.15 + }, + { + "start": "🇨🇿34454", + "end": "🇨🇿33654", + "length": 4 + }, + { + "start": "🇨🇿33654", + "end": "XTSA", + "length": 7 + }, + { + "start": "XTSA", + "end": "🇨🇿33494", + "length": 6, + "twistingFactor": 0.12 + }, + { + "start": "🇨🇿33494", + "end": "XTSU", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "XTSU", + "end": "🇨🇿34824", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34824", + "end": "🇨🇿34544", + "length": 6, + "twistingFactor": 0.18 + }, + { + "start": "🇨🇿34544", + "end": "🇨🇿34554", + "length": 4, + "maxSpeed": 135, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34554", + "end": "XTHM", + "length": 5, + "maxSpeed": 135, + "twistingFactor": 0.25 + }, + { + "start": "XTHM", + "end": "🇨🇿33472", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿33472", + "end": "🇨🇿34042", + "length": 8, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34042", + "end": "🇨🇿34642", + "length": 3, + "maxSpeed": 120, + "twistingFactor": 0.11 + }, + { + "start": "🇨🇿34642", + "end": "🇨🇿34652", + "length": 3, + "maxSpeed": 140, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34652", + "end": "XTPR", + "length": 7, + "twistingFactor": 0.25 + } + ] + }, + { + "name": "SŽDC 300 Brno-Přerov", + "group": 0, + "electrified": true, + "maxSpeed": 100, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTPR", + "end": "🇨🇿34115", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34115", + "end": "🇨🇿34105", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34105", + "end": "🇨🇿34306", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34306", + "end": "🇨🇿34326", + "length": 4, + "twistingFactor": 0.14 + }, + { + "start": "🇨🇿34326", + "end": "🇨🇿35235", + "length": 2, + "twistingFactor": 0.16 + }, + { + "start": "🇨🇿35235", + "end": "🇨🇿35285", + "length": 4, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿35285", + "end": "🇨🇿35295", + "length": 4, + "maxSpeed": 90, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿35295", + "end": "🇨🇿34145", + "length": 2, + "maxSpeed": 90, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34145", + "end": "🇨🇿34155", + "length": 2, + "maxSpeed": 90, + "twistingFactor": 0.14 + }, + { + "start": "🇨🇿34155", + "end": "🇨🇿36895", + "length": 5, + "maxSpeed": 90, + "twistingFactor": 0.16 + }, + { + "start": "🇨🇿36895", + "end": "🇨🇿34815", + "length": 6, + "maxSpeed": 90, + "twistingFactor": 0.15 + }, + { + "start": "🇨🇿34815", + "end": "🇨🇿O3305512300", + "length": 4, + "maxSpeed": 90, + "twistingFactor": 0.15 + }, + { + "start": "🇨🇿O3305512300", + "end": "🇨🇿35905", + "length": 3, + "maxSpeed": 90, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿35905", + "end": "🇨🇿O3320811574", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿O3320811574", + "end": "🇨🇿33125", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿33125", + "end": "🇨🇿36355", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36355", + "end": "🇨🇿36345", + "length": 2, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿36345", + "end": "🇨🇿33365", + "length": 4, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿33365", + "end": "XTBR", + "length": 9, + "twistingFactor": 0.42 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index 76a0a7da..f1e7d01a 100644 --- a/Station.json +++ b/Station.json @@ -46799,14 +46799,6 @@ "y": 487, "proj": 3 }, - { - "name": "Brno Hlavni Nadrazi", - "ril100": "XTBR", - "group": 0, - "x": 1382, - "y": 426, - "proj": 3 - }, { "name": "Adamov", "ril100": "🇨🇿33015", @@ -56503,6 +56495,332 @@ "platforms": 8, "proj": 3 }, + { + "name": "Polanka nad Odrou", + "ril100": "🇨🇿34454", + "group": 5, + "x": 1595, + "y": 329, + "proj": 3, + "platformLength": 206, + "platforms": 2 + }, + { + "name": "Jistebník", + "ril100": "🇨🇿33654", + "group": 2, + "x": 1590, + "y": 334, + "proj": 3, + "platformLength": 219, + "platforms": 4 + }, + { + "name": "Studénka", + "ril100": "XTSA", + "group": 1, + "x": 1578, + "y": 341, + "proj": 3, + "platformLength": 400, + "platforms": 5 + }, + { + "name": "Hladké Životice", + "ril100": "🇨🇿33494", + "group": 5, + "x": 1568, + "y": 346, + "proj": 3, + "platformLength": 206, + "platforms": 2 + }, + { + "name": "Suchdol nad Odrou", + "ril100": "XTSU", + "group": 1, + "x": 1561, + "y": 352, + "proj": 3, + "platformLength": 399, + "platforms": 7 + }, + { + "name": "Jeseník nad Odrou", + "ril100": "🇨🇿34824", + "group": 5, + "x": 1557, + "y": 356, + "proj": 3, + "platformLength": 205, + "platforms": 2 + }, + { + "name": "Polom", + "ril100": "🇨🇿34544", + "group": 2, + "x": 1551, + "y": 363, + "proj": 3, + "platformLength": 192, + "platforms": 4 + }, + { + "name": "Bělotín", + "ril100": "🇨🇿34554", + "group": 5, + "x": 1543, + "y": 361, + "proj": 3, + "platformLength": 196, + "platforms": 2 + }, + { + "name": "Hranice na Moravě", + "ril100": "XTHM", + "group": 1, + "x": 1535, + "y": 364, + "platformLength": 449, + "platforms": 5, + "proj": 3 + }, + { + "name": "Drahotuše", + "ril100": "🇨🇿33472", + "group": 2, + "x": 1527, + "y": 367, + "proj": 3, + "platformLength": 227, + "platforms": 4 + }, + { + "name": "Lipník nad Bečvou", + "ril100": "🇨🇿34042", + "group": 2, + "x": 1512, + "y": 370, + "proj": 3, + "platformLength": 313, + "platforms": 4 + }, + { + "name": "Osek nad Bečvou", + "ril100": "🇨🇿34642", + "group": 5, + "x": 1505, + "y": 373, + "proj": 3, + "platformLength": 189, + "platforms": 2 + }, + { + "name": "Prosenice", + "ril100": "🇨🇿34652", + "group": 2, + "x": 1500, + "y": 375, + "proj": 3, + "platformLength": 202, + "platforms": 3 + }, + { + "name": "Přerov", + "ril100": "XTPR", + "group": 1, + "x": 1495, + "y": 384, + "proj": 3, + "platformLength": 455, + "platforms": 9 + }, + { + "name": "Věžky", + "ril100": "🇨🇿34115", + "group": 2, + "x": 1492, + "y": 391, + "proj": 3, + "platformLength": 196, + "platforms": 2 + }, + { + "name": "Chropyně", + "ril100": "🇨🇿34105", + "group": 2, + "x": 1484, + "y": 397, + "proj": 3, + "platformLength": 241, + "platforms": 5 + }, + { + "name": "Kojetín", + "ril100": "🇨🇿34306", + "group": 2, + "x": 1477, + "y": 401, + "proj": 3, + "platformLength": 380, + "platforms": 4 + }, + { + "name": "Měrovice nad Hanou", + "ril100": "🇨🇿34326", + "group": 5, + "x": 1469, + "y": 401, + "proj": 3, + "platformLength": 220, + "platforms": 1 + }, + { + "name": "Němčice nad Hanou", + "ril100": "🇨🇿35235", + "group": 2, + "x": 1465, + "y": 401, + "proj": 3, + "platformLength": 135, + "platforms": 3 + }, + { + "name": "Nezamyslice", + "ril100": "🇨🇿35285", + "group": 2, + "x": 1457, + "y": 403, + "proj": 3, + "platformLength": 373, + "platforms": 5 + }, + { + "name": "Chvalkovice na Hané", + "ril100": "🇨🇿35295", + "group": 5, + "x": 1451, + "y": 405, + "proj": 3, + "platformLength": 147, + "platforms": 1 + }, + { + "name": "Ivanovice na Hané", + "ril100": "🇨🇿34145", + "group": 2, + "x": 1447, + "y": 408, + "proj": 3, + "platformLength": 265, + "platforms": 5 + }, + { + "name": "Hoštice-Heroltice", + "ril100": "🇨🇿34155", + "group": 5, + "x": 1444, + "y": 410, + "proj": 3, + "platformLength": 211, + "platforms": 1 + }, + { + "name": "Vyškov na Moravě", + "ril100": "🇨🇿36895", + "group": 2, + "x": 1434, + "y": 412, + "proj": 3, + "platformLength": 393, + "platforms": 5 + }, + { + "name": "Luleč", + "ril100": "🇨🇿34815", + "group": 2, + "x": 1425, + "y": 417, + "proj": 3, + "platformLength": 128, + "platforms": 2 + }, + { + "name": "Komořany u Vyškova", + "ril100": "🇨🇿O3305512300", + "group": 6, + "x": 1422, + "y": 423, + "proj": 3 + }, + { + "name": "Rousínov", + "ril100": "🇨🇿35905", + "group": 5, + "x": 1418, + "y": 426, + "proj": 3, + "platformLength": 160, + "platforms": 2 + }, + { + "name": "Holubice", + "ril100": "🇨🇿O3320811574", + "group": 6, + "x": 1412, + "y": 429, + "proj": 3 + }, + { + "name": "Ponětovice", + "ril100": "🇨🇿36355", + "group": 5, + "x": 1402, + "y": 433, + "proj": 3, + "platformLength": 170, + "platforms": 2 + }, + { + "name": "Blažovice", + "ril100": "🇨🇿33125", + "group": 2, + "x": 1409, + "y": 431, + "proj": 3, + "platformLength": 177, + "platforms": 3 + }, + { + "name": "Šlapanice", + "ril100": "🇨🇿36345", + "group": 2, + "x": 1399, + "y": 433, + "proj": 3, + "platformLength": 170, + "platforms": 1 + }, + { + "name": "Brno-Slatina", + "ril100": "🇨🇿33365", + "group": 5, + "x": 1393, + "y": 431, + "proj": 3, + "platformLength": 172, + "plaforms": 3 + }, + { + "name": "Brno Hlavni Nadrazi", + "ril100": "XTBR", + "group": 0, + "x": 1383, + "y": 427, + "platformLength": 379, + "platforms": 13, + "proj": 3 + }, { "group": 5, "name": "Steina", From 1070c3c1bfe389d9ba255d27abe1bdd7833affa2 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sat, 24 Sep 2022 21:01:32 +0200 Subject: [PATCH 03/12] route Breclav-Bratislava --- Path.json | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ Station.json | 152 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 301 insertions(+), 9 deletions(-) diff --git a/Path.json b/Path.json index d348ab07..e614ed56 100644 --- a/Path.json +++ b/Path.json @@ -40946,6 +40946,164 @@ } ] }, + { + "electrified": true, + "group": 0, + "objects": [ + { + "start": "XTBE", + "end": "XTLZ", + "length": 7, + "maxSpeed": 160, + "twistingFactor": 0.39, + "neededEquipments": [ + "CZ" + ] + }, + { + "start": "XTLZ", + "end": "XYBO", + "length": 6, + "maxSpeed": 160, + "twistingFactor": 0.1, + "neededEquipments": [ + "CZ", + "SK" + ] + }, + { + "start": "XYBO", + "end": "XYKU", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.14, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "XYKU", + "end": "🇸🇰O282377198", + "length": 5, + "maxSpeed": 140, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O282377198", + "end": "🇸🇰O2893302325", + "length": 2, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O2893302325", + "end": "🇸🇰O3334032454", + "length": 3, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O3334032454", + "end": "🇸🇰O3334032453", + "length": 3, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O3334032453", + "end": "XYMA", + "length": 8, + "maxSpeed": 140, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "XYMA", + "end": "🇸🇰O282377194", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O282377194", + "end": "XYZO", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "XYZO", + "end": "🇸🇰O682295722", + "length": 8, + "maxSpeed": 140, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O682295722", + "end": "XYDN", + "length": 3, + "maxSpeed": 140, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "XYDN", + "end": "🇸🇰O2865289058", + "length": 7, + "maxSpeed": 120, + "twistingFactor": 0.24, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O2865289058", + "end": "🇸🇰O2865289032", + "length": 1, + "maxSpeed": 100, + "twistingFactor": 0.1, + "neededEquipments": [ + "SK" + ] + }, + { + "start": "🇸🇰O2865289032", + "end": "XYB", + "name": "Červený most", + "length": 3, + "maxSpeed": 100, + "twistingFactor": 0.12, + "neededEquipments": [ + "SK" + ] + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index f1e7d01a..d1d63e5a 100644 --- a/Station.json +++ b/Station.json @@ -18969,7 +18969,9 @@ "group": 0, "x": 1457, "y": 599, - "proj": 3 + "proj": 3, + "platformLength": 341, + "platforms": 10 }, { "name": "Bratislava-Vajnory", @@ -23225,14 +23227,6 @@ "y": 525, "proj": 3 }, - { - "name": "Breclav", - "ril100": "XTBE", - "group": 1, - "x": 1424, - "y": 500, - "proj": 3 - }, { "name": "Hergenrath", "ril100": "XBHE", @@ -56821,6 +56815,146 @@ "platforms": 13, "proj": 3 }, + { + "name": "Břeclav", + "ril100": "XTBE", + "group": 1, + "x": 1424, + "y": 500, + "proj": 3, + "platformLength": 509, + "platforms": 10 + }, + { + "name": "Lanzhot", + "ril100": "XTLZ", + "group": 2, + "x": 1434, + "y": 503, + "proj": 3, + "platformLength": 176, + "platforms": 3 + }, + { + "name": "Brodské", + "ril100": "XYBO", + "group": 5, + "x": 1442, + "y": 510, + "platformLength": 150, + "platforms": 2, + "proj": 3 + }, + { + "name": "Kuty", + "ril100": "XYKU", + "group": 2, + "x": 1446, + "y": 515, + "proj": 3, + "platformLength": 303, + "platforms": 5 + }, + { + "name": "Sekule", + "ril100": "🇸🇰O282377198", + "group": 2, + "x": 1442, + "y": 524, + "proj": 3, + "platformLength": 254, + "platforms": 3 + }, + { + "name": "Moravský Svätý Ján", + "ril100": "🇸🇰O2893302325", + "group": 5, + "x": 1441, + "y": 528, + "platformLength": 269, + "platforms": 2, + "proj": 3 + }, + { + "name": "Závod", + "ril100": "🇸🇰O3334032454", + "group": 5, + "x": 1441, + "y": 536, + "platformLength": 123, + "platforms": 2, + "proj": 3 + }, + { + "name": "Veľké Leváre", + "ril100": "🇸🇰O3334032453", + "group": 2, + "x": 1443, + "y": 541, + "proj": 3, + "platformLength": 170, + "platforms": 4 + }, + { + "name": "Malacky", + "ril100": "XYMA", + "group": 2, + "x": 1444, + "y": 553, + "proj": 3, + "platformLength": 185, + "platforms": 3 + }, + { + "name": "Plavecký Štvrtok", + "ril100": "🇸🇰O282377194", + "group": 5, + "x": 1442, + "y": 563, + "platformLength": 260, + "platforms": 2, + "proj": 3 + }, + { + "name": "Zohor", + "ril100": "XYZO", + "group": 2, + "x": 1440, + "y": 571, + "proj": 3, + "platformLength": 242, + "platforms": 5 + }, + { + "name": "Devínske Jazero", + "ril100": "🇸🇰O682295722", + "group": 2, + "x": 1437, + "y": 584, + "platformLength": 195, + "platforms": 1, + "proj": 3 + }, + { + "name": "Bratislava-Lamač", + "ril100": "🇸🇰O2865289058", + "group": 5, + "x": 1450, + "y": 595, + "proj": 3, + "platformLength": 292, + "platforms": 3 + }, + { + "name": "Bratislava-Železná studienka", + "ril100": "🇸🇰O2865289032", + "group": 5, + "x": 1453, + "y": 597, + "proj": 3, + "platformLength": 184, + "platforms": 2 + }, { "group": 5, "name": "Steina", From 9dba9f1a11f7b6609b167d7f129b1f2c332842f5 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 14:38:23 +0200 Subject: [PATCH 04/12] add stations/route Prerov - Ceska Trebova --- Path.json | 138 ++++++++++++++++++++++++++++++++++++ Station.json | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 332 insertions(+), 2 deletions(-) diff --git a/Path.json b/Path.json index e614ed56..58531994 100644 --- a/Path.json +++ b/Path.json @@ -41104,6 +41104,144 @@ } ] }, + { + "name": "SŽDC 001 Praha-Ostrava", + "electrified": true, + "group": 0, + "maxSpeed": 160, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTPR", + "end": "🇨🇿33152", + "length": 5, + "twistingFactor": 0.12 + }, + { + "start": "🇨🇿33152", + "end": "🇨🇿33142", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿33142", + "end": "🇨🇿33482", + "length": 6, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿33482", + "end": "XTO", + "length": 6, + "twistingFactor": 0.1 + }, + { + "start": "XTO", + "end": "🇨🇿34932", + "length": 9, + "twistingFactor": 0.12 + }, + { + "start": "🇨🇿34932", + "end": "🇨🇿34912", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34912", + "end": "🇨🇿33312", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿33312", + "end": "🇨🇿34292", + "length": 9, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34292", + "end": "🇨🇿34282", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34282", + "end": "🇨🇿34162", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34162", + "end": "XTZM", + "length": 5, + "twistingFactor": 0.15 + }, + { + "start": "XTZM", + "end": "🇨🇿53993", + "length": 3, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿53993", + "end": "🇨🇿53983", + "name": "Hněvkovský I", + "length": 5, + "twistingFactor": 0.14 + }, + { + "start": "🇨🇿53983", + "end": "🇨🇿53973", + "name": "Malá Huba", + "length": 4, + "maxSpeed": 140, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿53973", + "end": "🇨🇿53963", + "name": "Krasíkov I", + "length": 1, + "maxSpeed": 140, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿53963", + "end": "🇨🇿53953", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿53953", + "end": "🇨🇿54003", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿54003", + "end": "🇨🇿53943", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿53943", + "end": "🇨🇿53933", + "length": 7, + "maxSpeed": 140, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿53933", + "end": "XTTR", + "length": 5, + "maxSpeed": 120, + "twistingFactor": 0.14 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index d1d63e5a..9c141ba4 100644 --- a/Station.json +++ b/Station.json @@ -46834,12 +46834,14 @@ "proj": 3 }, { - "name": "Ceska Trebova", + "name": "Česká Třebová", "ril100": "XTTR", "group": 1, "x": 1355, "y": 309, - "proj": 3 + "proj": 3, + "platformLength": 384, + "platforms": 9 }, { "name": "Salone", @@ -56629,6 +56631,196 @@ "platformLength": 455, "platforms": 9 }, + { + "name": "Rokytnice u Přerova", + "ril100": "🇨🇿33152", + "group": 5, + "x": 1485, + "y": 382, + "proj": 3, + "platformLength": 198, + "platforms": 2 + }, + { + "name": "Brodek u Přerova", + "ril100": "🇨🇿33142", + "group": 2, + "x": 1480, + "y": 378, + "proj": 3, + "platformLength": 216, + "platforms": 4 + }, + { + "name": "Grygov", + "ril100": "🇨🇿33482", + "group": 2, + "x": 1476, + "y": 370, + "proj": 3, + "platformLength": 239, + "platforms": 4 + }, + { + "name": "Olomouc Hlavni Nadrazi", + "ril100": "XTO", + "group": 1, + "x": 1472, + "y": 360, + "proj": 3, + "platformLength": 400, + "platforms": 11 + }, + { + "name": "Štěpánov", + "ril100": "🇨🇿34932", + "group": 2, + "x": 1463, + "y": 347, + "proj": 3, + "platformLength": 202, + "platforms": 4 + }, + { + "name": "Střeň", + "ril100": "🇨🇿34912", + "group": 5, + "x": 1454, + "y": 342, + "proj": 3, + "platformLength": 180, + "plaforms": 2 + }, + { + "name": "Červenka", + "ril100": "🇨🇿33312", + "group": 1, + "x": 1445, + "y": 338, + "proj": 3, + "platformLength": 276, + "plaforms": 5 + }, + { + "name": "Moravičany", + "ril100": "🇨🇿34292", + "group": 2, + "x": 1428, + "y": 332, + "proj": 3, + "platformLength": 170, + "plaforms": 3 + }, + { + "name": "Mohelnice", + "ril100": "🇨🇿34282", + "group": 2, + "x": 1424, + "y": 329, + "proj": 3, + "platformLength": 269, + "platforms": 5 + }, + { + "name": "Lukavice na Moravě", + "ril100": "🇨🇿34162", + "group": 2, + "x": 1421, + "y": 321, + "proj": 3, + "platformLength": 177, + "platforms": 3 + }, + { + "name": "Zabreh na Morave", + "ril100": "XTZM", + "group": 1, + "x": 1416, + "y": 313, + "proj": 3, + "platformLength": 457, + "platforms": 6 + }, + { + "name": "Lupěné", + "ril100": "🇨🇿53993", + "group": 5, + "x": 1410, + "y": 314, + "proj": 3, + "platformLength": 148, + "platforms": 2 + }, + { + "name": "Hoštejn", + "ril100": "🇨🇿53983", + "group": 5, + "x": 1401, + "y": 313, + "proj": 3, + "platformLength": 149, + "plaforms": 2 + }, + { + "name": "Tatenice", + "ril100": "🇨🇿53973", + "group": 5, + "x": 1392, + "y": 316, + "proj": 3, + "platformLength": 156, + "plaforms": 2 + }, + { + "name": "Krasíkov", + "ril100": "🇨🇿53963", + "group": 2, + "x": 1390, + "y": 317, + "proj": 3, + "platformLength": 135, + "platforms": 2 + }, + { + "name": "Žichlínek", + "ril100": "🇨🇿53953", + "group": 5, + "x": 1385, + "y": 315, + "proj": 3, + "platformLength": 140, + "platforms": 2 + }, + { + "name": "Luková u Rudoltic v Čechách", + "ril100": "🇨🇿54003", + "group": 5, + "x": 1378, + "y": 312, + "proj": 3, + "platformLength": 139, + "platforms": 2 + }, + { + "name": "Rudoltice v Čechách", + "ril100": "🇨🇿53943", + "group": 2, + "x": 1373, + "y": 310, + "proj": 3, + "platformLength": 150, + "platforms": 6 + }, + { + "name": "Třebovice v Čechách", + "ril100": "🇨🇿53933", + "group": 2, + "x": 1363, + "y": 316, + "proj": 3, + "platformLength": 168, + "platforms": 6 + }, { "name": "Věžky", "ril100": "🇨🇿34115", From be1fc087caac9b8cc20318dd63e94e01aee28e00 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 16:15:10 +0200 Subject: [PATCH 05/12] add stations/route Jihlava - Brno --- Path.json | 215 ++++++++++++++++++++++++++++++++++++++++ Station.json | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 485 insertions(+) diff --git a/Path.json b/Path.json index 58531994..233c2427 100644 --- a/Path.json +++ b/Path.json @@ -41242,6 +41242,221 @@ } ] }, + { + "name": "SŽDC 240 Brno - Jihlava", + "group": 0, + "electrified": true, + "maxSpeed": 100, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTJV", + "end": "🇨🇿34795", + "length": 3, + "maxSpeed": 75, + "twistingFactor": 0.28 + }, + { + "start": "🇨🇿34795", + "end": "🇨🇿34785", + "electrified": false, + "length": 7, + "maxSpeed": 75, + "twistingFactor": 0.26 + }, + { + "start": "🇨🇿34785", + "end": "🇨🇿34805", + "electrified": false, + "length": 2, + "maxSpeed": 75, + "twistingFactor": 0.14 + }, + { + "start": "🇨🇿34805", + "end": "🇨🇿33265", + "electrified": false, + "length": 2, + "maxSpeed": 80, + "twistingFactor": 0.15 + }, + { + "start": "🇨🇿33265", + "end": "🇨🇿33275", + "electrified": false, + "length": 2, + "maxSpeed": 80, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿33275", + "end": "🇨🇿33255", + "electrified": false, + "length": 2, + "maxSpeed": 80, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿33255", + "end": "🇨🇿33285", + "electrified": false, + "length": 3, + "maxSpeed": 85, + "twistingFactor": 0.19 + }, + { + "start": "🇨🇿33285", + "end": "🇨🇿35445", + "electrified": false, + "length": 5, + "maxSpeed": 85, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿35445", + "end": "🇨🇿34455", + "electrified": false, + "length": 5, + "maxSpeed": 60, + "twistingFactor": 0.25 + }, + { + "start": "🇨🇿34455", + "end": "🇨🇿36565", + "electrified": false, + "length": 3, + "maxSpeed": 60, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36565", + "end": "🇨🇿36555", + "electrified": false, + "length": 2, + "maxSpeed": 60, + "twistingFactor": 0.12 + }, + { + "start": "🇨🇿36555", + "end": "🇨🇿36535", + "electrified": false, + "length": 6, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36535", + "end": "🇨🇿36225", + "electrified": false, + "length": 6, + "maxSpeed": 60, + "twistingFactor": 0.16 + }, + { + "start": "🇨🇿36225", + "end": "🇨🇿35175", + "name": "vlečka", + "electrified": false, + "length": 5, + "maxSpeed": 90, + "twistingFactor": 0.11 + }, + { + "start": "🇨🇿35175", + "end": "🇨🇿34465", + "electrified": false, + "length": 5, + "maxSpeed": 80, + "twistingFactor": 0.37 + }, + { + "start": "🇨🇿34465", + "end": "🇨🇿35855", + "electrified": false, + "length": 4, + "maxSpeed": 85, + "twistingFactor": 0.23 + }, + { + "start": "🇨🇿35855", + "end": "🇨🇿35865", + "electrified": false, + "length": 2, + "maxSpeed": 85, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿35865", + "end": "🇨🇿36915", + "electrified": false, + "length": 5, + "maxSpeed": 85, + "twistingFactor": 0.17 + }, + { + "start": "🇨🇿36915", + "end": "🇨🇿36925", + "electrified": false, + "length": 2, + "maxSpeed": 80, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36925", + "end": "🇨🇿36375", + "electrified": false, + "length": 2, + "maxSpeed": 80, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36375", + "end": "🇨🇿36385", + "electrified": false, + "length": 3, + "maxSpeed": 80, + "twistingFactor": 0.19 + }, + { + "start": "🇨🇿36385", + "end": "🇨🇿36185", + "length": 3, + "twistingFactor": 0.19 + }, + { + "start": "🇨🇿36185", + "end": "🇨🇿36186", + "name": "3", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36186", + "end": "🇨🇿36215", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿36215", + "end": "🇨🇿34975", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34975", + "end": "🇨🇿34976", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿34976", + "end": "XTBR", + "length": 5, + "twistingFactor": 0.38 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index 9c141ba4..24546eab 100644 --- a/Station.json +++ b/Station.json @@ -57147,6 +57147,276 @@ "platformLength": 184, "platforms": 2 }, + { + "name": "Jihlava", + "ril100": "XTJV", + "group": 1, + "x": 1243, + "y": 390, + "proj": 3, + "platformLength": 196, + "platforms": 7 + }, + { + "name": "Malý Beranov", + "ril100": "🇨🇿34795", + "group": 5, + "x": 1247, + "y": 392, + "proj": 3, + "platformLength": 153, + "plaforms": 1 + }, + { + "name": "Luka nad Jihlavou", + "ril100": "🇨🇿34785", + "group": 2, + "x": 1258, + "y": 397, + "proj": 3, + "platformLength": 162, + "platforms": 3 + }, + { + "name": "Bítovčice", + "ril100": "🇨🇿34805", + "group": 5, + "x": 1262, + "y": 398, + "proj": 3, + "platformLength": 111, + "platforms": 1 + }, + { + "name": "Přímělkov", + "ril100": "🇨🇿33265", + "group": 5, + "x": 1263, + "y": 401, + "proj": 3, + "platformLength": 72, + "platforms": 1 + }, + { + "name": "Dolní Smrčné", + "ril100": "🇨🇿33275", + "group": 5, + "x": 1264, + "y": 405, + "proj": 3, + "platformLength": 79, + "platforms": 1 + }, + { + "name": "Bransouze", + "ril100": "🇨🇿33255", + "group": 2, + "x": 1264, + "y": 408, + "proj": 3, + "platformLength": 166, + "platforms": 3 + }, + { + "name": "Číchov", + "ril100": "🇨🇿33285", + "group": 5, + "x": 1266, + "y": 412, + "proj": 3, + "platformLength": 198, + "platforms": 1 + }, + { + "name": "Okříšky", + "ril100": "🇨🇿35445", + "group": 2, + "x": 1267, + "y": 417, + "proj": 3, + "platformLength": 293, + "platforms": 6 + }, + { + "name": "Krahulov", + "ril100": "🇨🇿34455", + "group": 2, + "x": 1272, + "y": 423, + "proj": 3, + "platformLength": 206, + "platforms": 3 + }, + { + "name": "Třebíč-Borovina", + "ril100": "🇨🇿36565", + "group": 5, + "x": 1279, + "y": 424, + "proj": 3, + "platformLength": 135, + "platforms": 1 + }, + { + "name": "Třebíč", + "ril100": "🇨🇿36555", + "group": 2, + "x": 1283, + "y": 423, + "proj": 3, + "platformLength": 317, + "platforms": 3 + }, + { + "name": "Vladislav zastávka", + "ril100": "🇨🇿36535", + "group": 5, + "x": 1296, + "y": 423, + "proj": 3, + "platformLength": 170, + "platforms": 1 + }, + { + "name": "Studenec", + "ril100": "🇨🇿36225", + "group": 2, + "x": 1308, + "y": 422, + "proj": 3, + "platformLength": 336, + "platforms": 4 + }, + { + "name": "Náměšť nad Oslavou", + "ril100": "🇨🇿35175", + "group": 2, + "x": 1319, + "y": 424, + "proj": 3, + "platformLength": 247, + "platforms": 3 + }, + { + "name": "Kralice nad Oslavou", + "ril100": "🇨🇿34465", + "group": 2, + "x": 1327, + "y": 427, + "proj": 3, + "platformLength": 164, + "platforms": 2 + }, + { + "name": "Rapotice", + "ril100": "🇨🇿35855", + "group": 2, + "x": 1334, + "y": 428, + "proj": 3, + "platformLength": 231, + "platforms": 3 + }, + { + "name": "Vysoké Popovice", + "ril100": "🇨🇿35865", + "group": 5, + "x": 1339, + "y": 429, + "proj": 3, + "platformLength": 137, + "plaforms": 1 + }, + { + "name": "Zastávka u Brna", + "ril100": "🇨🇿36915", + "group": 2, + "x": 1348, + "y": 427, + "proj": 3, + "platformLength": 293, + "platforms": 5 + }, + { + "name": "Rosice u Brna", + "ril100": "🇨🇿36925", + "group": 5, + "x": 1352, + "y": 429, + "proj": 3, + "platformLength": 109, + "platforms": 1 + }, + { + "name": "Tetčice", + "ril100": "🇨🇿36375", + "group": 2, + "x": 1355, + "y": 430, + "proj": 3, + "platformLength": 222, + "platforms": 4 + }, + { + "name": "Omice", + "ril100": "🇨🇿36385", + "group": 5, + "x": 1360, + "y": 432, + "proj": 3, + "platformLength": 164, + "platforms": 1 + }, + { + "name": "Střelice", + "ril100": "🇨🇿36185", + "group": 2, + "x": 1366, + "y": 433, + "proj": 3, + "platformLength": 207, + "platforms": 4 + }, + { + "name": "Střelice dolní", + "ril100": "🇨🇿36186", + "group": 5, + "x": 1369, + "y": 433, + "proj": 3, + "platformLength": 170, + "platforms": 2 + }, + { + "name": "Troubsko", + "ril100": "🇨🇿36215", + "group": 5, + "x": 1371, + "y": 431, + "proj": 3, + "platformLength": 170, + "platforms": 2 + }, + { + "name": "Ostopovice", + "ril100": "🇨🇿34975", + "group": 5, + "x": 1374, + "y": 431, + "proj": 3, + "platformLength": 163, + "platforms": 2 + }, + { + "name": "Brno-Starý Lískovec", + "ril100": "🇨🇿34976", + "group": 5, + "x": 1378, + "y": 432, + "proj": 3, + "platformLength": 220, + "platforms": 2 + }, { "group": 5, "name": "Steina", From 9f16f60e11841097017a601795275261d305d381 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 17:21:24 +0200 Subject: [PATCH 06/12] =?UTF-8?q?add=20route=20Vesel=C3=AD=20nad=20Lu?= =?UTF-8?q?=C5=BEnic=C3=AD=20-=20Jihlava?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Path.json | 135 ++++++++++++++++++++++++++++++++++++ Station.json | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 325 insertions(+) diff --git a/Path.json b/Path.json index 233c2427..05afc6da 100644 --- a/Path.json +++ b/Path.json @@ -41457,6 +41457,141 @@ } ] }, + { + "name": "SŽDC 225 Veselí nad Lužnicí - Jihlava", + "electrified": true, + "group": 0, + "maxSpeed": 70, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "🇨🇿73552", + "end": "🇨🇿73563", + "length": 2, + "maxSpeed": 160, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73563", + "end": "🇨🇿75672", + "length": 6, + "twistingFactor": 0.23 + }, + { + "start": "🇨🇿75672", + "end": "🇨🇿75682", + "length": 5, + "maxSpeed": 65, + "twistingFactor": 0.18 + }, + { + "start": "🇨🇿75682", + "end": "🇨🇿75692", + "length": 2, + "twistingFactor": 0.16 + }, + { + "start": "🇨🇿75692", + "end": "🇨🇿75702", + "length": 6, + "twistingFactor": 0.35 + }, + { + "start": "🇨🇿75702", + "end": "🇨🇿74362", + "length": 4, + "maxSpeed": 65, + "twistingFactor": 0.11 + }, + { + "start": "🇨🇿74362", + "end": "🇨🇿O776029989", + "length": 6, + "maxSpeed": 65, + "twistingFactor": 0.26 + }, + { + "start": "🇨🇿O776029989", + "end": "🇨🇿75752", + "length": 10, + "twistingFactor": 0.3 + }, + { + "start": "🇨🇿75752", + "end": "🇨🇿75762", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿75762", + "end": "🇨🇿O7958763952", + "length": 7, + "twistingFactor": 0.33 + }, + { + "start": "🇨🇿O7958763952", + "end": "🇨🇿75802", + "length": 7, + "twistingFactor": 0.13 + }, + { + "start": "🇨🇿75802", + "end": "🇨🇿75810", + "length": 2, + "maxSpeed": 65, + "twistingFactor": 0.31 + }, + { + "start": "🇨🇿75810", + "end": "🇨🇿75820", + "length": 3, + "maxSpeed": 65, + "twistingFactor": 0.23 + }, + { + "start": "🇨🇿75820", + "end": "🇨🇿75830", + "length": 5, + "maxSpeed": 65, + "twistingFactor": 0.12 + }, + { + "start": "🇨🇿75830", + "end": "🇨🇿75840", + "length": 2, + "maxSpeed": 65, + "twistingFactor": 0.16 + }, + { + "start": "🇨🇿75840", + "end": "🇨🇿75860", + "length": 6, + "maxSpeed": 75, + "twistingFactor": 0.26 + }, + { + "start": "🇨🇿75860", + "end": "🇨🇿34205", + "length": 4, + "twistingFactor": 0.22 + }, + { + "start": "🇨🇿34205", + "end": "XTJM", + "length": 2, + "twistingFactor": 0.28 + }, + { + "start": "XTJM", + "end": "XTJV", + "length": 2, + "maxSpeed": 60, + "twistingFactor": 0.19 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index 24546eab..55e5ce34 100644 --- a/Station.json +++ b/Station.json @@ -57417,6 +57417,196 @@ "platformLength": 220, "platforms": 2 }, + { + "name": "Veselí nad Lužnici", + "ril100": "🇨🇿73552", + "group": 1, + "x": 1123, + "y": 426, + "proj": 3, + "platformLength": 351, + "platforms": 5 + }, + { + "name": "Řípec", + "ril100": "🇨🇿73563", + "group": 5, + "x": 1125, + "y": 424, + "proj": 3, + "platformLength": 100, + "platforms": 1 + }, + { + "name": "Doňov", + "ril100": "🇨🇿75672", + "group": 2, + "x": 1134, + "y": 424, + "proj": 3, + "platformLength": 122, + "platforms": 2 + }, + { + "name": "Kardašova Řečice", + "ril100": "🇨🇿75682", + "group": 2, + "x": 1143, + "y": 428, + "proj": 3, + "platformLength": 100, + "platforms": 3 + }, + { + "name": "Mnich", + "ril100": "🇨🇿75692", + "group": 5, + "x": 1146, + "y": 430, + "proj": 3, + "platformLength": 99, + "platforms": 1 + }, + { + "name": "Děbolín", + "ril100": "🇨🇿75702", + "group": 5, + "x": 1155, + "y": 431, + "proj": 3, + "platformLength": 84, + "platforms": 1 + }, + { + "name": "Jindřichův Hradec", + "ril100": "🇨🇿74362", + "group": 2, + "x": 1163, + "y": 433, + "proj": 3, + "platformLength": 248, + "platforms": 4 + }, + { + "name": "Jarošov nad Nežárkou", + "ril100": "🇨🇿O776029989", + "group": 2, + "x": 1173, + "y": 428, + "proj": 3, + "platformLength": 152, + "platforms": 2 + }, + { + "name": "Popelín", + "ril100": "🇨🇿75752", + "group": 2, + "x": 1186, + "y": 422, + "proj": 3, + "platformLength": 168, + "platforms": 3 + }, + { + "name": "Počátky-Žirovnice", + "ril100": "🇨🇿75762", + "group": 2, + "x": 1191, + "y": 419, + "proj": 3, + "platformLength": 131, + "platforms": 2 + }, + { + "name": "Jihlávka", + "ril100": "🇨🇿O7958763952", + "group": 2, + "x": 1202, + "y": 417, + "proj": 3, + "platformLength": 270, + "platforms": 2 + }, + { + "name": "Horní Cerekev", + "ril100": "🇨🇿75802", + "group": 2, + "x": 1206, + "y": 407, + "proj": 3, + "platformLength": 160, + "platforms": 2 + }, + { + "name": "Švábov", + "ril100": "🇨🇿75810", + "group": 5, + "x": 1210, + "y": 406, + "proj": 3, + "platformLength": 90, + "platforms": 1 + }, + { + "name": "Batelov", + "ril100": "🇨🇿75820", + "group": 2, + "x": 1216, + "y": 406, + "proj": 3, + "platformLength": 358, + "platforms": 2 + }, + { + "name": "Dolní Cerekev", + "ril100": "🇨🇿75830", + "group": 5, + "x": 1224, + "y": 402, + "proj": 3, + "platformLength": 114, + "platforms": 1 + }, + { + "name": "Kostelec u Jihlavy", + "ril100": "🇨🇿75840", + "group": 2, + "x": 1227, + "y": 399, + "proj": 3, + "platformLength": 201, + "platforms": 5 + }, + { + "name": "Rantířov", + "ril100": "🇨🇿75860", + "group": 2, + "x": 1231, + "y": 391, + "proj": 3, + "platformLength": 152, + "platforms": 3 + }, + { + "name": "Jihlava-Staré Hory", + "ril100": "🇨🇿34205", + "group": 5, + "x": 1239, + "y": 390, + "proj": 3, + "platformLength": 100, + "platforms": 1 + }, + { + "name": "Jihlava město", + "ril100": "XTJM", + "group": 5, + "x": 1241, + "y": 391, + "proj": 3, + "platformLength": 120, + "platforms": 3 + }, { "group": 5, "name": "Steina", From fbadea1fdca8aa3469738a2ef2680151e3af0df7 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 18:22:50 +0200 Subject: [PATCH 07/12] add route Ceske Budejovice - Tabor --- Path.json | 128 ++++++++++++++++++++++++++++++++++++++ Station.json | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 297 insertions(+), 1 deletion(-) diff --git a/Path.json b/Path.json index 05afc6da..34e2a490 100644 --- a/Path.json +++ b/Path.json @@ -41592,6 +41592,134 @@ } ] }, + { + "name": "SŽDC 220 Praha - České Budějovice", + "group": 0, + "electrified": true, + "maxSpeed": 160, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTCB", + "end": "🇨🇿73462", + "length": 4, + "maxSpeed": 120, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73462", + "end": "🇨🇿73472", + "length": 2, + "maxSpeed": 90, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73472", + "end": "🇨🇿73482", + "length": 3, + "maxSpeed": 90, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿73482", + "end": "🇨🇿73492", + "length": 7, + "maxSpeed": 90, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿73492", + "end": "🇨🇿73502", + "length": 4, + "maxSpeed": 90, + "twistingFactor": 0.14 + }, + { + "start": "🇨🇿73502", + "end": "🇨🇿73512", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73512", + "end": "🇨🇿74531", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿74531", + "end": "🇨🇿73532", + "length": 5, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73532", + "end": "🇨🇿73542", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73542", + "end": "🇨🇿73552", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73552", + "end": "🇨🇿73562", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73562", + "end": "🇨🇿73572", + "length": 4, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73572", + "end": "🇨🇿O8278603034", + "length": 6, + "maxSpeed": 185, + "twistingFactor": 0.28 + }, + { + "start": "🇨🇿O8278603034", + "end": "🇨🇿73592", + "length": 3, + "maxSpeed": 185, + "twistingFactor": 0.38 + }, + { + "start": "🇨🇿73592", + "end": "🇨🇿73602", + "length": 4, + "maxSpeed": 160, + "twistingFactor": 0.38 + }, + { + "start": "🇨🇿73602", + "end": "XTSZ", + "length": 3, + "twistingFactor": 0.1 + }, + { + "start": "XTSZ", + "end": "🇨🇿73613", + "length": 2, + "twistingFactor": 0.1 + }, + { + "start": "🇨🇿73613", + "end": "XTT", + "length": 3, + "maxSpeed": 135, + "twistingFactor": 0.11 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index 55e5ce34..becdf934 100644 --- a/Station.json +++ b/Station.json @@ -5737,7 +5737,7 @@ "platforms": 2 }, { - "name": "Ceske Budejovice", + "name": "České Budějovice", "ril100": "XTCB", "group": 0, "x": 1093, @@ -57607,6 +57607,174 @@ "platformLength": 120, "platforms": 3 }, + { + "name": "Hrdějovice", + "ril100": "🇨🇿73462", + "group": 5, + "x": 1092, + "y": 455, + "proj": 3, + "platformLength": 80, + "platforms": 1 + }, + { + "name": "Hosín", + "ril100": "🇨🇿73472", + "group": 5, + "x": 1089, + "y": 453, + "proj": 3, + "platformLength": 160, + "platforms": 1 + }, + { + "name": "Hluboká nad Vltavou-Zámostí", + "ril100": "🇨🇿73482", + "group": 2, + "x": 1089, + "y": 450, + "proj": 3, + "platformLength": 250, + "platforms": 4 + }, + { + "name": "Chotýčany", + "ril100": "🇨🇿73492", + "group": 2, + "x": 1098, + "y": 446, + "proj": 3, + "platformLength": 115, + "platforms": 4 + }, + { + "name": "Ševětín", + "ril100": "🇨🇿73502", + "group": 2, + "x": 1104, + "y": 442, + "proj": 3, + "platformLength": 255, + "platforms": 3 + }, + { + "name": "Neplachov", + "ril100": "🇨🇿73512", + "group": 5, + "x": 1108, + "y": 438, + "proj": 3, + "platformLength": 90, + "platforms": 2 + }, + { + "name": "Dynín zastávka", + "ril100": "🇨🇿74531", + "group": 5, + "x": 1110, + "y": 435, + "proj": 3, + "platformLength": 90, + "platforms": 2 + }, + { + "name": "Horusice", + "ril100": "🇨🇿73532", + "group": 5, + "x": 1116, + "y": 431, + "proj": 3, + "platformLength": 90, + "platforms": 2 + }, + { + "name": "Veselí nad Lužnicí zastávka", + "ril100": "🇨🇿73542", + "group": 5, + "x": 1120, + "y": 429, + "proj": 3, + "platformLength": 218, + "platforms": 2 + }, + { + "name": "Řípec-Dráchov", + "ril100": "🇨🇿73562", + "group": 5, + "x": 1124, + "y": 421, + "proj": 3, + "platformLength": 92, + "platforms": 2 + }, + { + "name": "Soběslav", + "ril100": "🇨🇿73572", + "group": 2, + "x": 1124, + "y": 416, + "proj": 3, + "platformLength": 302, + "platforms": 3 + }, + { + "name": "Myslkovice", + "ril100": "🇨🇿O8278603034", + "group": 6, + "x": 1125, + "y": 409, + "proj": 3 + }, + { + "name": "Doubí u Tábora", + "ril100": "🇨🇿73592", + "group": 5, + "x": 1123, + "y": 405, + "proj": 3, + "platformLength": 192, + "platforms": 1 + }, + { + "name": "Planá nad Lužnicí", + "ril100": "🇨🇿73602", + "group": 2, + "x": 1121, + "y": 400, + "proj": 3, + "platformLength": 220, + "platforms": 3 + }, + { + "name": "Sezimovo Ústí", + "ril100": "XTSZ", + "group": 5, + "x": 1120, + "y": 395, + "proj": 3, + "platformLength": 220, + "platforms": 2 + }, + { + "name": "Tábor-Čápův Dvůr", + "ril100": "🇨🇿73613", + "group": 5, + "x": 1119, + "y": 393, + "proj": 3, + "platformLength": 140, + "platforms": 2 + }, + { + "name": "Tábor", + "ril100": "XTT", + "group": 1, + "x": 1117, + "y": 390, + "proj": 3, + "platformLength": 350, + "platforms": 5 + }, { "group": 5, "name": "Steina", From de6fc388ddb541e57143df4215ec3963eff1e838 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 19:50:04 +0200 Subject: [PATCH 08/12] add route Ceske Budejovice - Linz --- Path.json | 196 ++++++++++++++++++++++++++++++++++++++++ Station.json | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 446 insertions(+) diff --git a/Path.json b/Path.json index 34e2a490..c1a2e240 100644 --- a/Path.json +++ b/Path.json @@ -41720,6 +41720,202 @@ } ] }, + { + "name": "Summerauer Bahn (SŽDC 196)", + "electrified": true, + "group": 0, + "maxSpeed": 100, + "neededEquipments": [ + "CZ" + ], + "objects": [ + { + "start": "XTCB", + "end": "🇨🇿75352", + "length": 8, + "twistingFactor": 0.36 + }, + { + "start": "🇨🇿75352", + "end": "🇨🇿75332", + "length": 5, + "maxSpeed": 85, + "twistingFactor": 0.42 + }, + { + "start": "🇨🇿75332", + "end": "🇨🇿75312", + "length": 6, + "twistingFactor": 0.39 + }, + { + "start": "🇨🇿75312", + "end": "🇨🇿75292", + "length": 4, + "twistingFactor": 0.39 + }, + { + "start": "🇨🇿75292", + "end": "🇨🇿75282", + "length": 5, + "maxSpeed": 75, + "twistingFactor": 0.29 + }, + { + "start": "🇨🇿75282", + "end": "🇨🇿75272", + "length": 2, + "maxSpeed": 70, + "twistingFactor": 0.32 + }, + { + "start": "🇨🇿75272", + "end": "🇨🇿75262", + "length": 6, + "maxSpeed": 80, + "twistingFactor": 0.22 + }, + { + "start": "🇨🇿75262", + "end": "🇨🇿75252", + "length": 3, + "maxSpeed": 85, + "twistingFactor": 0.17 + }, + { + "start": "🇨🇿75252", + "end": "🇨🇿75242", + "length": 3, + "maxSpeed": 85, + "twistingFactor": 0.27 + }, + { + "start": "🇨🇿75242", + "end": "🇨🇿75232", + "length": 4, + "maxSpeed": 75, + "twistingFactor": 0.25 + }, + { + "start": "🇨🇿75232", + "end": "XTHD", + "length": 7, + "maxSpeed": 75, + "twistingFactor": 0.37 + }, + { + "start": "XTHD", + "end": "XASUM", + "name": "Summerauer Bahn", + "length": 6, + "maxSpeed": 80, + "twistingFactor": 0.29, + "neededEquipments": [ + "AT", + "CZ" + ] + } + ] + }, + { + "name": "Summerauer Bahn (ÖBB 141)", + "electrified": true, + "group": 0, + "maxSpeed": 80, + "neededEquipments": [ + "AT" + ], + "objects": [ + { + "start": "XASUM", + "end": "🇦🇹01583", + "length": 9, + "twistingFactor": 0.34 + }, + { + "start": "🇦🇹01583", + "end": "🇦🇹O334871746", + "length": 6, + "twistingFactor": 0.39 + }, + { + "start": "🇦🇹O334871746", + "end": "🇦🇹O157708008", + "length": 2, + "maxSpeed": 90, + "twistingFactor": 0.1 + }, + { + "start": "🇦🇹O157708008", + "end": "XAPR", + "length": 10, + "maxSpeed": 90, + "twistingFactor": 0.29 + }, + { + "start": "XAPR", + "end": "🇦🇹O261227970", + "length": 3, + "twistingFactor": 0.74 + }, + { + "start": "🇦🇹O261227970", + "end": "🇦🇹O6844641425", + "length": 2, + "twistingFactor": 0.32 + }, + { + "start": "🇦🇹O6844641425", + "end": "🇦🇹O157707258", + "length": 4, + "twistingFactor": 0.4 + }, + { + "start": "🇦🇹O157707258", + "end": "🇦🇹O158868668", + "length": 3, + "twistingFactor": 0.19 + }, + { + "start": "🇦🇹O158868668", + "end": "🇦🇹O148901378", + "length": 3, + "maxSpeed": 70, + "twistingFactor": 0.37 + }, + { + "start": "🇦🇹O148901378", + "end": "🇦🇹O158869023", + "length": 1, + "twistingFactor": 0.1 + }, + { + "start": "🇦🇹O158869023", + "end": "🇦🇹O616023441", + "length": 5, + "twistingFactor": 0.39 + }, + { + "start": "🇦🇹O616023441", + "end": "🇦🇹O7645724300", + "length": 2, + "twistingFactor": 0.11 + }, + { + "start": "🇦🇹O7645724300", + "end": "🇦🇹O3774599640", + "length": 3, + "twistingFactor": 0.11 + }, + { + "start": "🇦🇹O3774599640", + "end": "XAL", + "length": 3, + "maxSpeed": 95, + "twistingFactor": 0.39 + } + ] + }, { "electrified": false, "group": 0, diff --git a/Station.json b/Station.json index becdf934..ca59cd5a 100644 --- a/Station.json +++ b/Station.json @@ -57775,6 +57775,256 @@ "platformLength": 350, "platforms": 5 }, + { + "name": "Včelná", + "ril100": "🇨🇿75352", + "group": 5, + "x": 1088, + "y": 471, + "proj": 3, + "platformLength": 120, + "platforms": 1 + }, + { + "name": "Kamenný Újezd u Českých Budějovic", + "ril100": "🇨🇿75332", + "group": 2, + "x": 1088, + "y": 477, + "proj": 3, + "platformLength": 133, + "platforms": 2 + }, + { + "name": "Holkov", + "ril100": "🇨🇿75312", + "group": 2, + "x": 1088, + "y": 483, + "proj": 3, + "platformLength": 120, + "platforms": 3 + }, + { + "name": "Velešín", + "ril100": "🇨🇿75292", + "group": 2, + "x": 1086, + "y": 489, + "proj": 3, + "platformLength": 197, + "plaforms": 3 + }, + { + "name": "Výheň", + "ril100": "🇨🇿75282", + "group": 5, + "x": 1091, + "y": 494, + "proj": 3, + "platformLength": 120, + "platforms": 1 + }, + { + "name": "Kaplice", + "ril100": "🇨🇿75272", + "group": 2, + "x": 1091, + "y": 496, + "proj": 3, + "platformLength": 215, + "platforms": 4 + }, + { + "name": "Omlenice", + "ril100": "🇨🇿75262", + "group": 2, + "x": 1088, + "y": 505, + "proj": 3, + "platformLength": 132, + "platforms": 3 + }, + { + "name": "Bujanov", + "ril100": "🇨🇿75252", + "group": 5, + "x": 1086, + "y": 508, + "proj": 3, + "platformLength": 116, + "platforms": 1 + }, + { + "name": "Pšenice", + "ril100": "🇨🇿75242", + "group": 5, + "x": 1088, + "y": 512, + "proj": 3, + "platformLength": 110, + "platforms": 1 + }, + { + "name": "Rybník", + "ril100": "🇨🇿75232", + "group": 2, + "x": 1086, + "y": 517, + "proj": 3, + "platformLength": 182, + "platforms": 5 + }, + { + "name": "Horní Dvořiště", + "ril100": "XTHD", + "group": 2, + "x": 1085, + "y": 525, + "proj": 3, + "platformLength": 227, + "platforms": 2 + }, + { + "name": "Summerau", + "ril100": "XASUM", + "group": 2, + "x": 1089, + "y": 533, + "proj": 3, + "platformLength": 210, + "platforms": 3 + }, + { + "name": "Freistadt", + "ril100": "🇦🇹01583", + "group": 2, + "x": 1094, + "y": 543, + "proj": 3, + "platformLength": 181, + "platforms": 3 + }, + { + "name": "Lasberg-St. Oswald", + "ril100": "🇦🇹O334871746", + "group": 5, + "x": 1099, + "y": 549, + "proj": 3, + "platformLength": 151, + "platforms": 1 + }, + { + "name": "Kefermarkt", + "ril100": "🇦🇹O157708008", + "group": 2, + "x": 1102, + "y": 553, + "proj": 3, + "platformLength": 204, + "platforms": 2 + }, + { + "name": "Pregarten", + "ril100": "XAPR", + "group": 2, + "x": 1100, + "y": 566, + "proj": 3, + "platformLength": 222, + "platforms": 2 + }, + { + "name": "Schloß Haus", + "ril100": "🇦🇹O261227970", + "group": 5, + "x": 1098, + "y": 569, + "proj": 3, + "platformLength": 193, + "platforms": 3 + }, + { + "name": "Gaisbach-Wartberg", + "ril100": "🇦🇹O6844641425", + "group": 2, + "x": 1098, + "y": 571, + "proj": 3, + "platformLength": 189, + "platforms": 2 + }, + { + "name": "Katsdorf", + "ril100": "🇦🇹O157707258", + "group": 5, + "x": 1096, + "y": 574, + "proj": 3, + "platformLength": 158, + "platforms": 1 + }, + { + "name": "Lungitz", + "ril100": "🇦🇹O158868668", + "group": 2, + "x": 1094, + "y": 578, + "proj": 3, + "platformLength": 190, + "platforms": 2 + }, + { + "name": "St. Georgen an der Gusen Ort", + "ril100": "🇦🇹O148901378", + "group": 5, + "x": 1090, + "y": 581, + "proj": 3, + "platformLength": 191, + "platforms": 1 + }, + { + "name": "St. Georgen an der Gusen Bahnhof", + "ril100": "🇦🇹O158869023", + "group": 2, + "x": 1089, + "y": 581, + "proj": 3, + "platformLength": 234, + "platforms": 2 + }, + { + "name": "Pulgarn", + "ril100": "🇦🇹O616023441", + "group": 5, + "x": 1082, + "y": 579, + "proj": 3, + "platformLength": 190, + "platforms": 1 + }, + { + "name": "Steyregg", + "ril100": "🇦🇹O7645724300", + "group": 2, + "x": 1078, + "y": 578, + "proj": 3, + "platformLength": 217, + "platforms": 2 + }, + { + "name": "Linz Franckstraße", + "ril100": "🇦🇹O3774599640", + "group": 2, + "x": 1073, + "y": 578, + "proj": 3, + "platformLength": 249, + "platforms": 2 + }, { "group": 5, "name": "Steina", From cc279661c9c05b15c913c3b3b9c6c564aa64d31c Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 20:04:42 +0200 Subject: [PATCH 09/12] update path suggestions to include XTTR,XTBR,XTBE --- TaskModel.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TaskModel.json b/TaskModel.json index b2b1a53f..18461951 100644 --- a/TaskModel.json +++ b/TaskModel.json @@ -1371,7 +1371,7 @@ "Fahre zwischen Rhein und Bosporus." ], "stations": [ "KK", "XQIS" ], - "pathSuggestion": [ "KK", "KGRB", "KM", "KV", "EDG", "EOB", "🇳🇱Zv", "XNAH", "🇳🇱Zp", "🇳🇱Wdn", "🇳🇱Dv", "XNHL", "HR", "HO", "HL", "HM", "HWUN", "HH", "HLER", "HHI", "HBS", "LM", "LH", "LGOS", "LL", "LBOR", "DR", "DPR", "DCW", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XAWW", "XMBK", "XJSP", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], + "pathSuggestion": [ "KK", "KGRB", "KM", "KV", "EDG", "EOB", "🇳🇱Zv", "XNAH", "🇳🇱Zp", "🇳🇱Wdn", "🇳🇱Dv", "XNHL", "HR", "HO", "HL", "HM", "HWUN", "HH", "HLER", "HHI", "HBS", "LM", "LH", "LGOS", "LL", "LBOR", "DR", "DPR", "DCW", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTTR", "XTBR", "XAWW", "XMBK", "XJSP", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], "neededCapacity": [ { "name": "passengers" } ] @@ -5696,7 +5696,7 @@ "objects": [ { "stations": [ "XEMAT", "XEB", "XFM", "XIMB", "XSZH", "XAND", "XAWE", "BL" ], - "pathSuggestion": [ "XEMAT", "XEB", "XFNB", "🇫🇷VLM", "🇫🇷NPG", "XFAVV", "XFM", "XIAQ", "XITOR", "XIMB", "XSBZ", "XSBC", "XSADF", "XSAG", "XSTW", "XSZH", "XSZO", "XSSG", "XSRS", "XSSM", "XSBU", "XAND", "XAFK", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAWW", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL" ] + "pathSuggestion": [ "XEMAT", "XEB", "XFNB", "🇫🇷VLM", "🇫🇷NPG", "XFAVV", "XFM", "XIAQ", "XITOR", "XIMB", "XSBZ", "XSBC", "XSADF", "XSAG", "XSTW", "XSZH", "XSZO", "XSSG", "XSRS", "XSSM", "XSBU", "XAND", "XAFK", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAWW", "XTBE", "XTBR", "XTTR", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL" ] }, { "stations": [ "BL", "FF", "XFSTG", "XLL", "XBB", "XNAC", "AH", "XDKH", "XVS" ], @@ -7311,11 +7311,11 @@ "objects": [ { "stations": [ "XTP", "XTBR", "XTBE", "XYB" ], - "pathSuggestion": [ "XTP", "XTBR", "XTBE", "XAWW", "XYB" ] + "pathSuggestion": [ "XTP", "XTBR", "XTTR", "XTBE", "XAWW", "XYB" ] }, { "stations": [ "XTP", "XTBR", "XTBE", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "XTP", "XTBR", "XTBE", "XAWW", "XYB", "XYST", "XMBK" ] + "pathSuggestion": [ "XTP", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYST", "XMBK" ] } ], "neededCapacity": [ From b2fe64ce22a3f191d44539d1cd299809e24b0d38 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 20:06:50 +0200 Subject: [PATCH 10/12] update path suggestions to include Linz XAL --- TaskModel.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TaskModel.json b/TaskModel.json index 18461951..d32d1397 100644 --- a/TaskModel.json +++ b/TaskModel.json @@ -1227,7 +1227,7 @@ "Bringe den VSOE mit bestem Ambiente von %s nach %s." ], "stations": [ "XFPO", "XMBK", "XUSN", "XUBN", "XQIS" ], - "pathSuggestion": [ "XFPO", "XFVAR", "XFCM", "XFLE", "XFTU", "XFFD", "XFVH", "RWND", "RWRT", "RK", "TV", "TS", "TP", "TU", "MGZB", "MA", "MMR", "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAWW", "XMBK", "XUSN", "XUBN", "🇧🇬14000", "XWSV", "XQIS" ] + "pathSuggestion": [ "XFPO", "XFVAR", "XFCM", "XFLE", "XFTU", "XFFD", "XFVH", "RWND", "RWRT", "RK", "TV", "TS", "TP", "TU", "MGZB", "MA", "MMR", "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAL", "XAWW", "XMBK", "XUSN", "XUBN", "🇧🇬14000", "XWSV", "XQIS" ] } ], "neededCapacity": [ @@ -5696,7 +5696,7 @@ "objects": [ { "stations": [ "XEMAT", "XEB", "XFM", "XIMB", "XSZH", "XAND", "XAWE", "BL" ], - "pathSuggestion": [ "XEMAT", "XEB", "XFNB", "🇫🇷VLM", "🇫🇷NPG", "XFAVV", "XFM", "XIAQ", "XITOR", "XIMB", "XSBZ", "XSBC", "XSADF", "XSAG", "XSTW", "XSZH", "XSZO", "XSSG", "XSRS", "XSSM", "XSBU", "XAND", "XAFK", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAWW", "XTBE", "XTBR", "XTTR", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL" ] + "pathSuggestion": [ "XEMAT", "XEB", "XFNB", "🇫🇷VLM", "🇫🇷NPG", "XFAVV", "XFM", "XIAQ", "XITOR", "XIMB", "XSBZ", "XSBC", "XSADF", "XSAG", "XSTW", "XSZH", "XSZO", "XSSG", "XSRS", "XSSM", "XSBU", "XAND", "XAFK", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAL", "XAWW", "XTBE", "XTBR", "XTTR", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL" ] }, { "stations": [ "BL", "FF", "XFSTG", "XLL", "XBB", "XNAC", "AH", "XDKH", "XVS" ], @@ -5704,7 +5704,7 @@ }, { "stations": [ "XFSTG", "XSBE", "XIMB", "XIVP", "XAWW", "XMBK", "XJBC", "ZAS", "XGT", "XWS", "XQIS" ], - "pathSuggestion": [ "XFSTG", "XFMV", "RML", "RB", "XSB", "XSOL", "XSZG", "XSLT", "XSBE", "XSSP", "XSVI", "XIR", "XIMB", "XIVP", "XIFF", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAWW", "XMBK", "XJSP", "XJBC", "XJBR", "XJNI", "XJLE", "ZAS", "XGT", "XGPM", "XWPR", "XWS", "🇧🇬14000", "XWSV", "XQIS" ] + "pathSuggestion": [ "XFSTG", "XFMV", "RML", "RB", "XSB", "XSOL", "XSZG", "XSLT", "XSBE", "XSSP", "XSVI", "XIR", "XIMB", "XIVP", "XIFF", "XAI", "🇦🇹Fw Z2", "XAWL", "MRO", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAL", "XAWW", "XMBK", "XJSP", "XJBC", "XJBR", "XJNI", "XJLE", "ZAS", "XGT", "XGPM", "XWPR", "XWS", "🇧🇬14000", "XWSV", "XQIS" ] } ], "neededCapacity": [ From 9261bb6c51a3b3cf83fa9ca90119fbaaf0b981e8 Mon Sep 17 00:00:00 2001 From: Michel Bretschneider Date: Sun, 25 Sep 2022 20:11:45 +0200 Subject: [PATCH 11/12] fix Pannonia/Metropol jobs --- TaskModel.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TaskModel.json b/TaskModel.json index d32d1397..e447fa82 100644 --- a/TaskModel.json +++ b/TaskModel.json @@ -5972,7 +5972,7 @@ "objects": [ { "stations": [ "BHF", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XMBK", "XJBC", "XWS" ], - "pathSuggestion": [ "BHF", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJA", "XJNI", "XJP", "XWS" ] + "pathSuggestion": [ "BHF", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJA", "XJNI", "XJP", "XWS" ] } ], "neededCapacity": [ @@ -5991,14 +5991,14 @@ "Fahre den D 1275/1274 Metropol von %s nach %s" ], "stations": [ "WR", "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "WR", "WSN", "WG", "WWR", "WNT", "BOR", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYNZ", "XYST", "XMBK" ] + "pathSuggestion": [ "WR", "WSN", "WG", "WWR", "WNT", "BOR", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ] }, { "descriptions": [ "Fahre den D 1473/1472 Metropol von %s nach %s" ], "stations": [ "DH", "DSA", "XTD", "XTP", "XTBR", "XYST", "XMBK" ], - "pathSuggestion": [ "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYNZ", "XYST", "XMBK" ], + "pathSuggestion": [ "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ], "neededCapacity": [ { "name": "passengers" }, { "name": "bistroseats" }, @@ -6011,14 +6011,14 @@ "Fahre den D 377/376 Metropol von %s nach %s" ], "stations": [ "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYNZ", "XYST", "XMBK" ] + "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ] }, { "descriptions": [ "Fahre den IEx 73/72 Metropol von %s nach %s" ], "stations": [ "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMSB", "XMBK" ], - "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYNZ", "XYST", "XMSB", "XMBK" ] + "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMSB", "XMBK" ] }, { "descriptions": [ From 56aa2a918fbb68b5f1cacbf0a027ce9e7098d531 Mon Sep 17 00:00:00 2001 From: Marcel Heisinger Date: Mon, 26 Sep 2022 21:39:46 +0100 Subject: [PATCH 12/12] =?UTF-8?q?PathSuggestions=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Station.json | 2 +- TaskModel.json | 38 +++++++++++++++----------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Station.json b/Station.json index ca59cd5a..caef583c 100644 --- a/Station.json +++ b/Station.json @@ -18958,7 +18958,7 @@ { "name": "Devinska Nova Ves", "ril100": "XYDN", - "group": 5, + "group": 2, "x": 1438, "y": 591, "proj": 3 diff --git a/TaskModel.json b/TaskModel.json index e447fa82..4d3d697b 100644 --- a/TaskModel.json +++ b/TaskModel.json @@ -1169,7 +1169,7 @@ "Fahre den einzigen Autozug von Amtrak zwischen %s und %s." ], "stations": [ "🇺🇸LOR", "🇺🇸SFA" ], - "pathSuggestion": [ "🇺🇸LOR", "🇺🇸RMT", "🇺🇸SSM", "🇺🇸RGH", "🇺🇸CYN", "🇺🇸SFA" ], + "pathSuggestion": [ "🇺🇸LOR", "🇺🇸RMT", "🇺🇸WLN", "🇺🇸SSM", "🇺🇸RGH", "🇺🇸CYN", "🇺🇸SFA" ], "neededCapacity": [ { "name": "passengers" }, { "name": "bistroseats" }, @@ -1246,7 +1246,7 @@ "Verbinde Seine und Bosporus zwischen %s und %s.", "Veranstalte eine luxuriöse Reise, aber bitte ohne Gewaltverbrechen." ], - "pathSuggestion": [ "XFPO", "XFNO", "XFCSG", "XFVAR", "XFMEA", "🇫🇷OIR", "XFCM", "XFVV", "XFNT", "XFLE", "XFTU", "XFFD", "XFN", "XFMH", "XFVH", "XFMUM", "XFSTG", "RAP", "RK", "RBR", "RH", "RHKA", "RBIN", "RNZ", "RNEZ", "ROU", "TBF", "TBK", "THST", "TH", "TNO", "TKH", "TS", "TE", "TP", "TGO", "TLON", "TU", "MGZB", "MMAH", "MKUN", "MA", "MMR", "MH", "MHR", "MZO", "MGB", "MAG", "MGK", "MRO", "MBEF", "MUS", "MTS", "MTO", "MFL", "XASB", "🇦🇹Hw H1", "XANKD", "XASF", "XASR", "XAVB", "XAAT", "🇦🇹Sas", "🇦🇹Gun", "XAWE", "XAMR", "XAP", "XAWW", "XAGR", "XMG", "XMBK", "XJST", "XJNS", "XJSP", "XJNP", "XJBC", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], + "pathSuggestion": [ "XFPO", "XFNO", "XFCSG", "XFVAR", "XFMEA", "🇫🇷OIR", "XFCM", "XFVV", "XFNT", "XFLE", "XFTU", "XFFD", "XFN", "XFMH", "XFVH", "XFMUM", "XFSTG", "RAP", "RK", "RBR", "RH", "RHKA", "RBIN", "RNZ", "RNEZ", "ROU", "TBF", "TBK", "THST", "TH", "TNO", "TKH", "TS", "TE", "TP", "TGO", "TLON", "TU", "MGZB", "MMAH", "MKUN", "MA", "MMR", "MH", "MHR", "MZO", "MGB", "MAG", "MGK", "MRO", "MBEF", "MUS", "MTS", "MTO", "MFL", "XASB", "🇦🇹Hw H1", "XANKD", "XASF", "XASR", "XAVB", "XAAT", "🇦🇹Sas", "🇦🇹Gun", "XAWE", "XAL", "XAP", "XAWW", "XAGR", "XMG", "XMBK", "XJST", "XJNS", "XJSP", "XJNP", "XJBC", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], "neededCapacity": [ { "name": "beds" }, { "name": "bistroseats" } @@ -1286,7 +1286,7 @@ "Verbinde Seine und Bosporus zwischen %s und %s.", "Veranstalte eine luxuriöse Reise, aber bitte ohne Gewaltverbrechen." ], - "pathSuggestion": [ "XBO", "XBGP", "XBB", "XBLIG", "KA", "KDN", "KK", "KKAS", "KB", "KKO", "FBGK", "FMZ", "FMB", "FFLF", "FF", "FH", "NAH", "NLO", "NRB", "NWH", "NRTD", "NF", "NN", "NRH", "NOT", "NPL", "NPA", "XASH", "🇦🇹Neu H1", "XAWE", "XAL", "XAWW", "XYB", "XYG", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQED", "XQIS" ] + "pathSuggestion": [ "XBO", "XBGP", "XBB", "XBLIG", "KA", "KDN", "KK", "KKAS", "KB", "KKO", "FBGK", "FMZ", "FMB", "FFLF", "FF", "FH", "NAH", "NLO", "NRB", "NWH", "NRTD", "NF", "NN", "NRH", "NOT", "NPL", "NPA", "XASH", "🇦🇹Neu H1", "XAWE", "XAL", "XAWW", "XYDN", "XYB", "XYG", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQED", "XQIS" ] } ], "neededCapacity": [ @@ -1371,7 +1371,7 @@ "Fahre zwischen Rhein und Bosporus." ], "stations": [ "KK", "XQIS" ], - "pathSuggestion": [ "KK", "KGRB", "KM", "KV", "EDG", "EOB", "🇳🇱Zv", "XNAH", "🇳🇱Zp", "🇳🇱Wdn", "🇳🇱Dv", "XNHL", "HR", "HO", "HL", "HM", "HWUN", "HH", "HLER", "HHI", "HBS", "LM", "LH", "LGOS", "LL", "LBOR", "DR", "DPR", "DCW", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTTR", "XTBR", "XAWW", "XMBK", "XJSP", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], + "pathSuggestion": [ "KK", "KGRB", "KM", "KV", "EDG", "EOB", "🇳🇱Zv", "XNAH", "🇳🇱Zp", "🇳🇱Wdn", "🇳🇱Dv", "XNHL", "HR", "HO", "HL", "HM", "HWUN", "HH", "HLER", "HHI", "HBS", "LM", "LH", "LGOS", "LL", "LBOR", "DR", "DPR", "DCW", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTTR", "XTBR", "XTBE", "XAWW", "XMBK", "XJSP", "XJBR", "XJNI", "XWS", "🇧🇬14000", "XWSV", "XQIS" ], "neededCapacity": [ { "name": "passengers" } ] @@ -1795,11 +1795,11 @@ }, { "stations": [ "MH", "MRO", "XASB", "XAP", "XAWW", "XMHY", "XMBK" ], - "pathSuggestion": [ "MH", "MGB", "MRO", "MBEF", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAP", "XAWW", "XMHY", "XMBK" ] + "pathSuggestion": [ "MH", "MGB", "MRO", "MBEF", "MTS", "MFL", "XASB", "XASF", "XAAT", "XAWE", "XAL", "XAP", "XAWW", "XMHY", "XMBK" ] }, { "stations": [ "XMBK", "XMHY", "XAWW", "XTBR", "XTP", "DH", "BL", "LM", "EHM", "KW", "KK", "KM", "EDG", "EOB" ], - "pathSuggestion": [ "XMBK", "XMHY", "XAWW", "XTBR", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL", "LM", "HBS", "HHI", "HELZ", "HH", "HWUN", "HM", "HL", "EHFD", "EBILP", "EHM", "EHG", "KW", "KSO", "KK", "KGRB", "KM", "KV", "EDG", "EOB" ] + "pathSuggestion": [ "XMBK", "XMHY", "XAWW", "XTBE", "XTBR", "XTTR", "XTP", "XTU", "XTD", "DSA", "DPI", "DHD", "DH", "DGB", "BEW", "BDKO", "BBF", "BL", "LM", "HBS", "HHI", "HELZ", "HH", "HWUN", "HM", "HL", "EHFD", "EBILP", "EHM", "EHG", "KW", "KSO", "KK", "KGRB", "KM", "KV", "EDG", "EOB" ] } ], "neededCapacity": [ @@ -5972,7 +5972,7 @@ "objects": [ { "stations": [ "BHF", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XMBK", "XJBC", "XWS" ], - "pathSuggestion": [ "BHF", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJA", "XJNI", "XJP", "XWS" ] + "pathSuggestion": [ "BHF", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XMBK", "XJST", "XJSP", "XJBC", "XJBR", "XJA", "XJNI", "XJP", "XWS" ] } ], "neededCapacity": [ @@ -5991,14 +5991,14 @@ "Fahre den D 1275/1274 Metropol von %s nach %s" ], "stations": [ "WR", "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "WR", "WSN", "WG", "WWR", "WNT", "BOR", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ] + "pathSuggestion": [ "WR", "WSN", "WG", "WWR", "WNT", "BOR", "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XYNZ", "XYST", "XMBK" ] }, { "descriptions": [ "Fahre den D 1473/1472 Metropol von %s nach %s" ], "stations": [ "DH", "DSA", "XTD", "XTP", "XTBR", "XYST", "XMBK" ], - "pathSuggestion": [ "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ], + "pathSuggestion": [ "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XYNZ", "XYST", "XMBK" ], "neededCapacity": [ { "name": "passengers" }, { "name": "bistroseats" }, @@ -6011,14 +6011,14 @@ "Fahre den D 377/376 Metropol von %s nach %s" ], "stations": [ "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMBK" ] + "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XYNZ", "XYST", "XMBK" ] }, { "descriptions": [ "Fahre den IEx 73/72 Metropol von %s nach %s" ], "stations": [ "BL", "DH", "DSA", "XTD", "XTP", "XTBR", "XYB", "XYST", "XMSB", "XMBK" ], - "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYB", "XYNZ", "XYST", "XMSB", "XMBK" ] + "pathSuggestion": [ "BL", "BBF", "BDKO", "BEW", "DGB", "DH", "DHD", "DPI", "DSA", "XTD", "XTU", "XTP", "XTKI", "XTPAR", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XYNZ", "XYST", "XMSB", "XMBK" ] }, { "descriptions": [ @@ -7308,16 +7308,8 @@ "descriptions": [ "Fahre diesen EuroCity von %s nach %s." ], - "objects": [ - { - "stations": [ "XTP", "XTBR", "XTBE", "XYB" ], - "pathSuggestion": [ "XTP", "XTBR", "XTTR", "XTBE", "XAWW", "XYB" ] - }, - { - "stations": [ "XTP", "XTBR", "XTBE", "XYB", "XYST", "XMBK" ], - "pathSuggestion": [ "XTP", "XTTR", "XTBR", "XTBE", "XAWW", "XYB", "XYST", "XMBK" ] - } - ], + "stations": [ "XTP", "XTBR", "XTBE", "XYB", "XYST", "XMBK" ], + "pathSuggestion": [ "XTP", "XTTR", "XTBR", "XTBE", "XYDN", "XYB", "XYST", "XMBK" ], "neededCapacity": [ { "name": "passengers" }, { "name": "bistroseats" } @@ -7331,7 +7323,7 @@ "Fahre diesen Railjet von %s nach %s." ], "stations": [ "XYB", "XAWW", "XAL", "XASB", "XAWL", "XAI", "XALE", "XABL", "XAFK", "XSBU", "XSZH" ], - "pathSuggestion": [ "XYB", "XAWW", "XAL", "XAWE", "XAAT", "XASF", "XASB", "XASW", "XAWL", "🇦🇹Fw Z2", "XAI", "XALE", "XABL", "XAFK", "XSBU", "XSSR", "XSPF", "XSTW", "XSZH" ], + "pathSuggestion": [ "XYB", "XYDN", "XAWW", "XAL", "XAWE", "XAAT", "XASF", "XASB", "XASW", "XAWL", "🇦🇹Fw Z2", "XAI", "XALE", "XABL", "XAFK", "XSBU", "XSSR", "XSPF", "XSTW", "XSZH" ], "neededCapacity": [ { "name": "passengers" }, { "name": "bistroseats" } @@ -7359,7 +7351,7 @@ "Fahre diesen Regional-Express von %s nach %s.", "Verbinde die Hauptstädte Österreichs und der Slowakei miteinander." ], - "stations": [ "XYB", "XAWW" ], + "stations": [ "XYB", "XYDN", "XAWW" ], "stopsEverywhere": true, "neededCapacity": [ { "name": "passengers" }