diff --git a/front/bahnui-front/src/assets/logos/avl_lux.svg b/front/bahnui-front/src/assets/logos/avl_lux.svg new file mode 100644 index 0000000..56a3bcd --- /dev/null +++ b/front/bahnui-front/src/assets/logos/avl_lux.svg @@ -0,0 +1,22 @@ + + + + + + + + +]> + \ No newline at end of file diff --git a/front/bahnui-front/src/assets/logos/rgtr.svg b/front/bahnui-front/src/assets/logos/rgtr.svg new file mode 100644 index 0000000..7232b0c --- /dev/null +++ b/front/bahnui-front/src/assets/logos/rgtr.svg @@ -0,0 +1,25 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/front/bahnui-front/src/components/routing.vue b/front/bahnui-front/src/components/routing.vue index 1f443a5..b4f7e00 100644 --- a/front/bahnui-front/src/components/routing.vue +++ b/front/bahnui-front/src/components/routing.vue @@ -1,23 +1,24 @@ @@ -29,7 +30,8 @@ export default { name: 'RoutingBahn', props: { - connections: Array + connections: Array, + isMobile: Boolean, }, components: { }, @@ -40,6 +42,9 @@ } }, methods: { + getDisplayClass(){ + return this.isMobile ? "displaytall" : "displaywide"; + }, toDate(string){ return new Date(string).toLocaleDateString("de-DE"); }, @@ -55,6 +60,9 @@ getLineColors(line){ return routefunctions.getLineColors(line) }, + getRouteNumber(leg){ + return routefunctions.getRouteNumber(leg) + }, getOperatorLogo(line){ return operatorfunctions.getOperatorLogo(line) }, @@ -64,23 +72,19 @@ diff --git a/front/bahnui-front/src/lib/operators.js b/front/bahnui-front/src/lib/operators.js index 11435c9..941a585 100644 --- a/front/bahnui-front/src/lib/operators.js +++ b/front/bahnui-front/src/lib/operators.js @@ -78,7 +78,7 @@ let operatorfunctions = { return new URL('../assets/logos/zsrbije.png', import.meta.url); } else if (operator.id === "sncb"){ return new URL('../assets/logos/sncb.svg', import.meta.url); - } else if (operator.id === "cfl"){ + } else if (operator.id === "cfl" || operator.id ==="chemins-de-fer-luxembourgeois"){ return new URL('../assets/logos/cfl.svg', import.meta.url); } else if (operator.id.startsWith("s-bahn-berlin")){ return new URL('../assets/logos/sbahnberlin.svg', import.meta.url); @@ -159,9 +159,13 @@ let operatorfunctions = { } else if (operator.id === "caledonian-sleeper"){ return new URL('../assets/logos/caledonian-sleeper.png', import.meta.url); } else if (operator.id === "mecklenburgische-baderbahn-molli"){ - return new URL('../assets/logos/molli.svg', import.meta.url); + return new URL('../assets/logos/molli.svg', import.meta.url); } else if (operator.id === "berliner-verkehrsbetriebe"){ - return new URL('../assets/logos/bvg_berlin.svg', import.meta.url); + return new URL('../assets/logos/bvg_berlin.svg', import.meta.url); + } else if (operator.id === "ville-de-luxembourg-service-autobus"){ + return new URL('../assets/logos/avl_lux.svg', import.meta.url); + } else if (operator.id === "regime-general-des-transports-routiers"){ + return new URL('../assets/logos/rgtr.svg', import.meta.url); } else { console.log(operator.id); return (null); diff --git a/front/bahnui-front/src/lib/routes.js b/front/bahnui-front/src/lib/routes.js index 360bc5c..11c639b 100644 --- a/front/bahnui-front/src/lib/routes.js +++ b/front/bahnui-front/src/lib/routes.js @@ -1,21 +1,64 @@ let routefunctions = { - getLineColors(line){ + getLineColors(leg){ + let line = leg?.line if (!line){ - return (['black', 'white']); + return (['black', 'white']); } else if (line.productName === "STB"){ - return (['white', 'blue']); + return (['white', 'blue']); } else if (line.productName === "S"){ - return (['white', 'green']); - } else if (line.productName === "RE" || line.productName === "RB"){ - return (['white', 'red']); - } else if (line.productName === "IC" || line.productName === "ICE"){ - return (['red', 'white']); + return (['white', 'green']); + } else if (line.productName === "RE" || line.productName === "RB" || line.productName === "R"){ + return (['white', 'red']); + } else if (line.productName === "IR"){ + return (['green', 'white']); + } else if (line.productName === "IC" || line.productName === "ICE" || line.productName === "RJ" || line.productName === "RJX"){ + return (['red', 'white']); } else if (line.productName === "EC" || line.productName === "ECE"){ - return (['blue', 'white']); + return (['blue', 'white']); } else if (line.productName === "MEX"){ - return (['black', 'yellow']); + return (['black', 'yellow']); + } else if (line.productName === "EST"){ + return (['yellow', 'blue']); + } else if (line.productName === "TGV"){ + return (['IndianRed', 'white']); + } else if (line.productName === "EN"){ + return (['white', 'navy']); } else { - return (['black', 'white']); + console.log(line.productName) + return (['black', 'white']); + } + }, + getRouteNumber(leg){ + if (!leg) { + console.log(leg) + return "" + } else if (leg.walking){ + return ""; + } else if (leg.line){ + if (leg.line.name) { + if (leg.line.fahrtNr && leg.line.name.endsWith(leg.line.fahrtNr)){ + return leg.line.name.replace(leg.line.fahrtNr, "").trim(); + } else { + return leg.line.name; + } + } else if(leg.line.product){ + if (leg.line.product === 'regionalExpress'){ + return "REX" + } else if (leg.line.product === 'regional'){ + return "REG" + } else if (leg.line.product === 'national'){ + return "NAT" + } else { + console.log(leg) + return "" + } + } else { + console.log(leg) + return "" + } + } else { + console.log(leg) + return "" } } }