From c2666b2bfc49c3f72b852d86f93d4b5329ee5b94 Mon Sep 17 00:00:00 2001 From: Luna <160403915+lunas-bad-coding@users.noreply.github.com> Date: Fri, 24 May 2024 15:42:25 +0200 Subject: [PATCH 1/4] added hvv metrobus and xpressbus routes --- line-colors.csv | 41 +++++++++++++++++++++++++++++++++++++++++ sources.json | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/line-colors.csv b/line-colors.csv index 16953bd..a9e65b8 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -144,6 +144,47 @@ hvv-hha,U 1,,7-hvv001-1,#0072bc,#ffffff,,rectangle hvv-hha,U 2,,7-hvv001-2,#ee1d23,#ffffff,,rectangle hvv-hha,U 3,,7-hvv001-3,#ffdc01,#ffffff,,rectangle hvv-hha,U 4,,7-hvv001-4,#00aaad,#ffffff,,rectangle +hvv-hha,5,,5-hvvhha-5,#eb4630,#ffffff,,hexagon +hvv-hha,6,,5-hvvhha-6,#18257b,#ffffff,,hexagon +hvv-hha,8,,5-hvvhha-8,#c49569,#ffffff,,hexagon +hvv-hha,9,,5-hvvhha-9,#5fb358,#ffffff,,hexagon +hvv-hha,10,,5-hvvhha-10,#ed753a,#ffffff,,hexagon +hvv-hha,11,,5-hvvhha-11,#903634,#ffffff,,hexagon +hvv-hha,13,,5-hvvhha-13,#712f91,#ffffff,,hexagon +hvv-hha,14,,5-hvvhha-14,#dc424d,#ffffff,,hexagon +hvv-hha,16,,5-hvvhha-16,#571445,#ffffff,,hexagon +hvv-hha,17,,5-hvvhha-17,#62685f,#ffffff,,hexagon +hvv-hha,18,,5-hvvhha-18,#6b80be,#ffffff,,hexagon +hvv-hha,19,,5-hvvhha-19,#f4ba4f,#ffffff,,hexagon +hvv-hha,20,,5-hvvhha-20,#519bd2,#ffffff,,hexagon +hvv-hha,23,,5-hvvhha-23,#e74796,#ffffff,,hexagon +hvv-hha,24,,5-hvvhha-24,#f8d258,#ffffff,,hexagon +hvv-hha,26,,5-hvvhha-26,#bcd25d,#ffffff,,hexagon +hvv-hha,28,,5-hvvhha-28,#7e9bb4,#ffffff,,hexagon +hvv-hha,X11,,5-hvvhha-x11,#ffffff,#5fb358,,hexagon +hvv-hha,X22,,5-hvvhha-x22,#5fb358,#ffffff,,hexagon +hvv-hha,X35,,5-hvvhha-x35,#eb452e,#ffffff,,hexagon +hvv-hha,X40,,5-hvvhha-x40,#ffffff,#73c4a2,,hexagon +hvv-hha,X61,,5-hvvhha-x61,#ed7339,#ffffff,,hexagon +hvv-hha,X65,,5-hvvhha-x65,#52b4dc,#ffffff,,hexagon +hvv-hha,X86,,5-hvvhha-x65,#ebc353,#ffffff,,hexagon +hvv-kvi,X66,,5-hvvkvi-x66,#6780bf,#ffffff,,hexagon +hvv-kvi,X89,,5-hvvkvi-x89,#8cc359,#ffffff,,hexagon +hvv-kvi,X99,,5-hvvkvi-x99,#bc3c95,#ffffff,,hexagon +hvv-vhh,1,,5-hvvvhh-1,#bcd25d,#ffffff,,hexagon +hvv-vhh,2,,5-hvvvhh-2,#f4b94f,#ffffff,,hexagon +hvv-vhh,3,,5-hvvvhh-3,#bc3d95,#ffffff,,hexagon +hvv-vhh,12,,5-hvvvhh-12,#522a90,#ffffff,,hexagon +hvv-vhh,21,,5-hvvvhh-21,#234ea3,#ffffff,,hexagon +hvv-vhh,22,,5-hvvvhh-22,#712f91,#ffffff,,hexagon +hvv-vhh,29,,5-hvvvhh-29,#522a90,#ffffff,,hexagon +hvv-vhh,X3,,5-hvvvhh-x3,#722f91,#ffffff,,hexagon +hvv-vhh,X30,,5-hvvvhh-x30,#8e332a,#ffffff,,hexagon +hvv-vhh,X32,,5-hvvvhh-x32,#bf9466,#ffffff,,hexagon +hvv-vhh,X33,,5-hvvvhh-x32,#ffffff,#1c448f,,hexagon +hvv-vhh,X80,,5-hvvvhh-x80,#ebc353,#ffffff,,hexagon +hvv-vhh,X81,,5-hvvvhh-x81,#30653c,#ffffff,,hexagon +hvv-vhh,X95,,5-hvvvhh-x95,#c06936,#ffffff,,hexagon kvv-avg,S1,albtal-verkehrs-gesellschaft-mbh,4-a6s1-1,#00a76d,#ffffff,,rectangle-rounded-corner kvv-avg,S2,albtal-verkehrs-gesellschaft-mbh,4-a6-2,#a066aa,#ffffff,,rectangle-rounded-corner kvv-avg,S4,albtal-verkehrs-gesellschaft-mbh,4-a6s4-4,#ae4a63,#ffffff,,rectangle-rounded-corner diff --git a/sources.json b/sources.json index 9eb0b48..3f65037 100644 --- a/sources.json +++ b/sources.json @@ -269,12 +269,55 @@ }, { "github": "jheubuch" + }, + { + "github": "lunas-bad-coding" } ], "sources": [ { "name": "hvv USAR-Plan", "source": "https://www.hvv.de/de/plaene" + }, + { + "name": "hvv MetroBus Plan", + "source": "https://www.hvv.de/de/plaene" + }, + { + "name": "hvv XpressBus Plan", + "source": "https://www.hvv.de/de/plaene" + } + ] + }, + { + "shortOperatorName": "hvv-kvi", + "contributors": [ + { + "github": "lunas-bad-coding" + } + ], + "sources": [ + { + "name": "hvv XpressBus Plan", + "source": "https://www.hvv.de/de/plaene" + } + ] + }, + { + "shortOperatorName": "hvv-vhh", + "contributors": [ + { + "github": "lunas-bad-coding" + } + ], + "sources": [ + { + "name": "hvv MetroBus Plan", + "source": "https://www.hvv.de/de/plaene" + }, + { + "name": "hvv XpressBus Plan", + "source": "https://www.hvv.de/de/plaene" } ] }, From 71507a4478b602dae19faa8f0d56a47f63fb5c6a Mon Sep 17 00:00:00 2001 From: Luna <160403915+lunas-bad-coding@users.noreply.github.com> Date: Fri, 24 May 2024 18:58:28 +0200 Subject: [PATCH 2/4] changed hvv hexagon to rectangle-rounded-corner as hexagon isn't supported yet --- README.md | 2 +- line-colors.csv | 82 ++++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 7945004..7f1d90f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The `line-colors.csv` contains several columns: - `rectangle`: Just a rectangle - `pill`: Rectangle with rounded corners - `trapezoid` - - `hexagon` + - `hexagon` (not yet supported) ## Contributing diff --git a/line-colors.csv b/line-colors.csv index 338a60f..db8200e 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -144,47 +144,47 @@ hvv-hha,U 1,,7-hvv001-1,#0072bc,#ffffff,,rectangle hvv-hha,U 2,,7-hvv001-2,#ee1d23,#ffffff,,rectangle hvv-hha,U 3,,7-hvv001-3,#ffdc01,#ffffff,,rectangle hvv-hha,U 4,,7-hvv001-4,#00aaad,#ffffff,,rectangle -hvv-hha,5,,5-hvvhha-5,#eb4630,#ffffff,,hexagon -hvv-hha,6,,5-hvvhha-6,#18257b,#ffffff,,hexagon -hvv-hha,8,,5-hvvhha-8,#c49569,#ffffff,,hexagon -hvv-hha,9,,5-hvvhha-9,#5fb358,#ffffff,,hexagon -hvv-hha,10,,5-hvvhha-10,#ed753a,#ffffff,,hexagon -hvv-hha,11,,5-hvvhha-11,#903634,#ffffff,,hexagon -hvv-hha,13,,5-hvvhha-13,#712f91,#ffffff,,hexagon -hvv-hha,14,,5-hvvhha-14,#dc424d,#ffffff,,hexagon -hvv-hha,16,,5-hvvhha-16,#571445,#ffffff,,hexagon -hvv-hha,17,,5-hvvhha-17,#62685f,#ffffff,,hexagon -hvv-hha,18,,5-hvvhha-18,#6b80be,#ffffff,,hexagon -hvv-hha,19,,5-hvvhha-19,#f4ba4f,#ffffff,,hexagon -hvv-hha,20,,5-hvvhha-20,#519bd2,#ffffff,,hexagon -hvv-hha,23,,5-hvvhha-23,#e74796,#ffffff,,hexagon -hvv-hha,24,,5-hvvhha-24,#f8d258,#ffffff,,hexagon -hvv-hha,26,,5-hvvhha-26,#bcd25d,#ffffff,,hexagon -hvv-hha,28,,5-hvvhha-28,#7e9bb4,#ffffff,,hexagon -hvv-hha,X11,,5-hvvhha-x11,#ffffff,#5fb358,,hexagon -hvv-hha,X22,,5-hvvhha-x22,#5fb358,#ffffff,,hexagon -hvv-hha,X35,,5-hvvhha-x35,#eb452e,#ffffff,,hexagon -hvv-hha,X40,,5-hvvhha-x40,#ffffff,#73c4a2,,hexagon -hvv-hha,X61,,5-hvvhha-x61,#ed7339,#ffffff,,hexagon -hvv-hha,X65,,5-hvvhha-x65,#52b4dc,#ffffff,,hexagon -hvv-hha,X86,,5-hvvhha-x65,#ebc353,#ffffff,,hexagon -hvv-kvi,X66,,5-hvvkvi-x66,#6780bf,#ffffff,,hexagon -hvv-kvi,X89,,5-hvvkvi-x89,#8cc359,#ffffff,,hexagon -hvv-kvi,X99,,5-hvvkvi-x99,#bc3c95,#ffffff,,hexagon -hvv-vhh,1,,5-hvvvhh-1,#bcd25d,#ffffff,,hexagon -hvv-vhh,2,,5-hvvvhh-2,#f4b94f,#ffffff,,hexagon -hvv-vhh,3,,5-hvvvhh-3,#bc3d95,#ffffff,,hexagon -hvv-vhh,12,,5-hvvvhh-12,#522a90,#ffffff,,hexagon -hvv-vhh,21,,5-hvvvhh-21,#234ea3,#ffffff,,hexagon -hvv-vhh,22,,5-hvvvhh-22,#712f91,#ffffff,,hexagon -hvv-vhh,29,,5-hvvvhh-29,#522a90,#ffffff,,hexagon -hvv-vhh,X3,,5-hvvvhh-x3,#722f91,#ffffff,,hexagon -hvv-vhh,X30,,5-hvvvhh-x30,#8e332a,#ffffff,,hexagon -hvv-vhh,X32,,5-hvvvhh-x32,#bf9466,#ffffff,,hexagon -hvv-vhh,X33,,5-hvvvhh-x32,#ffffff,#1c448f,,hexagon -hvv-vhh,X80,,5-hvvvhh-x80,#ebc353,#ffffff,,hexagon -hvv-vhh,X81,,5-hvvvhh-x81,#30653c,#ffffff,,hexagon -hvv-vhh,X95,,5-hvvvhh-x95,#c06936,#ffffff,,hexagon +hvv-hha,5,,5-hvvhha-5,#eb4630,#ffffff,,rectangle-rounded-corner +hvv-hha,6,,5-hvvhha-6,#18257b,#ffffff,,rectangle-rounded-corner +hvv-hha,8,,5-hvvhha-8,#c49569,#ffffff,,rectangle-rounded-corner +hvv-hha,9,,5-hvvhha-9,#5fb358,#ffffff,,rectangle-rounded-corner +hvv-hha,10,,5-hvvhha-10,#ed753a,#ffffff,,rectangle-rounded-corner +hvv-hha,11,,5-hvvhha-11,#903634,#ffffff,,rectangle-rounded-corner +hvv-hha,13,,5-hvvhha-13,#712f91,#ffffff,,rectangle-rounded-corner +hvv-hha,14,,5-hvvhha-14,#dc424d,#ffffff,,rectangle-rounded-corner +hvv-hha,16,,5-hvvhha-16,#571445,#ffffff,,rectangle-rounded-corner +hvv-hha,17,,5-hvvhha-17,#62685f,#ffffff,,rectangle-rounded-corner +hvv-hha,18,,5-hvvhha-18,#6b80be,#ffffff,,rectangle-rounded-corner +hvv-hha,19,,5-hvvhha-19,#f4ba4f,#ffffff,,rectangle-rounded-corner +hvv-hha,20,,5-hvvhha-20,#519bd2,#ffffff,,rectangle-rounded-corner +hvv-hha,23,,5-hvvhha-23,#e74796,#ffffff,,rectangle-rounded-corner +hvv-hha,24,,5-hvvhha-24,#f8d258,#ffffff,,rectangle-rounded-corner +hvv-hha,26,,5-hvvhha-26,#bcd25d,#ffffff,,rectangle-rounded-corner +hvv-hha,28,,5-hvvhha-28,#7e9bb4,#ffffff,,rectangle-rounded-corner +hvv-hha,X11,,5-hvvhha-x11,#ffffff,#5fb358,,rectangle-rounded-corner +hvv-hha,X22,,5-hvvhha-x22,#5fb358,#ffffff,,rectangle-rounded-corner +hvv-hha,X35,,5-hvvhha-x35,#eb452e,#ffffff,,rectangle-rounded-corner +hvv-hha,X40,,5-hvvhha-x40,#ffffff,#73c4a2,,rectangle-rounded-corner +hvv-hha,X61,,5-hvvhha-x61,#ed7339,#ffffff,,rectangle-rounded-corner +hvv-hha,X65,,5-hvvhha-x65,#52b4dc,#ffffff,,rectangle-rounded-corner +hvv-hha,X86,,5-hvvhha-x65,#ebc353,#ffffff,,rectangle-rounded-corner +hvv-kvi,X66,,5-hvvkvi-x66,#6780bf,#ffffff,,rectangle-rounded-corner +hvv-kvi,X89,,5-hvvkvi-x89,#8cc359,#ffffff,,rectangle-rounded-corner +hvv-kvi,X99,,5-hvvkvi-x99,#bc3c95,#ffffff,,rectangle-rounded-corner +hvv-vhh,1,,5-hvvvhh-1,#bcd25d,#ffffff,,rectangle-rounded-corner +hvv-vhh,2,,5-hvvvhh-2,#f4b94f,#ffffff,,rectangle-rounded-corner +hvv-vhh,3,,5-hvvvhh-3,#bc3d95,#ffffff,,rectangle-rounded-corner +hvv-vhh,12,,5-hvvvhh-12,#522a90,#ffffff,,rectangle-rounded-corner +hvv-vhh,21,,5-hvvvhh-21,#234ea3,#ffffff,,rectangle-rounded-corner +hvv-vhh,22,,5-hvvvhh-22,#712f91,#ffffff,,rectangle-rounded-corner +hvv-vhh,29,,5-hvvvhh-29,#522a90,#ffffff,,rectangle-rounded-corner +hvv-vhh,X3,,5-hvvvhh-x3,#722f91,#ffffff,,rectangle-rounded-corner +hvv-vhh,X30,,5-hvvvhh-x30,#8e332a,#ffffff,,rectangle-rounded-corner +hvv-vhh,X32,,5-hvvvhh-x32,#bf9466,#ffffff,,rectangle-rounded-corner +hvv-vhh,X33,,5-hvvvhh-x32,#ffffff,#1c448f,,rectangle-rounded-corner +hvv-vhh,X80,,5-hvvvhh-x80,#ebc353,#ffffff,,rectangle-rounded-corner +hvv-vhh,X81,,5-hvvvhh-x81,#30653c,#ffffff,,rectangle-rounded-corner +hvv-vhh,X95,,5-hvvvhh-x95,#c06936,#ffffff,,rectangle-rounded-corner kvv-avg,S1,albtal-verkehrs-gesellschaft-mbh,4-a6s1-1,#00a76d,#ffffff,,rectangle-rounded-corner kvv-avg,S2,albtal-verkehrs-gesellschaft-mbh,4-a6-2,#a066aa,#ffffff,,rectangle-rounded-corner kvv-avg,S4,albtal-verkehrs-gesellschaft-mbh,4-a6s4-4,#ae4a63,#ffffff,,rectangle-rounded-corner From d9cb12f4daa5679217b8ef2a411a1c4b37df834b Mon Sep 17 00:00:00 2001 From: Luna <160403915+lunas-bad-coding@users.noreply.github.com> Date: Sat, 25 May 2024 17:23:29 +0200 Subject: [PATCH 3/4] added hvv ferries --- line-colors.csv | 6 ++++++ sources.json | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/line-colors.csv b/line-colors.csv index ff20b73..b359ca5 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -140,6 +140,12 @@ hvv-db-sbhh,S 1,s-bahn-hamburg,4-0s-1,#4da553,#ffffff,,pill hvv-db-sbhh,S 2,s-bahn-hamburg,4-0s-2,#95334a,#ffffff,,pill hvv-db-sbhh,S 3,s-bahn-hamburg,4-0s-3,#512c75,#ffffff,,pill hvv-db-sbhh,S 5,s-bahn-hamburg,4-0s-5,#3b87a9,#ffffff,,pill +hvv-had,61,,6-hvvhad-61,#009bb6,#ffffff,,trapezoid +hvv-had,62,,6-hvvhad-62,#009bb6,#ffffff,,trapezoid +hvv-had,64,,6-hvvhad-64,#009bb6,#ffffff,,trapezoid +hvv-had,72,,6-hvvhad-72,#009bb6,#ffffff,,trapezoid +hvv-had,73,,6-hvvhad-73,#009bb6,#ffffff,,trapezoid +hvv-had,75,,6-hvvhad-75,#009bb6,#ffffff,,trapezoid hvv-hha,U 1,,7-hvv001-1,#0072bc,#ffffff,,rectangle hvv-hha,U 2,,7-hvv001-2,#ee1d23,#ffffff,,rectangle hvv-hha,U 3,,7-hvv001-3,#ffdc01,#ffffff,,rectangle diff --git a/sources.json b/sources.json index 6c95ec2..15d771f 100644 --- a/sources.json +++ b/sources.json @@ -261,6 +261,21 @@ } ] }, + { + "shortOperatorName": "hvv-had", + "contributors": [ + { + "github": "lunas-bad-coding" + } + ], + "sources": [ + { + "name": "hvv Hafenfährenplan", + "source": "https://www.hvv.de/de/plaene" + } + ] + }, + { "shortOperatorName": "hvv-hha", "contributors": [ From f51d8ab54081fba82510edd55ed9eba2b6cc0a4b Mon Sep 17 00:00:00 2001 From: Luna <160403915+lunas-bad-coding@users.noreply.github.com> Date: Sat, 25 May 2024 17:25:39 +0200 Subject: [PATCH 4/4] changed hvv ferry shape --- line-colors.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/line-colors.csv b/line-colors.csv index b359ca5..9c66a19 100644 --- a/line-colors.csv +++ b/line-colors.csv @@ -140,12 +140,12 @@ hvv-db-sbhh,S 1,s-bahn-hamburg,4-0s-1,#4da553,#ffffff,,pill hvv-db-sbhh,S 2,s-bahn-hamburg,4-0s-2,#95334a,#ffffff,,pill hvv-db-sbhh,S 3,s-bahn-hamburg,4-0s-3,#512c75,#ffffff,,pill hvv-db-sbhh,S 5,s-bahn-hamburg,4-0s-5,#3b87a9,#ffffff,,pill -hvv-had,61,,6-hvvhad-61,#009bb6,#ffffff,,trapezoid -hvv-had,62,,6-hvvhad-62,#009bb6,#ffffff,,trapezoid -hvv-had,64,,6-hvvhad-64,#009bb6,#ffffff,,trapezoid -hvv-had,72,,6-hvvhad-72,#009bb6,#ffffff,,trapezoid -hvv-had,73,,6-hvvhad-73,#009bb6,#ffffff,,trapezoid -hvv-had,75,,6-hvvhad-75,#009bb6,#ffffff,,trapezoid +hvv-had,61,,6-hvvhad-61,#009bb6,#ffffff,,rectangle-rounded-corner +hvv-had,62,,6-hvvhad-62,#009bb6,#ffffff,,rectangle-rounded-corner +hvv-had,64,,6-hvvhad-64,#009bb6,#ffffff,,rectangle-rounded-corner +hvv-had,72,,6-hvvhad-72,#009bb6,#ffffff,,rectangle-rounded-corner +hvv-had,73,,6-hvvhad-73,#009bb6,#ffffff,,rectangle-rounded-corner +hvv-had,75,,6-hvvhad-75,#009bb6,#ffffff,,rectangle-rounded-corner hvv-hha,U 1,,7-hvv001-1,#0072bc,#ffffff,,rectangle hvv-hha,U 2,,7-hvv001-2,#ee1d23,#ffffff,,rectangle hvv-hha,U 3,,7-hvv001-3,#ffdc01,#ffffff,,rectangle