From 30038e5c3fd97ae5df5683404c8f5c838e61bea0 Mon Sep 17 00:00:00 2001 From: metrophil <72109316+metrophil@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:07:37 +0200 Subject: [PATCH 1/4] Update line-colors.csv fix Freiburg trams, add Freiburg S-Bahn --- line-colors.csv | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index 35c80a2..b4cd61f 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -688,11 +688,17 @@ rmv-vgf-ubahn,U6,,7-rmv255-6,#0082ca,#ffffff,,pill rmv-vgf-ubahn,U7,,7-rmv255-7,#f19e2d,#ffffff,,pill rmv-vgf-ubahn,U8,,7-rmv255-8,#ca7fbe,#ffffff,,pill rmv-vgf-ubahn,U9,,7-rmv255-9,#ffd939,#2c2e35,#2c2e35,pill -rvf-vag-stadtbahn,STR 1,,8-vag011-1,#e8001b,#ffffff,,rectangle-rounded-corner -rvf-vag-stadtbahn,STR 2,,8-vag011-2,#13a538,#ffffff,,rectangle-rounded-corner -rvf-vag-stadtbahn,STR 3,,8-vag011-3,#f59e00,#ffffff,,rectangle-rounded-corner -rvf-vag-stadtbahn,STR 4,,8-vag011-4,#ea5297,#ffffff,,rectangle-rounded-corner -rvf-vag-stadtbahn,STR 5,,8-vag011-5,#008bc5,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S1,db-regio-ag-baden-wurttemberg,#00569e,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S2,sweg-sudwestdeutsche-landesverkehrs-gmbh,#009e3c,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S3,sweg-sudwestdeutsche-landesverkehrs-gmbh,#e83281,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S5,sweg-sudwestdeutsche-landesverkehrs-gmbh,#ac69a8,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S10,db-regio-ag-baden-wurttemberg,#008bd2,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S11,db-regio-ag-baden-wurttemberg,#71cbf4,#ffffff,,rectangle-rounded-corner +rvf-vag-stadtbahn,1,,8-vag002-1,#ed1c24,#ffffff,,rectangle +rvf-vag-stadtbahn,2,,8-vag002-2,#35af3f,#ffffff,,rectangle +rvf-vag-stadtbahn,3,,8-vag002-3,#f79210,#ffffff,,rectangle +rvf-vag-stadtbahn,4,,8-vag002-4,#f033a3,#ffffff,,rectangle +rvf-vag-stadtbahn,5,,8-vag002-5,#0994ce,#ffffff,,rectangle s-bahn-bern-bls,S 1,bls-ag,4-850033-1,#50b447,#ffffff,,rectangle s-bahn-bern-bls,S 2,bls-ag,4-850033-2,#1cb1e6,#ffffff,,rectangle s-bahn-bern-bls,S 3,bls-ag,4-850033-3,#8868b3,#ffffff,,rectangle From 58bc78bab2410b467b3689c8114be502c20923bb Mon Sep 17 00:00:00 2001 From: metrophil <72109316+metrophil@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:11:51 +0200 Subject: [PATCH 2/4] fix Freiburg S-Bahn --- line-colors.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index b4cd61f..59aaf2c 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -688,12 +688,12 @@ rmv-vgf-ubahn,U6,,7-rmv255-6,#0082ca,#ffffff,,pill rmv-vgf-ubahn,U7,,7-rmv255-7,#f19e2d,#ffffff,,pill rmv-vgf-ubahn,U8,,7-rmv255-8,#ca7fbe,#ffffff,,pill rmv-vgf-ubahn,U9,,7-rmv255-9,#ffd939,#2c2e35,#2c2e35,pill -rvf-sbahn,S1,db-regio-ag-baden-wurttemberg,#00569e,#ffffff,,rectangle-rounded-corner -rvf-sbahn,S2,sweg-sudwestdeutsche-landesverkehrs-gmbh,#009e3c,#ffffff,,rectangle-rounded-corner -rvf-sbahn,S3,sweg-sudwestdeutsche-landesverkehrs-gmbh,#e83281,#ffffff,,rectangle-rounded-corner -rvf-sbahn,S5,sweg-sudwestdeutsche-landesverkehrs-gmbh,#ac69a8,#ffffff,,rectangle-rounded-corner -rvf-sbahn,S10,db-regio-ag-baden-wurttemberg,#008bd2,#ffffff,,rectangle-rounded-corner -rvf-sbahn,S11,db-regio-ag-baden-wurttemberg,#71cbf4,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S1,db-regio-ag-baden-wurttemberg,4-8006c6-1,#00569e,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S2,sweg-sudwestdeutsche-landesverkehrs-gmbh,4-s6-s2,#009e3c,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S3,sweg-sudwestdeutsche-landesverkehrs-gmbh,4-s6-s3,#e83281,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S5,sweg-sudwestdeutsche-landesverkehrs-gmbh,4-s6-s5,#ac69a8,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S10,db-regio-ag-baden-wurttemberg,4-8006c6-10,#008bd2,#ffffff,,rectangle-rounded-corner +rvf-sbahn,S11,db-regio-ag-baden-wurttemberg,4-8006c6-11,#71cbf4,#ffffff,,rectangle-rounded-corner rvf-vag-stadtbahn,1,,8-vag002-1,#ed1c24,#ffffff,,rectangle rvf-vag-stadtbahn,2,,8-vag002-2,#35af3f,#ffffff,,rectangle rvf-vag-stadtbahn,3,,8-vag002-3,#f79210,#ffffff,,rectangle From 4b38634d69c6964be5a86aed5e3d297551dcf9a5 Mon Sep 17 00:00:00 2001 From: metrophil <72109316+metrophil@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:15:16 +0200 Subject: [PATCH 3/4] Update sources.json add Freiburg sources --- sources.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sources.json b/sources.json index d2e5c0a..221b567 100644 --- a/sources.json +++ b/sources.json @@ -390,18 +390,39 @@ "source": "https://www.nah.sh/assets/05-Karten/BahnlinienSH_A3_2024_5.pdf" } ] + }, + { + "shortOperatorName": "rvf-sbahn", + "contributors": [ + { + "github": "metrophil" + } + ], + "sources": [ + { + "name": "Schienennetz RVF [PDF]" + "source": "https://www.rvf.de/fileadmin/user_upload/techdocs/linien-zonen/schienennetz/rvf_24_schienennetz_web.pdf" + } + ] }, { "shortOperatorName": "rvf-vag-stadtbahn", "contributors": [ { "github": "oneiricbotcelot" + }, + { + "github": "metrophil" } ], "sources": [ { "name": "Linienfahrpläne", "source": "https://www.vag-freiburg.de/fahrplan/linien-fahrplaene" + }, + { + "name": "Freiburger Schienennetz (Stadtbahn) [PDF]", + "source": "https://www.rvf.de/fileadmin/user_upload/techdocs/linien-zonen/linien/vag_24_stadtbahnnetzplan_web.pdf" } ] }, From 9b2dab76a2d510d12f05d52a7835adc1865f6b61 Mon Sep 17 00:00:00 2001 From: metrophil <72109316+metrophil@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:18:53 +0200 Subject: [PATCH 4/4] fix sources.json --- sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources.json b/sources.json index 221b567..5bbe7cb 100644 --- a/sources.json +++ b/sources.json @@ -400,7 +400,7 @@ ], "sources": [ { - "name": "Schienennetz RVF [PDF]" + "name": "Schienennetz RVF [PDF]", "source": "https://www.rvf.de/fileadmin/user_upload/techdocs/linien-zonen/schienennetz/rvf_24_schienennetz_web.pdf" } ]