From ec4bf099f952995106b5fedb6093cc4e3d0d1d04 Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 16:58:03 +0200 Subject: [PATCH 1/6] Change sources for trilex --- sources.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sources.json b/sources.json index f220f2d..b9808b0 100644 --- a/sources.json +++ b/sources.json @@ -907,6 +907,21 @@ } ] }, + { + "shortOperatorName": "tlx", + "contributors": [ + { + "github": "feuer1998" + } + ], + "sources": [ + { + "name": "Liniennetzplan Trilex Dezember 2023", + "source": "https://www.laenderbahn.com/media/laenderbahn/bilder/2023-12_Linienplan_trilex_ERWEITERT_A3_WEB.pdf" + } + ] + } +] { "shortOperatorName": "uestra", "contributors": [ @@ -1585,19 +1600,4 @@ "source": "https://www.vvo-online.de/doc/VVO-Liniennetzplan-SPNV-Sachsen.pdf" } ] - }, - { - "shortOperatorName": "zvon-tl", - "contributors": [ - { - "github": "hoolycrash" - } - ], - "sources": [ - { - "name": "Netzplan", - "source": "https://www.vvo-online.de/doc/VVO-Liniennetzplan-SPNV-Sachsen.pdf" - } - ] } -] From 12ddb3298ee49d53ab396399054c1cb871975cdd Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:27:07 +0200 Subject: [PATCH 2/6] Update trilex lines --- line-colors.csv | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index c6ec00c..8dc8d9c 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -794,6 +794,15 @@ sweg-sudwest,RB 66,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb66,#014f9f,#ff sweg-sudwest,RB 67,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb67,#00a9df,#ffffff,,rectangle sweg-sudwest,RB 68,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb68,#ec2933,#ffffff,,rectangle sweg-sudwest,RB 69,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb69,#f27320,#ffffff,,rectangle +tlx,L2,trilex-express-die-landerbahn-gmbh-dlb,tl-l2,#0f7ec0,#ffffff,,rectangle-rounded-corner +tlx,L4,trilex-express-die-landerbahn-gmbh-dlb,tl-l4,#242320,#ffffff,,rectangle-rounded-corner +tlx,L7,trilex-express-die-landerbahn-gmbh-dlb,tl-l7,#ea7b09,#ffffff,,rectangle-rounded-corner +tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner +tlx,RE1,trilex-express-die-landerbahn-gmbh-dlb,tlx-re1,#e97b3b,#ffffff,,rectangle-rounded-corner +tlx,RE2,trilex-express-die-landerbahn-gmbh-dlb,tlx-re2,#db031c,#ffffff,,rectangle-rounded-corner +tlx,RB60,trilex-express-die-landerbahn-gmbh-dlb,tl-rb60,#569b6d,#ffffff,,rectangle-rounded-corner +tlx,RB61,trilex-express-die-landerbahn-gmbh-dlb,tl-rb61,#438577,#ffffff,,rectangle-rounded-corner +tlx,T9,trilex-express-die-landerbahn-gmbh-dlb,tl-t9,#f6b90b,#ffffff,,rectangle-rounded-corner uestra,1,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-1,#ffffff,#2c2e35,#ff2e3e,rectangle uestra,2,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-2,#ffffff,#2c2e35,#ff2e3e,rectangle uestra,3,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-3,#ffffff,#2c2e35,#0073c0,rectangle @@ -1312,9 +1321,3 @@ zvnl-tram,N10,,8-naslvt-n10,#e1001e,#ffffff,,rectangle zvnl-tram,N17,,8-naslvt-n17,#67b337,#ffffff,,rectangle zvon-odeg,RB 64,ostdeutsche-eisenbahn-gmbh,8010177,#006552,#ffffff,,rectangle zvon-odeg,RB 65,ostdeutsche-eisenbahn-gmbh,8010073,#005b94,#ffffff,,rectangle -zvon-tl,TLX RE1,trilex-express-die-landerbahn-gmbh-dlb,8010085,#ec7404,#ffffff,,rectangle -zvon-tl,TLX RE2,trilex-express-die-landerbahn-gmbh-dlb,8010085,#e2001a,#ffffff,,rectangle -zvon-tl,TL RB60,trilex-die-landerbahn-gmbh-dlb,8010085,#38a962,#ffffff,,rectangle -zvon-tl,TL RB61,trilex-die-landerbahn-gmbh-dlb,8010085,#00632e,#ffffff,,rectangle -zvon-tl,TL L7,trilex-die-landerbahn-gmbh-dlb,8012979,#ec7404,#ffffff,,rectangle -zvon-tl,TL L9,trilex-die-landerbahn-gmbh-dlb,5400198,#58585a,#ffffff,,rectangle From 59242180b6818b8a8713051b551e4c4d1b749a2c Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:37:52 +0200 Subject: [PATCH 3/6] Update sources.json Fix syntax error --- sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources.json b/sources.json index b9808b0..d158ef7 100644 --- a/sources.json +++ b/sources.json @@ -921,7 +921,6 @@ } ] } -] { "shortOperatorName": "uestra", "contributors": [ @@ -1601,3 +1600,4 @@ } ] } +] From a5119624bd4dbe3f9885e86dee9e0be702f8a6af Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:45:44 +0200 Subject: [PATCH 4/6] Update line-colors.csv Change order --- line-colors.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index 8dc8d9c..b8c248f 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -795,13 +795,13 @@ sweg-sudwest,RB 67,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb67,#00a9df,#ff sweg-sudwest,RB 68,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb68,#ec2933,#ffffff,,rectangle sweg-sudwest,RB 69,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb69,#f27320,#ffffff,,rectangle tlx,L2,trilex-express-die-landerbahn-gmbh-dlb,tl-l2,#0f7ec0,#ffffff,,rectangle-rounded-corner +tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner tlx,L4,trilex-express-die-landerbahn-gmbh-dlb,tl-l4,#242320,#ffffff,,rectangle-rounded-corner tlx,L7,trilex-express-die-landerbahn-gmbh-dlb,tl-l7,#ea7b09,#ffffff,,rectangle-rounded-corner -tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner -tlx,RE1,trilex-express-die-landerbahn-gmbh-dlb,tlx-re1,#e97b3b,#ffffff,,rectangle-rounded-corner -tlx,RE2,trilex-express-die-landerbahn-gmbh-dlb,tlx-re2,#db031c,#ffffff,,rectangle-rounded-corner tlx,RB60,trilex-express-die-landerbahn-gmbh-dlb,tl-rb60,#569b6d,#ffffff,,rectangle-rounded-corner tlx,RB61,trilex-express-die-landerbahn-gmbh-dlb,tl-rb61,#438577,#ffffff,,rectangle-rounded-corner +tlx,RE1,trilex-express-die-landerbahn-gmbh-dlb,tlx-re1,#e97b3b,#ffffff,,rectangle-rounded-corner +tlx,RE2,trilex-express-die-landerbahn-gmbh-dlb,tlx-re2,#db031c,#ffffff,,rectangle-rounded-corner tlx,T9,trilex-express-die-landerbahn-gmbh-dlb,tl-t9,#f6b90b,#ffffff,,rectangle-rounded-corner uestra,1,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-1,#ffffff,#2c2e35,#ff2e3e,rectangle uestra,2,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-2,#ffffff,#2c2e35,#ff2e3e,rectangle From 8af1bb96a9d62885a16f1d9b9bdf170b91e79fef Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:48:24 +0200 Subject: [PATCH 5/6] Update line-colors.csv --- line-colors.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line-colors.csv b/line-colors.csv index b8c248f..18718ee 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -795,9 +795,9 @@ sweg-sudwest,RB 67,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb67,#00a9df,#ff sweg-sudwest,RB 68,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb68,#ec2933,#ffffff,,rectangle sweg-sudwest,RB 69,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb69,#f27320,#ffffff,,rectangle tlx,L2,trilex-express-die-landerbahn-gmbh-dlb,tl-l2,#0f7ec0,#ffffff,,rectangle-rounded-corner -tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner tlx,L4,trilex-express-die-landerbahn-gmbh-dlb,tl-l4,#242320,#ffffff,,rectangle-rounded-corner tlx,L7,trilex-express-die-landerbahn-gmbh-dlb,tl-l7,#ea7b09,#ffffff,,rectangle-rounded-corner +tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner tlx,RB60,trilex-express-die-landerbahn-gmbh-dlb,tl-rb60,#569b6d,#ffffff,,rectangle-rounded-corner tlx,RB61,trilex-express-die-landerbahn-gmbh-dlb,tl-rb61,#438577,#ffffff,,rectangle-rounded-corner tlx,RE1,trilex-express-die-landerbahn-gmbh-dlb,tlx-re1,#e97b3b,#ffffff,,rectangle-rounded-corner From a8ba419c16a7ffea8e8a42562cc079da885e6a34 Mon Sep 17 00:00:00 2001 From: feuer1998 <100516041+feuer1998@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:52:20 +0200 Subject: [PATCH 6/6] Update line-colors.csv --- line-colors.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index 18718ee..a9a6e14 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -794,15 +794,15 @@ sweg-sudwest,RB 66,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb66,#014f9f,#ff sweg-sudwest,RB 67,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb67,#00a9df,#ffffff,,rectangle sweg-sudwest,RB 68,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb68,#ec2933,#ffffff,,rectangle sweg-sudwest,RB 69,sweg-sudwestdeutsche-landesverkehrs-gmbh,swe-rb69,#f27320,#ffffff,,rectangle -tlx,L2,trilex-express-die-landerbahn-gmbh-dlb,tl-l2,#0f7ec0,#ffffff,,rectangle-rounded-corner -tlx,L4,trilex-express-die-landerbahn-gmbh-dlb,tl-l4,#242320,#ffffff,,rectangle-rounded-corner -tlx,L7,trilex-express-die-landerbahn-gmbh-dlb,tl-l7,#ea7b09,#ffffff,,rectangle-rounded-corner -tlx,L24,trilex-express-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner -tlx,RB60,trilex-express-die-landerbahn-gmbh-dlb,tl-rb60,#569b6d,#ffffff,,rectangle-rounded-corner -tlx,RB61,trilex-express-die-landerbahn-gmbh-dlb,tl-rb61,#438577,#ffffff,,rectangle-rounded-corner +tlx,L2,trilex-die-landerbahn-gmbh-dlb,tl-l2,#0f7ec0,#ffffff,,rectangle-rounded-corner +tlx,L4,trilex-die-landerbahn-gmbh-dlb,tl-l4,#242320,#ffffff,,rectangle-rounded-corner +tlx,L7,trilex-die-landerbahn-gmbh-dlb,tl-l7,#ea7b09,#ffffff,,rectangle-rounded-corner +tlx,L24,trilex-die-landerbahn-gmbh-dlb,tl-l24,#6eae47,#ffffff,,rectangle-rounded-corner +tlx,RB60,trilex-die-landerbahn-gmbh-dlb,tl-rb60,#569b6d,#ffffff,,rectangle-rounded-corner +tlx,RB61,trilex-die-landerbahn-gmbh-dlb,tl-rb61,#438577,#ffffff,,rectangle-rounded-corner tlx,RE1,trilex-express-die-landerbahn-gmbh-dlb,tlx-re1,#e97b3b,#ffffff,,rectangle-rounded-corner tlx,RE2,trilex-express-die-landerbahn-gmbh-dlb,tlx-re2,#db031c,#ffffff,,rectangle-rounded-corner -tlx,T9,trilex-express-die-landerbahn-gmbh-dlb,tl-t9,#f6b90b,#ffffff,,rectangle-rounded-corner +tlx,T9,trilex-die-landerbahn-gmbh-dlb,tl-t9,#f6b90b,#ffffff,,rectangle-rounded-corner uestra,1,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-1,#ffffff,#2c2e35,#ff2e3e,rectangle uestra,2,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-2,#ffffff,#2c2e35,#ff2e3e,rectangle uestra,3,ustra-hannoversche-verkehrsbetriebe-ag,8-webuet-3,#ffffff,#2c2e35,#0073c0,rectangle