From beab95509117f9f523d9b15d9f80bbab5ae297f1 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 23 Jul 2026 12:13:35 +0200 Subject: [PATCH 01/18] feat: Add initial route planner support --- .pre-commit-config.yaml | 1 + archetypes/country/index.de.md | 3 +- archetypes/country/index.en.md | 3 +- archetypes/country/index.fr.md | 3 +- assets/js/main.js | 1 + assets/js/routePlanner.js | 500 +++++++++++++++++++ assets/sass/main.scss | 1 + assets/sass/routePlanner.scss | 403 +++++++++++++++ content/country/austria/index.de.md | 36 +- content/country/austria/index.en.md | 36 +- content/country/austria/index.fr.md | 36 +- content/country/belgium/index.de.md | 6 +- content/country/belgium/index.en.md | 6 +- content/country/belgium/index.fr.md | 6 +- content/country/bulgaria/index.de.md | 3 +- content/country/bulgaria/index.en.md | 3 +- content/country/bulgaria/index.fr.md | 3 +- content/country/czechia/index.de.md | 21 +- content/country/czechia/index.en.md | 21 +- content/country/czechia/index.fr.md | 21 +- content/country/denmark/index.de.md | 21 +- content/country/denmark/index.en.md | 21 +- content/country/denmark/index.fr.md | 21 +- content/country/france/index.de.md | 21 +- content/country/france/index.en.md | 21 +- content/country/france/index.fr.md | 21 +- content/country/germany/index.de.md | 246 ++++++--- content/country/germany/index.en.md | 246 ++++++--- content/country/germany/index.fr.md | 246 ++++++--- content/country/greece/index.de.md | 6 +- content/country/greece/index.en.md | 6 +- content/country/greece/index.fr.md | 6 +- content/country/ireland/index.de.md | 3 +- content/country/ireland/index.en.md | 3 +- content/country/ireland/index.fr.md | 3 +- content/country/italy/index.de.md | 24 +- content/country/italy/index.en.md | 24 +- content/country/italy/index.fr.md | 24 +- content/country/latvia/index.de.md | 3 +- content/country/latvia/index.en.md | 3 +- content/country/latvia/index.fr.md | 3 +- content/country/lithuania/index.de.md | 3 +- content/country/lithuania/index.en.md | 3 +- content/country/lithuania/index.fr.md | 3 +- content/country/netherlands/index.de.md | 24 +- content/country/netherlands/index.en.md | 24 +- content/country/netherlands/index.fr.md | 24 +- content/country/norway/index.de.md | 12 +- content/country/norway/index.en.md | 12 +- content/country/norway/index.fr.md | 12 +- content/country/poland/index.de.md | 18 +- content/country/poland/index.en.md | 18 +- content/country/poland/index.fr.md | 18 +- content/country/portugal/index.de.md | 3 +- content/country/portugal/index.en.md | 3 +- content/country/portugal/index.fr.md | 3 +- content/country/romania/index.de.md | 18 +- content/country/romania/index.en.md | 18 +- content/country/romania/index.fr.md | 18 +- content/country/serbia/index.de.md | 3 +- content/country/serbia/index.en.md | 3 +- content/country/serbia/index.fr.md | 3 +- content/country/slovakia/index.de.md | 6 +- content/country/slovakia/index.en.md | 6 +- content/country/slovakia/index.fr.md | 6 +- content/country/slovenia/index.de.md | 3 +- content/country/slovenia/index.en.md | 3 +- content/country/slovenia/index.fr.md | 3 +- content/country/spain/index.de.md | 9 +- content/country/spain/index.en.md | 9 +- content/country/spain/index.fr.md | 9 +- content/country/switzerland/index.de.md | 18 +- content/country/switzerland/index.en.md | 18 +- content/country/switzerland/index.fr.md | 18 +- content/country/united-kingdom/index.de.md | 45 +- content/country/united-kingdom/index.en.md | 45 +- content/country/united-kingdom/index.fr.md | 45 +- content/general/_index.de.md | 1 + content/general/_index.en.md | 1 + content/general/_index.fr.md | 1 + content/general/route-planner/index.de.md | 4 + content/general/route-planner/index.en.md | 4 + content/general/route-planner/index.fr.md | 4 + content/operator/bdz/index.de.md | 3 + content/operator/bdz/index.en.md | 3 + content/operator/bdz/index.fr.md | 3 + content/operator/bls/index.de.md | 4 + content/operator/bls/index.en.md | 4 + content/operator/bls/index.fr.md | 4 + content/operator/cd/index.de.md | 4 + content/operator/cd/index.en.md | 4 + content/operator/cd/index.fr.md | 4 + content/operator/cfl/index.de.md | 3 + content/operator/cfl/index.en.md | 3 + content/operator/cfl/index.fr.md | 3 + content/operator/cfr/index.de.md | 3 + content/operator/cfr/index.en.md | 3 + content/operator/cfr/index.fr.md | 3 + content/operator/cie/index.de.md | 4 + content/operator/cie/index.en.md | 4 + content/operator/cie/index.fr.md | 4 + content/operator/cp/index.de.md | 4 + content/operator/cp/index.en.md | 4 + content/operator/cp/index.fr.md | 4 + content/operator/db/index.de.md | 20 + content/operator/db/index.en.md | 20 + content/operator/db/index.fr.md | 20 + content/operator/dsb/index.de.md | 3 + content/operator/dsb/index.en.md | 3 + content/operator/dsb/index.fr.md | 3 + content/operator/eurostar/index.de.md | 13 + content/operator/eurostar/index.en.md | 13 + content/operator/eurostar/index.fr.md | 12 + content/operator/fs/index.de.md | 3 + content/operator/fs/index.en.md | 3 + content/operator/fs/index.fr.md | 3 + content/operator/gysev/index.de.md | 4 + content/operator/gysev/index.en.md | 4 + content/operator/gysev/index.fr.md | 4 + content/operator/ht/index.de.md | 4 + content/operator/ht/index.en.md | 4 + content/operator/ht/index.fr.md | 4 + content/operator/kd/index.de.md | 3 + content/operator/kd/index.en.md | 3 + content/operator/kd/index.fr.md | 3 + content/operator/kml/index.de.md | 3 + content/operator/kml/index.en.md | 3 + content/operator/kml/index.fr.md | 3 + content/operator/ks/index.de.md | 3 + content/operator/ks/index.en.md | 3 + content/operator/ks/index.fr.md | 3 + content/operator/kw/index.de.md | 3 + content/operator/kw/index.en.md | 3 + content/operator/kw/index.fr.md | 3 + content/operator/lka/index.de.md | 3 + content/operator/lka/index.en.md | 3 + content/operator/lka/index.fr.md | 3 + content/operator/ltg/index.de.md | 3 + content/operator/ltg/index.en.md | 3 + content/operator/ltg/index.fr.md | 3 + content/operator/nir/index.de.md | 4 + content/operator/nir/index.en.md | 4 + content/operator/nir/index.fr.md | 4 + content/operator/ns/index.de.md | 5 + content/operator/ns/index.en.md | 5 + content/operator/ns/index.fr.md | 5 + content/operator/oebb/index.de.md | 5 + content/operator/oebb/index.en.md | 5 + content/operator/oebb/index.fr.md | 5 + content/operator/pkp/index.de.md | 4 + content/operator/pkp/index.en.md | 4 + content/operator/pkp/index.fr.md | 4 + content/operator/renfe/index.de.md | 8 + content/operator/renfe/index.en.md | 8 + content/operator/renfe/index.fr.md | 8 + content/operator/sbb/index.de.md | 6 + content/operator/sbb/index.en.md | 6 + content/operator/sbb/index.fr.md | 6 + content/operator/sncb/index.de.md | 4 + content/operator/sncb/index.en.md | 4 + content/operator/sncb/index.fr.md | 4 + content/operator/sncf/index.de.md | 4 + content/operator/sncf/index.en.md | 4 + content/operator/sncf/index.fr.md | 4 + content/operator/sv/index.de.md | 3 + content/operator/sv/index.en.md | 3 + content/operator/sv/index.fr.md | 3 + content/operator/sz/index.de.md | 4 + content/operator/sz/index.en.md | 4 + content/operator/sz/index.fr.md | 4 + content/operator/vy/index.de.md | 6 + content/operator/vy/index.en.md | 6 + content/operator/vy/index.fr.md | 6 + content/operator/zpcg/index.de.md | 3 + content/operator/zpcg/index.en.md | 3 + content/operator/zpcg/index.fr.md | 3 + content/operator/zssk/index.de.md | 3 + content/operator/zssk/index.en.md | 3 + content/operator/zssk/index.fr.md | 3 + hugo.yaml | 14 +- i18n/de.yaml | 24 + i18n/en.yaml | 24 + i18n/fr.yaml | 24 + layouts/_default/home.transitousmapping.json | 38 ++ layouts/_shortcodes/train-category.html | 4 + layouts/country/single.html | 2 +- layouts/general/route-planner/single.html | 128 +++++ package-lock.json | 20 + package.json | 1 + 189 files changed, 2754 insertions(+), 557 deletions(-) create mode 100644 assets/js/routePlanner.js create mode 100644 assets/sass/routePlanner.scss create mode 100644 content/general/route-planner/index.de.md create mode 100644 content/general/route-planner/index.en.md create mode 100644 content/general/route-planner/index.fr.md create mode 100644 layouts/_default/home.transitousmapping.json create mode 100644 layouts/general/route-planner/single.html diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d5b7d27f9..5ea443e80 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,6 +15,7 @@ repos: - id: check-case-conflict - id: check-executables-have-shebangs - id: check-json + exclude: "layouts/_default/home.transitousmapping.json$" - id: check-merge-conflict - id: check-shebang-scripts-are-executable - id: check-symlinks diff --git a/archetypes/country/index.de.md b/archetypes/country/index.de.md index 2f8fb99e3..dd7a927fa 100644 --- a/archetypes/country/index.de.md +++ b/archetypes/country/index.de.md @@ -4,7 +4,8 @@ title: "{{ .File.ContentBaseName | title }}" # Ändere den Name auf den deutsche country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - - # Liste Betreiber, die kein FIP akzeptieren + - name: # Betreibername + query: # z.B. agencyName == "Betreibername" --- diff --git a/archetypes/country/index.en.md b/archetypes/country/index.en.md index 9a845c761..89014724a 100644 --- a/archetypes/country/index.en.md +++ b/archetypes/country/index.en.md @@ -4,7 +4,8 @@ title: "{{ .File.ContentBaseName | title }}" # Change the name to the English co country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - - # List operators without FIP here + - name: # Operator name + query: # e.g. agencyName == "Operator Name" --- diff --git a/archetypes/country/index.fr.md b/archetypes/country/index.fr.md index 06df884ac..209b1b6d9 100644 --- a/archetypes/country/index.fr.md +++ b/archetypes/country/index.fr.md @@ -4,7 +4,8 @@ title: "{{ .File.ContentBaseName | title }}" # Change le nom par le nom du pays country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - - # Listez ici les opérateurs ne participant pas au FIP + - name: # Nom de l'opérateur + query: # p.ex. agencyName == "Nom de l'opérateur" --- diff --git a/assets/js/main.js b/assets/js/main.js index 250f2f335..24410a683 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -11,3 +11,4 @@ import "./expander.js"; import "./dialog.js"; import "./fipValidityComparison.js"; import "./search.js"; +import "./routePlanner.js"; diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js new file mode 100644 index 000000000..c6c35f8b3 --- /dev/null +++ b/assets/js/routePlanner.js @@ -0,0 +1,500 @@ +import { client, geocode, plan } from "@motis-project/motis-client"; + +client.setConfig({ + baseUrl: "https://api.transitous.org", + querySerializer: (params) => { + const parts = []; + for (const [key, value] of Object.entries(params)) { + if (value === undefined || value === null) continue; + if (Array.isArray(value)) { + parts.push(`${key}=${value.map(encodeURIComponent).join(",")}`); + } else { + parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`); + } + } + return parts.join("&"); + }, +}); + +const DEBOUNCE_MS = 300; +const MIN_QUERY_LEN = 2; + +let fromPlace = null; +let toPlace = null; + +let transitousMapping = null; + +async function loadData() { + const lang = window.routePlannerConfig.lang; + const mappingRes = await fetch(`/${lang}/transitous-mapping.json`); + transitousMapping = await mappingRes.json(); +} + +function evalQuery(query, leg) { + try { + const { + agencyId, + agencyName, + routeShortName, + displayName, + mode, + routeId, + tripShortName, + } = leg; + return Function( + "agencyId", + "agencyName", + "routeShortName", + "displayName", + "mode", + "routeId", + "tripShortName", + `"use strict"; return (${query});`, + )( + agencyId, + agencyName, + routeShortName, + displayName, + mode, + routeId, + tripShortName, + ); + } catch { + return false; + } +} + +function matchLeg(leg) { + if (!transitousMapping) return null; + for (const op of transitousMapping) { + for (const entry of op.mapping) { + if (evalQuery(entry.query, leg)) { + return { + operatorSlug: op.operator, + categoryId: entry.category || null, + fipAccepted: entry.fipAccepted ?? null, + matchedQuery: entry.query, + country: entry.country || null, + }; + } + } + } + return null; +} + +function getFipStatus(leg) { + const cfg = window.routePlannerConfig; + const debug = { + from: leg.from?.name || null, + to: leg.to?.name || null, + startTime: leg.startTime ? new Date(leg.startTime).toLocaleString() : null, + endTime: leg.endTime ? new Date(leg.endTime).toLocaleString() : null, + agencyId: leg.agencyId || null, + agencyName: leg.agencyName || null, + routeShortName: leg.routeShortName || null, + displayName: leg.displayName || null, + mode: leg.mode || null, + routeId: leg.routeId || null, + tripShortName: leg.tripShortName || null, + matchedQuery: null, + }; + + const match = matchLeg(leg); + if (!match) { + return { + status: "unknown", + label: cfg.labels.fipUnknown, + categoryUrl: null, + operatorSlug: null, + debug, + }; + } + + debug.matchedQuery = match.matchedQuery; + const { + operatorSlug, + categoryId, + fipAccepted: matchedFipAccepted, + country, + } = match; + const isNoFip = operatorSlug === "no-fip"; + const operatorUrl = isNoFip ? null : `/${cfg.lang}/operator/${operatorSlug}/`; + const categoryUrl = isNoFip + ? country + ? `/${cfg.lang}/country/${country}/#operators-without-fip-title` + : null + : categoryId + ? `/${cfg.lang}/operator/${operatorSlug}/#${categoryId}` + : operatorUrl; + + if (matchedFipAccepted === false || matchedFipAccepted === "false") { + return { + status: "not-accepted", + label: cfg.labels.fipNotAccepted, + categoryUrl, + operatorSlug, + debug, + }; + } + if (matchedFipAccepted === "partially") { + return { + status: "partial", + label: cfg.labels.fipPartial, + categoryUrl, + operatorSlug, + debug, + }; + } + if (matchedFipAccepted === true || matchedFipAccepted === "true") { + return { + status: "accepted", + label: cfg.labels.fipAccepted, + categoryUrl, + operatorSlug, + debug, + }; + } + return { + status: "unknown", + label: cfg.labels.fipUnknown, + categoryUrl, + operatorSlug, + debug, + }; +} + +function formatTime(isoString) { + if (!isoString) return ""; + const d = new Date(isoString); + return d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }); +} + +function formatDuration(seconds) { + const h = Math.floor(seconds / 3600); + const m = Math.floor((seconds % 3600) / 60); + if (h > 0) return `${h}h ${m}min`; + return `${m}min`; +} + +let fipDebugCounter = 0; + +function renderFipBadge(fipStatus) { + const cfg = window.routePlannerConfig; + const popoverId = `fip-debug-${++fipDebugCounter}`; + + const rows = Object.entries(fipStatus.debug) + .map( + ([k, v]) => + `${k}${v !== null ? v : "—"}`, + ) + .join(""); + const popoverHtml = ` +
+ ${rows}
+
`; + + let badgeHtml = `${fipStatus.label}`; + badgeHtml += ` ${popoverHtml}`; + if (fipStatus.categoryUrl) { + badgeHtml += ` ${cfg.labels.viewInFipGuide}`; + } + return badgeHtml; +} + +function renderLeg(leg) { + const cfg = window.routePlannerConfig; + + if (leg.mode === "WALK" || leg.mode === "FOOT") { + const mins = Math.round(leg.duration / 60); + return ` +
+
🚶
+
+ ${cfg.labels.walk} ${mins}min +
+
`; + } + + const agencyName = leg.agencyName || ""; + const fipStatus = getFipStatus(leg); + const legLabel = leg.displayName || leg.routeShortName || ""; + const depTime = formatTime(leg.startTime); + const arrTime = formatTime(leg.endTime); + const headsign = leg.headsign ? ` → ${leg.headsign}` : ""; + const routeColor = leg.routeColor + ? `#${leg.routeColor}` + : "var(--link-default)"; + const textColor = leg.routeTextColor ? `#${leg.routeTextColor}` : "#fff"; + const fromPlatform = leg.from?.platformCode + ? ` ${cfg.labels.platform} ${leg.from.platformCode}` + : ""; + const toPlatform = leg.to?.platformCode + ? ` ${cfg.labels.platform} ${leg.to.platformCode}` + : ""; + + return ` +
+
+ ${legLabel} +
+
+
+ ${legLabel}${headsign} + ${agencyName ? `(${agencyName})` : ""} +
+
+ ${depTime} ${leg.from?.name || ""}${fromPlatform} + ${formatDuration(leg.duration)} + ${arrTime} ${leg.to?.name || ""}${toPlatform} +
+
+ ${renderFipBadge(fipStatus)} +
+
+
`; +} + +function renderItinerary(itinerary, index) { + const cfg = window.routePlannerConfig; + const depTime = formatTime( + itinerary.startTime || itinerary.legs?.[0]?.startTime, + ); + const arrTime = formatTime( + itinerary.endTime || itinerary.legs?.[itinerary.legs.length - 1]?.endTime, + ); + const duration = formatDuration(itinerary.duration); + + const transitLegs = + itinerary.legs?.filter((l) => l.mode !== "WALK" && l.mode !== "FOOT") || []; + const transfers = Math.max(0, transitLegs.length - 1); + + const legsHtml = (itinerary.legs || []) + .map((leg) => renderLeg(leg)) + .join('
'); + + return ` +
+ + ${depTime} – ${arrTime} + ${duration} + ${transfers > 0 ? `${transfers} ${cfg.labels.transfer}` : ""} + +
+ ${legsHtml} +
+
`; +} + +async function search() { + if (!fromPlace || !toPlace) return; + + const cfg = window.routePlannerConfig; + const resultsEl = document.getElementById("route-planner-results"); + const loadingEl = document.getElementById("route-planner-loading"); + const errorEl = document.getElementById("route-planner-error"); + const itinerariesEl = document.getElementById("route-planner-itineraries"); + + resultsEl.hidden = false; + loadingEl.hidden = false; + errorEl.hidden = true; + itinerariesEl.innerHTML = ""; + + const timeInput = document.getElementById("route-planner-time"); + const timeValue = timeInput.value + ? new Date(timeInput.value).toISOString() + : new Date().toISOString(); + + try { + const response = await plan({ + query: { + fromPlace: fromPlace.id, + toPlace: toPlace.id, + time: timeValue, + withFares: true, + numLegAlternatives: 3, + fastestDirectFactor: 1.5, + joinInterlinedLegs: false, + maxMatchingDistance: 250, + numItineraries: 5, + transitModes: [ + "TRAM", + "FERRY", + "AIRPLANE", + "BUS", + "RAIL", + "FUNICULAR", + "AERIAL_LIFT", + "OTHER", + ], + }, + }); + + if (response.error) { + errorEl.textContent = cfg.labels.errorGeneric; + errorEl.hidden = false; + return; + } + + const itineraries = response.data?.itineraries || []; + if (itineraries.length === 0) { + itinerariesEl.innerHTML = `

${cfg.labels.noResults}

`; + return; + } + + itinerariesEl.innerHTML = itineraries + .map((it, i) => renderItinerary(it, i)) + .join(""); + } catch (err) { + errorEl.textContent = cfg.labels.errorGeneric; + errorEl.hidden = false; + } finally { + loadingEl.hidden = true; + } +} + +function setupAutocomplete(inputId, suggestionsId, onSelect) { + const input = document.getElementById(inputId); + const suggestions = document.getElementById(suggestionsId); + let debounce = null; + let activeIndex = -1; + let currentMatches = []; + + function hideSuggestions() { + suggestions.hidden = true; + input.setAttribute("aria-expanded", "false"); + activeIndex = -1; + } + + function showSuggestions(matches) { + currentMatches = matches; + if (matches.length === 0) { + hideSuggestions(); + return; + } + suggestions.innerHTML = matches + .map((m, i) => { + const area = m.areas?.[0]?.name + ? `${m.areas[0].name}` + : ""; + return `
  • ${m.name}${area}
    • `; + }) + .join(""); + suggestions.hidden = false; + input.setAttribute("aria-expanded", "true"); + activeIndex = -1; + } + + input.addEventListener("input", () => { + clearTimeout(debounce); + const q = input.value.trim(); + if (q.length < MIN_QUERY_LEN) { + hideSuggestions(); + onSelect(null); + return; + } + debounce = setTimeout(async () => { + try { + const res = await geocode({ query: { text: q, numResults: 20 } }); + showSuggestions((res.data || []).filter((r) => r.type === "STOP")); + } catch { + hideSuggestions(); + } + }, DEBOUNCE_MS); + }); + + suggestions.addEventListener("mousedown", (e) => { + const li = e.target.closest("[data-index]"); + if (!li) return; + e.preventDefault(); + const match = currentMatches[parseInt(li.dataset.index, 10)]; + input.value = match.name; + onSelect(match); + hideSuggestions(); + }); + + input.addEventListener("keydown", (e) => { + if (suggestions.hidden) return; + if (e.key === "ArrowDown") { + e.preventDefault(); + activeIndex = Math.min(activeIndex + 1, currentMatches.length - 1); + updateActive(); + } else if (e.key === "ArrowUp") { + e.preventDefault(); + activeIndex = Math.max(activeIndex - 1, 0); + updateActive(); + } else if (e.key === "Enter" && activeIndex >= 0) { + e.preventDefault(); + const match = currentMatches[activeIndex]; + input.value = match.name; + onSelect(match); + hideSuggestions(); + } else if (e.key === "Escape") { + hideSuggestions(); + } + }); + + function updateActive() { + const items = suggestions.querySelectorAll("[data-index]"); + items.forEach((item, i) => { + item.classList.toggle( + "o-route-planner__suggestion-item--active", + i === activeIndex, + ); + }); + } + + document.addEventListener("click", (e) => { + if (!input.contains(e.target) && !suggestions.contains(e.target)) { + hideSuggestions(); + } + }); +} + +function setDefaultTime() { + const input = document.getElementById("route-planner-time"); + const now = new Date(); + now.setSeconds(0, 0); + input.value = now.toISOString().slice(0, 16); +} + +function initRoutePlanner() { + if (!document.getElementById("route-planner-search")) return; + + setDefaultTime(); + loadData(); + + setupAutocomplete( + "route-planner-from", + "route-planner-from-suggestions", + (match) => { + fromPlace = match; + }, + ); + + setupAutocomplete( + "route-planner-to", + "route-planner-to-suggestions", + (match) => { + toPlace = match; + }, + ); + + document + .getElementById("route-planner-search") + .addEventListener("click", search); + + document + .getElementById("route-planner-swap") + .addEventListener("click", () => { + const fromInput = document.getElementById("route-planner-from"); + const toInput = document.getElementById("route-planner-to"); + [fromInput.value, toInput.value] = [toInput.value, fromInput.value]; + [fromPlace, toPlace] = [toPlace, fromPlace]; + }); +} + +if (document.readyState !== "loading") { + initRoutePlanner(); +} else { + document.addEventListener("DOMContentLoaded", initRoutePlanner); +} diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 3aed6e2f5..5f4a26739 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -26,3 +26,4 @@ @import "dialog.scss"; @import "fip-validity.scss"; @import "404.scss"; +@import "routePlanner.scss"; diff --git a/assets/sass/routePlanner.scss b/assets/sass/routePlanner.scss new file mode 100644 index 000000000..4a9d4c01a --- /dev/null +++ b/assets/sass/routePlanner.scss @@ -0,0 +1,403 @@ +.o-route-planner { + &__fields { + display: flex; + flex-direction: column; + gap: 1rem; + max-width: 640px; + } + + &__field-group { + display: flex; + flex-direction: column; + gap: 0.25rem; + + label { + font-weight: 500; + font-size: 2rem; + } + } + + &__autocomplete-wrapper { + position: relative; + } + + &__suggestions { + position: absolute; + top: 100%; + left: 0; + right: 0; + z-index: 100; + background: var(--bg-default); + border: 1px solid var(--border-visible); + border-radius: var(--border-radius-s); + box-shadow: var(--box-shadow); + list-style: none; + margin: 0.25rem 0 0; + padding: 0.25rem 0; + max-height: 320px; + overflow-y: auto; + } + + &__suggestion-item { + padding: 0.65rem 1rem; + cursor: pointer; + font-size: 2rem; + + &:hover, + &--active { + background: var(--bg-neutral); + } + } + + &__suggestion-area { + display: block; + font-size: 1.4rem; + color: #666; + + [data-theme="dark"] & { + color: #aaa; + } + } + + &__swap { + align-self: flex-start; + margin-top: 0.25rem; + } + + &__results { + margin-top: 1.5rem; + } + + &__loading { + display: flex; + align-items: center; + gap: 0.75rem; + color: var(--color-onLight, #000); + font-size: 1.5rem; + padding: 1rem 0; + + &[hidden] { + display: none; + } + } + + &__spinner { + display: inline-block; + width: 1.25rem; + height: 1.25rem; + border: 2px solid var(--bg-neutral); + border-top-color: var(--link-default); + border-radius: 50%; + animation: route-planner-spin 0.7s linear infinite; + + @media (prefers-reduced-motion: reduce) { + animation: none; + border-top-color: var(--link-default); + } + } + + &__error { + color: map-get($tag-colors, error); + padding: 0.75rem 1rem; + border: 1px solid currentColor; + border-radius: var(--border-radius-s); + background: rgba(map-get($tag-colors, error), 0.05); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, error); + } + } + + &__no-results { + color: #666; + font-style: italic; + } + + &__itinerary { + border: 1px solid var(--border-visible); + border-radius: var(--border-radius-m); + margin-bottom: 1rem; + overflow: hidden; + + &[open] > summary .a-icon { + transform: rotate(180deg); + } + } + + &__itinerary-summary { + display: flex; + align-items: center; + gap: 1rem; + padding: 0.875rem 1rem; + cursor: pointer; + background: var(--bg-neutral); + flex-wrap: wrap; + list-style: none; + + &::-webkit-details-marker { + display: none; + } + + &:hover { + background: darken(#ebe9e1, 5%); + } + } + + &__itinerary-times { + font-weight: 600; + font-size: 1.75rem; + } + + &__itinerary-duration { + color: #555; + font-size: 2rem; + + [data-theme="dark"] & { + color: #aaa; + } + } + + &__itinerary-transfers { + font-size: 1.5rem; + background: var(--bg-default); + border-radius: 999px; + padding: 0.1rem 0.5rem; + border: 1px solid var(--border-visible); + } + + &__itinerary-legs { + padding: 1.25rem; + display: flex; + flex-direction: column; + gap: 0; + } + + &__leg-connector { + width: 2px; + height: 1.25rem; + background: var(--border-visible); + margin-left: 1.5rem; + } + + &__leg { + display: flex; + gap: 1rem; + align-items: flex-start; + + &--walk { + opacity: 0.7; + font-size: 1.5rem; + } + + &--transit { + .o-route-planner__leg-info { + flex: 1; + min-width: 0; + } + } + } + + &__leg-line { + flex-shrink: 0; + width: 8rem; + display: flex; + justify-content: center; + } + + &__leg-badge { + display: inline-block; + background: var(--leg-color, var(--link-default)); + color: var(--leg-text-color, #fff); + font-weight: 700; + font-size: 1.4rem; + padding: 0.25rem 0.5rem; + border-radius: var(--border-radius-s); + white-space: nowrap; + max-width: 8rem; + overflow: hidden; + text-overflow: ellipsis; + } + + &__leg-icon { + flex-shrink: 0; + width: 3rem; + text-align: center; + font-size: 2rem; + } + + &__leg-route { + font-size: 2rem; + margin-bottom: 0.3rem; + } + + &__agency { + font-size: 1.4rem; + color: #666; + margin-left: 0.25rem; + + [data-theme="dark"] & { + color: #aaa; + } + } + + &__leg-times { + display: flex; + align-items: center; + gap: 0.5rem; + font-size: 1.5rem; + color: #444; + margin-bottom: 0.4rem; + flex-wrap: wrap; + + [data-theme="dark"] & { + color: #ccc; + } + } + + &__leg-duration { + font-style: italic; + flex-shrink: 0; + } + + &__platform { + font-size: 1.3rem; + background: var(--bg-neutral); + border-radius: var(--border-radius-s); + padding: 0.1rem 0.3rem; + } + + &__leg-walk { + font-size: 1.5rem; + color: #555; + + [data-theme="dark"] & { + color: #aaa; + } + } + + &__leg-fip { + display: flex; + align-items: center; + gap: 0.5rem; + flex-wrap: wrap; + margin-top: 0.2rem; + } + + &__fip-badge { + display: inline-block; + font-size: 1.3rem; + font-weight: 600; + padding: 0.2rem 0.6rem; + border-radius: 999px; + border: 1px solid currentColor; + + &--accepted { + color: map-get($tag-colors, success); + background: rgba(map-get($tag-colors, success), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, success); + background: rgba(map-get($tag-colors-dark, success), 0.1); + } + } + + &--partial { + color: map-get($tag-colors, warning); + background: rgba(map-get($tag-colors, warning), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, warning); + background: rgba(map-get($tag-colors-dark, warning), 0.1); + } + } + + &--not-accepted { + color: map-get($tag-colors, error); + background: rgba(map-get($tag-colors, error), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, error); + background: rgba(map-get($tag-colors-dark, error), 0.1); + } + } + + &--unknown { + color: map-get($tag-colors, info); + background: rgba(map-get($tag-colors, info), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, info); + background: rgba(map-get($tag-colors-dark, info), 0.1); + } + } + } + + &__fip-link { + font-size: 1.3rem; + } + + &__fip-info { + display: inline-flex; + align-items: center; + background: none; + border: none; + padding: 0; + cursor: pointer; + color: var(--text-muted, currentColor); + opacity: 0.6; + vertical-align: middle; + + &:hover { + opacity: 1; + } + + .a-icon { + font-size: 2rem; + } + } + + &__fip-debug-popover { + position: fixed; + margin: auto; + padding: 0.75rem 1rem; + border: 1px solid var(--border-default, #ccc); + border-radius: 0.5rem; + background: var(--bg-default, #fff); + color: var(--text-default, #000); + font-size: 1.3rem; + max-width: 480px; + width: 90vw; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15); + + [data-theme="dark"] & { + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5); + } + } + + &__fip-debug-table { + border-collapse: collapse; + width: 100%; + + td { + padding: 0.2rem 0.4rem; + vertical-align: top; + } + } + + &__fip-debug-key { + font-weight: 600; + white-space: nowrap; + padding-right: 1rem; + } + + &__fip-debug-val { + font-family: monospace; + word-break: break-all; + } +} + +@keyframes route-planner-spin { + to { + transform: rotate(360deg); + } +} diff --git a/content/country/austria/index.de.md b/content/country/austria/index.de.md index e3964f407..b193832be 100644 --- a/content/country/austria/index.de.md +++ b/content/country/austria/index.de.md @@ -4,18 +4,30 @@ title: "Österreich" country: "austria" params: operators_without_fip: - - Achenseebahn - - '[CAT (City Airport Train) Wien](/operator/oebb#wien-flughafen-city-airport-train-cat "CAT")' - - Graz–Köflacher Bahn (GKB) - - Montafonerbahn - - NÖVOG - - Pinzgauer Lokalbahn - - RegioJet - - Salzburger Lokalbahn - - Steiermärkische Landesbahnen - - WESTbahn - - Wiener Lokalbahn (Badner Bahn) - - Zillertalbahn + - name: Achenseebahn + query: + - name: '[CAT (City Airport Train) Wien](/operator/oebb#wien-flughafen-city-airport-train-cat "CAT")' + query: + - name: Graz–Köflacher Bahn (GKB) + query: + - name: Montafonerbahn + query: + - name: NÖVOG + query: + - name: Pinzgauer Lokalbahn + query: + - name: RegioJet + query: + - name: Salzburger Lokalbahn + query: + - name: Steiermärkische Landesbahnen + query: + - name: WESTbahn + query: + - name: Wiener Lokalbahn (Badner Bahn) + query: + - name: Zillertalbahn + query: --- ## FIP Nutzung diff --git a/content/country/austria/index.en.md b/content/country/austria/index.en.md index d89fa881f..cfa0178f3 100644 --- a/content/country/austria/index.en.md +++ b/content/country/austria/index.en.md @@ -4,18 +4,30 @@ title: "Austria" country: "austria" params: operators_without_fip: - - Achenseebahn - - '[CAT (City Airport Train) Vienna](/operator/oebb#vienna-airport-city-airport-train-cat "CAT")' - - Graz–Köflacher Bahn (GKB) - - Montafonerbahn - - NÖVOG - - Pinzgauer Lokalbahn - - RegioJet - - Salzburger Lokalbahn - - Steiermärkische Landesbahnen - - WESTbahn - - Wiener Lokalbahn (Badner Bahn) - - Zillertalbahn + - name: Achenseebahn + query: + - name: '[CAT (City Airport Train) Vienna](/operator/oebb#vienna-airport-city-airport-train-cat "CAT")' + query: + - name: Graz–Köflacher Bahn (GKB) + query: + - name: Montafonerbahn + query: + - name: NÖVOG + query: + - name: Pinzgauer Lokalbahn + query: + - name: RegioJet + query: + - name: Salzburger Lokalbahn + query: + - name: Steiermärkische Landesbahnen + query: + - name: WESTbahn + query: + - name: Wiener Lokalbahn (Badner Bahn) + query: + - name: Zillertalbahn + query: --- ## FIP Information diff --git a/content/country/austria/index.fr.md b/content/country/austria/index.fr.md index 3e2674efb..a39a13742 100644 --- a/content/country/austria/index.fr.md +++ b/content/country/austria/index.fr.md @@ -4,18 +4,30 @@ title: "Autriche" country: "austria" params: operators_without_fip: - - Achenseebahn - - ’[CAT (City Airport Train) Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat "CAT")’ - - Graz–Köflacher Bahn (GKB) - - Montafonerbahn - - NÖVOG - - Pinzgauer Lokalbahn - - RegioJet - - Salzburger Lokalbahn - - Steiermärkische Landesbahnen - - WESTbahn - - Wiener Lokalbahn (Badner Bahn) - - Zillertalbahn + - name: Achenseebahn + query: + - name: ’[CAT (City Airport Train) Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat "CAT")’ + query: + - name: Graz–Köflacher Bahn (GKB) + query: + - name: Montafonerbahn + query: + - name: NÖVOG + query: + - name: Pinzgauer Lokalbahn + query: + - name: RegioJet + query: + - name: Salzburger Lokalbahn + query: + - name: Steiermärkische Landesbahnen + query: + - name: WESTbahn + query: + - name: Wiener Lokalbahn (Badner Bahn) + query: + - name: Zillertalbahn + query: --- ## Informations FIP diff --git a/content/country/belgium/index.de.md b/content/country/belgium/index.de.md index 4bd5e334c..ebd2e79c4 100644 --- a/content/country/belgium/index.de.md +++ b/content/country/belgium/index.de.md @@ -4,8 +4,10 @@ title: "Belgien" country: "belgium" params: operators_without_fip: - - European Sleeper - - OUIGO + - name: European Sleeper + query: + - name: OUIGO + query: --- ## FIP Nutzung diff --git a/content/country/belgium/index.en.md b/content/country/belgium/index.en.md index 3818b497a..77e1734a2 100644 --- a/content/country/belgium/index.en.md +++ b/content/country/belgium/index.en.md @@ -4,8 +4,10 @@ title: "Belgium" country: "belgium" params: operators_without_fip: - - European Sleeper - - OUIGO + - name: European Sleeper + query: + - name: OUIGO + query: --- ## FIP Information diff --git a/content/country/belgium/index.fr.md b/content/country/belgium/index.fr.md index 372f96073..08b3b4735 100644 --- a/content/country/belgium/index.fr.md +++ b/content/country/belgium/index.fr.md @@ -4,8 +4,10 @@ title: "Belgique" country: "belgium" params: operators_without_fip: - - European Sleeper - - OUIGO + - name: European Sleeper + query: + - name: OUIGO + query: --- ## Informations FIP diff --git a/content/country/bulgaria/index.de.md b/content/country/bulgaria/index.de.md index d7679d870..61085841a 100644 --- a/content/country/bulgaria/index.de.md +++ b/content/country/bulgaria/index.de.md @@ -4,7 +4,8 @@ title: "Bulgarien" country: "bulgaria" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Nutzung diff --git a/content/country/bulgaria/index.en.md b/content/country/bulgaria/index.en.md index e8cca3580..ed84a979d 100644 --- a/content/country/bulgaria/index.en.md +++ b/content/country/bulgaria/index.en.md @@ -4,7 +4,8 @@ title: "Bulgaria" country: "bulgaria" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Information diff --git a/content/country/bulgaria/index.fr.md b/content/country/bulgaria/index.fr.md index dab58f35d..e1ad5623b 100644 --- a/content/country/bulgaria/index.fr.md +++ b/content/country/bulgaria/index.fr.md @@ -4,7 +4,8 @@ title: "Bulgarie" country: "bulgaria" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## Informations FIP diff --git a/content/country/czechia/index.de.md b/content/country/czechia/index.de.md index 162f373e9..f86c07ecd 100644 --- a/content/country/czechia/index.de.md +++ b/content/country/czechia/index.de.md @@ -4,13 +4,20 @@ title: "Tschechien" country: "czechia" params: operators_without_fip: - - ARRIVA vlaky s. r. o. - - AŽD Praha s.r.o. - - GW Train Regio - - Jindřichohradecké místní dráhy (JHMD) - - Leo Express - - RegioJet - - Trilex / Die Länderbahn + - name: ARRIVA vlaky s. r. o. + query: + - name: AŽD Praha s.r.o. + query: + - name: GW Train Regio + query: + - name: Jindřichohradecké místní dráhy (JHMD) + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Trilex / Die Länderbahn + query: --- ## FIP Nutzung diff --git a/content/country/czechia/index.en.md b/content/country/czechia/index.en.md index 1b2f97144..45db56db9 100644 --- a/content/country/czechia/index.en.md +++ b/content/country/czechia/index.en.md @@ -4,13 +4,20 @@ title: "Czechia" country: "czechia" params: operators_without_fip: - - ARRIVA vlaky s. r. o. - - AŽD Praha s.r.o. - - GW Train Regio - - Jindřichohradecké místní dráhy (JHMD) - - Leo Express - - RegioJet - - Trilex / Die Länderbahn + - name: ARRIVA vlaky s. r. o. + query: + - name: AŽD Praha s.r.o. + query: + - name: GW Train Regio + query: + - name: Jindřichohradecké místní dráhy (JHMD) + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Trilex / Die Länderbahn + query: --- ## FIP Information diff --git a/content/country/czechia/index.fr.md b/content/country/czechia/index.fr.md index 04f8526d0..e170bc693 100644 --- a/content/country/czechia/index.fr.md +++ b/content/country/czechia/index.fr.md @@ -4,13 +4,20 @@ title: "Tchéquie" country: "czechia" params: operators_without_fip: - - ARRIVA vlaky s. r. o. - - AŽD Praha s.r.o. - - GW Train Regio - - Jindřichohradecké místní dráhy (JHMD) - - Leo Express - - RegioJet - - Trilex / Die Länderbahn + - name: ARRIVA vlaky s. r. o. + query: + - name: AŽD Praha s.r.o. + query: + - name: GW Train Regio + query: + - name: Jindřichohradecké místní dráhy (JHMD) + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Trilex / Die Länderbahn + query: --- ## Informations FIP diff --git a/content/country/denmark/index.de.md b/content/country/denmark/index.de.md index b3737d735..08f7cfd45 100644 --- a/content/country/denmark/index.de.md +++ b/content/country/denmark/index.de.md @@ -4,13 +4,20 @@ title: "Dänemark" country: "denmark" params: operators_without_fip: - - GoCollective (ehemals Arriva Danmark) - - Lokaltog - - Øresundståg - - Midtjyske Jernbaner - - Nordjyske Jernbaner - - SJ - - Snälltåget + - name: GoCollective (ehemals Arriva Danmark) + query: + - name: Lokaltog + query: + - name: Øresundståg + query: + - name: Midtjyske Jernbaner + query: + - name: Nordjyske Jernbaner + query: + - name: SJ + query: + - name: Snälltåget + query: --- ## FIP Nutzung diff --git a/content/country/denmark/index.en.md b/content/country/denmark/index.en.md index c795f5a24..2320ea55a 100644 --- a/content/country/denmark/index.en.md +++ b/content/country/denmark/index.en.md @@ -4,13 +4,20 @@ title: "Denmark" country: "denmark" params: operators_without_fip: - - GoCollective (ehemals Arriva Danmark) - - Lokaltog - - Øresundståg - - Midtjyske Jernbaner - - Nordjyske Jernbaner - - SJ - - Snälltåget + - name: GoCollective (ehemals Arriva Danmark) + query: + - name: Lokaltog + query: + - name: Øresundståg + query: + - name: Midtjyske Jernbaner + query: + - name: Nordjyske Jernbaner + query: + - name: SJ + query: + - name: Snälltåget + query: --- ## FIP Information diff --git a/content/country/denmark/index.fr.md b/content/country/denmark/index.fr.md index 5513c5aa7..9bc58e390 100644 --- a/content/country/denmark/index.fr.md +++ b/content/country/denmark/index.fr.md @@ -4,13 +4,20 @@ title: "Danemark" country: "denmark" params: operators_without_fip: - - GoCollective (anciennement Arriva Danmark) - - Lokaltog - - Øresundståg - - Midtjyske Jernbaner - - Nordjyske Jernbaner - - SJ - - Snälltåget + - name: GoCollective (anciennement Arriva Danmark) + query: + - name: Lokaltog + query: + - name: Øresundståg + query: + - name: Midtjyske Jernbaner + query: + - name: Nordjyske Jernbaner + query: + - name: SJ + query: + - name: Snälltåget + query: --- ## Informations FIP diff --git a/content/country/france/index.de.md b/content/country/france/index.de.md index e33436df5..29b9b0b9f 100644 --- a/content/country/france/index.de.md +++ b/content/country/france/index.de.md @@ -4,13 +4,20 @@ title: "Frankreich" country: "france" params: operators_without_fip: - - CFC (Chemins de fer de la Corse / Eisenbahnen auf Korsika) - - '[Frecciarossa (Trenitalia)](/operator/fs/#internationale-frecciarossa-züge-nach-paris "Frecciarossa (Trenitalia)")' - - Getlink (Eurotunnel LeShuttle) - - GoVolta - - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - - RATP - - Transdev + - name: CFC (Chemins de fer de la Corse / Eisenbahnen auf Korsika) + query: + - name: '[Frecciarossa (Trenitalia)](/operator/fs/#internationale-frecciarossa-züge-nach-paris "Frecciarossa (Trenitalia)")' + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: GoVolta + query: + - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + query: + - name: RATP + query: + - name: Transdev + query: --- ## FIP Nutzung diff --git a/content/country/france/index.en.md b/content/country/france/index.en.md index a0aee3cd8..7ad3036e1 100644 --- a/content/country/france/index.en.md +++ b/content/country/france/index.en.md @@ -4,13 +4,20 @@ title: "France" country: "france" params: operators_without_fip: - - CFC (Chemins de fer de la Corse / Railways in Corsica) - - '[Frecciarossa (Trenitalia)](/operator/fs/#international-frecciarossa-trains-to-paris "Frecciarossa (Trenitalia)")' - - Getlink (Eurotunnel LeShuttle) - - GoVolta - - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - - RATP - - Transdev + - name: CFC (Chemins de fer de la Corse / Railways in Corsica) + query: + - name: '[Frecciarossa (Trenitalia)](/operator/fs/#international-frecciarossa-trains-to-paris "Frecciarossa (Trenitalia)")' + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: GoVolta + query: + - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + query: + - name: RATP + query: + - name: Transdev + query: --- ## FIP Information diff --git a/content/country/france/index.fr.md b/content/country/france/index.fr.md index 6b58949ef..a8f11c4ae 100644 --- a/content/country/france/index.fr.md +++ b/content/country/france/index.fr.md @@ -4,13 +4,20 @@ title: "France" country: "france" params: operators_without_fip: - - CFC (Chemins de fer de la Corse / Chemins de fer corses) - - ’[Frecciarossa (Trenitalia)](/operator/fs/#trains-frecciarossa-internationaux-vers-paris "Frecciarossa (Trenitalia)")’ - - Getlink (Eurotunnel LeShuttle) - - GoVolta - - ’[OUIGO](/operator/sncf#Fernverkehr "OUIGO")’ - - RATP - - Transdev + - name: CFC (Chemins de fer de la Corse / Chemins de fer corses) + query: + - name: ’[Frecciarossa (Trenitalia)](/operator/fs/#trains-frecciarossa-internationaux-vers-paris "Frecciarossa (Trenitalia)")’ + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: GoVolta + query: + - name: ’[OUIGO](/operator/sncf#Fernverkehr "OUIGO")’ + query: + - name: RATP + query: + - name: Transdev + query: --- ## Informations FIP diff --git a/content/country/germany/index.de.md b/content/country/germany/index.de.md index 041f67a40..3232102bf 100644 --- a/content/country/germany/index.de.md +++ b/content/country/germany/index.de.md @@ -4,88 +4,170 @@ title: "Deutschland" country: "germany" params: operators_without_fip: - - Abellio Rail Mitteldeutschland GmbH - - agilis – ag - - AKN Eisenbahn GmbH – AKN - - Albtal-Vekehrs-Gesellschaft mbH - - alex - Die Länderbahn GmbH DLB - - Arriva Danmark A/S - - Arriva Nederland - - Arverio Baden-Württemberg - - Arverio Bayern - - BahnTouristikExpress GmbH – BTE - - Bayerische Regiobahn – BRB - - Bayerische Zugspitzbahn Bergbahn AG - - Bentheimer Eisenbahn – BE - - Bodensee-Oberschwaben-Bahn - - Borkumer Kleinbahn- und Dampfschiffahrt GmbH - - Brohltal Schmalspureisenbahn Betriebs GmbH – P - - cantus Verkehrsgesellschaft - - City-Bahn Chemnitz – CB - - Daadetalbahn – Dab - - Dessau-Wörlitzer Eisenbahn – DWE - - Erfurter Bahn GmbH - - erixx – erx - - eurobahn - - European Sleeper – ES - - EVB ELBE-WESER GmbH – EVB - - FlixTrain GmbH – FLX - - Förderverein Mainschleifenbahn e.V. – MSB - - Freiberger Eisenbahngesellschaft mbH – FEG - - GoVolta - - Hamburger Hochbahn - - Hanseatische Eisenbahn GmbH - - Harzer Schmalspurbahn – HSB - - HLB Hessenbahn GmbH – HLB - - Kandertalbahn – KTB - - Kasbachtalbahn – P - - Leo Express - - Mecklenburgische Bäderbahn Molli – MBB - - metronom – ME - - Mitteldeutsche Regiobahn – MRB - - Mittelrheinbahn – MRB - - National Express – NX - - NEB Niederbarnimer Eisenbahn - - neg Niebüll GmbH – neg - - nordbahn – NBE - - NordWestBahn – NWB - - oberpfalzbahn - Die Länderbahn GmbH DLB - - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - - Ostdeutsche Eisenbahn GmbH - - Pressnitztalbahn – PRE - - RDC Autozug Sylt GmbH – AS - - RDC Deutschland GmbH - - REGIOBAHN - - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - - RegioTram – RT - - Rhein-Neckar-Verkehr GmbH - - RheinRuhrBahn (Transdev) – RRB - - Rurtalbahn – RTB - - Saarbahn - - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - - S-Bahn Hannover (Transdev) - - SBB GmbH – SBB - - Schienenverkehrsgesellschaft mbH (SVG) - - Schwäbische Alb-Bahn – SAB - - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - - Snältågget – D - - Süd-Thüringen-Bahn GmbH - - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - - trilex - Die Länderbahn GmbH DLB – TL - - trilex-Express - Die Länderbahn GmbH DLB – TLX - - TRI Train Rental GmbH – TRI - - VIAS GmbH – VIA - - VIAS Rail GmbH – VIA - - vlexx - - vogtlandbahn - Die Länderbahn GmbH DLB – VBG - - waldbahn - Die Länderbahn GmbH DLB - - WESTbahn – WB - - WestfalenBahn – WFB - - Württembergische Eisenbahn-Gesellschaft mbH – WEG + - name: Abellio Rail Mitteldeutschland GmbH + query: + - name: agilis – ag + query: + - name: AKN Eisenbahn GmbH – AKN + query: + - name: Albtal-Vekehrs-Gesellschaft mbH + query: + - name: alex - Die Länderbahn GmbH DLB + query: + - name: Arriva Danmark A/S + query: + - name: Arriva Nederland + query: + - name: Arverio Baden-Württemberg + query: + - name: Arverio Bayern + query: + - name: BahnTouristikExpress GmbH – BTE + query: + - name: Bayerische Regiobahn – BRB + query: + - name: Bayerische Zugspitzbahn Bergbahn AG + query: + - name: Bentheimer Eisenbahn – BE + query: + - name: Bodensee-Oberschwaben-Bahn + query: + - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH + query: + - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P + query: + - name: cantus Verkehrsgesellschaft + query: + - name: City-Bahn Chemnitz – CB + query: + - name: Daadetalbahn – Dab + query: + - name: Dessau-Wörlitzer Eisenbahn – DWE + query: + - name: Erfurter Bahn GmbH + query: + - name: erixx – erx + query: + - name: eurobahn + query: + - name: European Sleeper – ES + query: + - name: EVB ELBE-WESER GmbH – EVB + query: + - name: FlixTrain GmbH – FLX + query: + - name: Förderverein Mainschleifenbahn e.V. – MSB + query: + - name: Freiberger Eisenbahngesellschaft mbH – FEG + query: + - name: GoVolta + query: + - name: Hamburger Hochbahn + query: + - name: Hanseatische Eisenbahn GmbH + query: + - name: Harzer Schmalspurbahn – HSB + query: + - name: HLB Hessenbahn GmbH – HLB + query: + - name: Kandertalbahn – KTB + query: + - name: Kasbachtalbahn – P + query: + - name: Leo Express + query: + - name: Mecklenburgische Bäderbahn Molli – MBB + query: + - name: metronom – ME + query: + - name: Mitteldeutsche Regiobahn – MRB + query: + - name: Mittelrheinbahn – MRB + query: + - name: National Express – NX + query: agencyName == "National Express" + - name: NEB Niederbarnimer Eisenbahn + query: + - name: neg Niebüll GmbH – neg + query: + - name: nordbahn – NBE + query: + - name: NordWestBahn – NWB + query: + - name: oberpfalzbahn - Die Länderbahn GmbH DLB + query: + - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + query: + - name: Ostdeutsche Eisenbahn GmbH + query: + - name: Pressnitztalbahn – PRE + query: + - name: RDC Autozug Sylt GmbH – AS + query: + - name: RDC Deutschland GmbH + query: + - name: REGIOBAHN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + query: + - name: RegioTram – RT + query: + - name: Rhein-Neckar-Verkehr GmbH + query: + - name: RheinRuhrBahn (Transdev) – RRB + query: + - name: Rurtalbahn – RTB + query: + - name: Saarbahn + query: + - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + query: + - name: S-Bahn Hannover (Transdev) + query: + - name: SBB GmbH – SBB + query: + - name: Schienenverkehrsgesellschaft mbH (SVG) + query: + - name: Schwäbische Alb-Bahn – SAB + query: + - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + query: + - name: Snältågget – D + query: + - name: Süd-Thüringen-Bahn GmbH + query: + - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + query: + - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + query: + - name: trilex - Die Länderbahn GmbH DLB – TL + query: + - name: trilex-Express - Die Länderbahn GmbH DLB – TLX + query: + - name: TRI Train Rental GmbH – TRI + query: + - name: VIAS GmbH – VIA + query: + - name: VIAS Rail GmbH – VIA + query: + - name: vlexx + query: + - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG + query: + - name: waldbahn - Die Länderbahn GmbH DLB + query: + - name: WESTbahn – WB + query: + - name: WestfalenBahn – WFB + query: + - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG + query: --- ## FIP Nutzung diff --git a/content/country/germany/index.en.md b/content/country/germany/index.en.md index 73668c8ce..e7aa5e40b 100644 --- a/content/country/germany/index.en.md +++ b/content/country/germany/index.en.md @@ -4,88 +4,170 @@ title: "Germany" country: "germany" params: operators_without_fip: - - Abellio Rail Mitteldeutschland GmbH - - agilis – ag - - AKN Eisenbahn GmbH – AKN - - Albtal-Vekehrs-Gesellschaft mbH - - alex - Die Länderbahn GmbH DLB - - Arriva Danmark A/S - - Arriva Nederland - - Arverio Baden-Württemberg - - Arverio Bayern - - BahnTouristikExpress GmbH – BTE - - Bayerische Regiobahn – BRB - - Bayerische Zugspitzbahn Bergbahn AG - - Bentheimer Eisenbahn – BE - - Bodensee-Oberschwaben-Bahn - - Borkumer Kleinbahn- und Dampfschiffahrt GmbH - - Brohltal Schmalspureisenbahn Betriebs GmbH – P - - cantus Verkehrsgesellschaft - - City-Bahn Chemnitz – CB - - Daadetalbahn – Dab - - Dessau-Wörlitzer Eisenbahn – DWE - - Erfurter Bahn GmbH - - erixx – erx - - eurobahn - - European Sleeper – ES - - EVB ELBE-WESER GmbH – EVB - - FlixTrain GmbH – FLX - - Förderverein Mainschleifenbahn e.V. – MSB - - Freiberger Eisenbahngesellschaft mbH – FEG - - GoVolta - - Hamburger Hochbahn - - Hanseatische Eisenbahn GmbH - - Harzer Schmalspurbahn – HSB - - HLB Hessenbahn GmbH – HLB - - Kandertalbahn – KTB - - Kasbachtalbahn – P - - Leo Express - - Mecklenburgische Bäderbahn Molli – MBB - - metronom – ME - - Mitteldeutsche Regiobahn – MRB - - Mittelrheinbahn – MRB - - National Express – NX - - NEB Niederbarnimer Eisenbahn - - neg Niebüll GmbH – neg - - nordbahn – NBE - - NordWestBahn – NWB - - oberpfalzbahn - Die Länderbahn GmbH DLB - - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - - Ostdeutsche Eisenbahn GmbH - - Pressnitztalbahn – PRE - - RDC Autozug Sylt GmbH – AS - - RDC Deutschland GmbH - - REGIOBAHN - - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - - RegioTram – RT - - Rhein-Neckar-Verkehr GmbH - - RheinRuhrBahn (Transdev) – RRB - - Rurtalbahn – RTB - - Saarbahn - - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - - S-Bahn Hannover (Transdev) - - SBB GmbH – SBB - - Schienenverkehrsgesellschaft mbH (SVG) - - Schwäbische Alb-Bahn – SAB - - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - - Snältågget – D - - Süd-Thüringen-Bahn GmbH - - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - - trilex - Die Länderbahn GmbH DLB – TL - - trilex-Express - Die Länderbahn GmbH DLB – TLX - - TRI Train Rental GmbH – TRI - - VIAS GmbH – VIA - - VIAS Rail GmbH – VIA - - vlexx - - vogtlandbahn - Die Länderbahn GmbH DLB – VBG - - waldbahn - Die Länderbahn GmbH DLB - - WESTbahn – WB - - WestfalenBahn – WFB - - Württembergische Eisenbahn-Gesellschaft mbH – WEG + - name: Abellio Rail Mitteldeutschland GmbH + query: + - name: agilis – ag + query: + - name: AKN Eisenbahn GmbH – AKN + query: + - name: Albtal-Vekehrs-Gesellschaft mbH + query: + - name: alex - Die Länderbahn GmbH DLB + query: + - name: Arriva Danmark A/S + query: + - name: Arriva Nederland + query: + - name: Arverio Baden-Württemberg + query: + - name: Arverio Bayern + query: + - name: BahnTouristikExpress GmbH – BTE + query: + - name: Bayerische Regiobahn – BRB + query: + - name: Bayerische Zugspitzbahn Bergbahn AG + query: + - name: Bentheimer Eisenbahn – BE + query: + - name: Bodensee-Oberschwaben-Bahn + query: + - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH + query: + - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P + query: + - name: cantus Verkehrsgesellschaft + query: + - name: City-Bahn Chemnitz – CB + query: + - name: Daadetalbahn – Dab + query: + - name: Dessau-Wörlitzer Eisenbahn – DWE + query: + - name: Erfurter Bahn GmbH + query: + - name: erixx – erx + query: + - name: eurobahn + query: + - name: European Sleeper – ES + query: + - name: EVB ELBE-WESER GmbH – EVB + query: + - name: FlixTrain GmbH – FLX + query: + - name: Förderverein Mainschleifenbahn e.V. – MSB + query: + - name: Freiberger Eisenbahngesellschaft mbH – FEG + query: + - name: GoVolta + query: + - name: Hamburger Hochbahn + query: + - name: Hanseatische Eisenbahn GmbH + query: + - name: Harzer Schmalspurbahn – HSB + query: + - name: HLB Hessenbahn GmbH – HLB + query: + - name: Kandertalbahn – KTB + query: + - name: Kasbachtalbahn – P + query: + - name: Leo Express + query: + - name: Mecklenburgische Bäderbahn Molli – MBB + query: + - name: metronom – ME + query: + - name: Mitteldeutsche Regiobahn – MRB + query: + - name: Mittelrheinbahn – MRB + query: + - name: National Express – NX + query: agencyName == "National Express" + - name: NEB Niederbarnimer Eisenbahn + query: + - name: neg Niebüll GmbH – neg + query: + - name: nordbahn – NBE + query: + - name: NordWestBahn – NWB + query: + - name: oberpfalzbahn - Die Länderbahn GmbH DLB + query: + - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + query: + - name: Ostdeutsche Eisenbahn GmbH + query: + - name: Pressnitztalbahn – PRE + query: + - name: RDC Autozug Sylt GmbH – AS + query: + - name: RDC Deutschland GmbH + query: + - name: REGIOBAHN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + query: + - name: RegioTram – RT + query: + - name: Rhein-Neckar-Verkehr GmbH + query: + - name: RheinRuhrBahn (Transdev) – RRB + query: + - name: Rurtalbahn – RTB + query: + - name: Saarbahn + query: + - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + query: + - name: S-Bahn Hannover (Transdev) + query: + - name: SBB GmbH – SBB + query: + - name: Schienenverkehrsgesellschaft mbH (SVG) + query: + - name: Schwäbische Alb-Bahn – SAB + query: + - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + query: + - name: Snältågget – D + query: + - name: Süd-Thüringen-Bahn GmbH + query: + - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + query: + - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + query: + - name: trilex - Die Länderbahn GmbH DLB – TL + query: + - name: trilex-Express - Die Länderbahn GmbH DLB – TLX + query: + - name: TRI Train Rental GmbH – TRI + query: + - name: VIAS GmbH – VIA + query: + - name: VIAS Rail GmbH – VIA + query: + - name: vlexx + query: + - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG + query: + - name: waldbahn - Die Länderbahn GmbH DLB + query: + - name: WESTbahn – WB + query: + - name: WestfalenBahn – WFB + query: + - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG + query: --- ## FIP Information diff --git a/content/country/germany/index.fr.md b/content/country/germany/index.fr.md index 1a015854e..507d9ef23 100644 --- a/content/country/germany/index.fr.md +++ b/content/country/germany/index.fr.md @@ -4,88 +4,170 @@ title: "Allemagne" country: "germany" params: operators_without_fip: - - Abellio Rail Mitteldeutschland GmbH - - agilis – ag - - AKN Eisenbahn GmbH – AKN - - Albtal-Vekehrs-Gesellschaft mbH - - alex - Die Länderbahn GmbH DLB - - Arriva Danmark A/S - - Arriva Nederland - - Arverio Baden-Württemberg - - Arverio Bayern - - BahnTouristikExpress GmbH – BTE - - Bayerische Regiobahn – BRB - - Bayerische Zugspitzbahn Bergbahn AG - - Bentheimer Eisenbahn – BE - - Bodensee-Oberschwaben-Bahn - - Borkumer Kleinbahn- und Dampfschiffahrt GmbH - - Brohltal Schmalspureisenbahn Betriebs GmbH – P - - cantus Verkehrsgesellschaft - - City-Bahn Chemnitz – CB - - Daadetalbahn – Dab - - Dessau-Wörlitzer Eisenbahn – DWE - - Erfurter Bahn GmbH - - erixx – erx - - eurobahn - - European Sleeper – ES - - EVB ELBE-WESER GmbH – EVB - - FlixTrain GmbH – FLX - - Förderverein Mainschleifenbahn e.V. – MSB - - Freiberger Eisenbahngesellschaft mbH – FEG - - GoVolta - - Hamburger Hochbahn - - Hanseatische Eisenbahn GmbH - - Harzer Schmalspurbahn – HSB - - HLB Hessenbahn GmbH – HLB - - Kandertalbahn – KTB - - Kasbachtalbahn – P - - Leo Express - - Mecklenburgische Bäderbahn Molli – MBB - - metronom – ME - - Mitteldeutsche Regiobahn – MRB - - Mittelrheinbahn – MRB - - National Express – NX - - NEB Niederbarnimer Eisenbahn - - neg Niebüll GmbH – neg - - nordbahn – NBE - - NordWestBahn – NWB - - oberpfalzbahn - Die Länderbahn GmbH DLB - - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - - Ostdeutsche Eisenbahn GmbH - - Pressnitztalbahn – PRE - - RDC Autozug Sylt GmbH – AS - - RDC Deutschland GmbH - - REGIOBAHN - - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - - RegioTram – RT - - Rhein-Neckar-Verkehr GmbH - - RheinRuhrBahn (Transdev) – RRB - - Rurtalbahn – RTB - - Saarbahn - - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - - S-Bahn Hannover (Transdev) - - SBB GmbH – SBB - - Schienenverkehrsgesellschaft mbH (SVG) - - Schwäbische Alb-Bahn – SAB - - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - - Snältågget – D - - Süd-Thüringen-Bahn GmbH - - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - - trilex - Die Länderbahn GmbH DLB – TL - - trilex-Express - Die Länderbahn GmbH DLB – TLX - - TRI Train Rental GmbH – TRI - - VIAS GmbH – VIA - - VIAS Rail GmbH – VIA - - vlexx - - vogtlandbahn - Die Länderbahn GmbH DLB – VBG - - waldbahn - Die Länderbahn GmbH DLB - - WESTbahn – WB - - WestfalenBahn – WFB - - Württembergische Eisenbahn-Gesellschaft mbH – WEG + - name: Abellio Rail Mitteldeutschland GmbH + query: + - name: agilis – ag + query: + - name: AKN Eisenbahn GmbH – AKN + query: + - name: Albtal-Vekehrs-Gesellschaft mbH + query: + - name: alex - Die Länderbahn GmbH DLB + query: + - name: Arriva Danmark A/S + query: + - name: Arriva Nederland + query: + - name: Arverio Baden-Württemberg + query: + - name: Arverio Bayern + query: + - name: BahnTouristikExpress GmbH – BTE + query: + - name: Bayerische Regiobahn – BRB + query: + - name: Bayerische Zugspitzbahn Bergbahn AG + query: + - name: Bentheimer Eisenbahn – BE + query: + - name: Bodensee-Oberschwaben-Bahn + query: + - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH + query: + - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P + query: + - name: cantus Verkehrsgesellschaft + query: + - name: City-Bahn Chemnitz – CB + query: + - name: Daadetalbahn – Dab + query: + - name: Dessau-Wörlitzer Eisenbahn – DWE + query: + - name: Erfurter Bahn GmbH + query: + - name: erixx – erx + query: + - name: eurobahn + query: + - name: European Sleeper – ES + query: + - name: EVB ELBE-WESER GmbH – EVB + query: + - name: FlixTrain GmbH – FLX + query: + - name: Förderverein Mainschleifenbahn e.V. – MSB + query: + - name: Freiberger Eisenbahngesellschaft mbH – FEG + query: + - name: GoVolta + query: + - name: Hamburger Hochbahn + query: + - name: Hanseatische Eisenbahn GmbH + query: + - name: Harzer Schmalspurbahn – HSB + query: + - name: HLB Hessenbahn GmbH – HLB + query: + - name: Kandertalbahn – KTB + query: + - name: Kasbachtalbahn – P + query: + - name: Leo Express + query: + - name: Mecklenburgische Bäderbahn Molli – MBB + query: + - name: metronom – ME + query: + - name: Mitteldeutsche Regiobahn – MRB + query: + - name: Mittelrheinbahn – MRB + query: + - name: National Express – NX + query: agencyName == "National Express" + - name: NEB Niederbarnimer Eisenbahn + query: + - name: neg Niebüll GmbH – neg + query: + - name: nordbahn – NBE + query: + - name: NordWestBahn – NWB + query: + - name: oberpfalzbahn - Die Länderbahn GmbH DLB + query: + - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + query: + - name: Ostdeutsche Eisenbahn GmbH + query: + - name: Pressnitztalbahn – PRE + query: + - name: RDC Autozug Sylt GmbH – AS + query: + - name: RDC Deutschland GmbH + query: + - name: REGIOBAHN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + query: + - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + query: + - name: RegioTram – RT + query: + - name: Rhein-Neckar-Verkehr GmbH + query: + - name: RheinRuhrBahn (Transdev) – RRB + query: + - name: Rurtalbahn – RTB + query: + - name: Saarbahn + query: + - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + query: + - name: S-Bahn Hannover (Transdev) + query: + - name: SBB GmbH – SBB + query: + - name: Schienenverkehrsgesellschaft mbH (SVG) + query: + - name: Schwäbische Alb-Bahn – SAB + query: + - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + query: + - name: Snältågget – D + query: + - name: Süd-Thüringen-Bahn GmbH + query: + - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + query: + - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + query: + - name: trilex - Die Länderbahn GmbH DLB – TL + query: + - name: trilex-Express - Die Länderbahn GmbH DLB – TLX + query: + - name: TRI Train Rental GmbH – TRI + query: + - name: VIAS GmbH – VIA + query: + - name: VIAS Rail GmbH – VIA + query: + - name: vlexx + query: + - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG + query: + - name: waldbahn - Die Länderbahn GmbH DLB + query: + - name: WESTbahn – WB + query: + - name: WestfalenBahn – WFB + query: + - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG + query: --- ## Informations FIP diff --git a/content/country/greece/index.de.md b/content/country/greece/index.de.md index 03a1b826b..d3df41d8b 100644 --- a/content/country/greece/index.de.md +++ b/content/country/greece/index.de.md @@ -4,8 +4,10 @@ title: "Griechenland" country: "greece" params: operators_without_fip: - - STASY (Urban Rail Transport S.A.) - - THEMA S.A. – Thessaloniki Metro + - name: STASY (Urban Rail Transport S.A.) + query: + - name: THEMA S.A. – Thessaloniki Metro + query: --- ## FIP Nutzung diff --git a/content/country/greece/index.en.md b/content/country/greece/index.en.md index 66b8c77a9..b3fcdd44d 100644 --- a/content/country/greece/index.en.md +++ b/content/country/greece/index.en.md @@ -4,8 +4,10 @@ title: "Greece" country: "greece" params: operators_without_fip: - - STASY (Urban Rail Transport S.A.) - - THEMA S.A. – Thessaloniki Metro + - name: STASY (Urban Rail Transport S.A.) + query: + - name: THEMA S.A. – Thessaloniki Metro + query: --- ## FIP Information diff --git a/content/country/greece/index.fr.md b/content/country/greece/index.fr.md index bfd619d1d..4b5758e16 100644 --- a/content/country/greece/index.fr.md +++ b/content/country/greece/index.fr.md @@ -4,8 +4,10 @@ title: "Grèce" country: "greece" params: operators_without_fip: - - STASY (Urban Rail Transport S.A.) - - THEMA S.A. – Thessaloniki Metro + - name: STASY (Urban Rail Transport S.A.) + query: + - name: THEMA S.A. – Thessaloniki Metro + query: --- ## Informations FIP diff --git a/content/country/ireland/index.de.md b/content/country/ireland/index.de.md index 37e1037d8..c9f66d477 100644 --- a/content/country/ireland/index.de.md +++ b/content/country/ireland/index.de.md @@ -4,7 +4,8 @@ title: "Irland" country: "ireland" params: operators_without_fip: - - Transdev (Luas - Straßenbahn Dublin) + - name: Transdev (Luas - Straßenbahn Dublin) + query: --- ## FIP Nutzung diff --git a/content/country/ireland/index.en.md b/content/country/ireland/index.en.md index 599690a57..9b53712ec 100644 --- a/content/country/ireland/index.en.md +++ b/content/country/ireland/index.en.md @@ -4,7 +4,8 @@ title: "Ireland" country: "ireland" params: operators_without_fip: - - Transdev (Luas - Dublin Tram) + - name: Transdev (Luas - Dublin Tram) + query: --- ## FIP Information diff --git a/content/country/ireland/index.fr.md b/content/country/ireland/index.fr.md index 117c49ffc..e4665d6db 100644 --- a/content/country/ireland/index.fr.md +++ b/content/country/ireland/index.fr.md @@ -4,7 +4,8 @@ title: "Irlande" country: "ireland" params: operators_without_fip: - - Transdev (Luas - Tramway de Dublin) + - name: Transdev (Luas - Tramway de Dublin) + query: --- ## Informations FIP diff --git a/content/country/italy/index.de.md b/content/country/italy/index.de.md index 5f21b4ddb..4df62d2b7 100644 --- a/content/country/italy/index.de.md +++ b/content/country/italy/index.de.md @@ -4,14 +4,22 @@ title: "Italien" country: "italy" params: operators_without_fip: - - Azienda Regionale Sarda Trasporti - - Circumflegrea - - Circumvesuviana - - Cumana - - European Sleeper - - '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud Est")' - - Italo / NTV - - '[Trenord](/operator/fs#gültigkeit-fip-tickets "Trenord")' + - name: Azienda Regionale Sarda Trasporti + query: + - name: Circumflegrea + query: + - name: Circumvesuviana + query: + - name: Cumana + query: + - name: European Sleeper + query: + - name: '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud Est")' + query: + - name: Italo / NTV + query: + - name: '[Trenord](/operator/fs#gültigkeit-fip-tickets "Trenord")' + query: --- ## FIP Nutzung diff --git a/content/country/italy/index.en.md b/content/country/italy/index.en.md index ea61fb3e6..fd9c679eb 100644 --- a/content/country/italy/index.en.md +++ b/content/country/italy/index.en.md @@ -4,14 +4,22 @@ title: "Italy" country: "italy" params: operators_without_fip: - - Azienda Regionale Sarda Trasporti - - Circumflegrea - - Circumvesuviana - - Cumana - - European Sleeper - - '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud Est")' - - Italo / NTV - - '[Trenord](/operator/fs##validity-of-fip-tickets "Trenord")' + - name: Azienda Regionale Sarda Trasporti + query: + - name: Circumflegrea + query: + - name: Circumvesuviana + query: + - name: Cumana + query: + - name: European Sleeper + query: + - name: '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud Est")' + query: + - name: Italo / NTV + query: + - name: '[Trenord](/operator/fs##validity-of-fip-tickets "Trenord")' + query: --- ## FIP Information diff --git a/content/country/italy/index.fr.md b/content/country/italy/index.fr.md index b42c7be20..b36eca668 100644 --- a/content/country/italy/index.fr.md +++ b/content/country/italy/index.fr.md @@ -4,14 +4,22 @@ title: "Italie" country: "italy" params: operators_without_fip: - - Azienda Regionale Sarda Trasporti - - Circumflegrea - - Circumvesuviana - - Cumana - - European Sleeper - - ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud Est")’ - - Italo / NTV - - ’[Trenord](/operator/fs#validité-des-billets-fip "Trenord")’ + - name: Azienda Regionale Sarda Trasporti + query: + - name: Circumflegrea + query: + - name: Circumvesuviana + query: + - name: Cumana + query: + - name: European Sleeper + query: + - name: ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud Est")’ + query: + - name: Italo / NTV + query: + - name: ’[Trenord](/operator/fs#validité-des-billets-fip "Trenord")’ + query: --- ## Informations FIP diff --git a/content/country/latvia/index.de.md b/content/country/latvia/index.de.md index a73da1920..f8b63e77f 100644 --- a/content/country/latvia/index.de.md +++ b/content/country/latvia/index.de.md @@ -4,7 +4,8 @@ title: "Lettland" country: "latvia" params: operators_without_fip: - - "Latvijas dzelzceļš (LDz)" + - name: "Latvijas dzelzceļš (LDz)" + query: --- ## FIP Nutzung diff --git a/content/country/latvia/index.en.md b/content/country/latvia/index.en.md index 9bb1e19be..031b9a539 100644 --- a/content/country/latvia/index.en.md +++ b/content/country/latvia/index.en.md @@ -4,7 +4,8 @@ title: "Latvia" country: "latvia" params: operators_without_fip: - - "Latvijas dzelzceļš (LDz)" + - name: "Latvijas dzelzceļš (LDz)" + query: --- ## FIP Information diff --git a/content/country/latvia/index.fr.md b/content/country/latvia/index.fr.md index b08bd0738..e2aa48370 100644 --- a/content/country/latvia/index.fr.md +++ b/content/country/latvia/index.fr.md @@ -4,7 +4,8 @@ title: "Lettonie" country: "latvia" params: operators_without_fip: - - "Latvijas dzelzceļš (LDz)" + - name: "Latvijas dzelzceļš (LDz)" + query: --- ## Informations FIP diff --git a/content/country/lithuania/index.de.md b/content/country/lithuania/index.de.md index ed5af6889..e8489ecb3 100644 --- a/content/country/lithuania/index.de.md +++ b/content/country/lithuania/index.de.md @@ -4,7 +4,8 @@ title: "Litauen" country: "lithuania" params: operators_without_fip: - - "Aukštaitijos siaurasis geležinkelis (Museumsbahn)" + - name: "Aukštaitijos siaurasis geležinkelis (Museumsbahn)" + query: --- ## FIP Nutzung diff --git a/content/country/lithuania/index.en.md b/content/country/lithuania/index.en.md index 3a82574b3..b33d87b3b 100644 --- a/content/country/lithuania/index.en.md +++ b/content/country/lithuania/index.en.md @@ -4,7 +4,8 @@ title: "Lithuania" country: "lithuania" params: operators_without_fip: - - "Aukštaitijos siaurasis geležinkelis (heritage railway)" + - name: "Aukštaitijos siaurasis geležinkelis (heritage railway)" + query: --- ## FIP Information diff --git a/content/country/lithuania/index.fr.md b/content/country/lithuania/index.fr.md index 0bc3f00df..13f73ae63 100644 --- a/content/country/lithuania/index.fr.md +++ b/content/country/lithuania/index.fr.md @@ -4,7 +4,8 @@ title: "Lituanie" country: "lithuania" params: operators_without_fip: - - "Aukštaitijos siaurasis geležinkelis (chemin de fer musée)" + - name: "Aukštaitijos siaurasis geležinkelis (chemin de fer musée)" + query: --- ## Informations FIP diff --git a/content/country/netherlands/index.de.md b/content/country/netherlands/index.de.md index bc86a8298..13ed29b48 100644 --- a/content/country/netherlands/index.de.md +++ b/content/country/netherlands/index.de.md @@ -4,14 +4,22 @@ title: "Niederlande" country: "netherlands" params: operators_without_fip: - - Arriva Nederland - - Breng - - Connexxion - - European Sleeper - - GoVolta - - Keolis Nederland - - Qbuzz - - VIAS Rail + - name: Arriva Nederland + query: + - name: Breng + query: + - name: Connexxion + query: + - name: European Sleeper + query: + - name: GoVolta + query: + - name: Keolis Nederland + query: + - name: Qbuzz + query: + - name: VIAS Rail + query: --- ## FIP Nutzung diff --git a/content/country/netherlands/index.en.md b/content/country/netherlands/index.en.md index d2c057ad6..fe869a155 100644 --- a/content/country/netherlands/index.en.md +++ b/content/country/netherlands/index.en.md @@ -4,14 +4,22 @@ title: "Netherlands" country: "netherlands" params: operators_without_fip: - - Arriva Nederland - - Breng - - Connexxion - - European Sleeper - - GoVolta - - Keolis Nederland - - Qbuzz - - VIAS Rail + - name: Arriva Nederland + query: + - name: Breng + query: + - name: Connexxion + query: + - name: European Sleeper + query: + - name: GoVolta + query: + - name: Keolis Nederland + query: + - name: Qbuzz + query: + - name: VIAS Rail + query: --- ## FIP Information diff --git a/content/country/netherlands/index.fr.md b/content/country/netherlands/index.fr.md index 4663688ff..c45b6cf78 100644 --- a/content/country/netherlands/index.fr.md +++ b/content/country/netherlands/index.fr.md @@ -4,14 +4,22 @@ title: "Pays-Bas" country: "netherlands" params: operators_without_fip: - - Arriva Nederland - - Breng - - Connexxion - - European Sleeper - - GoVolta - - Keolis Nederland - - Qbuzz - - VIAS Rail + - name: Arriva Nederland + query: + - name: Breng + query: + - name: Connexxion + query: + - name: European Sleeper + query: + - name: GoVolta + query: + - name: Keolis Nederland + query: + - name: Qbuzz + query: + - name: VIAS Rail + query: --- ## Informations FIP diff --git a/content/country/norway/index.de.md b/content/country/norway/index.de.md index cc1aa832d..2f6b6d681 100644 --- a/content/country/norway/index.de.md +++ b/content/country/norway/index.de.md @@ -4,10 +4,14 @@ title: "Norwegen" country: "norway" params: operators_without_fip: - - Arctic Train - - Flåmbahn - - Flytoget Airport Express - - SJ Sverige + - name: Arctic Train + query: + - name: Flåmbahn + query: + - name: Flytoget Airport Express + query: + - name: SJ Sverige + query: --- ## FIP Nutzung diff --git a/content/country/norway/index.en.md b/content/country/norway/index.en.md index b3bca60d7..0ad3b0de6 100644 --- a/content/country/norway/index.en.md +++ b/content/country/norway/index.en.md @@ -4,10 +4,14 @@ title: "Norway" country: "norway" params: operators_without_fip: - - Arctic Train - - Flåm Railway - - Flytoget Airport Express - - SJ Sverige + - name: Arctic Train + query: + - name: Flåm Railway + query: + - name: Flytoget Airport Express + query: + - name: SJ Sverige + query: --- ## FIP Information diff --git a/content/country/norway/index.fr.md b/content/country/norway/index.fr.md index 524115657..a80fb1e6d 100644 --- a/content/country/norway/index.fr.md +++ b/content/country/norway/index.fr.md @@ -4,10 +4,14 @@ title: "Norvège" country: "norway" params: operators_without_fip: - - Arctic Train - - Chemin de fer de Flåm - - Flytoget Airport Express - - SJ Sverige + - name: Arctic Train + query: + - name: Chemin de fer de Flåm + query: + - name: Flytoget Airport Express + query: + - name: SJ Sverige + query: --- ## Informations FIP diff --git a/content/country/poland/index.de.md b/content/country/poland/index.de.md index 88217bb57..f3c67c130 100644 --- a/content/country/poland/index.de.md +++ b/content/country/poland/index.de.md @@ -4,12 +4,18 @@ title: Polen country: "poland" params: operators_without_fip: - - Arriva - - Leo Express - - RegioJet - - Szybka Kolej Miejska w Warszawie - - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - - Warszawska Kolej Dojazdowa (WKD) + - name: Arriva + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Szybka Kolej Miejska w Warszawie + query: + - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + query: + - name: Warszawska Kolej Dojazdowa (WKD) + query: --- ## FIP Nutzung diff --git a/content/country/poland/index.en.md b/content/country/poland/index.en.md index ea5b4745b..1c8af7869 100644 --- a/content/country/poland/index.en.md +++ b/content/country/poland/index.en.md @@ -4,12 +4,18 @@ title: "Poland" country: "poland" params: operators_without_fip: - - Arriva - - Leo Express - - RegioJet - - Szybka Kolej Miejska w Warszawie - - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - - Warszawska Kolej Dojazdowa (WKD) + - name: Arriva + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Szybka Kolej Miejska w Warszawie + query: + - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + query: + - name: Warszawska Kolej Dojazdowa (WKD) + query: --- ## FIP Information diff --git a/content/country/poland/index.fr.md b/content/country/poland/index.fr.md index 0ae4af525..46ebe1e97 100644 --- a/content/country/poland/index.fr.md +++ b/content/country/poland/index.fr.md @@ -4,12 +4,18 @@ title: "Pologne" country: "poland" params: operators_without_fip: - - Arriva - - Leo Express - - RegioJet - - Szybka Kolej Miejska w Warszawie - - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - - Warszawska Kolej Dojazdowa (WKD) + - name: Arriva + query: + - name: Leo Express + query: + - name: RegioJet + query: + - name: Szybka Kolej Miejska w Warszawie + query: + - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + query: + - name: Warszawska Kolej Dojazdowa (WKD) + query: --- ## Informations FIP diff --git a/content/country/portugal/index.de.md b/content/country/portugal/index.de.md index 3e3455d74..003462cfa 100644 --- a/content/country/portugal/index.de.md +++ b/content/country/portugal/index.de.md @@ -4,7 +4,8 @@ title: "Portugal" country: "portugal" params: operators_without_fip: - - Fertagus + - name: Fertagus + query: --- ## FIP Nutzung diff --git a/content/country/portugal/index.en.md b/content/country/portugal/index.en.md index cdbd6a04a..2469edee4 100644 --- a/content/country/portugal/index.en.md +++ b/content/country/portugal/index.en.md @@ -4,7 +4,8 @@ title: "Portugal" country: "portugal" params: operators_without_fip: - - Fertagus + - name: Fertagus + query: --- ## FIP Information diff --git a/content/country/portugal/index.fr.md b/content/country/portugal/index.fr.md index 44fd2361c..c78d523e9 100644 --- a/content/country/portugal/index.fr.md +++ b/content/country/portugal/index.fr.md @@ -4,7 +4,8 @@ title: "Portugal" country: "portugal" params: operators_without_fip: - - Fertagus + - name: Fertagus + query: --- ## Informations FIP diff --git a/content/country/romania/index.de.md b/content/country/romania/index.de.md index f5a33f026..f9c181e78 100644 --- a/content/country/romania/index.de.md +++ b/content/country/romania/index.de.md @@ -4,12 +4,18 @@ title: "Rumänien" country: "romania" params: operators_without_fip: - - Astra Trains Carpatic (ATC) - - IRC (InterRegional Călători) - - RC (Regio Călători) - - SFTRA (Softrans) - - TFC (Transferoviar Călători) - - TFI (Ferotrans) + - name: Astra Trains Carpatic (ATC) + query: + - name: IRC (InterRegional Călători) + query: + - name: RC (Regio Călători) + query: + - name: SFTRA (Softrans) + query: + - name: TFC (Transferoviar Călători) + query: + - name: TFI (Ferotrans) + query: --- ## FIP Nutzung diff --git a/content/country/romania/index.en.md b/content/country/romania/index.en.md index c513c5fa1..e11f7b816 100644 --- a/content/country/romania/index.en.md +++ b/content/country/romania/index.en.md @@ -4,12 +4,18 @@ title: "Romania" country: "romania" params: operators_without_fip: - - Astra Trains Carpatic (ATC) - - IRC (InterRegional Călători) - - RC (Regio Călători) - - SFTRA (Softrans) - - TFC (Transferoviar Călători) - - TFI (Ferotrans) + - name: Astra Trains Carpatic (ATC) + query: + - name: IRC (InterRegional Călători) + query: + - name: RC (Regio Călători) + query: + - name: SFTRA (Softrans) + query: + - name: TFC (Transferoviar Călători) + query: + - name: TFI (Ferotrans) + query: --- ## FIP Information diff --git a/content/country/romania/index.fr.md b/content/country/romania/index.fr.md index 14662d1a4..7ddd61f14 100644 --- a/content/country/romania/index.fr.md +++ b/content/country/romania/index.fr.md @@ -4,12 +4,18 @@ title: "Roumanie" country: "romania" params: operators_without_fip: - - Astra Trains Carpatic (ATC) - - IRC (InterRegional Călători) - - RC (Regio Călători) - - SFTRA (Softrans) - - TFC (Transferoviar Călători) - - TFI (Ferotrans) + - name: Astra Trains Carpatic (ATC) + query: + - name: IRC (InterRegional Călători) + query: + - name: RC (Regio Călători) + query: + - name: SFTRA (Softrans) + query: + - name: TFC (Transferoviar Călători) + query: + - name: TFI (Ferotrans) + query: --- ## Informations FIP diff --git a/content/country/serbia/index.de.md b/content/country/serbia/index.de.md index 3749872bf..c6823f482 100644 --- a/content/country/serbia/index.de.md +++ b/content/country/serbia/index.de.md @@ -4,7 +4,8 @@ title: "Serbien" country: "serbia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Nutzung diff --git a/content/country/serbia/index.en.md b/content/country/serbia/index.en.md index e848f0651..bc3871aaf 100644 --- a/content/country/serbia/index.en.md +++ b/content/country/serbia/index.en.md @@ -4,7 +4,8 @@ title: "Serbia" country: "serbia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Information diff --git a/content/country/serbia/index.fr.md b/content/country/serbia/index.fr.md index dfb10ea75..5b4dc119a 100644 --- a/content/country/serbia/index.fr.md +++ b/content/country/serbia/index.fr.md @@ -4,7 +4,8 @@ title: "Serbie" country: "serbia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## Informations FIP diff --git a/content/country/slovakia/index.de.md b/content/country/slovakia/index.de.md index bf3a045c3..eac9df8c6 100644 --- a/content/country/slovakia/index.de.md +++ b/content/country/slovakia/index.de.md @@ -4,8 +4,10 @@ title: "Slowakei" country: "slovakia" params: operators_without_fip: - - RegioJet - - Leo Express + - name: RegioJet + query: + - name: Leo Express + query: --- ## FIP Nutzung diff --git a/content/country/slovakia/index.en.md b/content/country/slovakia/index.en.md index ceebc658b..8315dc604 100644 --- a/content/country/slovakia/index.en.md +++ b/content/country/slovakia/index.en.md @@ -4,8 +4,10 @@ title: "Slovakia" country: "slovakia" params: operators_without_fip: - - RegioJet - - Leo Express + - name: RegioJet + query: + - name: Leo Express + query: --- ## FIP Information diff --git a/content/country/slovakia/index.fr.md b/content/country/slovakia/index.fr.md index 8925dc2a1..063623184 100644 --- a/content/country/slovakia/index.fr.md +++ b/content/country/slovakia/index.fr.md @@ -4,8 +4,10 @@ title: "Slovaquie" country: "slovakia" params: operators_without_fip: - - RegioJet - - Leo Express + - name: RegioJet + query: + - name: Leo Express + query: --- ## Informations FIP diff --git a/content/country/slovenia/index.de.md b/content/country/slovenia/index.de.md index e5b72c623..f6d5053c9 100644 --- a/content/country/slovenia/index.de.md +++ b/content/country/slovenia/index.de.md @@ -4,7 +4,8 @@ title: "Slowenien" country: "slovenia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Nutzung diff --git a/content/country/slovenia/index.en.md b/content/country/slovenia/index.en.md index 0c095e6f5..df4034b95 100644 --- a/content/country/slovenia/index.en.md +++ b/content/country/slovenia/index.en.md @@ -4,7 +4,8 @@ title: "Slovenia" country: "slovenia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## FIP Information diff --git a/content/country/slovenia/index.fr.md b/content/country/slovenia/index.fr.md index 42ccdb018..3e6d6aad6 100644 --- a/content/country/slovenia/index.fr.md +++ b/content/country/slovenia/index.fr.md @@ -4,7 +4,8 @@ title: "Slovénie" country: "slovenia" params: operators_without_fip: - - Optima Express + - name: Optima Express + query: --- ## Informations FIP diff --git a/content/country/spain/index.de.md b/content/country/spain/index.de.md index 460778168..3354c7fe0 100644 --- a/content/country/spain/index.de.md +++ b/content/country/spain/index.de.md @@ -4,9 +4,12 @@ title: "Spanien" country: "spain" params: operators_without_fip: - - Iryo - - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - - '[Avlo](/operator/renfe#langstrecke "Avlo")' + - name: Iryo + query: + - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + query: + - name: '[Avlo](/operator/renfe#langstrecke "Avlo")' + query: --- ## FIP Nutzung diff --git a/content/country/spain/index.en.md b/content/country/spain/index.en.md index 81afa741e..f24cecbe6 100644 --- a/content/country/spain/index.en.md +++ b/content/country/spain/index.en.md @@ -4,9 +4,12 @@ title: "Spain" country: "spain" params: operators_without_fip: - - Iryo - - OUIGO - - '[Avlo](/operator/renfe#long-distance "Avlo")' + - name: Iryo + query: + - name: OUIGO + query: + - name: '[Avlo](/operator/renfe#long-distance "Avlo")' + query: --- ## FIP Information diff --git a/content/country/spain/index.fr.md b/content/country/spain/index.fr.md index 252ede131..a8947386d 100644 --- a/content/country/spain/index.fr.md +++ b/content/country/spain/index.fr.md @@ -4,9 +4,12 @@ title: "Espagne" country: "spain" params: operators_without_fip: - - Iryo - - OUIGO - - ’[Avlo](/operator/renfe#longue-distance "Avlo")’ + - name: Iryo + query: + - name: OUIGO + query: + - name: ’[Avlo](/operator/renfe#longue-distance "Avlo")’ + query: --- ## Informations FIP diff --git a/content/country/switzerland/index.de.md b/content/country/switzerland/index.de.md index eb23e1175..9102d8830 100644 --- a/content/country/switzerland/index.de.md +++ b/content/country/switzerland/index.de.md @@ -4,12 +4,18 @@ title: "Schweiz" country: "switzerland" params: operators_without_fip: - - European Sleeper - - Heimwehfluhbahn (Interlaken – Heimwehfluh) - - Luftseilbahn Wengen – Männlichen - - Gondelbahn Grindelwald – Männlichen (GGM) - - Seilbahn Mürren – Allmendhubel (SMA) - - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + - name: European Sleeper + query: + - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) + query: + - name: Luftseilbahn Wengen – Männlichen + query: + - name: Gondelbahn Grindelwald – Männlichen (GGM) + query: + - name: Seilbahn Mürren – Allmendhubel (SMA) + query: + - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + query: --- ## FIP Nutzung diff --git a/content/country/switzerland/index.en.md b/content/country/switzerland/index.en.md index af23b8528..e2d6d2e39 100644 --- a/content/country/switzerland/index.en.md +++ b/content/country/switzerland/index.en.md @@ -4,12 +4,18 @@ title: "Switzerland" country: "switzerland" params: operators_without_fip: - - European Sleeper - - Heimwehfluhbahn (Interlaken – Heimwehfluh) - - Luftseilbahn Wengen – Männlichen - - Gondelbahn Grindelwald – Männlichen (GGM) - - Seilbahn Mürren – Allmendhubel (SMA) - - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + - name: European Sleeper + query: + - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) + query: + - name: Luftseilbahn Wengen – Männlichen + query: + - name: Gondelbahn Grindelwald – Männlichen (GGM) + query: + - name: Seilbahn Mürren – Allmendhubel (SMA) + query: + - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + query: --- ## FIP Information diff --git a/content/country/switzerland/index.fr.md b/content/country/switzerland/index.fr.md index 90c878022..bb2b01a13 100644 --- a/content/country/switzerland/index.fr.md +++ b/content/country/switzerland/index.fr.md @@ -4,12 +4,18 @@ title: "Suisse" country: "switzerland" params: operators_without_fip: - - European Sleeper - - Heimwehfluhbahn (Interlaken – Heimwehfluh) - - Luftseilbahn Wengen – Männlichen - - Gondelbahn Grindelwald – Männlichen (GGM) - - Seilbahn Mürren – Allmendhubel (SMA) - - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + - name: European Sleeper + query: + - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) + query: + - name: Luftseilbahn Wengen – Männlichen + query: + - name: Gondelbahn Grindelwald – Männlichen (GGM) + query: + - name: Seilbahn Mürren – Allmendhubel (SMA) + query: + - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + query: --- ## Informations FIP diff --git a/content/country/united-kingdom/index.de.md b/content/country/united-kingdom/index.de.md index bc20d208e..a9ff8f22a 100644 --- a/content/country/united-kingdom/index.de.md +++ b/content/country/united-kingdom/index.de.md @@ -4,21 +4,36 @@ title: "Vereinigtes Königreich" country: "united-kingdom" params: operators_without_fip: - - Blackpool Tramway - - Caledonian MacBrayne Ferries - - Docklands Light Railway - - Edinburgh Tramway - - Getlink (Eurotunnel LeShuttle) - - Glasgow Subway - - Hovertravel (Portsmouth nach Ryde auf der Isle of Wight) - - '[London Underground](/operator/gb#verkehr-in-london "London Underground")' - - Midland Metro (Birmingham nach Wolverhampton) - - Nottingham Express Transit - - Sheffield Supertram - - London Trams (ehemals Croydon Tramlink) - - Transport for Greater Manchester - - Tyne and Wear Metro - - Wightlink ferry (Portsmouth Harbour nach Ryde Pier Head station auf der Isle of Wight) + - name: Blackpool Tramway + query: + - name: Caledonian MacBrayne Ferries + query: + - name: Docklands Light Railway + query: + - name: Edinburgh Tramway + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: Glasgow Subway + query: + - name: Hovertravel (Portsmouth nach Ryde auf der Isle of Wight) + query: + - name: '[London Underground](/operator/gb#verkehr-in-london "London Underground")' + query: + - name: Midland Metro (Birmingham nach Wolverhampton) + query: + - name: Nottingham Express Transit + query: + - name: Sheffield Supertram + query: + - name: London Trams (ehemals Croydon Tramlink) + query: + - name: Transport for Greater Manchester + query: + - name: Tyne and Wear Metro + query: + - name: Wightlink ferry (Portsmouth Harbour nach Ryde Pier Head station auf der Isle of Wight) + query: --- diff --git a/content/country/united-kingdom/index.en.md b/content/country/united-kingdom/index.en.md index be153f7c2..873e7d90f 100644 --- a/content/country/united-kingdom/index.en.md +++ b/content/country/united-kingdom/index.en.md @@ -4,21 +4,36 @@ title: "United Kingdom" country: "united-kingdom" params: operators_without_fip: - - Blackpool Tramway - - Caledonian MacBrayne Ferries - - Docklands Light Railway - - Edinburgh Tramway - - Getlink (Eurotunnel LeShuttle) - - Glasgow Subway - - Hovertravel (Portsmouth to Ryde on the Isle of Wight) - - '[London Underground](/operator/gb#verkehr-in-london "London Underground")' - - Midland Metro (Birmingham to Wolverhampton) - - Nottingham Express Transit - - Sheffield Supertram - - London Trams (formerly Croydon Tramlink) - - Transport for Greater Manchester - - Tyne and Wear Metro - - Wightlink ferry (Portsmouth Harbour to Ryde Pier Head station on the Isle of Wight) + - name: Blackpool Tramway + query: + - name: Caledonian MacBrayne Ferries + query: + - name: Docklands Light Railway + query: + - name: Edinburgh Tramway + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: Glasgow Subway + query: + - name: Hovertravel (Portsmouth to Ryde on the Isle of Wight) + query: + - name: '[London Underground](/operator/gb#verkehr-in-london "London Underground")' + query: + - name: Midland Metro (Birmingham to Wolverhampton) + query: + - name: Nottingham Express Transit + query: + - name: Sheffield Supertram + query: + - name: London Trams (formerly Croydon Tramlink) + query: + - name: Transport for Greater Manchester + query: + - name: Tyne and Wear Metro + query: + - name: Wightlink ferry (Portsmouth Harbour to Ryde Pier Head station on the Isle of Wight) + query: --- diff --git a/content/country/united-kingdom/index.fr.md b/content/country/united-kingdom/index.fr.md index 0f577ca3a..e60b384a3 100644 --- a/content/country/united-kingdom/index.fr.md +++ b/content/country/united-kingdom/index.fr.md @@ -4,21 +4,36 @@ title: "Royaume-Uni" country: "united-kingdom" params: operators_without_fip: - - Blackpool Tramway - - Caledonian MacBrayne Ferries - - Docklands Light Railway - - Edinburgh Tramway - - Getlink (Eurotunnel LeShuttle) - - Glasgow Subway - - Hovertravel (Portsmouth à Ryde sur l’île de Wight) - - ’[London Underground](/operator/gb#verkehr-in-london "London Underground")’ - - Midland Metro (Birmingham à Wolverhampton) - - Nottingham Express Transit - - Sheffield Supertram - - London Trams (anciennement Croydon Tramlink) - - Transport for Greater Manchester - - Tyne and Wear Metro - - Wightlink ferry (Portsmouth Harbour à Ryde Pier Head station sur l’île de Wight) + - name: Blackpool Tramway + query: + - name: Caledonian MacBrayne Ferries + query: + - name: Docklands Light Railway + query: + - name: Edinburgh Tramway + query: + - name: Getlink (Eurotunnel LeShuttle) + query: + - name: Glasgow Subway + query: + - name: Hovertravel (Portsmouth à Ryde sur l’île de Wight) + query: + - name: ’[London Underground](/operator/gb#verkehr-in-london "London Underground")’ + query: + - name: Midland Metro (Birmingham à Wolverhampton) + query: + - name: Nottingham Express Transit + query: + - name: Sheffield Supertram + query: + - name: London Trams (anciennement Croydon Tramlink) + query: + - name: Transport for Greater Manchester + query: + - name: Tyne and Wear Metro + query: + - name: Wightlink ferry (Portsmouth Harbour à Ryde Pier Head station sur l’île de Wight) + query: --- diff --git a/content/general/_index.de.md b/content/general/_index.de.md index 0781ba536..af8df55cc 100644 --- a/content/general/_index.de.md +++ b/content/general/_index.de.md @@ -8,3 +8,4 @@ Hier findest du nützliche, allgemeine Informationen zur Reise mit FIP. - [Übergreifende Infos](general/generalinformation) - [FIP Beantragung](general/fip-validity) - [FAQ](general/faq) +- [Streckenplaner](general/route-planner) diff --git a/content/general/_index.en.md b/content/general/_index.en.md index 353da579d..fba0454eb 100644 --- a/content/general/_index.en.md +++ b/content/general/_index.en.md @@ -8,3 +8,4 @@ On this pages you can find useful, general information regarding FIP. - [General Information](general/generalinformation) - [FIP Application](general/fip-validity) - [FAQ](general/faq) +- [Route Planner](general/route-planner) diff --git a/content/general/_index.fr.md b/content/general/_index.fr.md index 75c7e20b2..67643a793 100644 --- a/content/general/_index.fr.md +++ b/content/general/_index.fr.md @@ -8,3 +8,4 @@ Sur ces pages, vous trouverez des informations générales et utiles concernant - [Informations générales](general/generalinformation) - [Demande FIP](general/fip-validity) - [FAQ](general/faq) +- [Planificateur d'itinéraire](general/route-planner) diff --git a/content/general/route-planner/index.de.md b/content/general/route-planner/index.de.md new file mode 100644 index 000000000..689cf2a98 --- /dev/null +++ b/content/general/route-planner/index.de.md @@ -0,0 +1,4 @@ +--- +draft: false +title: "Streckenplaner" +--- diff --git a/content/general/route-planner/index.en.md b/content/general/route-planner/index.en.md new file mode 100644 index 000000000..eb7ff77d6 --- /dev/null +++ b/content/general/route-planner/index.en.md @@ -0,0 +1,4 @@ +--- +draft: false +title: "Route Planner" +--- diff --git a/content/general/route-planner/index.fr.md b/content/general/route-planner/index.fr.md new file mode 100644 index 000000000..79b3d07b0 --- /dev/null +++ b/content/general/route-planner/index.fr.md @@ -0,0 +1,4 @@ +--- +draft: false +title: "Planificateur d'itinéraire" +--- diff --git a/content/operator/bdz/index.de.md b/content/operator/bdz/index.de.md index 69bfe09e4..389aad322 100644 --- a/content/operator/bdz/index.de.md +++ b/content/operator/bdz/index.de.md @@ -7,6 +7,9 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office +params: + transitous_mapping: + - query: agencyName == "BDZ" --- Die Balgarski Darschawni Schelesnizi (BDŽ) ist die staatliche Eisenbahngesellschaft von [Bulgarien](/country/bulgaria "Bulgarien") und betreibt derzeit fast alle Verbindungen im Personenverkehr auf dem bulgarischen Schienennetz. diff --git a/content/operator/bdz/index.en.md b/content/operator/bdz/index.en.md index 0c71dc87e..07158bb56 100644 --- a/content/operator/bdz/index.en.md +++ b/content/operator/bdz/index.en.md @@ -7,6 +7,9 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office +params: + transitous_mapping: + - query: agencyName == "BDZ" --- Balgarski Darschawni Schelesnizi (BDŽ) is the state railway company of [Bulgaria](/country/bulgaria "Bulgaria") and currently operates almost all passenger services on the Bulgarian rail network. diff --git a/content/operator/bdz/index.fr.md b/content/operator/bdz/index.fr.md index 5a9b41214..75e95f69a 100644 --- a/content/operator/bdz/index.fr.md +++ b/content/operator/bdz/index.fr.md @@ -7,6 +7,9 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office +params: + transitous_mapping: + - query: agencyName == "BDZ" --- Balgarski Darschawni Schelesnizi (BDŽ) est la compagnie ferroviaire nationale de [Bulgarie](/country/bulgaria "Bulgarie") et exploite actuellement presque tous les services voyageurs sur le réseau ferroviaire bulgare. diff --git a/content/operator/bls/index.de.md b/content/operator/bls/index.de.md index 50c4688ba..5942f9d1d 100644 --- a/content/operator/bls/index.de.md +++ b/content/operator/bls/index.de.md @@ -6,6 +6,10 @@ country: aliases: - /booking/bls-ticket-office +params: + transitous_mapping: + - query: agencyName == "BLS AG" + - query: agencyName == "BLS" --- Die BLS (ehemals Bern-Lötschberg-Simplon-Bahn) ist eine öffentliche Eisenbahngesellschaft in der [Schweiz](/country/switzerland "Schweiz"). Sie betreibt viele Zug-, Bus- und Schiffsverbindungen und fährt primär im Kanton Bern. diff --git a/content/operator/bls/index.en.md b/content/operator/bls/index.en.md index 19524b9ef..2c3182577 100644 --- a/content/operator/bls/index.en.md +++ b/content/operator/bls/index.en.md @@ -6,6 +6,10 @@ country: aliases: - /booking/bls-ticket-office +params: + transitous_mapping: + - query: agencyName == "BLS AG" + - query: agencyName == "BLS" --- The BLS (formerly Bern-Lötschberg-Simplon-Bahn) is a public railway company in [Switzerland](/country/switzerland "Switzerland"). It operates many train, bus and ship connections and primarily runs in the Canton of Bern. diff --git a/content/operator/bls/index.fr.md b/content/operator/bls/index.fr.md index cf454dfeb..eeaeb1e71 100644 --- a/content/operator/bls/index.fr.md +++ b/content/operator/bls/index.fr.md @@ -6,6 +6,10 @@ country: aliases: - /booking/bls-ticket-office +params: + transitous_mapping: + - query: agencyName == "BLS AG" + - query: agencyName == "BLS" --- La BLS (anciennement Bern-Lötschberg-Simplon-Bahn) est une entreprise ferroviaire publique de la [Suisse](/country/switzerland "Suisse"). Elle exploite de nombreuses liaisons de trains, de bus et de bateaux et circule principalement dans le canton de Berne. diff --git a/content/operator/cd/index.de.md b/content/operator/cd/index.de.md index 3d0fbe200..aa1f68aaa 100644 --- a/content/operator/cd/index.de.md +++ b/content/operator/cd/index.de.md @@ -8,6 +8,10 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website +params: + transitous_mapping: + - query: agencyName == "České dráhy" + - query: agencyName == "ČD" --- Die České dráhy (ČD) ist die staatliche Eisenbahngesellschaft der [Tschechischen Republik](/country/czechia "Tschechischen Republik") und betreibt einen großen Teil der Verbindungen im Personenverkehr auf dem tschechischen Schienennetz. diff --git a/content/operator/cd/index.en.md b/content/operator/cd/index.en.md index 84969df93..5954ab355 100644 --- a/content/operator/cd/index.en.md +++ b/content/operator/cd/index.en.md @@ -8,6 +8,10 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website +params: + transitous_mapping: + - query: agencyName == "České dráhy" + - query: agencyName == "ČD" --- České dráhy (ČD) is the state railway company of the [Czech Republic](/country/czechia "Czech Republic") and operates a large part of passenger services on the Czech rail network. diff --git a/content/operator/cd/index.fr.md b/content/operator/cd/index.fr.md index a985750a0..434572f23 100644 --- a/content/operator/cd/index.fr.md +++ b/content/operator/cd/index.fr.md @@ -8,6 +8,10 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website +params: + transitous_mapping: + - query: agencyName == "České dráhy" + - query: agencyName == "ČD" --- České dráhy (ČD) est la compagnie ferroviaire nationale de la [République tchèque](/country/czechia "République tchèque") et exploite une grande partie des services voyageurs sur le réseau ferroviaire tchèque. diff --git a/content/operator/cfl/index.de.md b/content/operator/cfl/index.de.md index b64f300d4..1eac0a2b0 100644 --- a/content/operator/cfl/index.de.md +++ b/content/operator/cfl/index.de.md @@ -8,6 +8,9 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFL" --- Die CFL (Société nationale des chemins de fer luxembourgeois) ist die luxemburgische Staatsbahn und die wichtigste Bahngesellschaft in [Luxemburg](/country/luxembourg "Luxemburg"). diff --git a/content/operator/cfl/index.en.md b/content/operator/cfl/index.en.md index 6a9550f2b..09fcba3c1 100644 --- a/content/operator/cfl/index.en.md +++ b/content/operator/cfl/index.en.md @@ -8,6 +8,9 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFL" --- CFL (Société nationale des chemins de fer luxembourgeois) is the Luxembourgish state railway and the main railway company in [Luxembourg](/country/luxembourg "Luxembourg"). diff --git a/content/operator/cfl/index.fr.md b/content/operator/cfl/index.fr.md index 012aeb643..df31a2787 100644 --- a/content/operator/cfl/index.fr.md +++ b/content/operator/cfl/index.fr.md @@ -8,6 +8,9 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFL" --- La CFL (Société nationale des chemins de fer luxembourgeois) est la compagnie ferroviaire nationale du [Luxembourg](/country/luxembourg "Luxembourg") et la principale société ferroviaire du pays. diff --git a/content/operator/cfr/index.de.md b/content/operator/cfr/index.de.md index c323e5c80..005fe19ee 100644 --- a/content/operator/cfr/index.de.md +++ b/content/operator/cfr/index.de.md @@ -7,6 +7,9 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFR Călători" --- Die Societatea Natională de Transport Feroviar de Călători “CFR Călători” S.A., kurz CFR Călători ist die staatliche Eisenbahngesellschaft von [Rumänien](/country/romania "Rumänien") und betreibt einen Großteil der Verbindungen im Personenverkehr auf dem rumänischen Schienennetz. diff --git a/content/operator/cfr/index.en.md b/content/operator/cfr/index.en.md index 5cc2077e2..2b8910d91 100644 --- a/content/operator/cfr/index.en.md +++ b/content/operator/cfr/index.en.md @@ -7,6 +7,9 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFR Călători" --- The Societatea Natională de Transport Feroviar de Călători "CFR Călători" S.A., or CFR Călători for short, is the state railway company of [Romania](/country/romania "Romania") and operates the majority of passenger services on the Romanian rail network. diff --git a/content/operator/cfr/index.fr.md b/content/operator/cfr/index.fr.md index 32407621e..0fc028b1a 100644 --- a/content/operator/cfr/index.fr.md +++ b/content/operator/cfr/index.fr.md @@ -7,6 +7,9 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office +params: + transitous_mapping: + - query: agencyName == "CFR Călători" --- La Societatea Natională de Transport Feroviar de Călători « CFR Călători » S.A., en abrégé CFR Călători, est la compagnie ferroviaire nationale de [Roumanie](/country/romania "Roumanie") et exploite la majorité des services voyageurs sur le réseau ferroviaire roumain. diff --git a/content/operator/cie/index.de.md b/content/operator/cie/index.de.md index d8f59e7cf..c66116748 100644 --- a/content/operator/cie/index.de.md +++ b/content/operator/cie/index.de.md @@ -8,6 +8,10 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website +params: + transitous_mapping: + - query: agencyName == "Irish Rail" + - query: agencyName == "Iarnród Éireann" --- Córas lompair Éireann (CIE) ist die staatliche Bahngesellschaft [Irlands](/country/ireland) und das Mutterunternehmen von Irish Rail (Iarnród Éireann). Die Tochtergesellschaft betreibt den Großteil des Schienenverkehrs in der Republik Irland, einschließlich der Hauptstrecken zwischen Dublin, Cork, Galway und Limerick sowie regionaler Verbindungen in der Gegend von Dublin und Cork. diff --git a/content/operator/cie/index.en.md b/content/operator/cie/index.en.md index a60d2c466..cb1dddee9 100644 --- a/content/operator/cie/index.en.md +++ b/content/operator/cie/index.en.md @@ -8,6 +8,10 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website +params: + transitous_mapping: + - query: agencyName == "Irish Rail" + - query: agencyName == "Iarnród Éireann" --- Córas Iompair Éireann (CIE) is the state railway company of [Ireland](/country/ireland) and the parent company of Irish Rail (Iarnród Éireann). The subsidiary operates the majority of rail services in the Republic of Ireland, including the main routes between Dublin, Cork, Galway and Limerick, as well as regional connections in the Dublin and Cork areas. diff --git a/content/operator/cie/index.fr.md b/content/operator/cie/index.fr.md index 7a7fe4409..e67d10a8f 100644 --- a/content/operator/cie/index.fr.md +++ b/content/operator/cie/index.fr.md @@ -8,6 +8,10 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website +params: + transitous_mapping: + - query: agencyName == "Irish Rail" + - query: agencyName == "Iarnród Éireann" --- Córas Iompair Éireann (CIE) est la compagnie ferroviaire nationale d’[Irlande](/country/ireland) et la société mère d’Irish Rail (Iarnród Éireann). La filiale exploite la majorité du trafic ferroviaire en République d’Irlande, notamment les lignes principales entre Dublin, Cork, Galway et Limerick, ainsi que des liaisons régionales dans les environs de Dublin et Cork. diff --git a/content/operator/cp/index.de.md b/content/operator/cp/index.de.md index 168863d2a..ae59e4887 100644 --- a/content/operator/cp/index.de.md +++ b/content/operator/cp/index.de.md @@ -7,6 +7,10 @@ operator: "cp" aliases: - /booking/cp-ticket-office +params: + transitous_mapping: + - query: agencyName == "CP - Comboios de Portugal" + - query: agencyName == "Comboios de Portugal" --- Die CP (Comboios de Portugal) ist die portugiesische Staatsbahn und die wichtigste Bahngesellschaft in [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/cp/index.en.md b/content/operator/cp/index.en.md index 49baae4f9..aa6a57daf 100644 --- a/content/operator/cp/index.en.md +++ b/content/operator/cp/index.en.md @@ -7,6 +7,10 @@ operator: "cp" aliases: - /booking/cp-ticket-office +params: + transitous_mapping: + - query: agencyName == "CP - Comboios de Portugal" + - query: agencyName == "Comboios de Portugal" --- CP (Comboios de Portugal) is the Portuguese state railway and the main railway company in [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/cp/index.fr.md b/content/operator/cp/index.fr.md index 97ccabade..153eb6d2b 100644 --- a/content/operator/cp/index.fr.md +++ b/content/operator/cp/index.fr.md @@ -7,6 +7,10 @@ operator: "cp" aliases: - /booking/cp-ticket-office +params: + transitous_mapping: + - query: agencyName == "CP - Comboios de Portugal" + - query: agencyName == "Comboios de Portugal" --- La CP (Comboios de Portugal) est la compagnie ferroviaire nationale portugaise et la principale société de chemins de fer au [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/db/index.de.md b/content/operator/db/index.de.md index 98ecfd760..e43d0a813 100644 --- a/content/operator/db/index.de.md +++ b/content/operator/db/index.de.md @@ -10,6 +10,26 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international +params: + transitous_mapping: + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") + category: ice + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") + category: tgv + - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) + category: rj + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") + category: ece + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") + category: ec + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + category: ic + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + category: re + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + category: rb + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + category: s --- Die Deutsche Bahn (DB) ist das größte Eisenbahnverkehrsunternehmen in [Deutschland](/country/germany "Deutschland") und betreibt den Großteil des Fernverkehrs sowie viele Verbindungen im Regionalverkehr. diff --git a/content/operator/db/index.en.md b/content/operator/db/index.en.md index f61c83b83..df50567a2 100644 --- a/content/operator/db/index.en.md +++ b/content/operator/db/index.en.md @@ -10,6 +10,26 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international +params: + transitous_mapping: + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") + category: ice + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") + category: tgv + - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) + category: rj + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") + category: ece + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") + category: ec + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + category: ic + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + category: re + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + category: rb + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + category: s --- Deutsche Bahn (DB) is the largest railway company in [Germany](/country/germany "Germany"), operating most long-distance services as well as many regional connections. diff --git a/content/operator/db/index.fr.md b/content/operator/db/index.fr.md index 4d2109238..bc7c2cd76 100644 --- a/content/operator/db/index.fr.md +++ b/content/operator/db/index.fr.md @@ -10,6 +10,26 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international +params: + transitous_mapping: + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") + category: ice + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") + category: tgv + - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) + category: rj + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") + category: ece + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") + category: ec + - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + category: ic + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + category: re + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + category: rb + - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + category: s --- La Deutsche Bahn (DB) est la plus grande entreprise ferroviaire d’[Allemagne](/country/germany "Allemagne") et exploite la majorité du trafic longue distance ainsi que de nombreuses liaisons régionales. diff --git a/content/operator/dsb/index.de.md b/content/operator/dsb/index.de.md index 39bc2e0d8..436656aa4 100644 --- a/content/operator/dsb/index.de.md +++ b/content/operator/dsb/index.de.md @@ -9,6 +9,9 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website +params: + transitous_mapping: + - query: agencyName == "DSB" --- Die DSB (Danske Statsbaner) ist die staatliche Eisenbahngesellschaft in [Dänemark](/country/denmark "Dänemark"). Sie betreibt den Großteil des Personenverkehrs auf dem dänischen Schienennetz. diff --git a/content/operator/dsb/index.en.md b/content/operator/dsb/index.en.md index 4cd669f0e..7b546a21b 100644 --- a/content/operator/dsb/index.en.md +++ b/content/operator/dsb/index.en.md @@ -9,6 +9,9 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website +params: + transitous_mapping: + - query: agencyName == "DSB" --- The DSB (Danske Statsbaner) is the state-owned railway company in [Denmark](/country/denmark "Denmark"). It operates the majority of passenger traffic on the Danish rail network. diff --git a/content/operator/dsb/index.fr.md b/content/operator/dsb/index.fr.md index e4fd98956..b7b15a745 100644 --- a/content/operator/dsb/index.fr.md +++ b/content/operator/dsb/index.fr.md @@ -9,6 +9,9 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website +params: + transitous_mapping: + - query: agencyName == "DSB" --- La DSB (Danske Statsbaner) est la compagnie ferroviaire publique du [Danemark](/country/denmark "Danemark"). Elle exploite la majorité du trafic voyageurs sur le réseau ferroviaire danois. diff --git a/content/operator/eurostar/index.de.md b/content/operator/eurostar/index.de.md index 83961ee0f..87a8522c1 100644 --- a/content/operator/eurostar/index.de.md +++ b/content/operator/eurostar/index.de.md @@ -16,6 +16,19 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website + +params: + transitous_mapping: + - query: agencyId == "EUROSTAR_CHANNEL" + category: eurostar-blue + - query: agencyId == "EUROSTAR_CONTINENTAL" + category: eurostar-red + - query: agencyName == "NS Int" && routeShortName == "Eurostar" + category: eurostar-red + - query: agencyName == "SNCF" && routeShortName == "THA" + category: eurostar-red + - query: agencyId == "EUROSTAR_SNOW" + category: eurostar-snow --- Eurostar ist ein Betreiber von Hochgeschwindigkeitszügen in Westeuropa. Ursprünglich wurden nur die blauen Züge zwischen London und Paris/Brüssel/Amsterdam durch den Eurotunnel als Eurostar bezeichnet. Nach dem Zusammenschluss zwischen Thalys und Eurostar werden auch die roten Thalys-Züge als Eurostar (Red) bezeichnet. Eurostar verkehrt in [Deutschland](/country/germany "Deutschland"), [Frankreich](/country/france "Frankreich"), dem [Vereinigten Königreich](/country/united-kingdom "Vereinigtes Königreich"), [Belgien](/country/belgium "Belgien") und den [Niederlanden](/country/netherlands "Niederlande"). diff --git a/content/operator/eurostar/index.en.md b/content/operator/eurostar/index.en.md index e1a7fccff..996fc7b91 100644 --- a/content/operator/eurostar/index.en.md +++ b/content/operator/eurostar/index.en.md @@ -16,6 +16,19 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website + +params: + transitous_mapping: + - query: agencyId == "EUROSTAR_CHANNEL" + category: eurostar-blue + - query: agencyId == "EUROSTAR_CONTINENTAL" + category: eurostar-red + - query: agencyName == "NS Int" && routeShortName == "Eurostar" + category: eurostar-red + - query: agencyName == "SNCF" && routeShortName == "THA" + category: eurostar-red + - query: agencyId == "EUROSTAR_SNOW" + category: eurostar-snow --- Eurostar is an operator of high-speed trains in Western Europe. Originally, only the blue trains between London and Paris/Brussels/Amsterdam through the Eurotunnel were referred to as Eurostar. After the merger between Thalys and Eurostar, the red Thalys trains are now also referred to as Eurostar (Red). Eurostar operates in [Germany](/country/germany "Germany"), [France](/country/france "France"), the [United Kingdom](/country/united-kingdom "United Kingdom"), [Belgium](/country/belgium "Belgium"), and the [Netherlands](/country/netherlands "Netherlands"). diff --git a/content/operator/eurostar/index.fr.md b/content/operator/eurostar/index.fr.md index 52e55c9ab..d4f3c1326 100644 --- a/content/operator/eurostar/index.fr.md +++ b/content/operator/eurostar/index.fr.md @@ -16,6 +16,18 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website +params: + transitous_mapping: + - query: agencyId == "EUROSTAR_CHANNEL" + category: eurostar-blue + - query: agencyId == "EUROSTAR_CONTINENTAL" + category: eurostar-red + - query: agencyName == "NS Int" && routeShortName == "Eurostar" + category: eurostar-red + - query: agencyName == "SNCF" && routeShortName == "THA" + category: eurostar-red + - query: agencyId == "EUROSTAR_SNOW" + category: eurostar-snow --- Eurostar est un opérateur de trains à grande vitesse en Europe de l’Ouest. À l’origine, seuls les trains bleus entre Londres et Paris/Bruxelles/Amsterdam via l’Eurotunnel étaient désignés comme Eurostar. Depuis la fusion entre Thalys et Eurostar, les anciens trains rouges Thalys sont désormais appelés Eurostar (Rouge). Eurostar circule en [Allemagne](/country/germany "Allemagne"), [France](/country/france "France"), au [Royaume-Uni](/country/united-kingdom "Royaume-Uni"), en [Belgique](/country/belgium "Belgique") et aux [Pays-Bas](/country/netherlands "Pays-Bas"). diff --git a/content/operator/fs/index.de.md b/content/operator/fs/index.de.md index b2e0acccd..7a9ddd20b 100644 --- a/content/operator/fs/index.de.md +++ b/content/operator/fs/index.de.md @@ -9,6 +9,9 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website +params: + transitous_mapping: + - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) ist die italienische Staatsbahn. FIP Vergünstigungen gelten jedoch nur bei der Tochtergesellschaft Trenitalia in [Italien](/country/italy "Italien"). diff --git a/content/operator/fs/index.en.md b/content/operator/fs/index.en.md index 62b161d22..d9216e824 100644 --- a/content/operator/fs/index.en.md +++ b/content/operator/fs/index.en.md @@ -9,6 +9,9 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website +params: + transitous_mapping: + - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) is the Italian state railway. FIP discounts only apply to its subsidiary Trenitalia in [Italy](/country/italy "Italy"). diff --git a/content/operator/fs/index.fr.md b/content/operator/fs/index.fr.md index f96775cea..6f2363fe1 100644 --- a/content/operator/fs/index.fr.md +++ b/content/operator/fs/index.fr.md @@ -9,6 +9,9 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website +params: + transitous_mapping: + - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) est la compagnie ferroviaire nationale italienne. Les rabais FIP ne s’appliquent qu’à sa filiale Trenitalia en [Italie](/country/italy "Italie"). diff --git a/content/operator/gysev/index.de.md b/content/operator/gysev/index.de.md index 615f1a890..07eb04f39 100644 --- a/content/operator/gysev/index.de.md +++ b/content/operator/gysev/index.de.md @@ -9,6 +9,10 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website +params: + transitous_mapping: + - query: agencyName == "GYSEV" + - query: agencyName == "Raaberbahn" --- Die Raab-Oedenburg-Ebenfurter Eisenbahn AG (ungarisch Győr-Sopron-Ebenfurti Vasút Zrt.), kurz GySEV oder Raaberbahn ist ein privates ungarisches Eisenbahnunternehmen, welches Regionalzüge in Ungarn und [Österreich](/country/austria "Österreich") betreibt. Die Züge verkehren hauptsächlich südlich und östlich des Neusiedlersees (Westungarn), teilweise sind sie sogar auf eigener Infrastruktur unterwegs. diff --git a/content/operator/gysev/index.en.md b/content/operator/gysev/index.en.md index 60f342c76..a8bfbed0d 100644 --- a/content/operator/gysev/index.en.md +++ b/content/operator/gysev/index.en.md @@ -9,6 +9,10 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website +params: + transitous_mapping: + - query: agencyName == "GYSEV" + - query: agencyName == "Raaberbahn" --- The Raab-Oedenburg-Ebenfurter Eisenbahn AG (Hungarian: Győr-Sopron-Ebenfurti Vasút Zrt.), short: GySEV or Raaberbahn, is a private Hungarian railway company that operates regional trains in Hungary and [Austria](/country/austria "Austria"). They primarily operate passenger services south and east of Lake Neusiedl (Western Hungary), partly even on their own infrastructure. diff --git a/content/operator/gysev/index.fr.md b/content/operator/gysev/index.fr.md index 93d187b7f..2900b82ce 100644 --- a/content/operator/gysev/index.fr.md +++ b/content/operator/gysev/index.fr.md @@ -9,6 +9,10 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website +params: + transitous_mapping: + - query: agencyName == "GYSEV" + - query: agencyName == "Raaberbahn" --- La Raab-Oedenburg-Ebenfurter Eisenbahn AG (en hongrois Győr-Sopron-Ebenfurti Vasút Zrt.), abrégée GySEV ou Raaberbahn, est une compagnie ferroviaire privée hongroise qui exploite des trains régionaux en Hongrie et en [Autriche](/country/austria "Autriche"). Elle assure principalement le transport de voyageurs au sud et à l’est du lac de Neusiedl (ouest de la Hongrie), parfois même sur sa propre infrastructure. diff --git a/content/operator/ht/index.de.md b/content/operator/ht/index.de.md index 44d40f654..771ae0679 100644 --- a/content/operator/ht/index.de.md +++ b/content/operator/ht/index.de.md @@ -8,6 +8,10 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website +params: + transitous_mapping: + - query: agencyName == "HŽ Putnički prijevoz" + - query: agencyName == "HŽ" --- Die Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) betreibt den gesamten staatlichen Personenverkehr auf dem griechischen Normalspurnetz. Das Unternehmen betreibt Fern-, Regional- und den Vorortverkehr („Proastiakos“). Seit 2017 ist es eine hundertprozentige Tochter der italienischen Staatsbahn Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/ht/index.en.md b/content/operator/ht/index.en.md index d73a16542..d495e5321 100644 --- a/content/operator/ht/index.en.md +++ b/content/operator/ht/index.en.md @@ -8,6 +8,10 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website +params: + transitous_mapping: + - query: agencyName == "HŽ Putnički prijevoz" + - query: agencyName == "HŽ" --- Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) operates all state passenger services on the Greek standard-gauge network. The company runs long-distance, regional and suburban services ("Proastiakos"). Since 2017, it has been a wholly owned subsidiary of the Italian state railway Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/ht/index.fr.md b/content/operator/ht/index.fr.md index 242b4b2a6..78f10129a 100644 --- a/content/operator/ht/index.fr.md +++ b/content/operator/ht/index.fr.md @@ -8,6 +8,10 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website +params: + transitous_mapping: + - query: agencyName == "HŽ Putnički prijevoz" + - query: agencyName == "HŽ" --- Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) exploite l’ensemble du transport de voyageurs de l’État sur le réseau grec à voie normale. L’entreprise exploite des services grandes lignes, régionaux et de banlieue (« Proastiakos »). Depuis 2017, elle est une filiale à 100 % des chemins de fer italiens Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/kd/index.de.md b/content/operator/kd/index.de.md index 430241bc1..a304c005f 100644 --- a/content/operator/kd/index.de.md +++ b/content/operator/kd/index.de.md @@ -9,6 +9,9 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website +params: + transitous_mapping: + - query: agencyName == "Koleje Dolnośląskie" --- Die Koleje Dolnośląskie, kurz KD, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Niederschlesien anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kd/index.en.md b/content/operator/kd/index.en.md index 857bb8071..7a704ce63 100644 --- a/content/operator/kd/index.en.md +++ b/content/operator/kd/index.en.md @@ -9,6 +9,9 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website +params: + transitous_mapping: + - query: agencyName == "Koleje Dolnośląskie" --- Koleje Dolnośląskie (KD) is a Polish railway company offering regional services in the Lower Silesia Province. It is one of five different operators in [Poland](/country/poland) which provide FIP benefits. diff --git a/content/operator/kd/index.fr.md b/content/operator/kd/index.fr.md index 899b93fa6..cc125ac39 100644 --- a/content/operator/kd/index.fr.md +++ b/content/operator/kd/index.fr.md @@ -9,6 +9,9 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website +params: + transitous_mapping: + - query: agencyName == "Koleje Dolnośląskie" --- Koleje Dolnośląskie (KD) est une compagnie ferroviaire polonaise assurant principalement des services régionaux dans la voïvodie de Basse-Silésie. C’est l’une des cinq compagnies différentes de [Pologne](/country/poland) qui proposent le FIP. diff --git a/content/operator/kml/index.de.md b/content/operator/kml/index.de.md index f3476f8e9..e71eeacb7 100644 --- a/content/operator/kml/index.de.md +++ b/content/operator/kml/index.de.md @@ -7,6 +7,9 @@ operator: "kml" aliases: - /booking/kml-ticket-office +params: + transitous_mapping: + - query: agencyName == "Koleje Małopolskie" --- Die Koleje Małopolskie, kurz KMŁ, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Kleinpolen anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kml/index.en.md b/content/operator/kml/index.en.md index 5e5c52366..f3313e7ac 100644 --- a/content/operator/kml/index.en.md +++ b/content/operator/kml/index.en.md @@ -7,6 +7,9 @@ operator: "kml" aliases: - /booking/kml-ticket-office +params: + transitous_mapping: + - query: agencyName == "Koleje Małopolskie" --- Koleje Małopolskie, abbreviated KMŁ, is a Polish railway company that mainly provides regional services in the Lesser Poland Voivodeship. It is one of five different companies offering FIP in [Poland](/country/poland). diff --git a/content/operator/kml/index.fr.md b/content/operator/kml/index.fr.md index a9160ca61..0a26eca80 100644 --- a/content/operator/kml/index.fr.md +++ b/content/operator/kml/index.fr.md @@ -7,6 +7,9 @@ operator: "kml" aliases: - /booking/kml-ticket-office +params: + transitous_mapping: + - query: agencyName == "Koleje Małopolskie" --- Les Koleje Małopolskie, abrégées KMŁ, sont une compagnie ferroviaire polonaise qui assure principalement des services régionaux dans la voïvodie de Petite-Pologne. C’est l’une des cinq compagnies différentes proposant la FIP en [Pologne](/country/poland). diff --git a/content/operator/ks/index.de.md b/content/operator/ks/index.de.md index 6bceeaf09..4af5f9e15 100644 --- a/content/operator/ks/index.de.md +++ b/content/operator/ks/index.de.md @@ -9,6 +9,9 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website +params: + transitous_mapping: + - query: agencyName == "Koleje Śląskie" --- Die Koleje Śląskie, kurz KŚ, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Schlesien anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/ks/index.en.md b/content/operator/ks/index.en.md index f71979eaa..347de30a9 100644 --- a/content/operator/ks/index.en.md +++ b/content/operator/ks/index.en.md @@ -9,6 +9,9 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website +params: + transitous_mapping: + - query: agencyName == "Koleje Śląskie" --- Koleje Śląskie, short KŚ, is a Polish railway operator that primarily offers regional transport in the Silesian Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/ks/index.fr.md b/content/operator/ks/index.fr.md index 2b4a94b69..9a6fea546 100644 --- a/content/operator/ks/index.fr.md +++ b/content/operator/ks/index.fr.md @@ -9,6 +9,9 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website +params: + transitous_mapping: + - query: agencyName == "Koleje Śląskie" --- Koleje Śląskie, abrégées KŚ, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Silésie. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/kw/index.de.md b/content/operator/kw/index.de.md index 47cefbdf3..aa9255520 100644 --- a/content/operator/kw/index.de.md +++ b/content/operator/kw/index.de.md @@ -9,6 +9,9 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website +params: + transitous_mapping: + - query: agencyName == "Koleje Wielkopolskie" --- Die Koleje Wielkopolskie, kurz KW, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Großpolen anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kw/index.en.md b/content/operator/kw/index.en.md index d7b2584be..69e6bd59d 100644 --- a/content/operator/kw/index.en.md +++ b/content/operator/kw/index.en.md @@ -9,6 +9,9 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website +params: + transitous_mapping: + - query: agencyName == "Koleje Wielkopolskie" --- Koleje Wielkopolskie, short KW, is a Polish railway operator that primarily offers regional transport in the Greater Poland Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/kw/index.fr.md b/content/operator/kw/index.fr.md index d29e22472..4491a840a 100644 --- a/content/operator/kw/index.fr.md +++ b/content/operator/kw/index.fr.md @@ -9,6 +9,9 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website +params: + transitous_mapping: + - query: agencyName == "Koleje Wielkopolskie" --- Koleje Wielkopolskie, abrégées KW, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Grande-Pologne. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/lka/index.de.md b/content/operator/lka/index.de.md index 892dd7708..eddba007c 100644 --- a/content/operator/lka/index.de.md +++ b/content/operator/lka/index.de.md @@ -8,6 +8,9 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office +params: + transitous_mapping: + - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Die Łódzka Kolej Aglomeracyjna, kurz ŁKA, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Łódz anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/lka/index.en.md b/content/operator/lka/index.en.md index 6b137aae3..b6517fc5d 100644 --- a/content/operator/lka/index.en.md +++ b/content/operator/lka/index.en.md @@ -8,6 +8,9 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office +params: + transitous_mapping: + - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Łódzka Kolej Aglomeracyjna, short ŁKA, is a Polish railway operator that primarily offers regional transport in the Łódź Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/lka/index.fr.md b/content/operator/lka/index.fr.md index 988f53f26..96f630002 100644 --- a/content/operator/lka/index.fr.md +++ b/content/operator/lka/index.fr.md @@ -8,6 +8,9 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office +params: + transitous_mapping: + - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Łódzka Kolej Aglomeracyjna, abrégées ŁKA, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Łódź. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/ltg/index.de.md b/content/operator/ltg/index.de.md index d72be8cad..a278ccfac 100644 --- a/content/operator/ltg/index.de.md +++ b/content/operator/ltg/index.de.md @@ -8,6 +8,9 @@ operator: "ltg" aliases: - /booking/ltg-website +params: + transitous_mapping: + - query: agencyName == "LTG Link" --- Die LTG ist die staatliche Eisenbahngesellschaft der Republik Litauen und betreibt mit ihrer Tochtergesellschaft LTG-Link alle Verbindungen im Personenverkehr auf dem litauischen Schienennetz sowie ins Ausland. diff --git a/content/operator/ltg/index.en.md b/content/operator/ltg/index.en.md index 5d726f660..8f947c4d8 100644 --- a/content/operator/ltg/index.en.md +++ b/content/operator/ltg/index.en.md @@ -8,6 +8,9 @@ operator: "ltg" aliases: - /booking/ltg-website +params: + transitous_mapping: + - query: agencyName == "LTG Link" --- LTG is the state railway company of the Republic of Lithuania and, through its subsidiary LTG-Link, operates all passenger services on the Lithuanian rail network as well as international connections. diff --git a/content/operator/ltg/index.fr.md b/content/operator/ltg/index.fr.md index 2fce76d46..321e0d83f 100644 --- a/content/operator/ltg/index.fr.md +++ b/content/operator/ltg/index.fr.md @@ -8,6 +8,9 @@ operator: "ltg" aliases: - /booking/ltg-website +params: + transitous_mapping: + - query: agencyName == "LTG Link" --- LTG est la compagnie ferroviaire nationale de la République de Lituanie et, avec sa filiale LTG-Link, exploite toutes les liaisons de transport de passagers sur le réseau ferroviaire lituanien ainsi qu’à l’étranger. diff --git a/content/operator/nir/index.de.md b/content/operator/nir/index.de.md index 80b21a6bf..6f8a74741 100644 --- a/content/operator/nir/index.de.md +++ b/content/operator/nir/index.de.md @@ -8,6 +8,10 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp +params: + transitous_mapping: + - query: agencyName == "Translink NI Railways" + - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) ist die staatliche Bahngesellschaft in Nordirland und gehört zu Translink, einem staatlichen Verkehrsunternehmen. Das Zugnetz ist überschaubar und umfasst hauptsächlich Verbindungen von bzw. nach Belfast. diff --git a/content/operator/nir/index.en.md b/content/operator/nir/index.en.md index a0091fb80..6ee91f84d 100644 --- a/content/operator/nir/index.en.md +++ b/content/operator/nir/index.en.md @@ -8,6 +8,10 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp +params: + transitous_mapping: + - query: agencyName == "Translink NI Railways" + - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) is the state railway company in Northern Ireland and is part of Translink, a state transport company. The rail network is compact and mainly consists of connections to and from Belfast. diff --git a/content/operator/nir/index.fr.md b/content/operator/nir/index.fr.md index 72c6f84ad..fee9dc247 100644 --- a/content/operator/nir/index.fr.md +++ b/content/operator/nir/index.fr.md @@ -8,6 +8,10 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp +params: + transitous_mapping: + - query: agencyName == "Translink NI Railways" + - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) est la compagnie ferroviaire nationale d’Irlande du Nord et fait partie de Translink, une entreprise de transport public. Le réseau ferroviaire est compact et comprend principalement des liaisons à destination et en provenance de Belfast. diff --git a/content/operator/ns/index.de.md b/content/operator/ns/index.de.md index a4ae074ad..c8d57f406 100644 --- a/content/operator/ns/index.de.md +++ b/content/operator/ns/index.de.md @@ -8,6 +8,11 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office +params: + transitous_mapping: + - query: agencyName == "NS" + - query: agencyName == "NS Int" + - query: agencyName == "Nederlandse Spoorwegen" --- Die Nederlandse Spoorwegen (NS) ist die staatliche Eisenbahngesellschaft der [Niederlande](/country/netherlands "Niederlande") und betreibt den Großteil des Personenverkehrs auf dem niederländischen Schienennetz. diff --git a/content/operator/ns/index.en.md b/content/operator/ns/index.en.md index bcb218833..1b2b383dd 100644 --- a/content/operator/ns/index.en.md +++ b/content/operator/ns/index.en.md @@ -8,6 +8,11 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office +params: + transitous_mapping: + - query: agencyName == "NS" + - query: agencyName == "NS Int" + - query: agencyName == "Nederlandse Spoorwegen" --- Nederlandse Spoorwegen (NS) is the state railway company of the [Netherlands](/country/netherlands "Netherlands") and operates the majority of passenger traffic on the Dutch rail network. diff --git a/content/operator/ns/index.fr.md b/content/operator/ns/index.fr.md index 3de5a8ed3..12677214f 100644 --- a/content/operator/ns/index.fr.md +++ b/content/operator/ns/index.fr.md @@ -8,6 +8,11 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office +params: + transitous_mapping: + - query: agencyName == "NS" + - query: agencyName == "NS Int" + - query: agencyName == "Nederlandse Spoorwegen" --- Les Nederlandse Spoorwegen (NS) sont la compagnie ferroviaire nationale des [Pays-Bas](/country/netherlands "Pays-Bas") et assurent la majorité du trafic voyageurs dans le pays. diff --git a/content/operator/oebb/index.de.md b/content/operator/oebb/index.de.md index 1a692e0e0..501136dff 100644 --- a/content/operator/oebb/index.de.md +++ b/content/operator/oebb/index.de.md @@ -12,6 +12,11 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website +params: + transitous_mapping: + - query: agencyName == "OEBB Personenverkehr AG Kundenservice" + - query: agencyName == "ÖBB-Personenverkehr AG" + - query: agencyName == "ÖBB" --- Die ÖBB (Österreichische Bundesbahnen) ist die nationale Eisenbahngesellschaft [Österreich](/country/austria "Österreich") und die wichtigste Bahngesellschaft des Landes. Sie betreiben einen Großteil des Personenverkehrs in Österreich. diff --git a/content/operator/oebb/index.en.md b/content/operator/oebb/index.en.md index cda3f0097..3eba46db2 100644 --- a/content/operator/oebb/index.en.md +++ b/content/operator/oebb/index.en.md @@ -12,6 +12,11 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website +params: + transitous_mapping: + - query: agencyName == "OEBB Personenverkehr AG Kundenservice" + - query: agencyName == "ÖBB-Personenverkehr AG" + - query: agencyName == "ÖBB" --- ÖBB (Austrian Federal Railways) is [Austria](/country/austria "Austria")’s national railway company and the country’s most important rail operator. It operates the majority of passenger services in Austria. diff --git a/content/operator/oebb/index.fr.md b/content/operator/oebb/index.fr.md index 37a401d48..29a72aa27 100644 --- a/content/operator/oebb/index.fr.md +++ b/content/operator/oebb/index.fr.md @@ -12,6 +12,11 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website +params: + transitous_mapping: + - query: agencyName == "OEBB Personenverkehr AG Kundenservice" + - query: agencyName == "ÖBB-Personenverkehr AG" + - query: agencyName == "ÖBB" --- Les ÖBB (Österreichische Bundesbahnen) sont la compagnie ferroviaire nationale d’[Autriche](/country/austria "Autriche") et l’opérateur ferroviaire le plus important du pays. Elle assure la majorité des services voyageurs. diff --git a/content/operator/pkp/index.de.md b/content/operator/pkp/index.de.md index 8f69a2b2f..b7caa164b 100644 --- a/content/operator/pkp/index.de.md +++ b/content/operator/pkp/index.de.md @@ -10,6 +10,10 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website +params: + transitous_mapping: + - query: agencyName == "PKP Intercity" + - query: agencyName == "Polregio" --- Die polnische Staatsbahn PKP (Polskie Koleje Państwowe) betreibt mit ihren Tochtergesellschaften PKP Intercity und Polregio einen Großteil des Schienenpersonenverkehrs in [Polen](/country/poland "Polen"). diff --git a/content/operator/pkp/index.en.md b/content/operator/pkp/index.en.md index c70f87223..143e00cbe 100644 --- a/content/operator/pkp/index.en.md +++ b/content/operator/pkp/index.en.md @@ -10,6 +10,10 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website +params: + transitous_mapping: + - query: agencyName == "PKP Intercity" + - query: agencyName == "Polregio" --- The Polish State Railways PKP (Polskie Koleje Państwowe) operates, together with its subsidiaries PKP Intercity and Polregio, a large part of passenger rail transport in [Poland](/country/poland "Poland"). diff --git a/content/operator/pkp/index.fr.md b/content/operator/pkp/index.fr.md index 5d9ca70ec..d7bd2a64a 100644 --- a/content/operator/pkp/index.fr.md +++ b/content/operator/pkp/index.fr.md @@ -10,6 +10,10 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website +params: + transitous_mapping: + - query: agencyName == "PKP Intercity" + - query: agencyName == "Polregio" --- Les chemins de fer polonais PKP (Polskie Koleje Państwowe) exploitent, avec leurs filiales PKP Intercity et Polregio, une grande partie du transport ferroviaire de voyageurs en [Pologne](/country/poland "Pologne"). diff --git a/content/operator/renfe/index.de.md b/content/operator/renfe/index.de.md index 915db9db5..4cb746d86 100644 --- a/content/operator/renfe/index.de.md +++ b/content/operator/renfe/index.de.md @@ -8,6 +8,14 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office +params: + transitous_mapping: + - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" + category: ave + - query: agencyName == "Renfe" + - query: agencyName == "Renfe Operadora" + - query: agencyName == "RENFE" + - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora ist das staatliche Eisenbahnunternehmen in [Spanien](/country/spain "Spanien"). Hierzu gehören komfortable Hochgeschwindkeitszüge, diverse Regionalzüge und S-Bahnen. diff --git a/content/operator/renfe/index.en.md b/content/operator/renfe/index.en.md index 341657c95..aaa5d0235 100644 --- a/content/operator/renfe/index.en.md +++ b/content/operator/renfe/index.en.md @@ -8,6 +8,14 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office +params: + transitous_mapping: + - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" + category: ave + - query: agencyName == "Renfe" + - query: agencyName == "Renfe Operadora" + - query: agencyName == "RENFE" + - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora is the state-owned railroad company in [Spain](/country/spain "Spain"). It operates comfortable high-speed trains, various regional trains and suburban trains. diff --git a/content/operator/renfe/index.fr.md b/content/operator/renfe/index.fr.md index 52b1627ba..6b35ba51c 100644 --- a/content/operator/renfe/index.fr.md +++ b/content/operator/renfe/index.fr.md @@ -8,6 +8,14 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office +params: + transitous_mapping: + - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" + category: ave + - query: agencyName == "Renfe" + - query: agencyName == "Renfe Operadora" + - query: agencyName == "RENFE" + - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora est la compagnie ferroviaire publique en [Espagne](/country/spain "Espagne"). Elle exploite des trains à grande vitesse confortables, divers trains régionaux et des trains de banlieue. diff --git a/content/operator/sbb/index.de.md b/content/operator/sbb/index.de.md index d9c341ec0..14e525c24 100644 --- a/content/operator/sbb/index.de.md +++ b/content/operator/sbb/index.de.md @@ -8,6 +8,12 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website +params: + transitous_mapping: + - query: agencyName == "SBB" + - query: agencyName == "CFF" + - query: agencyName == "FFS" + - query: agencyName == "SBB CFF FFS" --- Die SBB (Schweizerische Bundesbahnen) – (Chemins de fer fédéraux suisses CFF, Ferrovie federali svizzere FFS) ist die nationale Eisenbahngesellschaft der [Schweiz](/country/switzerland "Schweiz"). Sie betreibt einen Großteil des schweizerischen Schienennetzes. Die SBB ist bekannt für ihre Pünktlichkeit und Zuverlässigkeit. diff --git a/content/operator/sbb/index.en.md b/content/operator/sbb/index.en.md index 4c8f6bf95..ae07c501a 100644 --- a/content/operator/sbb/index.en.md +++ b/content/operator/sbb/index.en.md @@ -8,6 +8,12 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website +params: + transitous_mapping: + - query: agencyName == "SBB" + - query: agencyName == "CFF" + - query: agencyName == "FFS" + - query: agencyName == "SBB CFF FFS" --- SBB (Swiss Federal Railways) – (Chemins de fer fédéraux suisses CFF, Ferrovie federali svizzere FFS) is the national railway company of [Switzerland](/country/switzerland "Switzerland"). It operates most of the Swiss rail network and is known for its punctuality and reliability. diff --git a/content/operator/sbb/index.fr.md b/content/operator/sbb/index.fr.md index ee3fdd674..61e9ee3a8 100644 --- a/content/operator/sbb/index.fr.md +++ b/content/operator/sbb/index.fr.md @@ -8,6 +8,12 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website +params: + transitous_mapping: + - query: agencyName == "SBB" + - query: agencyName == "CFF" + - query: agencyName == "FFS" + - query: agencyName == "SBB CFF FFS" --- Les CFF (Chemins de fer fédéraux suisses, SBB en allemand, FFS en italien) sont la compagnie ferroviaire nationale de la [Suisse](/country/switzerland "Suisse"). Ils exploitent la majeure partie du réseau ferroviaire suisse et sont réputés pour leur ponctualité et leur fiabilité. diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index c1ffbf573..097cdd2b3 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -9,6 +9,10 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website +params: + transitous_mapping: + - query: agencyName == "SNCB" + - query: agencyName == "NMBS" --- Die SNCB (Société nationale des chemins de fer belges) bzw. NMBS (Nationale Maatschappij der Belgische Spoorwegen) ist die belgische Staatsbahn und die wichtigste Bahngesellschaft in [Belgien](/country/belgium "Belgien"). diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index 1b5d549b0..0961c8e35 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -9,6 +9,10 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website +params: + transitous_mapping: + - query: agencyName == "SNCB" + - query: agencyName == "NMBS" --- The SNCB (Société nationale des chemins de fer belges) or NMBS (Nationale Maatschappij der Belgische Spoorwegen) is the Belgian national railway operator and the most important railway operator in [Belgium](/country/belgium "Belgium"). diff --git a/content/operator/sncb/index.fr.md b/content/operator/sncb/index.fr.md index b25977786..01035dbba 100644 --- a/content/operator/sncb/index.fr.md +++ b/content/operator/sncb/index.fr.md @@ -9,6 +9,10 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website +params: + transitous_mapping: + - query: agencyName == "SNCB" + - query: agencyName == "NMBS" --- La SNCB (Société nationale des chemins de fer belges) ou NMBS (Nationale Maatschappij der Belgische Spoorwegen) est l’opérateur ferroviaire national belge et le plus important de [Belgique](/country/belgium "Belgique"). diff --git a/content/operator/sncf/index.de.md b/content/operator/sncf/index.de.md index 62e541649..38dec5313 100644 --- a/content/operator/sncf/index.de.md +++ b/content/operator/sncf/index.de.md @@ -15,6 +15,10 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office +params: + transitous_mapping: + - query: agencyName == "SNCF" + - query: agencyName == "SNCF Voyageurs" --- Die SNCF (Société Nationale des Chemins de fer Français) ist die französische Staatsbahn und die wichtigste Bahngesellschaft in [Frankreich](/country/france "Frankreich"). Sie betreibt fast alle Fern- und Regionalzüge in Frankreich. diff --git a/content/operator/sncf/index.en.md b/content/operator/sncf/index.en.md index e8f6bbcc0..b59607b66 100644 --- a/content/operator/sncf/index.en.md +++ b/content/operator/sncf/index.en.md @@ -15,6 +15,10 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office +params: + transitous_mapping: + - query: agencyName == "SNCF" + - query: agencyName == "SNCF Voyageurs" --- SNCF (Société Nationale des Chemins de fer Français) is the French national railway company and the main rail operator in [France](/country/france "France"). It operates almost all long-distance and regional trains in France. diff --git a/content/operator/sncf/index.fr.md b/content/operator/sncf/index.fr.md index dfdb0eff0..f2ba818d0 100644 --- a/content/operator/sncf/index.fr.md +++ b/content/operator/sncf/index.fr.md @@ -15,6 +15,10 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office +params: + transitous_mapping: + - query: agencyName == "SNCF" + - query: agencyName == "SNCF Voyageurs" --- La SNCF (Société Nationale des Chemins de fer Français) est la compagnie ferroviaire nationale française et le principal opérateur ferroviaire en [France](/country/france "France"). Elle exploite la quasi-totalité des trains grandes lignes et régionaux du pays. diff --git a/content/operator/sv/index.de.md b/content/operator/sv/index.de.md index 29c36b2db..46c584df6 100644 --- a/content/operator/sv/index.de.md +++ b/content/operator/sv/index.de.md @@ -4,6 +4,9 @@ title: "SV" country: - "serbia" operator: "sv" +params: + transitous_mapping: + - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) ist die staatliche Eisenbahngesellschaft in Serbien und betreibt den Großteil des Personenverkehrs im Land. diff --git a/content/operator/sv/index.en.md b/content/operator/sv/index.en.md index e33d8d4b4..b9edab00a 100644 --- a/content/operator/sv/index.en.md +++ b/content/operator/sv/index.en.md @@ -4,6 +4,9 @@ title: "SV" country: - "serbia" operator: "sv" +params: + transitous_mapping: + - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) is the state railway company in Serbia and operates the majority of passenger traffic in the country. diff --git a/content/operator/sv/index.fr.md b/content/operator/sv/index.fr.md index 9f4729804..d276a8bdb 100644 --- a/content/operator/sv/index.fr.md +++ b/content/operator/sv/index.fr.md @@ -4,6 +4,9 @@ title: "SV" country: - "serbia" operator: "sv" +params: + transitous_mapping: + - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) est la compagnie ferroviaire nationale de Serbie et exploite la majeure partie du trafic voyageurs dans le pays. diff --git a/content/operator/sz/index.de.md b/content/operator/sz/index.de.md index a41993c9f..d687f83e2 100644 --- a/content/operator/sz/index.de.md +++ b/content/operator/sz/index.de.md @@ -4,6 +4,10 @@ title: "SŽ" country: - "slovenia" operator: "sz" +params: + transitous_mapping: + - query: agencyName == "Slovenske železnice" + - query: agencyName == "SŽ" --- Die Slovenske železnice (SŽ) ist die staatliche Eisenbahngesellschaft von [Slowenien](/country/slovenia "Slowenien") und betreibt einen Großteil der Verbindungen im Personenverkehr auf dem slowenischen Schienennetz. diff --git a/content/operator/sz/index.en.md b/content/operator/sz/index.en.md index 725b234a1..eb263b65a 100644 --- a/content/operator/sz/index.en.md +++ b/content/operator/sz/index.en.md @@ -4,6 +4,10 @@ title: "SŽ" country: - "slovenia" operator: "sz" +params: + transitous_mapping: + - query: agencyName == "Slovenske železnice" + - query: agencyName == "SŽ" --- The Slovenske železnice (SŽ) is the state railway company of [Slovenia](/country/slovenia "Slovenia") and operates the majority of passenger services on the Slovenian rail network. diff --git a/content/operator/sz/index.fr.md b/content/operator/sz/index.fr.md index 6cf9c51b4..cd82d7294 100644 --- a/content/operator/sz/index.fr.md +++ b/content/operator/sz/index.fr.md @@ -4,6 +4,10 @@ title: "SŽ" country: - "slovenia" operator: "sz" +params: + transitous_mapping: + - query: agencyName == "Slovenske železnice" + - query: agencyName == "SŽ" --- Les Slovenske železnice (SŽ) sont la compagnie ferroviaire nationale de [Slovénie](/country/slovenia "Slovénie") et exploitent la majorité des services de voyageurs sur le réseau ferroviaire slovène. diff --git a/content/operator/vy/index.de.md b/content/operator/vy/index.de.md index 17ff860e1..a309dde27 100644 --- a/content/operator/vy/index.de.md +++ b/content/operator/vy/index.de.md @@ -9,6 +9,12 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office +params: + transitous_mapping: + - query: agencyName == "Vy" + - query: agencyName == "Vy Tog" + - query: agencyName == "SJ Nord" + - query: agencyName == "Go-Ahead Nordic" --- Die Vy Group (ehemals Norges Statsbaner) ist die staatliche Bahngesellschaft in [Norwegen](/country/norway). Sie betreibt mit ihren Tochtergesellschaften den Großteil des Schienenpersonenverkehrs in Norwegen. diff --git a/content/operator/vy/index.en.md b/content/operator/vy/index.en.md index bbd09c772..6d9f5fbec 100644 --- a/content/operator/vy/index.en.md +++ b/content/operator/vy/index.en.md @@ -9,6 +9,12 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office +params: + transitous_mapping: + - query: agencyName == "Vy" + - query: agencyName == "Vy Tog" + - query: agencyName == "SJ Nord" + - query: agencyName == "Go-Ahead Nordic" --- Vy Group (formerly Norges Statsbaner) is the state railway company in [Norway](/country/norway). Together with its subsidiaries, it operates most of the passenger rail transport in Norway. diff --git a/content/operator/vy/index.fr.md b/content/operator/vy/index.fr.md index dfe3e37c2..9022ab9bf 100644 --- a/content/operator/vy/index.fr.md +++ b/content/operator/vy/index.fr.md @@ -9,6 +9,12 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office +params: + transitous_mapping: + - query: agencyName == "Vy" + - query: agencyName == "Vy Tog" + - query: agencyName == "SJ Nord" + - query: agencyName == "Go-Ahead Nordic" --- Vy Group (anciennement Norges Statsbaner) est la compagnie ferroviaire nationale de la [Norvège](/country/norway). Avec ses filiales, elle assure la majeure partie du transport ferroviaire de voyageurs en Norvège. diff --git a/content/operator/zpcg/index.de.md b/content/operator/zpcg/index.de.md index 48ed51b0c..8831bf6c2 100644 --- a/content/operator/zpcg/index.de.md +++ b/content/operator/zpcg/index.de.md @@ -4,6 +4,9 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" +params: + transitous_mapping: + - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) ist der nationale Personenverkehrsbetreiber in Montenegro. diff --git a/content/operator/zpcg/index.en.md b/content/operator/zpcg/index.en.md index 1c539e256..c4c6f7e1e 100644 --- a/content/operator/zpcg/index.en.md +++ b/content/operator/zpcg/index.en.md @@ -4,6 +4,9 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" +params: + transitous_mapping: + - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) is the national passenger transport operator in Montenegro. diff --git a/content/operator/zpcg/index.fr.md b/content/operator/zpcg/index.fr.md index e23cd6578..db6331129 100644 --- a/content/operator/zpcg/index.fr.md +++ b/content/operator/zpcg/index.fr.md @@ -4,6 +4,9 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" +params: + transitous_mapping: + - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) est l’opérateur national de transport de voyageurs au Monténégro. diff --git a/content/operator/zssk/index.de.md b/content/operator/zssk/index.de.md index e0727a9a4..c4e88225f 100644 --- a/content/operator/zssk/index.de.md +++ b/content/operator/zssk/index.de.md @@ -9,6 +9,9 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website +params: + transitous_mapping: + - query: agencyName == "ZSSK" --- Die ŽSR (Železnice Slovenskej republiky) sowie der dazugehörige Zugbetreiber ZSSK (Železničná spoločnosť Slovensko) ist die slowakische Staatsbahn und die wichtigste Bahngesellschaft in der [Slowakei](/country/slovakia "Slowakei"). diff --git a/content/operator/zssk/index.en.md b/content/operator/zssk/index.en.md index 06aa42374..b7a41971a 100644 --- a/content/operator/zssk/index.en.md +++ b/content/operator/zssk/index.en.md @@ -8,6 +8,9 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website +params: + transitous_mapping: + - query: agencyName == "ZSSK" --- The ŽSR (Železnice Slovenskej republiky) and its associated train operator ZSSK (Železničná spoločnosť Slovensko) are the Slovak state railways and the most important railway operator in [Slovaika](/country/slovakia "Slovakia"). diff --git a/content/operator/zssk/index.fr.md b/content/operator/zssk/index.fr.md index 65153ea00..c7cecb8a2 100644 --- a/content/operator/zssk/index.fr.md +++ b/content/operator/zssk/index.fr.md @@ -8,6 +8,9 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website +params: + transitous_mapping: + - query: agencyName == "ZSSK" --- La ŽSR (Železnice Slovenskej republiky) et son exploitant ferroviaire ZSSK (Železničná spoločnosť Slovensko) sont les chemins de fer nationaux slovaques et constituent l’opérateur ferroviaire principal du [Slovaquie](/country/slovakia "Slovaquie"). diff --git a/hugo.yaml b/hugo.yaml index 9408f6696..634f770e3 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -1,6 +1,6 @@ enableRobotsTXT: true enableGitInfo: true -ignoreLogs: ['warning-rendershortcodes-in-html'] +ignoreLogs: ["warning-rendershortcodes-in-html"] defaultContentLanguage: "en" defaultContentLanguageInSubdir: true @@ -21,6 +21,18 @@ languages: weight: 3 title: "FIP Guide – Rapide. Clair. Basé sur le partage." +outputFormats: + TransitousMapping: + mediaType: application/json + baseName: transitous-mapping + isPlainText: true + notAlternative: true + +outputs: + home: + - HTML + - TransitousMapping + module: mounts: - source: "assets" diff --git a/i18n/de.yaml b/i18n/de.yaml index 4d34eba30..780c2a001 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -224,6 +224,30 @@ related-countries: Verwandte Länder related-news: Verwandte News related-operators: Verwandte Betreiber reportError: Melde ein Fehler +routePlanner: + arrival: Ankunft + departure: Abfahrt + departureTime: Abfahrtszeit + duration: Dauer + errorGeneric: Ein Fehler ist aufgetreten. Bitte versuche es erneut. + fipAccepted: FIP akzeptiert + fipNotAccepted: FIP nicht akzeptiert + fipPartial: FIP teilweise akzeptiert + fipUnknown: FIP-Status unbekannt + from: Von + fromPlaceholder: z. B. Brüssel-Midi + loading: Verbindungen werden gesucht… + noResults: Keine Verbindungen gefunden. + operatorBaseUrl: /de + operatorNotInFipGuide: Betreiber nicht im FIP Guide + platform: Gleis + search: Suchen + swap: Abfahrts- und Ankunftsort tauschen + to: Nach + toPlaceholder: z. B. Wien Hbf + transfer: Umstieg(e) + viewInFipGuide: Im FIP Guide ansehen + walk: Fußweg satellite: content: >- Um zusätzliche Kosten bei Anrufen ins Ausland zu vermeiden, kann die App diff --git a/i18n/en.yaml b/i18n/en.yaml index 976af2d84..0e0e656cf 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -217,6 +217,30 @@ related: operators: Related Operators operators-nearby: Neighboring Operators reportError: Report an error +routePlanner: + arrival: Arrival + departure: Departure + departureTime: Departure time + duration: Duration + errorGeneric: An error occurred. Please try again. + fipAccepted: FIP accepted + fipNotAccepted: FIP not accepted + fipPartial: FIP partially accepted + fipUnknown: FIP status unknown + from: From + fromPlaceholder: e.g. Brussels-Midi + loading: Searching for connections… + noResults: No connections found. + operatorBaseUrl: /en + operatorNotInFipGuide: Operator not in FIP Guide + platform: Platform + search: Search + swap: Swap origin and destination + to: To + toPlaceholder: e.g. Vienna Hbf + transfer: transfer(s) + viewInFipGuide: View in FIP Guide + walk: Walk satellite: content: >- To avoid additional costs when calling abroad, you can use the app diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 013b894c0..fb1a9a19b 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -226,6 +226,30 @@ related: operators: Opérateurs associés operators-nearby: Opérateurs voisins reportError: Signaler une erreur +routePlanner: + arrival: Arrivée + departure: Départ + departureTime: Heure de départ + duration: Durée + errorGeneric: Une erreur s'est produite. Veuillez réessayer. + fipAccepted: FIP accepté + fipNotAccepted: FIP non accepté + fipPartial: FIP partiellement accepté + fipUnknown: Statut FIP inconnu + from: De + fromPlaceholder: ex. Bruxelles-Midi + loading: Recherche de connexions… + noResults: Aucune connexion trouvée. + operatorBaseUrl: /fr + operatorNotInFipGuide: Opérateur absent du FIP Guide + platform: Voie + search: Rechercher + swap: Échanger l'origine et la destination + to: Vers + toPlaceholder: ex. Vienne Hbf + transfer: correspondance(s) + viewInFipGuide: Voir dans le FIP Guide + walk: À pied satellite: content: >- Pour éviter des frais supplémentaires lors d'appels à l'étranger, vous diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json new file mode 100644 index 000000000..5325df06b --- /dev/null +++ b/layouts/_default/home.transitousmapping.json @@ -0,0 +1,38 @@ +{{- $operators := where (where site.Pages "Type" "operator") "IsPage" true -}} +{{- $result := slice -}} +{{- range $operators -}} + {{- $mapping := .Params.transitous_mapping -}} + {{- if $mapping -}} + {{- $trainCategories := .Store.Get "train_categories" | default slice -}} + {{- $entries := slice -}} + {{- range $mapping -}} + {{- $entry := dict "query" .query -}} + {{- if .category -}} + {{- $entry = merge $entry (dict "category" .category) -}} + {{- $catId := .category -}} + {{- range $trainCategories -}} + {{- if eq .id $catId -}} + {{- $entry = merge $entry (dict "fipAccepted" .fip_accepted) -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- $entries = $entries | append $entry -}} + {{- end -}} + {{- $op := dict "operator" .File.ContentBaseName "mapping" $entries -}} + {{- $result = $result | append $op -}} + {{- end -}} +{{- end -}} +{{- $noFipEntries := slice -}} +{{- $countries := where (where site.Pages "Type" "country") "IsPage" true -}} +{{- range $countries -}} + {{- $countrySlug := .File.ContentBaseName -}} + {{- range .Params.operators_without_fip -}} + {{- if .query -}} + {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug) -}} + {{- end -}} + {{- end -}} +{{- end -}} +{{- if $noFipEntries -}} + {{- $result = $result | append (dict "operator" "no-fip" "mapping" $noFipEntries) -}} +{{- end -}} +{{- $result | jsonify (dict "indent" " ") -}} diff --git a/layouts/_shortcodes/train-category.html b/layouts/_shortcodes/train-category.html index 11519013f..814a94038 100644 --- a/layouts/_shortcodes/train-category.html +++ b/layouts/_shortcodes/train-category.html @@ -12,4 +12,8 @@ "content" (.Inner) -}} +{{- $existing := .Page.Store.Get "train_categories" | default slice -}} +{{- $entry := dict "id" $data.id "fip_accepted" $data.fip_accepted -}} +{{- .Page.Store.Set "train_categories" ($existing | append $entry) -}} + {{- partial "train-category" $data -}} diff --git a/layouts/country/single.html b/layouts/country/single.html index dd42afd59..4782318ec 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -36,7 +36,7 @@

    {{ end }} diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html new file mode 100644 index 000000000..e4a19850c --- /dev/null +++ b/layouts/general/route-planner/single.html @@ -0,0 +1,128 @@ +{{ define "main" }} +
    +
    +
    +
    +
    +

    {{ .Title }}

    +
    +
    + +
    +
    +
    + +
    + + +
    +
    + + + +
    + +
    + + +
    +
    + +
    + + +
    + + +
    +
    + + +
    +
    +
    + + +{{ end }} diff --git a/package-lock.json b/package-lock.json index 9c4a38111..0a6b1865c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@fontsource/roboto": "^5.2.9", "@fontsource/sansita": "^5.2.8", "@material-symbols/svg-700": "^0.43.0", + "@motis-project/motis-client": "^2.10.2", "@panzoom/panzoom": "^4.6.1", "pagefind": "^1.5.2" }, @@ -38,12 +39,31 @@ "url": "https://github.com/sponsors/ayuhito" } }, + "node_modules/@hey-api/client-fetch": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@hey-api/client-fetch/-/client-fetch-0.4.4.tgz", + "integrity": "sha512-ebh1JjUdMAqes/Rg8OvbjDqGWGNhgHgmPtHlkIOUtj3y2mUXqX2g9sVoI/rSKW/FdADPng/90k5AL7bwT8W2lA==", + "deprecated": "Starting with v0.73.0, this package is bundled directly inside @hey-api/openapi-ts.", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/hey-api" + } + }, "node_modules/@material-symbols/svg-700": { "version": "0.43.0", "resolved": "https://registry.npmjs.org/@material-symbols/svg-700/-/svg-700-0.43.0.tgz", "integrity": "sha512-apCxQvQ1eZrxvgvr+CbwnPvN6aS0hn9EgGm+vI3bzEMdE1gqZ4Tk8liDuAhEXdFyYVX6CDUzz/zt+6lCufmSVg==", "license": "Apache-2.0" }, + "node_modules/@motis-project/motis-client": { + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@motis-project/motis-client/-/motis-client-2.10.2.tgz", + "integrity": "sha512-6HSznDh+iHDxPZXGRG5L8gHXztiTa9Zr+/ZPzOf9wc3JeYQHYlSh5SnUpMrhEch03fQ82EdnQkZ444i3hOW7SQ==", + "license": "MIT", + "dependencies": { + "@hey-api/client-fetch": "^0.4.4" + } + }, "node_modules/@pagefind/darwin-arm64": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@pagefind/darwin-arm64/-/darwin-arm64-1.5.2.tgz", diff --git a/package.json b/package.json index 5159d306e..bf5d3af84 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@fontsource/roboto": "^5.2.9", "@fontsource/sansita": "^5.2.8", "@material-symbols/svg-700": "^0.43.0", + "@motis-project/motis-client": "^2.10.2", "@panzoom/panzoom": "^4.6.1", "pagefind": "^1.5.2" }, From 85a4a65742b3e00a61d369bf1be6f5980310a6ce Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 23 Jul 2026 12:25:10 +0200 Subject: [PATCH 02/18] feat: Add reservation required tag --- assets/js/routePlanner.js | 17 ++++++++++++++++- assets/sass/routePlanner.scss | 20 ++++++++++++++++++++ i18n/de.yaml | 2 ++ i18n/en.yaml | 2 ++ i18n/fr.yaml | 2 ++ layouts/_default/home.transitousmapping.json | 2 +- layouts/_shortcodes/train-category.html | 2 +- layouts/general/route-planner/single.html | 2 ++ 8 files changed, 46 insertions(+), 3 deletions(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index c6c35f8b3..c080137d1 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -73,6 +73,7 @@ function matchLeg(leg) { operatorSlug: op.operator, categoryId: entry.category || null, fipAccepted: entry.fipAccepted ?? null, + reservationRequired: entry.reservationRequired ?? null, matchedQuery: entry.query, country: entry.country || null, }; @@ -115,6 +116,7 @@ function getFipStatus(leg) { operatorSlug, categoryId, fipAccepted: matchedFipAccepted, + reservationRequired, country, } = match; const isNoFip = operatorSlug === "no-fip"; @@ -133,6 +135,7 @@ function getFipStatus(leg) { label: cfg.labels.fipNotAccepted, categoryUrl, operatorSlug, + reservationRequired, debug, }; } @@ -142,6 +145,7 @@ function getFipStatus(leg) { label: cfg.labels.fipPartial, categoryUrl, operatorSlug, + reservationRequired, debug, }; } @@ -151,6 +155,7 @@ function getFipStatus(leg) { label: cfg.labels.fipAccepted, categoryUrl, operatorSlug, + reservationRequired, debug, }; } @@ -159,6 +164,7 @@ function getFipStatus(leg) { label: cfg.labels.fipUnknown, categoryUrl, operatorSlug, + reservationRequired, debug, }; } @@ -193,7 +199,16 @@ function renderFipBadge(fipStatus) { ${rows}
    `; - let badgeHtml = `${fipStatus.label}`; + let reservationBadge = ""; + if ( + fipStatus.reservationRequired === true || + fipStatus.reservationRequired === "true" + ) { + reservationBadge = ` ${cfg.labels.reservationRequired}`; + } else if (fipStatus.reservationRequired === "partially") { + reservationBadge = ` ${cfg.labels.reservationPartiallyRequired}`; + } + let badgeHtml = `${fipStatus.label}${reservationBadge}`; badgeHtml += ` ${popoverHtml}`; if (fipStatus.categoryUrl) { badgeHtml += ` ${cfg.labels.viewInFipGuide}`; diff --git a/assets/sass/routePlanner.scss b/assets/sass/routePlanner.scss index 4a9d4c01a..bc61ea40b 100644 --- a/assets/sass/routePlanner.scss +++ b/assets/sass/routePlanner.scss @@ -330,6 +330,26 @@ background: rgba(map-get($tag-colors-dark, info), 0.1); } } + + &--reservation-required { + color: map-get($tag-colors, error); + background: rgba(map-get($tag-colors, error), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, error); + background: rgba(map-get($tag-colors-dark, error), 0.1); + } + } + + &--reservation-partial { + color: map-get($tag-colors, warning); + background: rgba(map-get($tag-colors, warning), 0.08); + + [data-theme="dark"] & { + color: map-get($tag-colors-dark, warning); + background: rgba(map-get($tag-colors-dark, warning), 0.1); + } + } } &__fip-link { diff --git a/i18n/de.yaml b/i18n/de.yaml index 780c2a001..7ecb680b7 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -241,6 +241,8 @@ routePlanner: operatorBaseUrl: /de operatorNotInFipGuide: Betreiber nicht im FIP Guide platform: Gleis + reservationPartiallyRequired: Reservierung teilweise erforderlich + reservationRequired: Reservierung erforderlich search: Suchen swap: Abfahrts- und Ankunftsort tauschen to: Nach diff --git a/i18n/en.yaml b/i18n/en.yaml index 0e0e656cf..de7b89421 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -234,6 +234,8 @@ routePlanner: operatorBaseUrl: /en operatorNotInFipGuide: Operator not in FIP Guide platform: Platform + reservationPartiallyRequired: Reservation partially required + reservationRequired: Reservation required search: Search swap: Swap origin and destination to: To diff --git a/i18n/fr.yaml b/i18n/fr.yaml index fb1a9a19b..1c0ca07cf 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -243,6 +243,8 @@ routePlanner: operatorBaseUrl: /fr operatorNotInFipGuide: Opérateur absent du FIP Guide platform: Voie + reservationPartiallyRequired: Réservation partiellement obligatoire + reservationRequired: Réservation obligatoire search: Rechercher swap: Échanger l'origine et la destination to: Vers diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json index 5325df06b..1bdde23c7 100644 --- a/layouts/_default/home.transitousmapping.json +++ b/layouts/_default/home.transitousmapping.json @@ -12,7 +12,7 @@ {{- $catId := .category -}} {{- range $trainCategories -}} {{- if eq .id $catId -}} - {{- $entry = merge $entry (dict "fipAccepted" .fip_accepted) -}} + {{- $entry = merge $entry (dict "fipAccepted" .fip_accepted "reservationRequired" .reservation_required) -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/layouts/_shortcodes/train-category.html b/layouts/_shortcodes/train-category.html index 814a94038..e785a652f 100644 --- a/layouts/_shortcodes/train-category.html +++ b/layouts/_shortcodes/train-category.html @@ -13,7 +13,7 @@ -}} {{- $existing := .Page.Store.Get "train_categories" | default slice -}} -{{- $entry := dict "id" $data.id "fip_accepted" $data.fip_accepted -}} +{{- $entry := dict "id" $data.id "fip_accepted" $data.fip_accepted "reservation_required" $data.reservation_required -}} {{- .Page.Store.Set "train_categories" ($existing | append $entry) -}} {{- partial "train-category" $data -}} diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html index e4a19850c..2219c830c 100644 --- a/layouts/general/route-planner/single.html +++ b/layouts/general/route-planner/single.html @@ -113,6 +113,8 @@

    {{ .Title }}

    fipPartial: "{{ T "routePlanner.fipPartial" }}", fipNotAccepted: "{{ T "routePlanner.fipNotAccepted" }}", fipUnknown: "{{ T "routePlanner.fipUnknown" }}", + reservationRequired: "{{ T "routePlanner.reservationRequired" }}", + reservationPartiallyRequired: "{{ T "routePlanner.reservationPartiallyRequired" }}", operatorNotInFipGuide: "{{ T "routePlanner.operatorNotInFipGuide" }}", viewInFipGuide: "{{ T "routePlanner.viewInFipGuide" }}", transfer: "{{ T "routePlanner.transfer" }}", From 450404869c30d9002b744c1311692ef48e1644d1 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 23 Jul 2026 22:23:27 +0200 Subject: [PATCH 03/18] feat: Add warning for international journeys --- archetypes/country/index.de.md | 1 + archetypes/country/index.en.md | 1 + archetypes/country/index.fr.md | 1 + assets/js/routePlanner.js | 51 +++++++++++++++++++++- assets/sass/routePlanner.scss | 22 ++++++++++ content/country/austria/index.de.md | 1 + content/country/austria/index.en.md | 1 + content/country/austria/index.fr.md | 1 + content/country/belgium/index.de.md | 1 + content/country/belgium/index.en.md | 1 + content/country/belgium/index.fr.md | 1 + content/country/bulgaria/index.de.md | 1 + content/country/bulgaria/index.en.md | 1 + content/country/bulgaria/index.fr.md | 1 + content/country/czechia/index.de.md | 1 + content/country/czechia/index.en.md | 1 + content/country/czechia/index.fr.md | 1 + content/country/denmark/index.de.md | 1 + content/country/denmark/index.en.md | 1 + content/country/denmark/index.fr.md | 1 + content/country/france/index.de.md | 1 + content/country/france/index.en.md | 1 + content/country/france/index.fr.md | 1 + content/country/germany/index.de.md | 1 + content/country/germany/index.en.md | 1 + content/country/germany/index.fr.md | 1 + content/country/greece/index.de.md | 1 + content/country/greece/index.en.md | 1 + content/country/greece/index.fr.md | 1 + content/country/ireland/index.de.md | 1 + content/country/ireland/index.en.md | 1 + content/country/ireland/index.fr.md | 1 + content/country/italy/index.de.md | 1 + content/country/italy/index.en.md | 1 + content/country/italy/index.fr.md | 1 + content/country/latvia/index.de.md | 1 + content/country/latvia/index.en.md | 1 + content/country/latvia/index.fr.md | 1 + content/country/lithuania/index.de.md | 1 + content/country/lithuania/index.en.md | 1 + content/country/lithuania/index.fr.md | 1 + content/country/netherlands/index.de.md | 1 + content/country/netherlands/index.en.md | 1 + content/country/netherlands/index.fr.md | 1 + content/country/norway/index.de.md | 1 + content/country/norway/index.en.md | 1 + content/country/norway/index.fr.md | 1 + content/country/poland/index.de.md | 1 + content/country/poland/index.en.md | 1 + content/country/poland/index.fr.md | 1 + content/country/portugal/index.de.md | 1 + content/country/portugal/index.en.md | 1 + content/country/portugal/index.fr.md | 1 + content/country/romania/index.de.md | 1 + content/country/romania/index.en.md | 1 + content/country/romania/index.fr.md | 1 + content/country/serbia/index.de.md | 1 + content/country/serbia/index.en.md | 1 + content/country/serbia/index.fr.md | 1 + content/country/slovakia/index.de.md | 1 + content/country/slovakia/index.en.md | 1 + content/country/slovakia/index.fr.md | 1 + content/country/slovenia/index.de.md | 1 + content/country/slovenia/index.en.md | 1 + content/country/slovenia/index.fr.md | 1 + content/country/spain/index.de.md | 1 + content/country/spain/index.en.md | 1 + content/country/spain/index.fr.md | 1 + content/country/switzerland/index.de.md | 1 + content/country/switzerland/index.en.md | 1 + content/country/switzerland/index.fr.md | 1 + content/country/united-kingdom/index.de.md | 1 + content/country/united-kingdom/index.en.md | 1 + content/country/united-kingdom/index.fr.md | 1 + i18n/de.yaml | 1 + i18n/en.yaml | 1 + i18n/fr.yaml | 3 ++ layouts/general/route-planner/single.html | 4 +- 78 files changed, 152 insertions(+), 2 deletions(-) diff --git a/archetypes/country/index.de.md b/archetypes/country/index.de.md index dd7a927fa..b5574e65a 100644 --- a/archetypes/country/index.de.md +++ b/archetypes/country/index.de.md @@ -3,6 +3,7 @@ draft: false title: "{{ .File.ContentBaseName | title }}" # Ändere den Name auf den deutschen Ländernamen country: "{{ .File.ContentBaseName }}" params: + iso_code: # ISO 3166-1 alpha-2 Code, z. B. DE operators_without_fip: - name: # Betreibername query: # z.B. agencyName == "Betreibername" diff --git a/archetypes/country/index.en.md b/archetypes/country/index.en.md index 89014724a..b6b1c5d70 100644 --- a/archetypes/country/index.en.md +++ b/archetypes/country/index.en.md @@ -3,6 +3,7 @@ draft: false title: "{{ .File.ContentBaseName | title }}" # Change the name to the English country name country: "{{ .File.ContentBaseName }}" params: + iso_code: # ISO 3166-1 alpha-2 code, e.g. DE operators_without_fip: - name: # Operator name query: # e.g. agencyName == "Operator Name" diff --git a/archetypes/country/index.fr.md b/archetypes/country/index.fr.md index 209b1b6d9..46383067b 100644 --- a/archetypes/country/index.fr.md +++ b/archetypes/country/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "{{ .File.ContentBaseName | title }}" # Change le nom par le nom du pays français country: "{{ .File.ContentBaseName }}" params: + iso_code: # Code ISO 3166-1 alpha-2, p.ex. DE operators_without_fip: - name: # Nom de l'opérateur query: # p.ex. agencyName == "Nom de l'opérateur" diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index c080137d1..570020fda 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -1,4 +1,25 @@ -import { client, geocode, plan } from "@motis-project/motis-client"; +import { + client, + geocode, + plan, + reverseGeocode, +} from "@motis-project/motis-client"; + +const countryCache = new Map(); + +async function getCountryForPlace(place) { + if (!place?.lat || !place?.lon) return null; + const key = `${place.lat},${place.lon}`; + if (countryCache.has(key)) return countryCache.get(key); + try { + const res = await reverseGeocode({ query: { place: key, numResults: 1 } }); + const country = res.data?.[0]?.country || null; + countryCache.set(key, country); + return country; + } catch { + return null; + } +} client.setConfig({ baseUrl: "https://api.transitous.org", @@ -87,7 +108,9 @@ function getFipStatus(leg) { const cfg = window.routePlannerConfig; const debug = { from: leg.from?.name || null, + fromId: leg.from?.stopId || leg.from?.id || null, to: leg.to?.name || null, + toId: leg.to?.stopId || leg.to?.id || null, startTime: leg.startTime ? new Date(leg.startTime).toLocaleString() : null, endTime: leg.endTime ? new Date(leg.endTime).toLocaleString() : null, agencyId: leg.agencyId || null, @@ -183,6 +206,23 @@ function formatDuration(seconds) { } let fipDebugCounter = 0; +let legWarningCounter = 0; + +function renderInternationalWarning(fromCode, toCode) { + const cfg = window.routePlannerConfig; + if (!fromCode || !toCode || fromCode === toCode) return ""; + + const countries = [...new Set([fromCode, toCode])] + .map((code) => { + const entry = cfg.countryCodeMap[code]; + if (!entry) return null; + return `${entry.name}`; + }) + .filter(Boolean); + + if (countries.length === 0) return ""; + return `
    ${cfg.labels.internationalJourney} ${countries.join(", ")}
    `; +} function renderFipBadge(fipStatus) { const cfg = window.routePlannerConfig; @@ -247,6 +287,14 @@ function renderLeg(leg) { ? ` ${cfg.labels.platform} ${leg.to.platformCode}` : ""; + const warningId = ++legWarningCounter; + getCountryForPlace(leg.from).then((fromCode) => { + getCountryForPlace(leg.to).then((toCode) => { + const el = document.getElementById(`leg-warning-${warningId}`); + if (el) el.outerHTML = renderInternationalWarning(fromCode, toCode); + }); + }); + return `
    @@ -262,6 +310,7 @@ function renderLeg(leg) { ${formatDuration(leg.duration)} ${arrTime} ${leg.to?.name || ""}${toPlatform}
    +
    ${renderFipBadge(fipStatus)}
    diff --git a/assets/sass/routePlanner.scss b/assets/sass/routePlanner.scss index bc61ea40b..c965124ea 100644 --- a/assets/sass/routePlanner.scss +++ b/assets/sass/routePlanner.scss @@ -356,6 +356,28 @@ font-size: 1.3rem; } + &__international-warning { + font-size: 1.3rem; + margin-top: 0.4rem; + margin-bottom: 0.6rem; + padding: 0.4rem 0.75rem; + border-radius: var(--border-radius-s); + border-left: 3px solid map-get($tag-colors, warning); + background: rgba(map-get($tag-colors, warning), 0.08); + color: map-get($tag-colors, warning); + + [data-theme="dark"] & { + border-left-color: map-get($tag-colors-dark, warning); + background: rgba(map-get($tag-colors-dark, warning), 0.1); + color: map-get($tag-colors-dark, warning); + } + + a { + color: inherit; + font-weight: 600; + } + } + &__fip-info { display: inline-flex; align-items: center; diff --git a/content/country/austria/index.de.md b/content/country/austria/index.de.md index b193832be..c1bfb9f81 100644 --- a/content/country/austria/index.de.md +++ b/content/country/austria/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Österreich" country: "austria" params: + iso_code: AT operators_without_fip: - name: Achenseebahn query: diff --git a/content/country/austria/index.en.md b/content/country/austria/index.en.md index cfa0178f3..c6f853bbf 100644 --- a/content/country/austria/index.en.md +++ b/content/country/austria/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Austria" country: "austria" params: + iso_code: AT operators_without_fip: - name: Achenseebahn query: diff --git a/content/country/austria/index.fr.md b/content/country/austria/index.fr.md index a39a13742..f370159c0 100644 --- a/content/country/austria/index.fr.md +++ b/content/country/austria/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Autriche" country: "austria" params: + iso_code: AT operators_without_fip: - name: Achenseebahn query: diff --git a/content/country/belgium/index.de.md b/content/country/belgium/index.de.md index ebd2e79c4..a6efe006e 100644 --- a/content/country/belgium/index.de.md +++ b/content/country/belgium/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Belgien" country: "belgium" params: + iso_code: BE operators_without_fip: - name: European Sleeper query: diff --git a/content/country/belgium/index.en.md b/content/country/belgium/index.en.md index 77e1734a2..da9f86243 100644 --- a/content/country/belgium/index.en.md +++ b/content/country/belgium/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Belgium" country: "belgium" params: + iso_code: BE operators_without_fip: - name: European Sleeper query: diff --git a/content/country/belgium/index.fr.md b/content/country/belgium/index.fr.md index 08b3b4735..e7bbf7a86 100644 --- a/content/country/belgium/index.fr.md +++ b/content/country/belgium/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Belgique" country: "belgium" params: + iso_code: BE operators_without_fip: - name: European Sleeper query: diff --git a/content/country/bulgaria/index.de.md b/content/country/bulgaria/index.de.md index 61085841a..1b8d4dbf1 100644 --- a/content/country/bulgaria/index.de.md +++ b/content/country/bulgaria/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Bulgarien" country: "bulgaria" params: + iso_code: BG operators_without_fip: - name: Optima Express query: diff --git a/content/country/bulgaria/index.en.md b/content/country/bulgaria/index.en.md index ed84a979d..411210926 100644 --- a/content/country/bulgaria/index.en.md +++ b/content/country/bulgaria/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Bulgaria" country: "bulgaria" params: + iso_code: BG operators_without_fip: - name: Optima Express query: diff --git a/content/country/bulgaria/index.fr.md b/content/country/bulgaria/index.fr.md index e1ad5623b..66bff0023 100644 --- a/content/country/bulgaria/index.fr.md +++ b/content/country/bulgaria/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Bulgarie" country: "bulgaria" params: + iso_code: BG operators_without_fip: - name: Optima Express query: diff --git a/content/country/czechia/index.de.md b/content/country/czechia/index.de.md index f86c07ecd..00ba4bd0c 100644 --- a/content/country/czechia/index.de.md +++ b/content/country/czechia/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Tschechien" country: "czechia" params: + iso_code: CZ operators_without_fip: - name: ARRIVA vlaky s. r. o. query: diff --git a/content/country/czechia/index.en.md b/content/country/czechia/index.en.md index 45db56db9..24d382993 100644 --- a/content/country/czechia/index.en.md +++ b/content/country/czechia/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Czechia" country: "czechia" params: + iso_code: CZ operators_without_fip: - name: ARRIVA vlaky s. r. o. query: diff --git a/content/country/czechia/index.fr.md b/content/country/czechia/index.fr.md index e170bc693..b37234c54 100644 --- a/content/country/czechia/index.fr.md +++ b/content/country/czechia/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Tchéquie" country: "czechia" params: + iso_code: CZ operators_without_fip: - name: ARRIVA vlaky s. r. o. query: diff --git a/content/country/denmark/index.de.md b/content/country/denmark/index.de.md index 08f7cfd45..d551958b2 100644 --- a/content/country/denmark/index.de.md +++ b/content/country/denmark/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Dänemark" country: "denmark" params: + iso_code: DK operators_without_fip: - name: GoCollective (ehemals Arriva Danmark) query: diff --git a/content/country/denmark/index.en.md b/content/country/denmark/index.en.md index 2320ea55a..0be8fa0b5 100644 --- a/content/country/denmark/index.en.md +++ b/content/country/denmark/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Denmark" country: "denmark" params: + iso_code: DK operators_without_fip: - name: GoCollective (ehemals Arriva Danmark) query: diff --git a/content/country/denmark/index.fr.md b/content/country/denmark/index.fr.md index 9bc58e390..83fcea9f7 100644 --- a/content/country/denmark/index.fr.md +++ b/content/country/denmark/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Danemark" country: "denmark" params: + iso_code: DK operators_without_fip: - name: GoCollective (anciennement Arriva Danmark) query: diff --git a/content/country/france/index.de.md b/content/country/france/index.de.md index 29b9b0b9f..583f285c6 100644 --- a/content/country/france/index.de.md +++ b/content/country/france/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Frankreich" country: "france" params: + iso_code: FR operators_without_fip: - name: CFC (Chemins de fer de la Corse / Eisenbahnen auf Korsika) query: diff --git a/content/country/france/index.en.md b/content/country/france/index.en.md index 7ad3036e1..57004581c 100644 --- a/content/country/france/index.en.md +++ b/content/country/france/index.en.md @@ -3,6 +3,7 @@ draft: false title: "France" country: "france" params: + iso_code: FR operators_without_fip: - name: CFC (Chemins de fer de la Corse / Railways in Corsica) query: diff --git a/content/country/france/index.fr.md b/content/country/france/index.fr.md index a8f11c4ae..bba03c8cd 100644 --- a/content/country/france/index.fr.md +++ b/content/country/france/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "France" country: "france" params: + iso_code: FR operators_without_fip: - name: CFC (Chemins de fer de la Corse / Chemins de fer corses) query: diff --git a/content/country/germany/index.de.md b/content/country/germany/index.de.md index 3232102bf..e04c665e5 100644 --- a/content/country/germany/index.de.md +++ b/content/country/germany/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Deutschland" country: "germany" params: + iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH query: diff --git a/content/country/germany/index.en.md b/content/country/germany/index.en.md index e7aa5e40b..a1a9767bf 100644 --- a/content/country/germany/index.en.md +++ b/content/country/germany/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Germany" country: "germany" params: + iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH query: diff --git a/content/country/germany/index.fr.md b/content/country/germany/index.fr.md index 507d9ef23..6ec0e9adb 100644 --- a/content/country/germany/index.fr.md +++ b/content/country/germany/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Allemagne" country: "germany" params: + iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH query: diff --git a/content/country/greece/index.de.md b/content/country/greece/index.de.md index d3df41d8b..e61aabc79 100644 --- a/content/country/greece/index.de.md +++ b/content/country/greece/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Griechenland" country: "greece" params: + iso_code: GR operators_without_fip: - name: STASY (Urban Rail Transport S.A.) query: diff --git a/content/country/greece/index.en.md b/content/country/greece/index.en.md index b3fcdd44d..0c2fa14b7 100644 --- a/content/country/greece/index.en.md +++ b/content/country/greece/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Greece" country: "greece" params: + iso_code: GR operators_without_fip: - name: STASY (Urban Rail Transport S.A.) query: diff --git a/content/country/greece/index.fr.md b/content/country/greece/index.fr.md index 4b5758e16..723ce8152 100644 --- a/content/country/greece/index.fr.md +++ b/content/country/greece/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Grèce" country: "greece" params: + iso_code: GR operators_without_fip: - name: STASY (Urban Rail Transport S.A.) query: diff --git a/content/country/ireland/index.de.md b/content/country/ireland/index.de.md index c9f66d477..5761bcafc 100644 --- a/content/country/ireland/index.de.md +++ b/content/country/ireland/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Irland" country: "ireland" params: + iso_code: IE operators_without_fip: - name: Transdev (Luas - Straßenbahn Dublin) query: diff --git a/content/country/ireland/index.en.md b/content/country/ireland/index.en.md index 9b53712ec..26722a119 100644 --- a/content/country/ireland/index.en.md +++ b/content/country/ireland/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Ireland" country: "ireland" params: + iso_code: IE operators_without_fip: - name: Transdev (Luas - Dublin Tram) query: diff --git a/content/country/ireland/index.fr.md b/content/country/ireland/index.fr.md index e4665d6db..b7bac7eb3 100644 --- a/content/country/ireland/index.fr.md +++ b/content/country/ireland/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Irlande" country: "ireland" params: + iso_code: IE operators_without_fip: - name: Transdev (Luas - Tramway de Dublin) query: diff --git a/content/country/italy/index.de.md b/content/country/italy/index.de.md index 4df62d2b7..5fc79c8c0 100644 --- a/content/country/italy/index.de.md +++ b/content/country/italy/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Italien" country: "italy" params: + iso_code: IT operators_without_fip: - name: Azienda Regionale Sarda Trasporti query: diff --git a/content/country/italy/index.en.md b/content/country/italy/index.en.md index fd9c679eb..63f2b715d 100644 --- a/content/country/italy/index.en.md +++ b/content/country/italy/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Italy" country: "italy" params: + iso_code: IT operators_without_fip: - name: Azienda Regionale Sarda Trasporti query: diff --git a/content/country/italy/index.fr.md b/content/country/italy/index.fr.md index b36eca668..9b951ade0 100644 --- a/content/country/italy/index.fr.md +++ b/content/country/italy/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Italie" country: "italy" params: + iso_code: IT operators_without_fip: - name: Azienda Regionale Sarda Trasporti query: diff --git a/content/country/latvia/index.de.md b/content/country/latvia/index.de.md index f8b63e77f..a526352df 100644 --- a/content/country/latvia/index.de.md +++ b/content/country/latvia/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Lettland" country: "latvia" params: + iso_code: LV operators_without_fip: - name: "Latvijas dzelzceļš (LDz)" query: diff --git a/content/country/latvia/index.en.md b/content/country/latvia/index.en.md index 031b9a539..765bdbf38 100644 --- a/content/country/latvia/index.en.md +++ b/content/country/latvia/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Latvia" country: "latvia" params: + iso_code: LV operators_without_fip: - name: "Latvijas dzelzceļš (LDz)" query: diff --git a/content/country/latvia/index.fr.md b/content/country/latvia/index.fr.md index e2aa48370..9ee5bb418 100644 --- a/content/country/latvia/index.fr.md +++ b/content/country/latvia/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Lettonie" country: "latvia" params: + iso_code: LV operators_without_fip: - name: "Latvijas dzelzceļš (LDz)" query: diff --git a/content/country/lithuania/index.de.md b/content/country/lithuania/index.de.md index e8489ecb3..771c87aa3 100644 --- a/content/country/lithuania/index.de.md +++ b/content/country/lithuania/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Litauen" country: "lithuania" params: + iso_code: LT operators_without_fip: - name: "Aukštaitijos siaurasis geležinkelis (Museumsbahn)" query: diff --git a/content/country/lithuania/index.en.md b/content/country/lithuania/index.en.md index b33d87b3b..74a694210 100644 --- a/content/country/lithuania/index.en.md +++ b/content/country/lithuania/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Lithuania" country: "lithuania" params: + iso_code: LT operators_without_fip: - name: "Aukštaitijos siaurasis geležinkelis (heritage railway)" query: diff --git a/content/country/lithuania/index.fr.md b/content/country/lithuania/index.fr.md index 13f73ae63..da891b353 100644 --- a/content/country/lithuania/index.fr.md +++ b/content/country/lithuania/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Lituanie" country: "lithuania" params: + iso_code: LT operators_without_fip: - name: "Aukštaitijos siaurasis geležinkelis (chemin de fer musée)" query: diff --git a/content/country/netherlands/index.de.md b/content/country/netherlands/index.de.md index 13ed29b48..90e2957ad 100644 --- a/content/country/netherlands/index.de.md +++ b/content/country/netherlands/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Niederlande" country: "netherlands" params: + iso_code: NL operators_without_fip: - name: Arriva Nederland query: diff --git a/content/country/netherlands/index.en.md b/content/country/netherlands/index.en.md index fe869a155..29ce1df5f 100644 --- a/content/country/netherlands/index.en.md +++ b/content/country/netherlands/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Netherlands" country: "netherlands" params: + iso_code: NL operators_without_fip: - name: Arriva Nederland query: diff --git a/content/country/netherlands/index.fr.md b/content/country/netherlands/index.fr.md index c45b6cf78..4bc70115d 100644 --- a/content/country/netherlands/index.fr.md +++ b/content/country/netherlands/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Pays-Bas" country: "netherlands" params: + iso_code: NL operators_without_fip: - name: Arriva Nederland query: diff --git a/content/country/norway/index.de.md b/content/country/norway/index.de.md index 2f6b6d681..53ec7307d 100644 --- a/content/country/norway/index.de.md +++ b/content/country/norway/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Norwegen" country: "norway" params: + iso_code: NO operators_without_fip: - name: Arctic Train query: diff --git a/content/country/norway/index.en.md b/content/country/norway/index.en.md index 0ad3b0de6..d9dd6342b 100644 --- a/content/country/norway/index.en.md +++ b/content/country/norway/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Norway" country: "norway" params: + iso_code: NO operators_without_fip: - name: Arctic Train query: diff --git a/content/country/norway/index.fr.md b/content/country/norway/index.fr.md index a80fb1e6d..40620ac0c 100644 --- a/content/country/norway/index.fr.md +++ b/content/country/norway/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Norvège" country: "norway" params: + iso_code: NO operators_without_fip: - name: Arctic Train query: diff --git a/content/country/poland/index.de.md b/content/country/poland/index.de.md index f3c67c130..70c74529d 100644 --- a/content/country/poland/index.de.md +++ b/content/country/poland/index.de.md @@ -3,6 +3,7 @@ draft: false title: Polen country: "poland" params: + iso_code: PL operators_without_fip: - name: Arriva query: diff --git a/content/country/poland/index.en.md b/content/country/poland/index.en.md index 1c8af7869..ca4c3b3fc 100644 --- a/content/country/poland/index.en.md +++ b/content/country/poland/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Poland" country: "poland" params: + iso_code: PL operators_without_fip: - name: Arriva query: diff --git a/content/country/poland/index.fr.md b/content/country/poland/index.fr.md index 46ebe1e97..38e2b61fd 100644 --- a/content/country/poland/index.fr.md +++ b/content/country/poland/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Pologne" country: "poland" params: + iso_code: PL operators_without_fip: - name: Arriva query: diff --git a/content/country/portugal/index.de.md b/content/country/portugal/index.de.md index 003462cfa..1ed66f1c2 100644 --- a/content/country/portugal/index.de.md +++ b/content/country/portugal/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Portugal" country: "portugal" params: + iso_code: PT operators_without_fip: - name: Fertagus query: diff --git a/content/country/portugal/index.en.md b/content/country/portugal/index.en.md index 2469edee4..96636cb9f 100644 --- a/content/country/portugal/index.en.md +++ b/content/country/portugal/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Portugal" country: "portugal" params: + iso_code: PT operators_without_fip: - name: Fertagus query: diff --git a/content/country/portugal/index.fr.md b/content/country/portugal/index.fr.md index c78d523e9..6b1153338 100644 --- a/content/country/portugal/index.fr.md +++ b/content/country/portugal/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Portugal" country: "portugal" params: + iso_code: PT operators_without_fip: - name: Fertagus query: diff --git a/content/country/romania/index.de.md b/content/country/romania/index.de.md index f9c181e78..d41270fc4 100644 --- a/content/country/romania/index.de.md +++ b/content/country/romania/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Rumänien" country: "romania" params: + iso_code: RO operators_without_fip: - name: Astra Trains Carpatic (ATC) query: diff --git a/content/country/romania/index.en.md b/content/country/romania/index.en.md index e11f7b816..2db403488 100644 --- a/content/country/romania/index.en.md +++ b/content/country/romania/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Romania" country: "romania" params: + iso_code: RO operators_without_fip: - name: Astra Trains Carpatic (ATC) query: diff --git a/content/country/romania/index.fr.md b/content/country/romania/index.fr.md index 7ddd61f14..e81abba28 100644 --- a/content/country/romania/index.fr.md +++ b/content/country/romania/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Roumanie" country: "romania" params: + iso_code: RO operators_without_fip: - name: Astra Trains Carpatic (ATC) query: diff --git a/content/country/serbia/index.de.md b/content/country/serbia/index.de.md index c6823f482..a9e9447bf 100644 --- a/content/country/serbia/index.de.md +++ b/content/country/serbia/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Serbien" country: "serbia" params: + iso_code: RS operators_without_fip: - name: Optima Express query: diff --git a/content/country/serbia/index.en.md b/content/country/serbia/index.en.md index bc3871aaf..ee364e343 100644 --- a/content/country/serbia/index.en.md +++ b/content/country/serbia/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Serbia" country: "serbia" params: + iso_code: RS operators_without_fip: - name: Optima Express query: diff --git a/content/country/serbia/index.fr.md b/content/country/serbia/index.fr.md index 5b4dc119a..2a14fd15f 100644 --- a/content/country/serbia/index.fr.md +++ b/content/country/serbia/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Serbie" country: "serbia" params: + iso_code: RS operators_without_fip: - name: Optima Express query: diff --git a/content/country/slovakia/index.de.md b/content/country/slovakia/index.de.md index eac9df8c6..59691e6d9 100644 --- a/content/country/slovakia/index.de.md +++ b/content/country/slovakia/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Slowakei" country: "slovakia" params: + iso_code: SK operators_without_fip: - name: RegioJet query: diff --git a/content/country/slovakia/index.en.md b/content/country/slovakia/index.en.md index 8315dc604..eb5c3af79 100644 --- a/content/country/slovakia/index.en.md +++ b/content/country/slovakia/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Slovakia" country: "slovakia" params: + iso_code: SK operators_without_fip: - name: RegioJet query: diff --git a/content/country/slovakia/index.fr.md b/content/country/slovakia/index.fr.md index 063623184..635f35032 100644 --- a/content/country/slovakia/index.fr.md +++ b/content/country/slovakia/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Slovaquie" country: "slovakia" params: + iso_code: SK operators_without_fip: - name: RegioJet query: diff --git a/content/country/slovenia/index.de.md b/content/country/slovenia/index.de.md index f6d5053c9..6f7677d51 100644 --- a/content/country/slovenia/index.de.md +++ b/content/country/slovenia/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Slowenien" country: "slovenia" params: + iso_code: SI operators_without_fip: - name: Optima Express query: diff --git a/content/country/slovenia/index.en.md b/content/country/slovenia/index.en.md index df4034b95..b1f50e11d 100644 --- a/content/country/slovenia/index.en.md +++ b/content/country/slovenia/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Slovenia" country: "slovenia" params: + iso_code: SI operators_without_fip: - name: Optima Express query: diff --git a/content/country/slovenia/index.fr.md b/content/country/slovenia/index.fr.md index 3e6d6aad6..0362a17c4 100644 --- a/content/country/slovenia/index.fr.md +++ b/content/country/slovenia/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Slovénie" country: "slovenia" params: + iso_code: SI operators_without_fip: - name: Optima Express query: diff --git a/content/country/spain/index.de.md b/content/country/spain/index.de.md index 3354c7fe0..e6df26c87 100644 --- a/content/country/spain/index.de.md +++ b/content/country/spain/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Spanien" country: "spain" params: + iso_code: ES operators_without_fip: - name: Iryo query: diff --git a/content/country/spain/index.en.md b/content/country/spain/index.en.md index f24cecbe6..f090fbd32 100644 --- a/content/country/spain/index.en.md +++ b/content/country/spain/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Spain" country: "spain" params: + iso_code: ES operators_without_fip: - name: Iryo query: diff --git a/content/country/spain/index.fr.md b/content/country/spain/index.fr.md index a8947386d..cf5b34311 100644 --- a/content/country/spain/index.fr.md +++ b/content/country/spain/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Espagne" country: "spain" params: + iso_code: ES operators_without_fip: - name: Iryo query: diff --git a/content/country/switzerland/index.de.md b/content/country/switzerland/index.de.md index 9102d8830..aa277cc81 100644 --- a/content/country/switzerland/index.de.md +++ b/content/country/switzerland/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Schweiz" country: "switzerland" params: + iso_code: CH operators_without_fip: - name: European Sleeper query: diff --git a/content/country/switzerland/index.en.md b/content/country/switzerland/index.en.md index e2d6d2e39..fc0b81786 100644 --- a/content/country/switzerland/index.en.md +++ b/content/country/switzerland/index.en.md @@ -3,6 +3,7 @@ draft: false title: "Switzerland" country: "switzerland" params: + iso_code: CH operators_without_fip: - name: European Sleeper query: diff --git a/content/country/switzerland/index.fr.md b/content/country/switzerland/index.fr.md index bb2b01a13..7b9e43d77 100644 --- a/content/country/switzerland/index.fr.md +++ b/content/country/switzerland/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Suisse" country: "switzerland" params: + iso_code: CH operators_without_fip: - name: European Sleeper query: diff --git a/content/country/united-kingdom/index.de.md b/content/country/united-kingdom/index.de.md index a9ff8f22a..f7ac22b5b 100644 --- a/content/country/united-kingdom/index.de.md +++ b/content/country/united-kingdom/index.de.md @@ -3,6 +3,7 @@ draft: false title: "Vereinigtes Königreich" country: "united-kingdom" params: + iso_code: GB operators_without_fip: - name: Blackpool Tramway query: diff --git a/content/country/united-kingdom/index.en.md b/content/country/united-kingdom/index.en.md index 873e7d90f..31aa896c8 100644 --- a/content/country/united-kingdom/index.en.md +++ b/content/country/united-kingdom/index.en.md @@ -3,6 +3,7 @@ draft: false title: "United Kingdom" country: "united-kingdom" params: + iso_code: GB operators_without_fip: - name: Blackpool Tramway query: diff --git a/content/country/united-kingdom/index.fr.md b/content/country/united-kingdom/index.fr.md index e60b384a3..e4c8c8012 100644 --- a/content/country/united-kingdom/index.fr.md +++ b/content/country/united-kingdom/index.fr.md @@ -3,6 +3,7 @@ draft: false title: "Royaume-Uni" country: "united-kingdom" params: + iso_code: GB operators_without_fip: - name: Blackpool Tramway query: diff --git a/i18n/de.yaml b/i18n/de.yaml index 7ecb680b7..d64703a05 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -236,6 +236,7 @@ routePlanner: fipUnknown: FIP-Status unbekannt from: Von fromPlaceholder: z. B. Brüssel-Midi + internationalJourney: 'Internationale Fahrt! Bitte prüfe die Grenzpunkte auf den Länderseiten:' loading: Verbindungen werden gesucht… noResults: Keine Verbindungen gefunden. operatorBaseUrl: /de diff --git a/i18n/en.yaml b/i18n/en.yaml index de7b89421..ed60a118c 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -229,6 +229,7 @@ routePlanner: fipUnknown: FIP status unknown from: From fromPlaceholder: e.g. Brussels-Midi + internationalJourney: 'International journey! Please check the border points on the country pages:' loading: Searching for connections… noResults: No connections found. operatorBaseUrl: /en diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 1c0ca07cf..43583ad8a 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -238,6 +238,9 @@ routePlanner: fipUnknown: Statut FIP inconnu from: De fromPlaceholder: ex. Bruxelles-Midi + internationalJourney: >- + Trajet international ! Veuillez vérifier les points frontières sur les pages + des pays : loading: Recherche de connexions… noResults: Aucune connexion trouvée. operatorBaseUrl: /fr diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html index 2219c830c..19f3bb826 100644 --- a/layouts/general/route-planner/single.html +++ b/layouts/general/route-planner/single.html @@ -107,6 +107,7 @@

    {{ .Title }}

    window.routePlannerConfig = { lang: "{{ .Language.Lang }}", baseUrl: "{{ T "routePlanner.operatorBaseUrl" }}", + countryCodeMap: {{ $map := dict }}{{ range where (where site.Pages "Type" "country") "IsPage" true }}{{ $slug := .File.ContentBaseName }}{{ $name := .Title }}{{ with .Params.iso_code }}{{ $map = merge $map (dict . (dict "slug" $slug "name" $name)) }}{{ end }}{{ end }}{{ $map | jsonify }}, labels: { walk: "{{ T "routePlanner.walk" }}", fipAccepted: "{{ T "routePlanner.fipAccepted" }}", @@ -123,7 +124,8 @@

    {{ .Title }}

    duration: "{{ T "routePlanner.duration" }}", platform: "{{ T "routePlanner.platform" }}", noResults: "{{ T "routePlanner.noResults" }}", - errorGeneric: "{{ T "routePlanner.errorGeneric" }}" + errorGeneric: "{{ T "routePlanner.errorGeneric" }}", + internationalJourney: "{{ T "routePlanner.internationalJourney" }}" } }; From d9e5404b58643099202fa111e646cb66b58b055c Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Fri, 24 Jul 2026 09:16:04 +0200 Subject: [PATCH 04/18] fix: Display international warning message again --- assets/js/routePlanner.js | 34 ++++++++++++++++------- layouts/general/route-planner/single.html | 2 +- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index 570020fda..d4bed6a0f 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -109,8 +109,10 @@ function getFipStatus(leg) { const debug = { from: leg.from?.name || null, fromId: leg.from?.stopId || leg.from?.id || null, + fromCountry: null, to: leg.to?.name || null, toId: leg.to?.stopId || leg.to?.id || null, + toCountry: null, startTime: leg.startTime ? new Date(leg.startTime).toLocaleString() : null, endTime: leg.endTime ? new Date(leg.endTime).toLocaleString() : null, agencyId: leg.agencyId || null, @@ -224,14 +226,14 @@ function renderInternationalWarning(fromCode, toCode) { return `
    ${cfg.labels.internationalJourney} ${countries.join(", ")}
    `; } -function renderFipBadge(fipStatus) { +function renderFipBadge(fipStatus, popoverId) { const cfg = window.routePlannerConfig; - const popoverId = `fip-debug-${++fipDebugCounter}`; + if (!popoverId) popoverId = `fip-debug-${++fipDebugCounter}`; const rows = Object.entries(fipStatus.debug) .map( ([k, v]) => - `${k}${v !== null ? v : "—"}`, + `${k}${v !== null ? v : "—"}`, ) .join(""); const popoverHtml = ` @@ -288,12 +290,24 @@ function renderLeg(leg) { : ""; const warningId = ++legWarningCounter; - getCountryForPlace(leg.from).then((fromCode) => { - getCountryForPlace(leg.to).then((toCode) => { - const el = document.getElementById(`leg-warning-${warningId}`); - if (el) el.outerHTML = renderInternationalWarning(fromCode, toCode); - }); - }); + const popoverId = `fip-debug-${++fipDebugCounter}`; + Promise.all([getCountryForPlace(leg.from), getCountryForPlace(leg.to)]).then( + ([fromCode, toCode]) => { + setTimeout(() => { + const el = document.getElementById(`leg-warning-${warningId}`); + if (el) el.outerHTML = renderInternationalWarning(fromCode, toCode); + const popover = document.getElementById(popoverId); + if (popover) { + const update = (key, val) => { + const cell = popover.querySelector(`[data-debug-key="${key}"]`); + if (cell) cell.textContent = val !== null ? val : "—"; + }; + update("fromCountry", fromCode); + update("toCountry", toCode); + } + }, 0); + }, + ); return `
    @@ -312,7 +326,7 @@ function renderLeg(leg) {
    - ${renderFipBadge(fipStatus)} + ${renderFipBadge(fipStatus, popoverId)}
    `; diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html index 19f3bb826..795b20125 100644 --- a/layouts/general/route-planner/single.html +++ b/layouts/general/route-planner/single.html @@ -107,7 +107,7 @@

    {{ .Title }}

    window.routePlannerConfig = { lang: "{{ .Language.Lang }}", baseUrl: "{{ T "routePlanner.operatorBaseUrl" }}", - countryCodeMap: {{ $map := dict }}{{ range where (where site.Pages "Type" "country") "IsPage" true }}{{ $slug := .File.ContentBaseName }}{{ $name := .Title }}{{ with .Params.iso_code }}{{ $map = merge $map (dict . (dict "slug" $slug "name" $name)) }}{{ end }}{{ end }}{{ $map | jsonify }}, + countryCodeMap: JSON.parse('{{ $map := dict }}{{ range where (where site.Pages "Type" "country") "IsPage" true }}{{ $slug := .File.ContentBaseName }}{{ $name := .Title }}{{ with .Params.iso_code }}{{ $map = merge $map (dict . (dict "slug" $slug "name" $name)) }}{{ end }}{{ end }}{{ $map | jsonify }}'), labels: { walk: "{{ T "routePlanner.walk" }}", fipAccepted: "{{ T "routePlanner.fipAccepted" }}", From 38ecbd2d3705c881bab420285e3f6aed1ddf22cb Mon Sep 17 00:00:00 2001 From: MoritzWeber0 Date: Sun, 2 Aug 2026 19:32:56 +0200 Subject: [PATCH 05/18] feat: Improve transitous queries --- content/country/denmark/index.de.md | 14 +-- content/country/denmark/index.en.md | 14 +-- content/country/denmark/index.fr.md | 14 +-- content/country/germany/index.de.md | 136 +++++++++++++-------------- content/country/germany/index.en.md | 136 +++++++++++++-------------- content/country/germany/index.fr.md | 136 +++++++++++++-------------- content/country/ireland/index.de.md | 2 +- content/country/ireland/index.en.md | 2 +- content/country/ireland/index.fr.md | 2 +- content/country/portugal/index.de.md | 2 +- content/country/portugal/index.en.md | 2 +- content/country/portugal/index.fr.md | 2 +- content/operator/db/index.de.md | 8 +- content/operator/db/index.en.md | 8 +- content/operator/db/index.fr.md | 8 +- 15 files changed, 243 insertions(+), 243 deletions(-) diff --git a/content/country/denmark/index.de.md b/content/country/denmark/index.de.md index d551958b2..0cc43ffad 100644 --- a/content/country/denmark/index.de.md +++ b/content/country/denmark/index.de.md @@ -6,19 +6,19 @@ params: iso_code: DK operators_without_fip: - name: GoCollective (ehemals Arriva Danmark) - query: + query: agencyId == "471" # agencyName: "GoCollective" - name: Lokaltog - query: + query: agencyId == "316" # agencyName: "Lokaltog A/S" - name: Øresundståg - query: + query: agencyId == "300" # agencyName: "Öresundståg" - name: Midtjyske Jernbaner - query: + query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - name: Nordjyske Jernbaner - query: + query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - name: SJ - query: + query: agencyId == "74" # agencyName: "SJ" - name: Snälltåget - query: + query: agencyId == "451" # agencyName: "Snälltåget AB" --- ## FIP Nutzung diff --git a/content/country/denmark/index.en.md b/content/country/denmark/index.en.md index 0be8fa0b5..4d0b4e95a 100644 --- a/content/country/denmark/index.en.md +++ b/content/country/denmark/index.en.md @@ -6,19 +6,19 @@ params: iso_code: DK operators_without_fip: - name: GoCollective (ehemals Arriva Danmark) - query: + query: agencyId == "471" # agencyName: "GoCollective" - name: Lokaltog - query: + query: agencyId == "316" # agencyName: "Lokaltog A/S" - name: Øresundståg - query: + query: agencyId == "300" # agencyName: "Öresundståg" - name: Midtjyske Jernbaner - query: + query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - name: Nordjyske Jernbaner - query: + query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - name: SJ - query: + query: agencyId == "74" # agencyName: "SJ" - name: Snälltåget - query: + query: agencyId == "451" # agencyName: "Snälltåget AB" --- ## FIP Information diff --git a/content/country/denmark/index.fr.md b/content/country/denmark/index.fr.md index 83fcea9f7..50ad6c4c0 100644 --- a/content/country/denmark/index.fr.md +++ b/content/country/denmark/index.fr.md @@ -6,19 +6,19 @@ params: iso_code: DK operators_without_fip: - name: GoCollective (anciennement Arriva Danmark) - query: + query: agencyId == "471" # agencyName: "GoCollective" - name: Lokaltog - query: + query: agencyId == "316" # agencyName: "Lokaltog A/S" - name: Øresundståg - query: + query: agencyId == "300" # agencyName: "Öresundståg" - name: Midtjyske Jernbaner - query: + query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - name: Nordjyske Jernbaner - query: + query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - name: SJ - query: + query: agencyId == "74" # agencyName: "SJ" - name: Snälltåget - query: + query: agencyId == "451" # agencyName: "Snälltåget AB" --- ## Informations FIP diff --git a/content/country/germany/index.de.md b/content/country/germany/index.de.md index e04c665e5..1ea0253e8 100644 --- a/content/country/germany/index.de.md +++ b/content/country/germany/index.de.md @@ -6,167 +6,167 @@ params: iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH - query: + query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - name: agilis – ag - query: + query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - name: AKN Eisenbahn GmbH – AKN - query: + query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - name: Albtal-Vekehrs-Gesellschaft mbH - query: + query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - name: alex - Die Länderbahn GmbH DLB - query: + query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - name: Arriva Danmark A/S query: - name: Arriva Nederland - query: + query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - name: Arverio Baden-Württemberg - query: + query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - name: Arverio Bayern - query: + query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - name: BahnTouristikExpress GmbH – BTE query: - name: Bayerische Regiobahn – BRB - query: + query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - name: Bayerische Zugspitzbahn Bergbahn AG - query: + query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - name: Bentheimer Eisenbahn – BE - query: + query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - name: Bodensee-Oberschwaben-Bahn - query: + query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH query: - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: + query: agencyId == "10845" # agencyName: "Brohltalbahn" - name: cantus Verkehrsgesellschaft - query: + query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - name: City-Bahn Chemnitz – CB - query: + query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - name: Daadetalbahn – Dab - query: + query: agencyId == "10959" # agencyName: "Daadetalbahn" - name: Dessau-Wörlitzer Eisenbahn – DWE - query: + query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - name: Erfurter Bahn GmbH - query: + query: agencyId == "8654" # agencyName: "Erfurter Bahn" - name: erixx – erx - query: + query: agencyId == "10966" # agencyName: "erixx" - name: eurobahn - query: + query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - name: European Sleeper – ES - query: + query: agencyId == "es" # agencyName: "European Sleeper" - name: EVB ELBE-WESER GmbH – EVB - query: + query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - name: FlixTrain GmbH – FLX - query: + query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - name: Förderverein Mainschleifenbahn e.V. – MSB - query: + query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - name: Freiberger Eisenbahngesellschaft mbH – FEG query: - name: GoVolta - query: + query: agencyId == "IFF:GV" # agencyName: "GoVolta" - name: Hamburger Hochbahn query: - name: Hanseatische Eisenbahn GmbH - query: + query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - name: Harzer Schmalspurbahn – HSB - query: + query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - name: HLB Hessenbahn GmbH – HLB - query: + query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - name: Kandertalbahn – KTB - query: + query: agencyId == "10848" # agencyName: "Kandertalbahn" - name: Kasbachtalbahn – P - query: + query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - name: Leo Express - query: + query: agencyId == "10385" # agencyName: "LEO Express" - name: Mecklenburgische Bäderbahn Molli – MBB - query: + query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - name: metronom – ME - query: + query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - name: Mitteldeutsche Regiobahn – MRB - query: + query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - name: Mittelrheinbahn – MRB - query: + query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - name: National Express – NX query: agencyName == "National Express" - name: NEB Niederbarnimer Eisenbahn - query: + query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - name: neg Niebüll GmbH – neg - query: + query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - name: nordbahn – NBE - query: + query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - name: NordWestBahn – NWB - query: + query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA query: - name: Ostdeutsche Eisenbahn GmbH - query: + query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - name: Pressnitztalbahn – PRE - query: + query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - name: RDC Autozug Sylt GmbH – AS query: - name: RDC Deutschland GmbH query: - name: REGIOBAHN - query: + query: agencyId == "10894" # agencyName: "REGIOBAHN" - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: + query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: + query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: + query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: + query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - name: RegioTram – RT query: - name: Rhein-Neckar-Verkehr GmbH query: - name: RheinRuhrBahn (Transdev) – RRB - query: + query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - name: Rurtalbahn – RTB - query: + query: agencyId == "10858" # agencyName: "Rurtalbahn" - name: Saarbahn - query: + query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: + query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - name: S-Bahn Hannover (Transdev) - query: + query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - name: SBB GmbH – SBB - query: + query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - name: Schienenverkehrsgesellschaft mbH (SVG) - query: + query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - name: Schwäbische Alb-Bahn – SAB - query: + query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: + query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - name: Snältågget – D query: - name: Süd-Thüringen-Bahn GmbH - query: + query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: + query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL query: - name: trilex - Die Länderbahn GmbH DLB – TL - query: + query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: + query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - name: TRI Train Rental GmbH – TRI - query: + query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - name: VIAS GmbH – VIA - query: + query: agencyId == "10932" # agencyName: "VIAS GmbH" - name: VIAS Rail GmbH – VIA - query: + query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - name: vlexx - query: + query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: + query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - name: waldbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - name: WESTbahn – WB - query: + query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - name: WestfalenBahn – WFB - query: + query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG query: --- diff --git a/content/country/germany/index.en.md b/content/country/germany/index.en.md index a1a9767bf..44fd97291 100644 --- a/content/country/germany/index.en.md +++ b/content/country/germany/index.en.md @@ -6,167 +6,167 @@ params: iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH - query: + query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - name: agilis – ag - query: + query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - name: AKN Eisenbahn GmbH – AKN - query: + query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - name: Albtal-Vekehrs-Gesellschaft mbH - query: + query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - name: alex - Die Länderbahn GmbH DLB - query: + query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - name: Arriva Danmark A/S query: - name: Arriva Nederland - query: + query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - name: Arverio Baden-Württemberg - query: + query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - name: Arverio Bayern - query: + query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - name: BahnTouristikExpress GmbH – BTE query: - name: Bayerische Regiobahn – BRB - query: + query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - name: Bayerische Zugspitzbahn Bergbahn AG - query: + query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - name: Bentheimer Eisenbahn – BE - query: + query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - name: Bodensee-Oberschwaben-Bahn - query: + query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH query: - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: + query: agencyId == "10845" # agencyName: "Brohltalbahn" - name: cantus Verkehrsgesellschaft - query: + query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - name: City-Bahn Chemnitz – CB - query: + query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - name: Daadetalbahn – Dab - query: + query: agencyId == "10959" # agencyName: "Daadetalbahn" - name: Dessau-Wörlitzer Eisenbahn – DWE - query: + query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - name: Erfurter Bahn GmbH - query: + query: agencyId == "8654" # agencyName: "Erfurter Bahn" - name: erixx – erx - query: + query: agencyId == "10966" # agencyName: "erixx" - name: eurobahn - query: + query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - name: European Sleeper – ES - query: + query: agencyId == "es" # agencyName: "European Sleeper" - name: EVB ELBE-WESER GmbH – EVB - query: + query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - name: FlixTrain GmbH – FLX - query: + query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - name: Förderverein Mainschleifenbahn e.V. – MSB - query: + query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - name: Freiberger Eisenbahngesellschaft mbH – FEG query: - name: GoVolta - query: + query: agencyId == "IFF:GV" # agencyName: "GoVolta" - name: Hamburger Hochbahn query: - name: Hanseatische Eisenbahn GmbH - query: + query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - name: Harzer Schmalspurbahn – HSB - query: + query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - name: HLB Hessenbahn GmbH – HLB - query: + query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - name: Kandertalbahn – KTB - query: + query: agencyId == "10848" # agencyName: "Kandertalbahn" - name: Kasbachtalbahn – P - query: + query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - name: Leo Express - query: + query: agencyId == "10385" # agencyName: "LEO Express" - name: Mecklenburgische Bäderbahn Molli – MBB - query: + query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - name: metronom – ME - query: + query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - name: Mitteldeutsche Regiobahn – MRB - query: + query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - name: Mittelrheinbahn – MRB - query: + query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - name: National Express – NX query: agencyName == "National Express" - name: NEB Niederbarnimer Eisenbahn - query: + query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - name: neg Niebüll GmbH – neg - query: + query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - name: nordbahn – NBE - query: + query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - name: NordWestBahn – NWB - query: + query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA query: - name: Ostdeutsche Eisenbahn GmbH - query: + query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - name: Pressnitztalbahn – PRE - query: + query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - name: RDC Autozug Sylt GmbH – AS query: - name: RDC Deutschland GmbH query: - name: REGIOBAHN - query: + query: agencyId == "10894" # agencyName: "REGIOBAHN" - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: + query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: + query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: + query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: + query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - name: RegioTram – RT query: - name: Rhein-Neckar-Verkehr GmbH query: - name: RheinRuhrBahn (Transdev) – RRB - query: + query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - name: Rurtalbahn – RTB - query: + query: agencyId == "10858" # agencyName: "Rurtalbahn" - name: Saarbahn - query: + query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: + query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - name: S-Bahn Hannover (Transdev) - query: + query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - name: SBB GmbH – SBB - query: + query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - name: Schienenverkehrsgesellschaft mbH (SVG) - query: + query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - name: Schwäbische Alb-Bahn – SAB - query: + query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: + query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - name: Snältågget – D query: - name: Süd-Thüringen-Bahn GmbH - query: + query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: + query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL query: - name: trilex - Die Länderbahn GmbH DLB – TL - query: + query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: + query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - name: TRI Train Rental GmbH – TRI - query: + query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - name: VIAS GmbH – VIA - query: + query: agencyId == "10932" # agencyName: "VIAS GmbH" - name: VIAS Rail GmbH – VIA - query: + query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - name: vlexx - query: + query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: + query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - name: waldbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - name: WESTbahn – WB - query: + query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - name: WestfalenBahn – WFB - query: + query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG query: --- diff --git a/content/country/germany/index.fr.md b/content/country/germany/index.fr.md index 6ec0e9adb..6b6e867c3 100644 --- a/content/country/germany/index.fr.md +++ b/content/country/germany/index.fr.md @@ -6,167 +6,167 @@ params: iso_code: DE operators_without_fip: - name: Abellio Rail Mitteldeutschland GmbH - query: + query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - name: agilis – ag - query: + query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - name: AKN Eisenbahn GmbH – AKN - query: + query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - name: Albtal-Vekehrs-Gesellschaft mbH - query: + query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - name: alex - Die Länderbahn GmbH DLB - query: + query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - name: Arriva Danmark A/S query: - name: Arriva Nederland - query: + query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - name: Arverio Baden-Württemberg - query: + query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - name: Arverio Bayern - query: + query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - name: BahnTouristikExpress GmbH – BTE query: - name: Bayerische Regiobahn – BRB - query: + query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - name: Bayerische Zugspitzbahn Bergbahn AG - query: + query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - name: Bentheimer Eisenbahn – BE - query: + query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - name: Bodensee-Oberschwaben-Bahn - query: + query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH query: - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: + query: agencyId == "10845" # agencyName: "Brohltalbahn" - name: cantus Verkehrsgesellschaft - query: + query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - name: City-Bahn Chemnitz – CB - query: + query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - name: Daadetalbahn – Dab - query: + query: agencyId == "10959" # agencyName: "Daadetalbahn" - name: Dessau-Wörlitzer Eisenbahn – DWE - query: + query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - name: Erfurter Bahn GmbH - query: + query: agencyId == "8654" # agencyName: "Erfurter Bahn" - name: erixx – erx - query: + query: agencyId == "10966" # agencyName: "erixx" - name: eurobahn - query: + query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - name: European Sleeper – ES - query: + query: agencyId == "es" # agencyName: "European Sleeper" - name: EVB ELBE-WESER GmbH – EVB - query: + query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - name: FlixTrain GmbH – FLX - query: + query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - name: Förderverein Mainschleifenbahn e.V. – MSB - query: + query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - name: Freiberger Eisenbahngesellschaft mbH – FEG query: - name: GoVolta - query: + query: agencyId == "IFF:GV" # agencyName: "GoVolta" - name: Hamburger Hochbahn query: - name: Hanseatische Eisenbahn GmbH - query: + query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - name: Harzer Schmalspurbahn – HSB - query: + query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - name: HLB Hessenbahn GmbH – HLB - query: + query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - name: Kandertalbahn – KTB - query: + query: agencyId == "10848" # agencyName: "Kandertalbahn" - name: Kasbachtalbahn – P - query: + query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - name: Leo Express - query: + query: agencyId == "10385" # agencyName: "LEO Express" - name: Mecklenburgische Bäderbahn Molli – MBB - query: + query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - name: metronom – ME - query: + query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - name: Mitteldeutsche Regiobahn – MRB - query: + query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - name: Mittelrheinbahn – MRB - query: + query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - name: National Express – NX query: agencyName == "National Express" - name: NEB Niederbarnimer Eisenbahn - query: + query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - name: neg Niebüll GmbH – neg - query: + query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - name: nordbahn – NBE - query: + query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - name: NordWestBahn – NWB - query: + query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA query: - name: Ostdeutsche Eisenbahn GmbH - query: + query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - name: Pressnitztalbahn – PRE - query: + query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - name: RDC Autozug Sylt GmbH – AS query: - name: RDC Deutschland GmbH query: - name: REGIOBAHN - query: + query: agencyId == "10894" # agencyName: "REGIOBAHN" - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: + query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: + query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: + query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: + query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - name: RegioTram – RT query: - name: Rhein-Neckar-Verkehr GmbH query: - name: RheinRuhrBahn (Transdev) – RRB - query: + query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - name: Rurtalbahn – RTB - query: + query: agencyId == "10858" # agencyName: "Rurtalbahn" - name: Saarbahn - query: + query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: + query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - name: S-Bahn Hannover (Transdev) - query: + query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - name: SBB GmbH – SBB - query: + query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - name: Schienenverkehrsgesellschaft mbH (SVG) - query: + query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - name: Schwäbische Alb-Bahn – SAB - query: + query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: + query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - name: Snältågget – D query: - name: Süd-Thüringen-Bahn GmbH - query: + query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: + query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL query: - name: trilex - Die Länderbahn GmbH DLB – TL - query: + query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: + query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - name: TRI Train Rental GmbH – TRI - query: + query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - name: VIAS GmbH – VIA - query: + query: agencyId == "10932" # agencyName: "VIAS GmbH" - name: VIAS Rail GmbH – VIA - query: + query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - name: vlexx - query: + query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: + query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - name: waldbahn - Die Länderbahn GmbH DLB - query: + query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - name: WESTbahn – WB - query: + query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - name: WestfalenBahn – WFB - query: + query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG query: --- diff --git a/content/country/ireland/index.de.md b/content/country/ireland/index.de.md index 5761bcafc..4ac176c3c 100644 --- a/content/country/ireland/index.de.md +++ b/content/country/ireland/index.de.md @@ -6,7 +6,7 @@ params: iso_code: IE operators_without_fip: - name: Transdev (Luas - Straßenbahn Dublin) - query: + query: agencyId == "10000" # agencyName: "LUAS" --- ## FIP Nutzung diff --git a/content/country/ireland/index.en.md b/content/country/ireland/index.en.md index 26722a119..f3e44c919 100644 --- a/content/country/ireland/index.en.md +++ b/content/country/ireland/index.en.md @@ -6,7 +6,7 @@ params: iso_code: IE operators_without_fip: - name: Transdev (Luas - Dublin Tram) - query: + query: agencyId == "10000" # agencyName: "LUAS" --- ## FIP Information diff --git a/content/country/ireland/index.fr.md b/content/country/ireland/index.fr.md index b7bac7eb3..cdd559889 100644 --- a/content/country/ireland/index.fr.md +++ b/content/country/ireland/index.fr.md @@ -6,7 +6,7 @@ params: iso_code: IE operators_without_fip: - name: Transdev (Luas - Tramway de Dublin) - query: + query: agencyId == "10000" # agencyName: "LUAS" --- ## Informations FIP diff --git a/content/country/portugal/index.de.md b/content/country/portugal/index.de.md index 1ed66f1c2..6f6e791db 100644 --- a/content/country/portugal/index.de.md +++ b/content/country/portugal/index.de.md @@ -6,7 +6,7 @@ params: iso_code: PT operators_without_fip: - name: Fertagus - query: + query: agencyId == "15" # agencyName: "Fertagus" --- ## FIP Nutzung diff --git a/content/country/portugal/index.en.md b/content/country/portugal/index.en.md index 96636cb9f..48437673d 100644 --- a/content/country/portugal/index.en.md +++ b/content/country/portugal/index.en.md @@ -6,7 +6,7 @@ params: iso_code: PT operators_without_fip: - name: Fertagus - query: + query: agencyId == "15" # agencyName: "Fertagus" --- ## FIP Information diff --git a/content/country/portugal/index.fr.md b/content/country/portugal/index.fr.md index 6b1153338..4ebd6195f 100644 --- a/content/country/portugal/index.fr.md +++ b/content/country/portugal/index.fr.md @@ -6,7 +6,7 @@ params: iso_code: PT operators_without_fip: - name: Fertagus - query: + query: agencyId == "15" # agencyName: "Fertagus" --- ## Informations FIP diff --git a/content/operator/db/index.de.md b/content/operator/db/index.de.md index e43d0a813..465c1816a 100644 --- a/content/operator/db/index.de.md +++ b/content/operator/db/index.de.md @@ -22,13 +22,13 @@ params: category: ece - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") category: ec - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") category: ic - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") category: re - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") category: rb - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" category: s --- diff --git a/content/operator/db/index.en.md b/content/operator/db/index.en.md index df50567a2..c552173d9 100644 --- a/content/operator/db/index.en.md +++ b/content/operator/db/index.en.md @@ -22,13 +22,13 @@ params: category: ece - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") category: ec - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") category: ic - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") category: re - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") category: rb - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" category: s --- diff --git a/content/operator/db/index.fr.md b/content/operator/db/index.fr.md index bc7c2cd76..aedfd8766 100644 --- a/content/operator/db/index.fr.md +++ b/content/operator/db/index.fr.md @@ -22,13 +22,13 @@ params: category: ece - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") category: ec - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("IC") + - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") category: ic - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RE") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") category: re - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && routeShortName.startsWith("RB") + - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") category: rb - - query: (agencyName == "DB Regio AG NRW" || agencyName == "DB Regio AG Bayern" || agencyName == "DB Regio AG Mitte" || agencyName == "DB Regio AG Süd" || agencyName == "DB Regio AG Nord") && mode == "SUBURBAN" + - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" category: s --- From 7f0938e5e7f6cdf1e99537df464c138f42045134 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 09:01:57 +0200 Subject: [PATCH 06/18] Move transitous mapping to separate YAML files and add route planner experimental message - Extract transitous_mapping from operator frontmatter to transitous.yaml - Extract country operators_without_fip queries to transitous.yaml - Simplify operators_without_fip to a plain string list - Update templates to read from resource files - Add experimental warning message to route planner page --- archetypes/country/index.de.md | 3 +- archetypes/country/index.en.md | 3 +- archetypes/country/index.fr.md | 3 +- content/country/austria/index.de.md | 36 +-- content/country/austria/index.en.md | 36 +-- content/country/austria/index.fr.md | 36 +-- content/country/belgium/index.de.md | 6 +- content/country/belgium/index.en.md | 6 +- content/country/belgium/index.fr.md | 6 +- content/country/bulgaria/index.de.md | 3 +- content/country/bulgaria/index.en.md | 3 +- content/country/bulgaria/index.fr.md | 3 +- content/country/czechia/index.de.md | 21 +- content/country/czechia/index.en.md | 21 +- content/country/czechia/index.fr.md | 21 +- content/country/denmark/index.de.md | 21 +- content/country/denmark/index.en.md | 21 +- content/country/denmark/index.fr.md | 21 +- content/country/denmark/transitous.yaml | 7 + content/country/france/index.de.md | 21 +- content/country/france/index.en.md | 21 +- content/country/france/index.fr.md | 21 +- content/country/germany/index.de.md | 246 +++++++------------ content/country/germany/index.en.md | 246 +++++++------------ content/country/germany/index.fr.md | 246 +++++++------------ content/country/germany/transitous.yaml | 69 ++++++ content/country/greece/index.de.md | 6 +- content/country/greece/index.en.md | 6 +- content/country/greece/index.fr.md | 6 +- content/country/ireland/index.de.md | 3 +- content/country/ireland/index.en.md | 3 +- content/country/ireland/index.fr.md | 3 +- content/country/ireland/transitous.yaml | 1 + content/country/italy/index.de.md | 24 +- content/country/italy/index.en.md | 24 +- content/country/italy/index.fr.md | 24 +- content/country/latvia/index.de.md | 3 +- content/country/latvia/index.en.md | 3 +- content/country/latvia/index.fr.md | 3 +- content/country/lithuania/index.de.md | 3 +- content/country/lithuania/index.en.md | 3 +- content/country/lithuania/index.fr.md | 3 +- content/country/netherlands/index.de.md | 24 +- content/country/netherlands/index.en.md | 24 +- content/country/netherlands/index.fr.md | 24 +- content/country/norway/index.de.md | 12 +- content/country/norway/index.en.md | 12 +- content/country/norway/index.fr.md | 12 +- content/country/poland/index.de.md | 18 +- content/country/poland/index.en.md | 18 +- content/country/poland/index.fr.md | 18 +- content/country/portugal/index.de.md | 3 +- content/country/portugal/index.en.md | 3 +- content/country/portugal/index.fr.md | 3 +- content/country/portugal/transitous.yaml | 1 + content/country/romania/index.de.md | 18 +- content/country/romania/index.en.md | 18 +- content/country/romania/index.fr.md | 18 +- content/country/serbia/index.de.md | 3 +- content/country/serbia/index.en.md | 3 +- content/country/serbia/index.fr.md | 3 +- content/country/slovakia/index.de.md | 6 +- content/country/slovakia/index.en.md | 6 +- content/country/slovakia/index.fr.md | 6 +- content/country/slovenia/index.de.md | 3 +- content/country/slovenia/index.en.md | 3 +- content/country/slovenia/index.fr.md | 3 +- content/country/spain/index.de.md | 9 +- content/country/spain/index.en.md | 9 +- content/country/spain/index.fr.md | 9 +- content/country/switzerland/index.de.md | 18 +- content/country/switzerland/index.en.md | 18 +- content/country/switzerland/index.fr.md | 18 +- content/country/united-kingdom/index.de.md | 45 ++-- content/country/united-kingdom/index.en.md | 45 ++-- content/country/united-kingdom/index.fr.md | 45 ++-- content/operator/bdz/index.de.md | 3 - content/operator/bdz/index.en.md | 3 - content/operator/bdz/index.fr.md | 3 - content/operator/bdz/transitous.yaml | 1 + content/operator/bls/index.de.md | 4 - content/operator/bls/index.en.md | 4 - content/operator/bls/index.fr.md | 4 - content/operator/bls/transitous.yaml | 2 + content/operator/cd/index.de.md | 4 - content/operator/cd/index.en.md | 4 - content/operator/cd/index.fr.md | 4 - content/operator/cd/transitous.yaml | 2 + content/operator/cfl/index.de.md | 3 - content/operator/cfl/index.en.md | 3 - content/operator/cfl/index.fr.md | 3 - content/operator/cfl/transitous.yaml | 1 + content/operator/cfr/index.de.md | 3 - content/operator/cfr/index.en.md | 3 - content/operator/cfr/index.fr.md | 3 - content/operator/cfr/transitous.yaml | 1 + content/operator/cie/index.de.md | 4 - content/operator/cie/index.en.md | 4 - content/operator/cie/index.fr.md | 4 - content/operator/cie/transitous.yaml | 2 + content/operator/cp/index.de.md | 4 - content/operator/cp/index.en.md | 4 - content/operator/cp/index.fr.md | 4 - content/operator/cp/transitous.yaml | 2 + content/operator/db/index.de.md | 20 -- content/operator/db/index.en.md | 20 -- content/operator/db/index.fr.md | 20 -- content/operator/db/transitous.yaml | 18 ++ content/operator/dsb/index.de.md | 3 - content/operator/dsb/index.en.md | 3 - content/operator/dsb/index.fr.md | 3 - content/operator/dsb/transitous.yaml | 1 + content/operator/eurostar/index.de.md | 13 - content/operator/eurostar/index.en.md | 13 - content/operator/eurostar/index.fr.md | 12 - content/operator/eurostar/transitous.yaml | 12 + content/operator/fs/index.de.md | 3 - content/operator/fs/index.en.md | 3 - content/operator/fs/index.fr.md | 3 - content/operator/fs/transitous.yaml | 1 + content/operator/gysev/index.de.md | 4 - content/operator/gysev/index.en.md | 4 - content/operator/gysev/index.fr.md | 4 - content/operator/gysev/transitous.yaml | 2 + content/operator/ht/index.de.md | 4 - content/operator/ht/index.en.md | 4 - content/operator/ht/index.fr.md | 4 - content/operator/ht/transitous.yaml | 2 + content/operator/kd/index.de.md | 3 - content/operator/kd/index.en.md | 3 - content/operator/kd/index.fr.md | 3 - content/operator/kd/transitous.yaml | 1 + content/operator/kml/index.de.md | 3 - content/operator/kml/index.en.md | 3 - content/operator/kml/index.fr.md | 3 - content/operator/kml/transitous.yaml | 1 + content/operator/ks/index.de.md | 3 - content/operator/ks/index.en.md | 3 - content/operator/ks/index.fr.md | 3 - content/operator/ks/transitous.yaml | 1 + content/operator/kw/index.de.md | 3 - content/operator/kw/index.en.md | 3 - content/operator/kw/index.fr.md | 3 - content/operator/kw/transitous.yaml | 1 + content/operator/lka/index.de.md | 3 - content/operator/lka/index.en.md | 3 - content/operator/lka/index.fr.md | 3 - content/operator/lka/transitous.yaml | 1 + content/operator/ltg/index.de.md | 3 - content/operator/ltg/index.en.md | 3 - content/operator/ltg/index.fr.md | 3 - content/operator/ltg/transitous.yaml | 1 + content/operator/nir/index.de.md | 4 - content/operator/nir/index.en.md | 4 - content/operator/nir/index.fr.md | 4 - content/operator/nir/transitous.yaml | 2 + content/operator/ns/index.de.md | 5 - content/operator/ns/index.en.md | 5 - content/operator/ns/index.fr.md | 5 - content/operator/ns/transitous.yaml | 3 + content/operator/oebb/index.de.md | 5 - content/operator/oebb/index.en.md | 5 - content/operator/oebb/index.fr.md | 5 - content/operator/oebb/transitous.yaml | 3 + content/operator/pkp/index.de.md | 4 - content/operator/pkp/index.en.md | 4 - content/operator/pkp/index.fr.md | 4 - content/operator/pkp/transitous.yaml | 2 + content/operator/renfe/index.de.md | 8 - content/operator/renfe/index.en.md | 8 - content/operator/renfe/index.fr.md | 8 - content/operator/renfe/transitous.yaml | 6 + content/operator/sbb/index.de.md | 6 - content/operator/sbb/index.en.md | 6 - content/operator/sbb/index.fr.md | 6 - content/operator/sbb/transitous.yaml | 4 + content/operator/sncb/index.de.md | 4 - content/operator/sncb/index.en.md | 4 - content/operator/sncb/index.fr.md | 4 - content/operator/sncb/transitous.yaml | 2 + content/operator/sncf/index.de.md | 4 - content/operator/sncf/index.en.md | 4 - content/operator/sncf/index.fr.md | 4 - content/operator/sncf/transitous.yaml | 2 + content/operator/sv/index.de.md | 3 - content/operator/sv/index.en.md | 3 - content/operator/sv/index.fr.md | 3 - content/operator/sv/transitous.yaml | 1 + content/operator/sz/index.de.md | 4 - content/operator/sz/index.en.md | 4 - content/operator/sz/index.fr.md | 4 - content/operator/sz/transitous.yaml | 2 + content/operator/vy/index.de.md | 6 - content/operator/vy/index.en.md | 6 - content/operator/vy/index.fr.md | 6 - content/operator/vy/transitous.yaml | 4 + content/operator/zpcg/index.de.md | 3 - content/operator/zpcg/index.en.md | 3 - content/operator/zpcg/index.fr.md | 3 - content/operator/zpcg/transitous.yaml | 1 + content/operator/zssk/index.de.md | 3 - content/operator/zssk/index.en.md | 3 - content/operator/zssk/index.fr.md | 3 - content/operator/zssk/transitous.yaml | 1 + i18n/de.yaml | 7 + i18n/en.yaml | 7 + i18n/fr.yaml | 8 + layouts/_default/home.transitousmapping.json | 18 +- layouts/country/single.html | 2 +- layouts/general/route-planner/single.html | 6 + 210 files changed, 759 insertions(+), 1564 deletions(-) create mode 100644 content/country/denmark/transitous.yaml create mode 100644 content/country/germany/transitous.yaml create mode 100644 content/country/ireland/transitous.yaml create mode 100644 content/country/portugal/transitous.yaml create mode 100644 content/operator/bdz/transitous.yaml create mode 100644 content/operator/bls/transitous.yaml create mode 100644 content/operator/cd/transitous.yaml create mode 100644 content/operator/cfl/transitous.yaml create mode 100644 content/operator/cfr/transitous.yaml create mode 100644 content/operator/cie/transitous.yaml create mode 100644 content/operator/cp/transitous.yaml create mode 100644 content/operator/db/transitous.yaml create mode 100644 content/operator/dsb/transitous.yaml create mode 100644 content/operator/eurostar/transitous.yaml create mode 100644 content/operator/fs/transitous.yaml create mode 100644 content/operator/gysev/transitous.yaml create mode 100644 content/operator/ht/transitous.yaml create mode 100644 content/operator/kd/transitous.yaml create mode 100644 content/operator/kml/transitous.yaml create mode 100644 content/operator/ks/transitous.yaml create mode 100644 content/operator/kw/transitous.yaml create mode 100644 content/operator/lka/transitous.yaml create mode 100644 content/operator/ltg/transitous.yaml create mode 100644 content/operator/nir/transitous.yaml create mode 100644 content/operator/ns/transitous.yaml create mode 100644 content/operator/oebb/transitous.yaml create mode 100644 content/operator/pkp/transitous.yaml create mode 100644 content/operator/renfe/transitous.yaml create mode 100644 content/operator/sbb/transitous.yaml create mode 100644 content/operator/sncb/transitous.yaml create mode 100644 content/operator/sncf/transitous.yaml create mode 100644 content/operator/sv/transitous.yaml create mode 100644 content/operator/sz/transitous.yaml create mode 100644 content/operator/vy/transitous.yaml create mode 100644 content/operator/zpcg/transitous.yaml create mode 100644 content/operator/zssk/transitous.yaml diff --git a/archetypes/country/index.de.md b/archetypes/country/index.de.md index b5574e65a..b1ae98cf2 100644 --- a/archetypes/country/index.de.md +++ b/archetypes/country/index.de.md @@ -5,8 +5,7 @@ country: "{{ .File.ContentBaseName }}" params: iso_code: # ISO 3166-1 alpha-2 Code, z. B. DE operators_without_fip: - - name: # Betreibername - query: # z.B. agencyName == "Betreibername" + - # Betreibername --- diff --git a/archetypes/country/index.en.md b/archetypes/country/index.en.md index b6b1c5d70..9a346b5c1 100644 --- a/archetypes/country/index.en.md +++ b/archetypes/country/index.en.md @@ -5,8 +5,7 @@ country: "{{ .File.ContentBaseName }}" params: iso_code: # ISO 3166-1 alpha-2 code, e.g. DE operators_without_fip: - - name: # Operator name - query: # e.g. agencyName == "Operator Name" + - # Operator name --- diff --git a/archetypes/country/index.fr.md b/archetypes/country/index.fr.md index 46383067b..175a70629 100644 --- a/archetypes/country/index.fr.md +++ b/archetypes/country/index.fr.md @@ -5,8 +5,7 @@ country: "{{ .File.ContentBaseName }}" params: iso_code: # Code ISO 3166-1 alpha-2, p.ex. DE operators_without_fip: - - name: # Nom de l'opérateur - query: # p.ex. agencyName == "Nom de l'opérateur" + - # Nom de l'opérateur --- diff --git a/content/country/austria/index.de.md b/content/country/austria/index.de.md index c1bfb9f81..8384cc6ac 100644 --- a/content/country/austria/index.de.md +++ b/content/country/austria/index.de.md @@ -5,30 +5,18 @@ country: "austria" params: iso_code: AT operators_without_fip: - - name: Achenseebahn - query: - - name: '[CAT (City Airport Train) Wien](/operator/oebb#wien-flughafen-city-airport-train-cat "CAT")' - query: - - name: Graz–Köflacher Bahn (GKB) - query: - - name: Montafonerbahn - query: - - name: NÖVOG - query: - - name: Pinzgauer Lokalbahn - query: - - name: RegioJet - query: - - name: Salzburger Lokalbahn - query: - - name: Steiermärkische Landesbahnen - query: - - name: WESTbahn - query: - - name: Wiener Lokalbahn (Badner Bahn) - query: - - name: Zillertalbahn - query: + - Achenseebahn + - '[CAT (City Airport Train) Wien](/operator/oebb#wien-flughafen-city-airport-train-cat "CAT")' + - Graz–Köflacher Bahn (GKB) + - Montafonerbahn + - NÖVOG + - Pinzgauer Lokalbahn + - RegioJet + - Salzburger Lokalbahn + - Steiermärkische Landesbahnen + - WESTbahn + - Wiener Lokalbahn (Badner Bahn) + - Zillertalbahn --- ## FIP Nutzung diff --git a/content/country/austria/index.en.md b/content/country/austria/index.en.md index c6f853bbf..ac649a14f 100644 --- a/content/country/austria/index.en.md +++ b/content/country/austria/index.en.md @@ -5,30 +5,18 @@ country: "austria" params: iso_code: AT operators_without_fip: - - name: Achenseebahn - query: - - name: '[CAT (City Airport Train) Vienna](/operator/oebb#vienna-airport-city-airport-train-cat "CAT")' - query: - - name: Graz–Köflacher Bahn (GKB) - query: - - name: Montafonerbahn - query: - - name: NÖVOG - query: - - name: Pinzgauer Lokalbahn - query: - - name: RegioJet - query: - - name: Salzburger Lokalbahn - query: - - name: Steiermärkische Landesbahnen - query: - - name: WESTbahn - query: - - name: Wiener Lokalbahn (Badner Bahn) - query: - - name: Zillertalbahn - query: + - Achenseebahn + - '[CAT (City Airport Train) Vienna](/operator/oebb#vienna-airport-city-airport-train-cat "CAT")' + - Graz–Köflacher Bahn (GKB) + - Montafonerbahn + - NÖVOG + - Pinzgauer Lokalbahn + - RegioJet + - Salzburger Lokalbahn + - Steiermärkische Landesbahnen + - WESTbahn + - Wiener Lokalbahn (Badner Bahn) + - Zillertalbahn --- ## FIP Information diff --git a/content/country/austria/index.fr.md b/content/country/austria/index.fr.md index f370159c0..29488168f 100644 --- a/content/country/austria/index.fr.md +++ b/content/country/austria/index.fr.md @@ -5,30 +5,18 @@ country: "austria" params: iso_code: AT operators_without_fip: - - name: Achenseebahn - query: - - name: ’[CAT (City Airport Train) Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat "CAT")’ - query: - - name: Graz–Köflacher Bahn (GKB) - query: - - name: Montafonerbahn - query: - - name: NÖVOG - query: - - name: Pinzgauer Lokalbahn - query: - - name: RegioJet - query: - - name: Salzburger Lokalbahn - query: - - name: Steiermärkische Landesbahnen - query: - - name: WESTbahn - query: - - name: Wiener Lokalbahn (Badner Bahn) - query: - - name: Zillertalbahn - query: + - Achenseebahn + - ’[CAT (City Airport Train) Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat "CAT")’ + - Graz–Köflacher Bahn (GKB) + - Montafonerbahn + - NÖVOG + - Pinzgauer Lokalbahn + - RegioJet + - Salzburger Lokalbahn + - Steiermärkische Landesbahnen + - WESTbahn + - Wiener Lokalbahn (Badner Bahn) + - Zillertalbahn --- ## Informations FIP diff --git a/content/country/belgium/index.de.md b/content/country/belgium/index.de.md index a6efe006e..909473288 100644 --- a/content/country/belgium/index.de.md +++ b/content/country/belgium/index.de.md @@ -5,10 +5,8 @@ country: "belgium" params: iso_code: BE operators_without_fip: - - name: European Sleeper - query: - - name: OUIGO - query: + - European Sleeper + - OUIGO --- ## FIP Nutzung diff --git a/content/country/belgium/index.en.md b/content/country/belgium/index.en.md index da9f86243..5845498f6 100644 --- a/content/country/belgium/index.en.md +++ b/content/country/belgium/index.en.md @@ -5,10 +5,8 @@ country: "belgium" params: iso_code: BE operators_without_fip: - - name: European Sleeper - query: - - name: OUIGO - query: + - European Sleeper + - OUIGO --- ## FIP Information diff --git a/content/country/belgium/index.fr.md b/content/country/belgium/index.fr.md index e7bbf7a86..9748ccb5b 100644 --- a/content/country/belgium/index.fr.md +++ b/content/country/belgium/index.fr.md @@ -5,10 +5,8 @@ country: "belgium" params: iso_code: BE operators_without_fip: - - name: European Sleeper - query: - - name: OUIGO - query: + - European Sleeper + - OUIGO --- ## Informations FIP diff --git a/content/country/bulgaria/index.de.md b/content/country/bulgaria/index.de.md index 1b8d4dbf1..d28e68b30 100644 --- a/content/country/bulgaria/index.de.md +++ b/content/country/bulgaria/index.de.md @@ -5,8 +5,7 @@ country: "bulgaria" params: iso_code: BG operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Nutzung diff --git a/content/country/bulgaria/index.en.md b/content/country/bulgaria/index.en.md index 411210926..5e712d01c 100644 --- a/content/country/bulgaria/index.en.md +++ b/content/country/bulgaria/index.en.md @@ -5,8 +5,7 @@ country: "bulgaria" params: iso_code: BG operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Information diff --git a/content/country/bulgaria/index.fr.md b/content/country/bulgaria/index.fr.md index 66bff0023..d5fbf91fa 100644 --- a/content/country/bulgaria/index.fr.md +++ b/content/country/bulgaria/index.fr.md @@ -5,8 +5,7 @@ country: "bulgaria" params: iso_code: BG operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## Informations FIP diff --git a/content/country/czechia/index.de.md b/content/country/czechia/index.de.md index 00ba4bd0c..082f7146e 100644 --- a/content/country/czechia/index.de.md +++ b/content/country/czechia/index.de.md @@ -5,20 +5,13 @@ country: "czechia" params: iso_code: CZ operators_without_fip: - - name: ARRIVA vlaky s. r. o. - query: - - name: AŽD Praha s.r.o. - query: - - name: GW Train Regio - query: - - name: Jindřichohradecké místní dráhy (JHMD) - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Trilex / Die Länderbahn - query: + - ARRIVA vlaky s. r. o. + - AŽD Praha s.r.o. + - GW Train Regio + - Jindřichohradecké místní dráhy (JHMD) + - Leo Express + - RegioJet + - Trilex / Die Länderbahn --- ## FIP Nutzung diff --git a/content/country/czechia/index.en.md b/content/country/czechia/index.en.md index 24d382993..6246177f7 100644 --- a/content/country/czechia/index.en.md +++ b/content/country/czechia/index.en.md @@ -5,20 +5,13 @@ country: "czechia" params: iso_code: CZ operators_without_fip: - - name: ARRIVA vlaky s. r. o. - query: - - name: AŽD Praha s.r.o. - query: - - name: GW Train Regio - query: - - name: Jindřichohradecké místní dráhy (JHMD) - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Trilex / Die Länderbahn - query: + - ARRIVA vlaky s. r. o. + - AŽD Praha s.r.o. + - GW Train Regio + - Jindřichohradecké místní dráhy (JHMD) + - Leo Express + - RegioJet + - Trilex / Die Länderbahn --- ## FIP Information diff --git a/content/country/czechia/index.fr.md b/content/country/czechia/index.fr.md index b37234c54..b1c6d8dda 100644 --- a/content/country/czechia/index.fr.md +++ b/content/country/czechia/index.fr.md @@ -5,20 +5,13 @@ country: "czechia" params: iso_code: CZ operators_without_fip: - - name: ARRIVA vlaky s. r. o. - query: - - name: AŽD Praha s.r.o. - query: - - name: GW Train Regio - query: - - name: Jindřichohradecké místní dráhy (JHMD) - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Trilex / Die Länderbahn - query: + - ARRIVA vlaky s. r. o. + - AŽD Praha s.r.o. + - GW Train Regio + - Jindřichohradecké místní dráhy (JHMD) + - Leo Express + - RegioJet + - Trilex / Die Länderbahn --- ## Informations FIP diff --git a/content/country/denmark/index.de.md b/content/country/denmark/index.de.md index 0cc43ffad..ee1bd1118 100644 --- a/content/country/denmark/index.de.md +++ b/content/country/denmark/index.de.md @@ -5,20 +5,13 @@ country: "denmark" params: iso_code: DK operators_without_fip: - - name: GoCollective (ehemals Arriva Danmark) - query: agencyId == "471" # agencyName: "GoCollective" - - name: Lokaltog - query: agencyId == "316" # agencyName: "Lokaltog A/S" - - name: Øresundståg - query: agencyId == "300" # agencyName: "Öresundståg" - - name: Midtjyske Jernbaner - query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - - name: Nordjyske Jernbaner - query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - - name: SJ - query: agencyId == "74" # agencyName: "SJ" - - name: Snälltåget - query: agencyId == "451" # agencyName: "Snälltåget AB" + - GoCollective (ehemals Arriva Danmark) + - Lokaltog + - Øresundståg + - Midtjyske Jernbaner + - Nordjyske Jernbaner + - SJ + - Snälltåget --- ## FIP Nutzung diff --git a/content/country/denmark/index.en.md b/content/country/denmark/index.en.md index 4d0b4e95a..bda52759c 100644 --- a/content/country/denmark/index.en.md +++ b/content/country/denmark/index.en.md @@ -5,20 +5,13 @@ country: "denmark" params: iso_code: DK operators_without_fip: - - name: GoCollective (ehemals Arriva Danmark) - query: agencyId == "471" # agencyName: "GoCollective" - - name: Lokaltog - query: agencyId == "316" # agencyName: "Lokaltog A/S" - - name: Øresundståg - query: agencyId == "300" # agencyName: "Öresundståg" - - name: Midtjyske Jernbaner - query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - - name: Nordjyske Jernbaner - query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - - name: SJ - query: agencyId == "74" # agencyName: "SJ" - - name: Snälltåget - query: agencyId == "451" # agencyName: "Snälltåget AB" + - GoCollective (ehemals Arriva Danmark) + - Lokaltog + - Øresundståg + - Midtjyske Jernbaner + - Nordjyske Jernbaner + - SJ + - Snälltåget --- ## FIP Information diff --git a/content/country/denmark/index.fr.md b/content/country/denmark/index.fr.md index 50ad6c4c0..74f677d68 100644 --- a/content/country/denmark/index.fr.md +++ b/content/country/denmark/index.fr.md @@ -5,20 +5,13 @@ country: "denmark" params: iso_code: DK operators_without_fip: - - name: GoCollective (anciennement Arriva Danmark) - query: agencyId == "471" # agencyName: "GoCollective" - - name: Lokaltog - query: agencyId == "316" # agencyName: "Lokaltog A/S" - - name: Øresundståg - query: agencyId == "300" # agencyName: "Öresundståg" - - name: Midtjyske Jernbaner - query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) - - name: Nordjyske Jernbaner - query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) - - name: SJ - query: agencyId == "74" # agencyName: "SJ" - - name: Snälltåget - query: agencyId == "451" # agencyName: "Snälltåget AB" + - GoCollective (anciennement Arriva Danmark) + - Lokaltog + - Øresundståg + - Midtjyske Jernbaner + - Nordjyske Jernbaner + - SJ + - Snälltåget --- ## Informations FIP diff --git a/content/country/denmark/transitous.yaml b/content/country/denmark/transitous.yaml new file mode 100644 index 000000000..5c35b6fe6 --- /dev/null +++ b/content/country/denmark/transitous.yaml @@ -0,0 +1,7 @@ +- query: agencyId == "471" # agencyName: "GoCollective" +- query: agencyId == "316" # agencyName: "Lokaltog A/S" +- query: agencyId == "300" # agencyName: "Öresundståg" +- query: agencyId == "281" && mode == "REGIONAL_RAIL" # agencyName: "Midttrafik" (line 92 Holstebro–Vemb run by Midtjyske Jernbaner but attributed to the Midttrafik PTA in the feed) +- query: agencyId == "206" # agencyName: "NT" (Nordjyske Jernbaner) +- query: agencyId == "74" # agencyName: "SJ" +- query: agencyId == "451" # agencyName: "Snälltåget AB" diff --git a/content/country/france/index.de.md b/content/country/france/index.de.md index 583f285c6..d215ea1cf 100644 --- a/content/country/france/index.de.md +++ b/content/country/france/index.de.md @@ -5,20 +5,13 @@ country: "france" params: iso_code: FR operators_without_fip: - - name: CFC (Chemins de fer de la Corse / Eisenbahnen auf Korsika) - query: - - name: '[Frecciarossa (Trenitalia)](/operator/fs/#internationale-frecciarossa-züge-nach-paris "Frecciarossa (Trenitalia)")' - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: GoVolta - query: - - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - query: - - name: RATP - query: - - name: Transdev - query: + - CFC (Chemins de fer de la Corse / Eisenbahnen auf Korsika) + - '[Frecciarossa (Trenitalia)](/operator/fs/#internationale-frecciarossa-züge-nach-paris "Frecciarossa (Trenitalia)")' + - Getlink (Eurotunnel LeShuttle) + - GoVolta + - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + - RATP + - Transdev --- ## FIP Nutzung diff --git a/content/country/france/index.en.md b/content/country/france/index.en.md index 57004581c..f58a425dc 100644 --- a/content/country/france/index.en.md +++ b/content/country/france/index.en.md @@ -5,20 +5,13 @@ country: "france" params: iso_code: FR operators_without_fip: - - name: CFC (Chemins de fer de la Corse / Railways in Corsica) - query: - - name: '[Frecciarossa (Trenitalia)](/operator/fs/#international-frecciarossa-trains-to-paris "Frecciarossa (Trenitalia)")' - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: GoVolta - query: - - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - query: - - name: RATP - query: - - name: Transdev - query: + - CFC (Chemins de fer de la Corse / Railways in Corsica) + - '[Frecciarossa (Trenitalia)](/operator/fs/#international-frecciarossa-trains-to-paris "Frecciarossa (Trenitalia)")' + - Getlink (Eurotunnel LeShuttle) + - GoVolta + - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + - RATP + - Transdev --- ## FIP Information diff --git a/content/country/france/index.fr.md b/content/country/france/index.fr.md index bba03c8cd..3cd5b20de 100644 --- a/content/country/france/index.fr.md +++ b/content/country/france/index.fr.md @@ -5,20 +5,13 @@ country: "france" params: iso_code: FR operators_without_fip: - - name: CFC (Chemins de fer de la Corse / Chemins de fer corses) - query: - - name: ’[Frecciarossa (Trenitalia)](/operator/fs/#trains-frecciarossa-internationaux-vers-paris "Frecciarossa (Trenitalia)")’ - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: GoVolta - query: - - name: ’[OUIGO](/operator/sncf#Fernverkehr "OUIGO")’ - query: - - name: RATP - query: - - name: Transdev - query: + - CFC (Chemins de fer de la Corse / Chemins de fer corses) + - ’[Frecciarossa (Trenitalia)](/operator/fs/#trains-frecciarossa-internationaux-vers-paris "Frecciarossa (Trenitalia)")’ + - Getlink (Eurotunnel LeShuttle) + - GoVolta + - ’[OUIGO](/operator/sncf#Fernverkehr "OUIGO")’ + - RATP + - Transdev --- ## Informations FIP diff --git a/content/country/germany/index.de.md b/content/country/germany/index.de.md index 1ea0253e8..a880b0faf 100644 --- a/content/country/germany/index.de.md +++ b/content/country/germany/index.de.md @@ -5,170 +5,88 @@ country: "germany" params: iso_code: DE operators_without_fip: - - name: Abellio Rail Mitteldeutschland GmbH - query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - - name: agilis – ag - query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - - name: AKN Eisenbahn GmbH – AKN - query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - - name: Albtal-Vekehrs-Gesellschaft mbH - query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - - name: alex - Die Länderbahn GmbH DLB - query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - - name: Arriva Danmark A/S - query: - - name: Arriva Nederland - query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - - name: Arverio Baden-Württemberg - query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - - name: Arverio Bayern - query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - - name: BahnTouristikExpress GmbH – BTE - query: - - name: Bayerische Regiobahn – BRB - query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - - name: Bayerische Zugspitzbahn Bergbahn AG - query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - - name: Bentheimer Eisenbahn – BE - query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - - name: Bodensee-Oberschwaben-Bahn - query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH - query: - - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: agencyId == "10845" # agencyName: "Brohltalbahn" - - name: cantus Verkehrsgesellschaft - query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - - name: City-Bahn Chemnitz – CB - query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - - name: Daadetalbahn – Dab - query: agencyId == "10959" # agencyName: "Daadetalbahn" - - name: Dessau-Wörlitzer Eisenbahn – DWE - query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - - name: Erfurter Bahn GmbH - query: agencyId == "8654" # agencyName: "Erfurter Bahn" - - name: erixx – erx - query: agencyId == "10966" # agencyName: "erixx" - - name: eurobahn - query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - - name: European Sleeper – ES - query: agencyId == "es" # agencyName: "European Sleeper" - - name: EVB ELBE-WESER GmbH – EVB - query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - - name: FlixTrain GmbH – FLX - query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - - name: Förderverein Mainschleifenbahn e.V. – MSB - query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - - name: Freiberger Eisenbahngesellschaft mbH – FEG - query: - - name: GoVolta - query: agencyId == "IFF:GV" # agencyName: "GoVolta" - - name: Hamburger Hochbahn - query: - - name: Hanseatische Eisenbahn GmbH - query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - - name: Harzer Schmalspurbahn – HSB - query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - - name: HLB Hessenbahn GmbH – HLB - query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - - name: Kandertalbahn – KTB - query: agencyId == "10848" # agencyName: "Kandertalbahn" - - name: Kasbachtalbahn – P - query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - - name: Leo Express - query: agencyId == "10385" # agencyName: "LEO Express" - - name: Mecklenburgische Bäderbahn Molli – MBB - query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - - name: metronom – ME - query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - - name: Mitteldeutsche Regiobahn – MRB - query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - - name: Mittelrheinbahn – MRB - query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - - name: National Express – NX - query: agencyName == "National Express" - - name: NEB Niederbarnimer Eisenbahn - query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - - name: neg Niebüll GmbH – neg - query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - - name: nordbahn – NBE - query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - - name: NordWestBahn – NWB - query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - query: - - name: Ostdeutsche Eisenbahn GmbH - query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - - name: Pressnitztalbahn – PRE - query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - - name: RDC Autozug Sylt GmbH – AS - query: - - name: RDC Deutschland GmbH - query: - - name: REGIOBAHN - query: agencyId == "10894" # agencyName: "REGIOBAHN" - - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - - name: RegioTram – RT - query: - - name: Rhein-Neckar-Verkehr GmbH - query: - - name: RheinRuhrBahn (Transdev) – RRB - query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - - name: Rurtalbahn – RTB - query: agencyId == "10858" # agencyName: "Rurtalbahn" - - name: Saarbahn - query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - - name: S-Bahn Hannover (Transdev) - query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - - name: SBB GmbH – SBB - query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - - name: Schienenverkehrsgesellschaft mbH (SVG) - query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - - name: Schwäbische Alb-Bahn – SAB - query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - - name: Snältågget – D - query: - - name: Süd-Thüringen-Bahn GmbH - query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - query: - - name: trilex - Die Länderbahn GmbH DLB – TL - query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - - name: TRI Train Rental GmbH – TRI - query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - - name: VIAS GmbH – VIA - query: agencyId == "10932" # agencyName: "VIAS GmbH" - - name: VIAS Rail GmbH – VIA - query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - - name: vlexx - query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - - name: waldbahn - Die Länderbahn GmbH DLB - query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - - name: WESTbahn – WB - query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - - name: WestfalenBahn – WFB - query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG - query: + - Abellio Rail Mitteldeutschland GmbH + - agilis – ag + - AKN Eisenbahn GmbH – AKN + - Albtal-Vekehrs-Gesellschaft mbH + - alex - Die Länderbahn GmbH DLB + - Arriva Danmark A/S + - Arriva Nederland + - Arverio Baden-Württemberg + - Arverio Bayern + - BahnTouristikExpress GmbH – BTE + - Bayerische Regiobahn – BRB + - Bayerische Zugspitzbahn Bergbahn AG + - Bentheimer Eisenbahn – BE + - Bodensee-Oberschwaben-Bahn + - Borkumer Kleinbahn- und Dampfschiffahrt GmbH + - Brohltal Schmalspureisenbahn Betriebs GmbH – P + - cantus Verkehrsgesellschaft + - City-Bahn Chemnitz – CB + - Daadetalbahn – Dab + - Dessau-Wörlitzer Eisenbahn – DWE + - Erfurter Bahn GmbH + - erixx – erx + - eurobahn + - European Sleeper – ES + - EVB ELBE-WESER GmbH – EVB + - FlixTrain GmbH – FLX + - Förderverein Mainschleifenbahn e.V. – MSB + - Freiberger Eisenbahngesellschaft mbH – FEG + - GoVolta + - Hamburger Hochbahn + - Hanseatische Eisenbahn GmbH + - Harzer Schmalspurbahn – HSB + - HLB Hessenbahn GmbH – HLB + - Kandertalbahn – KTB + - Kasbachtalbahn – P + - Leo Express + - Mecklenburgische Bäderbahn Molli – MBB + - metronom – ME + - Mitteldeutsche Regiobahn – MRB + - Mittelrheinbahn – MRB + - National Express – NX + - NEB Niederbarnimer Eisenbahn + - neg Niebüll GmbH – neg + - nordbahn – NBE + - NordWestBahn – NWB + - oberpfalzbahn - Die Länderbahn GmbH DLB + - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + - Ostdeutsche Eisenbahn GmbH + - Pressnitztalbahn – PRE + - RDC Autozug Sylt GmbH – AS + - RDC Deutschland GmbH + - REGIOBAHN + - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + - RegioTram – RT + - Rhein-Neckar-Verkehr GmbH + - RheinRuhrBahn (Transdev) – RRB + - Rurtalbahn – RTB + - Saarbahn + - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + - S-Bahn Hannover (Transdev) + - SBB GmbH – SBB + - Schienenverkehrsgesellschaft mbH (SVG) + - Schwäbische Alb-Bahn – SAB + - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + - Snältågget – D + - Süd-Thüringen-Bahn GmbH + - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + - trilex - Die Länderbahn GmbH DLB – TL + - trilex-Express - Die Länderbahn GmbH DLB – TLX + - TRI Train Rental GmbH – TRI + - VIAS GmbH – VIA + - VIAS Rail GmbH – VIA + - vlexx + - vogtlandbahn - Die Länderbahn GmbH DLB – VBG + - waldbahn - Die Länderbahn GmbH DLB + - WESTbahn – WB + - WestfalenBahn – WFB + - Württembergische Eisenbahn-Gesellschaft mbH – WEG --- ## FIP Nutzung diff --git a/content/country/germany/index.en.md b/content/country/germany/index.en.md index 44fd97291..937ee83b2 100644 --- a/content/country/germany/index.en.md +++ b/content/country/germany/index.en.md @@ -5,170 +5,88 @@ country: "germany" params: iso_code: DE operators_without_fip: - - name: Abellio Rail Mitteldeutschland GmbH - query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - - name: agilis – ag - query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - - name: AKN Eisenbahn GmbH – AKN - query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - - name: Albtal-Vekehrs-Gesellschaft mbH - query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - - name: alex - Die Länderbahn GmbH DLB - query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - - name: Arriva Danmark A/S - query: - - name: Arriva Nederland - query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - - name: Arverio Baden-Württemberg - query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - - name: Arverio Bayern - query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - - name: BahnTouristikExpress GmbH – BTE - query: - - name: Bayerische Regiobahn – BRB - query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - - name: Bayerische Zugspitzbahn Bergbahn AG - query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - - name: Bentheimer Eisenbahn – BE - query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - - name: Bodensee-Oberschwaben-Bahn - query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH - query: - - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: agencyId == "10845" # agencyName: "Brohltalbahn" - - name: cantus Verkehrsgesellschaft - query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - - name: City-Bahn Chemnitz – CB - query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - - name: Daadetalbahn – Dab - query: agencyId == "10959" # agencyName: "Daadetalbahn" - - name: Dessau-Wörlitzer Eisenbahn – DWE - query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - - name: Erfurter Bahn GmbH - query: agencyId == "8654" # agencyName: "Erfurter Bahn" - - name: erixx – erx - query: agencyId == "10966" # agencyName: "erixx" - - name: eurobahn - query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - - name: European Sleeper – ES - query: agencyId == "es" # agencyName: "European Sleeper" - - name: EVB ELBE-WESER GmbH – EVB - query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - - name: FlixTrain GmbH – FLX - query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - - name: Förderverein Mainschleifenbahn e.V. – MSB - query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - - name: Freiberger Eisenbahngesellschaft mbH – FEG - query: - - name: GoVolta - query: agencyId == "IFF:GV" # agencyName: "GoVolta" - - name: Hamburger Hochbahn - query: - - name: Hanseatische Eisenbahn GmbH - query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - - name: Harzer Schmalspurbahn – HSB - query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - - name: HLB Hessenbahn GmbH – HLB - query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - - name: Kandertalbahn – KTB - query: agencyId == "10848" # agencyName: "Kandertalbahn" - - name: Kasbachtalbahn – P - query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - - name: Leo Express - query: agencyId == "10385" # agencyName: "LEO Express" - - name: Mecklenburgische Bäderbahn Molli – MBB - query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - - name: metronom – ME - query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - - name: Mitteldeutsche Regiobahn – MRB - query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - - name: Mittelrheinbahn – MRB - query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - - name: National Express – NX - query: agencyName == "National Express" - - name: NEB Niederbarnimer Eisenbahn - query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - - name: neg Niebüll GmbH – neg - query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - - name: nordbahn – NBE - query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - - name: NordWestBahn – NWB - query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - query: - - name: Ostdeutsche Eisenbahn GmbH - query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - - name: Pressnitztalbahn – PRE - query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - - name: RDC Autozug Sylt GmbH – AS - query: - - name: RDC Deutschland GmbH - query: - - name: REGIOBAHN - query: agencyId == "10894" # agencyName: "REGIOBAHN" - - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - - name: RegioTram – RT - query: - - name: Rhein-Neckar-Verkehr GmbH - query: - - name: RheinRuhrBahn (Transdev) – RRB - query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - - name: Rurtalbahn – RTB - query: agencyId == "10858" # agencyName: "Rurtalbahn" - - name: Saarbahn - query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - - name: S-Bahn Hannover (Transdev) - query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - - name: SBB GmbH – SBB - query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - - name: Schienenverkehrsgesellschaft mbH (SVG) - query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - - name: Schwäbische Alb-Bahn – SAB - query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - - name: Snältågget – D - query: - - name: Süd-Thüringen-Bahn GmbH - query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - query: - - name: trilex - Die Länderbahn GmbH DLB – TL - query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - - name: TRI Train Rental GmbH – TRI - query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - - name: VIAS GmbH – VIA - query: agencyId == "10932" # agencyName: "VIAS GmbH" - - name: VIAS Rail GmbH – VIA - query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - - name: vlexx - query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - - name: waldbahn - Die Länderbahn GmbH DLB - query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - - name: WESTbahn – WB - query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - - name: WestfalenBahn – WFB - query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG - query: + - Abellio Rail Mitteldeutschland GmbH + - agilis – ag + - AKN Eisenbahn GmbH – AKN + - Albtal-Vekehrs-Gesellschaft mbH + - alex - Die Länderbahn GmbH DLB + - Arriva Danmark A/S + - Arriva Nederland + - Arverio Baden-Württemberg + - Arverio Bayern + - BahnTouristikExpress GmbH – BTE + - Bayerische Regiobahn – BRB + - Bayerische Zugspitzbahn Bergbahn AG + - Bentheimer Eisenbahn – BE + - Bodensee-Oberschwaben-Bahn + - Borkumer Kleinbahn- und Dampfschiffahrt GmbH + - Brohltal Schmalspureisenbahn Betriebs GmbH – P + - cantus Verkehrsgesellschaft + - City-Bahn Chemnitz – CB + - Daadetalbahn – Dab + - Dessau-Wörlitzer Eisenbahn – DWE + - Erfurter Bahn GmbH + - erixx – erx + - eurobahn + - European Sleeper – ES + - EVB ELBE-WESER GmbH – EVB + - FlixTrain GmbH – FLX + - Förderverein Mainschleifenbahn e.V. – MSB + - Freiberger Eisenbahngesellschaft mbH – FEG + - GoVolta + - Hamburger Hochbahn + - Hanseatische Eisenbahn GmbH + - Harzer Schmalspurbahn – HSB + - HLB Hessenbahn GmbH – HLB + - Kandertalbahn – KTB + - Kasbachtalbahn – P + - Leo Express + - Mecklenburgische Bäderbahn Molli – MBB + - metronom – ME + - Mitteldeutsche Regiobahn – MRB + - Mittelrheinbahn – MRB + - National Express – NX + - NEB Niederbarnimer Eisenbahn + - neg Niebüll GmbH – neg + - nordbahn – NBE + - NordWestBahn – NWB + - oberpfalzbahn - Die Länderbahn GmbH DLB + - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + - Ostdeutsche Eisenbahn GmbH + - Pressnitztalbahn – PRE + - RDC Autozug Sylt GmbH – AS + - RDC Deutschland GmbH + - REGIOBAHN + - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + - RegioTram – RT + - Rhein-Neckar-Verkehr GmbH + - RheinRuhrBahn (Transdev) – RRB + - Rurtalbahn – RTB + - Saarbahn + - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + - S-Bahn Hannover (Transdev) + - SBB GmbH – SBB + - Schienenverkehrsgesellschaft mbH (SVG) + - Schwäbische Alb-Bahn – SAB + - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + - Snältågget – D + - Süd-Thüringen-Bahn GmbH + - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + - trilex - Die Länderbahn GmbH DLB – TL + - trilex-Express - Die Länderbahn GmbH DLB – TLX + - TRI Train Rental GmbH – TRI + - VIAS GmbH – VIA + - VIAS Rail GmbH – VIA + - vlexx + - vogtlandbahn - Die Länderbahn GmbH DLB – VBG + - waldbahn - Die Länderbahn GmbH DLB + - WESTbahn – WB + - WestfalenBahn – WFB + - Württembergische Eisenbahn-Gesellschaft mbH – WEG --- ## FIP Information diff --git a/content/country/germany/index.fr.md b/content/country/germany/index.fr.md index 6b6e867c3..93330577b 100644 --- a/content/country/germany/index.fr.md +++ b/content/country/germany/index.fr.md @@ -5,170 +5,88 @@ country: "germany" params: iso_code: DE operators_without_fip: - - name: Abellio Rail Mitteldeutschland GmbH - query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" - - name: agilis – ag - query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" - - name: AKN Eisenbahn GmbH – AKN - query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - - name: Albtal-Vekehrs-Gesellschaft mbH - query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - - name: alex - Die Länderbahn GmbH DLB - query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" - - name: Arriva Danmark A/S - query: - - name: Arriva Nederland - query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) - - name: Arverio Baden-Württemberg - query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - - name: Arverio Bayern - query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - - name: BahnTouristikExpress GmbH – BTE - query: - - name: Bayerische Regiobahn – BRB - query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" - - name: Bayerische Zugspitzbahn Bergbahn AG - query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" - - name: Bentheimer Eisenbahn – BE - query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" - - name: Bodensee-Oberschwaben-Bahn - query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" - - name: Borkumer Kleinbahn- und Dampfschiffahrt GmbH - query: - - name: Brohltal Schmalspureisenbahn Betriebs GmbH – P - query: agencyId == "10845" # agencyName: "Brohltalbahn" - - name: cantus Verkehrsgesellschaft - query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" - - name: City-Bahn Chemnitz – CB - query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" - - name: Daadetalbahn – Dab - query: agencyId == "10959" # agencyName: "Daadetalbahn" - - name: Dessau-Wörlitzer Eisenbahn – DWE - query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) - - name: Erfurter Bahn GmbH - query: agencyId == "8654" # agencyName: "Erfurter Bahn" - - name: erixx – erx - query: agencyId == "10966" # agencyName: "erixx" - - name: eurobahn - query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" - - name: European Sleeper – ES - query: agencyId == "es" # agencyName: "European Sleeper" - - name: EVB ELBE-WESER GmbH – EVB - query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" - - name: FlixTrain GmbH – FLX - query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" - - name: Förderverein Mainschleifenbahn e.V. – MSB - query: agencyId == "10899" # agencyName: "Mainschleifenbahn" - - name: Freiberger Eisenbahngesellschaft mbH – FEG - query: - - name: GoVolta - query: agencyId == "IFF:GV" # agencyName: "GoVolta" - - name: Hamburger Hochbahn - query: - - name: Hanseatische Eisenbahn GmbH - query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" - - name: Harzer Schmalspurbahn – HSB - query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" - - name: HLB Hessenbahn GmbH – HLB - query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" - - name: Kandertalbahn – KTB - query: agencyId == "10848" # agencyName: "Kandertalbahn" - - name: Kasbachtalbahn – P - query: agencyId == "10862" # agencyName: "Kasbachtalbahn" - - name: Leo Express - query: agencyId == "10385" # agencyName: "LEO Express" - - name: Mecklenburgische Bäderbahn Molli – MBB - query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" - - name: metronom – ME - query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" - - name: Mitteldeutsche Regiobahn – MRB - query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" - - name: Mittelrheinbahn – MRB - query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" - - name: National Express – NX - query: agencyName == "National Express" - - name: NEB Niederbarnimer Eisenbahn - query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" - - name: neg Niebüll GmbH – neg - query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" - - name: nordbahn – NBE - query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" - - name: NordWestBahn – NWB - query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" - - name: oberpfalzbahn - Die Länderbahn GmbH DLB - query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" - - name: Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA - query: - - name: Ostdeutsche Eisenbahn GmbH - query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - - name: Pressnitztalbahn – PRE - query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - - name: RDC Autozug Sylt GmbH – AS - query: - - name: RDC Deutschland GmbH - query: - - name: REGIOBAHN - query: agencyId == "10894" # agencyName: "REGIOBAHN" - - name: Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) - query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" - - name: Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) - query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" - - name: Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN - query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" - - name: Regionalverkehre Start Deutschland GmbH (Start Unterelbe) - query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - - name: RegioTram – RT - query: - - name: Rhein-Neckar-Verkehr GmbH - query: - - name: RheinRuhrBahn (Transdev) – RRB - query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - - name: Rurtalbahn – RTB - query: agencyId == "10858" # agencyName: "Rurtalbahn" - - name: Saarbahn - query: agencyId == "8931" # agencyName: "Saarbahn GmbH" - - name: Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE - query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" - - name: S-Bahn Hannover (Transdev) - query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" - - name: SBB GmbH – SBB - query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" - - name: Schienenverkehrsgesellschaft mbH (SVG) - query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) - - name: Schwäbische Alb-Bahn – SAB - query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" - - name: SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG - query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" - - name: Snältågget – D - query: - - name: Süd-Thüringen-Bahn GmbH - query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" - - name: SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE - query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) - - name: Touristik-Eisenbahn Lüneburger Heide GmbH – TEL - query: - - name: trilex - Die Länderbahn GmbH DLB – TL - query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" - - name: trilex-Express - Die Länderbahn GmbH DLB – TLX - query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" - - name: TRI Train Rental GmbH – TRI - query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" - - name: VIAS GmbH – VIA - query: agencyId == "10932" # agencyName: "VIAS GmbH" - - name: VIAS Rail GmbH – VIA - query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" - - name: vlexx - query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" - - name: vogtlandbahn - Die Länderbahn GmbH DLB – VBG - query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" - - name: waldbahn - Die Länderbahn GmbH DLB - query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" - - name: WESTbahn – WB - query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" - - name: WestfalenBahn – WFB - query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" - - name: Württembergische Eisenbahn-Gesellschaft mbH – WEG - query: + - Abellio Rail Mitteldeutschland GmbH + - agilis – ag + - AKN Eisenbahn GmbH – AKN + - Albtal-Vekehrs-Gesellschaft mbH + - alex - Die Länderbahn GmbH DLB + - Arriva Danmark A/S + - Arriva Nederland + - Arverio Baden-Württemberg + - Arverio Bayern + - BahnTouristikExpress GmbH – BTE + - Bayerische Regiobahn – BRB + - Bayerische Zugspitzbahn Bergbahn AG + - Bentheimer Eisenbahn – BE + - Bodensee-Oberschwaben-Bahn + - Borkumer Kleinbahn- und Dampfschiffahrt GmbH + - Brohltal Schmalspureisenbahn Betriebs GmbH – P + - cantus Verkehrsgesellschaft + - City-Bahn Chemnitz – CB + - Daadetalbahn – Dab + - Dessau-Wörlitzer Eisenbahn – DWE + - Erfurter Bahn GmbH + - erixx – erx + - eurobahn + - European Sleeper – ES + - EVB ELBE-WESER GmbH – EVB + - FlixTrain GmbH – FLX + - Förderverein Mainschleifenbahn e.V. – MSB + - Freiberger Eisenbahngesellschaft mbH – FEG + - GoVolta + - Hamburger Hochbahn + - Hanseatische Eisenbahn GmbH + - Harzer Schmalspurbahn – HSB + - HLB Hessenbahn GmbH – HLB + - Kandertalbahn – KTB + - Kasbachtalbahn – P + - Leo Express + - Mecklenburgische Bäderbahn Molli – MBB + - metronom – ME + - Mitteldeutsche Regiobahn – MRB + - Mittelrheinbahn – MRB + - National Express – NX + - NEB Niederbarnimer Eisenbahn + - neg Niebüll GmbH – neg + - nordbahn – NBE + - NordWestBahn – NWB + - oberpfalzbahn - Die Länderbahn GmbH DLB + - Öchsle-Bahn Betriebsgesellschaft mbH – ÖBA + - Ostdeutsche Eisenbahn GmbH + - Pressnitztalbahn – PRE + - RDC Autozug Sylt GmbH – AS + - RDC Deutschland GmbH + - REGIOBAHN + - Regionalverkehre Start Deutschland GmbH (Start Mitteldeutschland) + - Regionalverkehre Start Deutschland GmbH (Start Niedersachsen-Mitte) + - Regionalverkehre Start Deutschland GmbH (Start Taunus) – STN + - Regionalverkehre Start Deutschland GmbH (Start Unterelbe) + - RegioTram – RT + - Rhein-Neckar-Verkehr GmbH + - RheinRuhrBahn (Transdev) – RRB + - Rurtalbahn – RTB + - Saarbahn + - Sächsisch-Oberlausitzer Eisenbahngesellschaft – SOE + - S-Bahn Hannover (Transdev) + - SBB GmbH – SBB + - Schienenverkehrsgesellschaft mbH (SVG) + - Schwäbische Alb-Bahn – SAB + - SDG Sächsische Dampfeisenbahngesellschaft mbH – SDG + - Snältågget – D + - Süd-Thüringen-Bahn GmbH + - SWEG Südwestdeutsche Landesverkehrs-GmbH – SWE + - Touristik-Eisenbahn Lüneburger Heide GmbH – TEL + - trilex - Die Länderbahn GmbH DLB – TL + - trilex-Express - Die Länderbahn GmbH DLB – TLX + - TRI Train Rental GmbH – TRI + - VIAS GmbH – VIA + - VIAS Rail GmbH – VIA + - vlexx + - vogtlandbahn - Die Länderbahn GmbH DLB – VBG + - waldbahn - Die Länderbahn GmbH DLB + - WESTbahn – WB + - WestfalenBahn – WFB + - Württembergische Eisenbahn-Gesellschaft mbH – WEG --- ## Informations FIP diff --git a/content/country/germany/transitous.yaml b/content/country/germany/transitous.yaml new file mode 100644 index 000000000..daf12b6f8 --- /dev/null +++ b/content/country/germany/transitous.yaml @@ -0,0 +1,69 @@ +- query: agencyId == "11961" # agencyName: "Abellio Rail Mitteldeutschland GmbH" +- query: agencyId == "10838" || agencyId == "10940" # agencyName: "agilis" / "agilis-Schnellzug" +- query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" +- query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" +- query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" +- query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) +- query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" +- query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" +- query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" +- query: agencyId == "10971" # agencyName: "Bayerische Zugspitzbahn" +- query: agencyId == "10847" || agencyId == "1249" # agencyName: "Bentheimer Eisenbahn" +- query: agencyId == "10867" # agencyName: "Bodensee-Oberschwaben-Bahn" +- query: agencyId == "10845" # agencyName: "Brohltalbahn" +- query: agencyId == "10907" || agencyId == "608" # agencyName: "cantus Verkehrsgesellschaft" +- query: agencyId == "10851" # agencyName: "City-Bahn Chemnitz" +- query: agencyId == "10959" # agencyName: "Daadetalbahn" +- query: agencyId == "10358" # agencyName: "Dessauer Verkehrs- und Eisenbahngesellschaft" (routeShortName: DWE) +- query: agencyId == "8654" # agencyName: "Erfurter Bahn" +- query: agencyId == "10966" # agencyName: "erixx" +- query: agencyId == "2155" || agencyId == "11049" # agencyName: "eurobahn" / "Eurobahn" +- query: agencyId == "es" # agencyName: "European Sleeper" +- query: agencyId == "10861" # agencyName: "EVB ELBE-WESER GmbH" +- query: agencyId == "13796" || agencyId == "FLIXTRAIN-eu" # agencyName: "FlixTrain-de" / "FlixTrain-eu" +- query: agencyId == "10899" # agencyName: "Mainschleifenbahn" +- query: agencyId == "IFF:GV" # agencyName: "GoVolta" +- query: agencyId == "10927" || agencyId == "751" # agencyName: "Hanseatische Eisenbahn GmbH" +- query: agencyId == "10875" || agencyId == "8875" # agencyName: "Harzer Schmalspurbahn" / "Harzer Schmalspurbahnen" +- query: agencyId == "11046" # agencyName: "Hessische Landesbahn GmbH" +- query: agencyId == "10848" # agencyName: "Kandertalbahn" +- query: agencyId == "10862" # agencyName: "Kasbachtalbahn" +- query: agencyId == "10385" # agencyName: "LEO Express" +- query: agencyId == "10904" # agencyName: "Mecklenburgische Bäderbahn Molli" +- query: agencyId == "10931" || agencyId == "606" # agencyName: "metronom" / "metronom Eisenbahngesellschaft mbH" +- query: agencyId == "10853" || agencyId == "856" # agencyName: "Mitteldeutsche Regiobahn" +- query: agencyId == "10946" # agencyName: "MittelrheinBahn (Trans Regio)" +- query: agencyName == "National Express" +- query: agencyId == "10912" # agencyName: "NEB Niederbarnimer Eisenbahn" +- query: agencyId == "10905" # agencyName: "Norddeutsche Eisenbahn Gesellschaft" +- query: agencyId == "10919" # agencyName: "Nordbahn Eisenbahngesellschaft" +- query: agencyId == "12638" || agencyId == "605" # agencyName: "NordWestBahn" +- query: agencyId == "10923" # agencyName: "oberpfalzbahn - Die Länderbahn GmbH DLB" +- query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" +- query: agencyId == "10937" # agencyName: "Pressnitztalbahn" +- query: agencyId == "10894" # agencyName: "REGIOBAHN" +- query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" +- query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" +- query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" +- query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" +- query: agencyId == "14173" # agencyName: "RheinRuhrBahn" +- query: agencyId == "10858" # agencyName: "Rurtalbahn" +- query: agencyId == "8931" # agencyName: "Saarbahn GmbH" +- query: agencyId == "10924" # agencyName: "Sächsisch-Oberlausitzer Eisenbahngesellschaft" +- query: agencyId == "2506" # agencyName: "S-Bahn Hannover (Transdev)" +- query: agencyId == "351" || agencyId == "L7____" # agencyName: "SBB GmbH (Grenzverkehr)" / "SBB GmbH" +- query: agencyId == "10918" # agencyName: "DB Fernverkehr (Codesharing)" (IC services operated by SVG on behalf of DB Fernverkehr) +- query: agencyId == "12894" # agencyName: "Schwäbische Alb-Bahn" +- query: agencyId == "10846" # agencyName: "SDG Sächsische Dampfeisenbahngesellschaft mbH" +- query: agencyId == "10942" # agencyName: "Süd-Thüringen-Bahn" +- query: agencyId == "10939" # agencyName: "Südwestdeutsche Verkehrs-AG" (SWEG operates under this brand) +- query: agencyId == "10892" # agencyName: "trilex - Die Länderbahn GmbH DLB" +- query: agencyId == "10890" # agencyName: "trilex-express - Die Länderbahn GmbH DLB" +- query: agencyId == "13122" # agencyName: "TRI Train Rental GmbH" +- query: agencyId == "10932" # agencyName: "VIAS GmbH" +- query: agencyId == "10933" # agencyName: "VIAS Rail GmbH" +- query: agencyId == "10951" || agencyId == "10952" # agencyName: "vlexx" / "vlexx1" +- query: agencyId == "10382" # agencyName: "vogtlandbahn - Die Länderbahn GmbH DLB" +- query: agencyId == "10964" # agencyName: "waldbahn - Die Länderbahn GmbH DLB" +- query: agencyId == "02" || agencyId == "10383" # agencyName: "WESTbahn Management GmbH" / "WESTbahn" +- query: agencyId == "13291" || agencyId == "810" # agencyName: "WestfalenBahn" diff --git a/content/country/greece/index.de.md b/content/country/greece/index.de.md index e61aabc79..938e56ff7 100644 --- a/content/country/greece/index.de.md +++ b/content/country/greece/index.de.md @@ -5,10 +5,8 @@ country: "greece" params: iso_code: GR operators_without_fip: - - name: STASY (Urban Rail Transport S.A.) - query: - - name: THEMA S.A. – Thessaloniki Metro - query: + - STASY (Urban Rail Transport S.A.) + - THEMA S.A. – Thessaloniki Metro --- ## FIP Nutzung diff --git a/content/country/greece/index.en.md b/content/country/greece/index.en.md index 0c2fa14b7..305147e4d 100644 --- a/content/country/greece/index.en.md +++ b/content/country/greece/index.en.md @@ -5,10 +5,8 @@ country: "greece" params: iso_code: GR operators_without_fip: - - name: STASY (Urban Rail Transport S.A.) - query: - - name: THEMA S.A. – Thessaloniki Metro - query: + - STASY (Urban Rail Transport S.A.) + - THEMA S.A. – Thessaloniki Metro --- ## FIP Information diff --git a/content/country/greece/index.fr.md b/content/country/greece/index.fr.md index 723ce8152..bb13e7676 100644 --- a/content/country/greece/index.fr.md +++ b/content/country/greece/index.fr.md @@ -5,10 +5,8 @@ country: "greece" params: iso_code: GR operators_without_fip: - - name: STASY (Urban Rail Transport S.A.) - query: - - name: THEMA S.A. – Thessaloniki Metro - query: + - STASY (Urban Rail Transport S.A.) + - THEMA S.A. – Thessaloniki Metro --- ## Informations FIP diff --git a/content/country/ireland/index.de.md b/content/country/ireland/index.de.md index 4ac176c3c..223bc7e4e 100644 --- a/content/country/ireland/index.de.md +++ b/content/country/ireland/index.de.md @@ -5,8 +5,7 @@ country: "ireland" params: iso_code: IE operators_without_fip: - - name: Transdev (Luas - Straßenbahn Dublin) - query: agencyId == "10000" # agencyName: "LUAS" + - Transdev (Luas - Straßenbahn Dublin) --- ## FIP Nutzung diff --git a/content/country/ireland/index.en.md b/content/country/ireland/index.en.md index f3e44c919..8c51089c1 100644 --- a/content/country/ireland/index.en.md +++ b/content/country/ireland/index.en.md @@ -5,8 +5,7 @@ country: "ireland" params: iso_code: IE operators_without_fip: - - name: Transdev (Luas - Dublin Tram) - query: agencyId == "10000" # agencyName: "LUAS" + - Transdev (Luas - Dublin Tram) --- ## FIP Information diff --git a/content/country/ireland/index.fr.md b/content/country/ireland/index.fr.md index cdd559889..6701116d0 100644 --- a/content/country/ireland/index.fr.md +++ b/content/country/ireland/index.fr.md @@ -5,8 +5,7 @@ country: "ireland" params: iso_code: IE operators_without_fip: - - name: Transdev (Luas - Tramway de Dublin) - query: agencyId == "10000" # agencyName: "LUAS" + - Transdev (Luas - Tramway de Dublin) --- ## Informations FIP diff --git a/content/country/ireland/transitous.yaml b/content/country/ireland/transitous.yaml new file mode 100644 index 000000000..34b000064 --- /dev/null +++ b/content/country/ireland/transitous.yaml @@ -0,0 +1 @@ +- query: agencyId == "10000" # agencyName: "LUAS" diff --git a/content/country/italy/index.de.md b/content/country/italy/index.de.md index 5fc79c8c0..d3f4a09f3 100644 --- a/content/country/italy/index.de.md +++ b/content/country/italy/index.de.md @@ -5,22 +5,14 @@ country: "italy" params: iso_code: IT operators_without_fip: - - name: Azienda Regionale Sarda Trasporti - query: - - name: Circumflegrea - query: - - name: Circumvesuviana - query: - - name: Cumana - query: - - name: European Sleeper - query: - - name: '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud Est")' - query: - - name: Italo / NTV - query: - - name: '[Trenord](/operator/fs#gültigkeit-fip-tickets "Trenord")' - query: + - Azienda Regionale Sarda Trasporti + - Circumflegrea + - Circumvesuviana + - Cumana + - European Sleeper + - '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud Est")' + - Italo / NTV + - '[Trenord](/operator/fs#gültigkeit-fip-tickets "Trenord")' --- ## FIP Nutzung diff --git a/content/country/italy/index.en.md b/content/country/italy/index.en.md index 63f2b715d..2a14383f3 100644 --- a/content/country/italy/index.en.md +++ b/content/country/italy/index.en.md @@ -5,22 +5,14 @@ country: "italy" params: iso_code: IT operators_without_fip: - - name: Azienda Regionale Sarda Trasporti - query: - - name: Circumflegrea - query: - - name: Circumvesuviana - query: - - name: Cumana - query: - - name: European Sleeper - query: - - name: '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud Est")' - query: - - name: Italo / NTV - query: - - name: '[Trenord](/operator/fs##validity-of-fip-tickets "Trenord")' - query: + - Azienda Regionale Sarda Trasporti + - Circumflegrea + - Circumvesuviana + - Cumana + - European Sleeper + - '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud Est")' + - Italo / NTV + - '[Trenord](/operator/fs##validity-of-fip-tickets "Trenord")' --- ## FIP Information diff --git a/content/country/italy/index.fr.md b/content/country/italy/index.fr.md index 9b951ade0..960392443 100644 --- a/content/country/italy/index.fr.md +++ b/content/country/italy/index.fr.md @@ -5,22 +5,14 @@ country: "italy" params: iso_code: IT operators_without_fip: - - name: Azienda Regionale Sarda Trasporti - query: - - name: Circumflegrea - query: - - name: Circumvesuviana - query: - - name: Cumana - query: - - name: European Sleeper - query: - - name: ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud Est")’ - query: - - name: Italo / NTV - query: - - name: ’[Trenord](/operator/fs#validité-des-billets-fip "Trenord")’ - query: + - Azienda Regionale Sarda Trasporti + - Circumflegrea + - Circumvesuviana + - Cumana + - European Sleeper + - ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud Est")’ + - Italo / NTV + - ’[Trenord](/operator/fs#validité-des-billets-fip "Trenord")’ --- ## Informations FIP diff --git a/content/country/latvia/index.de.md b/content/country/latvia/index.de.md index a526352df..5ac0965eb 100644 --- a/content/country/latvia/index.de.md +++ b/content/country/latvia/index.de.md @@ -5,8 +5,7 @@ country: "latvia" params: iso_code: LV operators_without_fip: - - name: "Latvijas dzelzceļš (LDz)" - query: + - Latvijas dzelzceļš (LDz) --- ## FIP Nutzung diff --git a/content/country/latvia/index.en.md b/content/country/latvia/index.en.md index 765bdbf38..b4df14c3c 100644 --- a/content/country/latvia/index.en.md +++ b/content/country/latvia/index.en.md @@ -5,8 +5,7 @@ country: "latvia" params: iso_code: LV operators_without_fip: - - name: "Latvijas dzelzceļš (LDz)" - query: + - Latvijas dzelzceļš (LDz) --- ## FIP Information diff --git a/content/country/latvia/index.fr.md b/content/country/latvia/index.fr.md index 9ee5bb418..89d465268 100644 --- a/content/country/latvia/index.fr.md +++ b/content/country/latvia/index.fr.md @@ -5,8 +5,7 @@ country: "latvia" params: iso_code: LV operators_without_fip: - - name: "Latvijas dzelzceļš (LDz)" - query: + - Latvijas dzelzceļš (LDz) --- ## Informations FIP diff --git a/content/country/lithuania/index.de.md b/content/country/lithuania/index.de.md index 771c87aa3..ffde83cc4 100644 --- a/content/country/lithuania/index.de.md +++ b/content/country/lithuania/index.de.md @@ -5,8 +5,7 @@ country: "lithuania" params: iso_code: LT operators_without_fip: - - name: "Aukštaitijos siaurasis geležinkelis (Museumsbahn)" - query: + - Aukštaitijos siaurasis geležinkelis (Museumsbahn) --- ## FIP Nutzung diff --git a/content/country/lithuania/index.en.md b/content/country/lithuania/index.en.md index 74a694210..998a2e544 100644 --- a/content/country/lithuania/index.en.md +++ b/content/country/lithuania/index.en.md @@ -5,8 +5,7 @@ country: "lithuania" params: iso_code: LT operators_without_fip: - - name: "Aukštaitijos siaurasis geležinkelis (heritage railway)" - query: + - Aukštaitijos siaurasis geležinkelis (heritage railway) --- ## FIP Information diff --git a/content/country/lithuania/index.fr.md b/content/country/lithuania/index.fr.md index da891b353..f8453cce2 100644 --- a/content/country/lithuania/index.fr.md +++ b/content/country/lithuania/index.fr.md @@ -5,8 +5,7 @@ country: "lithuania" params: iso_code: LT operators_without_fip: - - name: "Aukštaitijos siaurasis geležinkelis (chemin de fer musée)" - query: + - Aukštaitijos siaurasis geležinkelis (chemin de fer musée) --- ## Informations FIP diff --git a/content/country/netherlands/index.de.md b/content/country/netherlands/index.de.md index 90e2957ad..8bb8a4a5b 100644 --- a/content/country/netherlands/index.de.md +++ b/content/country/netherlands/index.de.md @@ -5,22 +5,14 @@ country: "netherlands" params: iso_code: NL operators_without_fip: - - name: Arriva Nederland - query: - - name: Breng - query: - - name: Connexxion - query: - - name: European Sleeper - query: - - name: GoVolta - query: - - name: Keolis Nederland - query: - - name: Qbuzz - query: - - name: VIAS Rail - query: + - Arriva Nederland + - Breng + - Connexxion + - European Sleeper + - GoVolta + - Keolis Nederland + - Qbuzz + - VIAS Rail --- ## FIP Nutzung diff --git a/content/country/netherlands/index.en.md b/content/country/netherlands/index.en.md index 29ce1df5f..cb64ab56b 100644 --- a/content/country/netherlands/index.en.md +++ b/content/country/netherlands/index.en.md @@ -5,22 +5,14 @@ country: "netherlands" params: iso_code: NL operators_without_fip: - - name: Arriva Nederland - query: - - name: Breng - query: - - name: Connexxion - query: - - name: European Sleeper - query: - - name: GoVolta - query: - - name: Keolis Nederland - query: - - name: Qbuzz - query: - - name: VIAS Rail - query: + - Arriva Nederland + - Breng + - Connexxion + - European Sleeper + - GoVolta + - Keolis Nederland + - Qbuzz + - VIAS Rail --- ## FIP Information diff --git a/content/country/netherlands/index.fr.md b/content/country/netherlands/index.fr.md index 4bc70115d..e872ac187 100644 --- a/content/country/netherlands/index.fr.md +++ b/content/country/netherlands/index.fr.md @@ -5,22 +5,14 @@ country: "netherlands" params: iso_code: NL operators_without_fip: - - name: Arriva Nederland - query: - - name: Breng - query: - - name: Connexxion - query: - - name: European Sleeper - query: - - name: GoVolta - query: - - name: Keolis Nederland - query: - - name: Qbuzz - query: - - name: VIAS Rail - query: + - Arriva Nederland + - Breng + - Connexxion + - European Sleeper + - GoVolta + - Keolis Nederland + - Qbuzz + - VIAS Rail --- ## Informations FIP diff --git a/content/country/norway/index.de.md b/content/country/norway/index.de.md index 53ec7307d..457bdeb31 100644 --- a/content/country/norway/index.de.md +++ b/content/country/norway/index.de.md @@ -5,14 +5,10 @@ country: "norway" params: iso_code: NO operators_without_fip: - - name: Arctic Train - query: - - name: Flåmbahn - query: - - name: Flytoget Airport Express - query: - - name: SJ Sverige - query: + - Arctic Train + - Flåmbahn + - Flytoget Airport Express + - SJ Sverige --- ## FIP Nutzung diff --git a/content/country/norway/index.en.md b/content/country/norway/index.en.md index d9dd6342b..168314fd4 100644 --- a/content/country/norway/index.en.md +++ b/content/country/norway/index.en.md @@ -5,14 +5,10 @@ country: "norway" params: iso_code: NO operators_without_fip: - - name: Arctic Train - query: - - name: Flåm Railway - query: - - name: Flytoget Airport Express - query: - - name: SJ Sverige - query: + - Arctic Train + - Flåm Railway + - Flytoget Airport Express + - SJ Sverige --- ## FIP Information diff --git a/content/country/norway/index.fr.md b/content/country/norway/index.fr.md index 40620ac0c..72adfed10 100644 --- a/content/country/norway/index.fr.md +++ b/content/country/norway/index.fr.md @@ -5,14 +5,10 @@ country: "norway" params: iso_code: NO operators_without_fip: - - name: Arctic Train - query: - - name: Chemin de fer de Flåm - query: - - name: Flytoget Airport Express - query: - - name: SJ Sverige - query: + - Arctic Train + - Chemin de fer de Flåm + - Flytoget Airport Express + - SJ Sverige --- ## Informations FIP diff --git a/content/country/poland/index.de.md b/content/country/poland/index.de.md index 70c74529d..4fc361e5d 100644 --- a/content/country/poland/index.de.md +++ b/content/country/poland/index.de.md @@ -5,18 +5,12 @@ country: "poland" params: iso_code: PL operators_without_fip: - - name: Arriva - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Szybka Kolej Miejska w Warszawie - query: - - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - query: - - name: Warszawska Kolej Dojazdowa (WKD) - query: + - Arriva + - Leo Express + - RegioJet + - Szybka Kolej Miejska w Warszawie + - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + - Warszawska Kolej Dojazdowa (WKD) --- ## FIP Nutzung diff --git a/content/country/poland/index.en.md b/content/country/poland/index.en.md index ca4c3b3fc..fb409d64e 100644 --- a/content/country/poland/index.en.md +++ b/content/country/poland/index.en.md @@ -5,18 +5,12 @@ country: "poland" params: iso_code: PL operators_without_fip: - - name: Arriva - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Szybka Kolej Miejska w Warszawie - query: - - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - query: - - name: Warszawska Kolej Dojazdowa (WKD) - query: + - Arriva + - Leo Express + - RegioJet + - Szybka Kolej Miejska w Warszawie + - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + - Warszawska Kolej Dojazdowa (WKD) --- ## FIP Information diff --git a/content/country/poland/index.fr.md b/content/country/poland/index.fr.md index 38e2b61fd..f6442d1dc 100644 --- a/content/country/poland/index.fr.md +++ b/content/country/poland/index.fr.md @@ -5,18 +5,12 @@ country: "poland" params: iso_code: PL operators_without_fip: - - name: Arriva - query: - - name: Leo Express - query: - - name: RegioJet - query: - - name: Szybka Kolej Miejska w Warszawie - query: - - name: Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - query: - - name: Warszawska Kolej Dojazdowa (WKD) - query: + - Arriva + - Leo Express + - RegioJet + - Szybka Kolej Miejska w Warszawie + - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) + - Warszawska Kolej Dojazdowa (WKD) --- ## Informations FIP diff --git a/content/country/portugal/index.de.md b/content/country/portugal/index.de.md index 6f6e791db..e40716dfa 100644 --- a/content/country/portugal/index.de.md +++ b/content/country/portugal/index.de.md @@ -5,8 +5,7 @@ country: "portugal" params: iso_code: PT operators_without_fip: - - name: Fertagus - query: agencyId == "15" # agencyName: "Fertagus" + - Fertagus --- ## FIP Nutzung diff --git a/content/country/portugal/index.en.md b/content/country/portugal/index.en.md index 48437673d..518c53d3c 100644 --- a/content/country/portugal/index.en.md +++ b/content/country/portugal/index.en.md @@ -5,8 +5,7 @@ country: "portugal" params: iso_code: PT operators_without_fip: - - name: Fertagus - query: agencyId == "15" # agencyName: "Fertagus" + - Fertagus --- ## FIP Information diff --git a/content/country/portugal/index.fr.md b/content/country/portugal/index.fr.md index 4ebd6195f..0c6305dd2 100644 --- a/content/country/portugal/index.fr.md +++ b/content/country/portugal/index.fr.md @@ -5,8 +5,7 @@ country: "portugal" params: iso_code: PT operators_without_fip: - - name: Fertagus - query: agencyId == "15" # agencyName: "Fertagus" + - Fertagus --- ## Informations FIP diff --git a/content/country/portugal/transitous.yaml b/content/country/portugal/transitous.yaml new file mode 100644 index 000000000..12aadbb2d --- /dev/null +++ b/content/country/portugal/transitous.yaml @@ -0,0 +1 @@ +- query: agencyId == "15" # agencyName: "Fertagus" diff --git a/content/country/romania/index.de.md b/content/country/romania/index.de.md index d41270fc4..97ab52805 100644 --- a/content/country/romania/index.de.md +++ b/content/country/romania/index.de.md @@ -5,18 +5,12 @@ country: "romania" params: iso_code: RO operators_without_fip: - - name: Astra Trains Carpatic (ATC) - query: - - name: IRC (InterRegional Călători) - query: - - name: RC (Regio Călători) - query: - - name: SFTRA (Softrans) - query: - - name: TFC (Transferoviar Călători) - query: - - name: TFI (Ferotrans) - query: + - Astra Trains Carpatic (ATC) + - IRC (InterRegional Călători) + - RC (Regio Călători) + - SFTRA (Softrans) + - TFC (Transferoviar Călători) + - TFI (Ferotrans) --- ## FIP Nutzung diff --git a/content/country/romania/index.en.md b/content/country/romania/index.en.md index 2db403488..35bd9a2c7 100644 --- a/content/country/romania/index.en.md +++ b/content/country/romania/index.en.md @@ -5,18 +5,12 @@ country: "romania" params: iso_code: RO operators_without_fip: - - name: Astra Trains Carpatic (ATC) - query: - - name: IRC (InterRegional Călători) - query: - - name: RC (Regio Călători) - query: - - name: SFTRA (Softrans) - query: - - name: TFC (Transferoviar Călători) - query: - - name: TFI (Ferotrans) - query: + - Astra Trains Carpatic (ATC) + - IRC (InterRegional Călători) + - RC (Regio Călători) + - SFTRA (Softrans) + - TFC (Transferoviar Călători) + - TFI (Ferotrans) --- ## FIP Information diff --git a/content/country/romania/index.fr.md b/content/country/romania/index.fr.md index e81abba28..d71b245d9 100644 --- a/content/country/romania/index.fr.md +++ b/content/country/romania/index.fr.md @@ -5,18 +5,12 @@ country: "romania" params: iso_code: RO operators_without_fip: - - name: Astra Trains Carpatic (ATC) - query: - - name: IRC (InterRegional Călători) - query: - - name: RC (Regio Călători) - query: - - name: SFTRA (Softrans) - query: - - name: TFC (Transferoviar Călători) - query: - - name: TFI (Ferotrans) - query: + - Astra Trains Carpatic (ATC) + - IRC (InterRegional Călători) + - RC (Regio Călători) + - SFTRA (Softrans) + - TFC (Transferoviar Călători) + - TFI (Ferotrans) --- ## Informations FIP diff --git a/content/country/serbia/index.de.md b/content/country/serbia/index.de.md index a9e9447bf..d0921cca4 100644 --- a/content/country/serbia/index.de.md +++ b/content/country/serbia/index.de.md @@ -5,8 +5,7 @@ country: "serbia" params: iso_code: RS operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Nutzung diff --git a/content/country/serbia/index.en.md b/content/country/serbia/index.en.md index ee364e343..be638455c 100644 --- a/content/country/serbia/index.en.md +++ b/content/country/serbia/index.en.md @@ -5,8 +5,7 @@ country: "serbia" params: iso_code: RS operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Information diff --git a/content/country/serbia/index.fr.md b/content/country/serbia/index.fr.md index 2a14fd15f..20cec23d2 100644 --- a/content/country/serbia/index.fr.md +++ b/content/country/serbia/index.fr.md @@ -5,8 +5,7 @@ country: "serbia" params: iso_code: RS operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## Informations FIP diff --git a/content/country/slovakia/index.de.md b/content/country/slovakia/index.de.md index 59691e6d9..ce1e513e0 100644 --- a/content/country/slovakia/index.de.md +++ b/content/country/slovakia/index.de.md @@ -5,10 +5,8 @@ country: "slovakia" params: iso_code: SK operators_without_fip: - - name: RegioJet - query: - - name: Leo Express - query: + - RegioJet + - Leo Express --- ## FIP Nutzung diff --git a/content/country/slovakia/index.en.md b/content/country/slovakia/index.en.md index eb5c3af79..cb7232a78 100644 --- a/content/country/slovakia/index.en.md +++ b/content/country/slovakia/index.en.md @@ -5,10 +5,8 @@ country: "slovakia" params: iso_code: SK operators_without_fip: - - name: RegioJet - query: - - name: Leo Express - query: + - RegioJet + - Leo Express --- ## FIP Information diff --git a/content/country/slovakia/index.fr.md b/content/country/slovakia/index.fr.md index 635f35032..119bb13de 100644 --- a/content/country/slovakia/index.fr.md +++ b/content/country/slovakia/index.fr.md @@ -5,10 +5,8 @@ country: "slovakia" params: iso_code: SK operators_without_fip: - - name: RegioJet - query: - - name: Leo Express - query: + - RegioJet + - Leo Express --- ## Informations FIP diff --git a/content/country/slovenia/index.de.md b/content/country/slovenia/index.de.md index 6f7677d51..1cc105679 100644 --- a/content/country/slovenia/index.de.md +++ b/content/country/slovenia/index.de.md @@ -5,8 +5,7 @@ country: "slovenia" params: iso_code: SI operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Nutzung diff --git a/content/country/slovenia/index.en.md b/content/country/slovenia/index.en.md index b1f50e11d..cb507d64e 100644 --- a/content/country/slovenia/index.en.md +++ b/content/country/slovenia/index.en.md @@ -5,8 +5,7 @@ country: "slovenia" params: iso_code: SI operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## FIP Information diff --git a/content/country/slovenia/index.fr.md b/content/country/slovenia/index.fr.md index 0362a17c4..39936d934 100644 --- a/content/country/slovenia/index.fr.md +++ b/content/country/slovenia/index.fr.md @@ -5,8 +5,7 @@ country: "slovenia" params: iso_code: SI operators_without_fip: - - name: Optima Express - query: + - Optima Express --- ## Informations FIP diff --git a/content/country/spain/index.de.md b/content/country/spain/index.de.md index e6df26c87..8aea43e63 100644 --- a/content/country/spain/index.de.md +++ b/content/country/spain/index.de.md @@ -5,12 +5,9 @@ country: "spain" params: iso_code: ES operators_without_fip: - - name: Iryo - query: - - name: '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - query: - - name: '[Avlo](/operator/renfe#langstrecke "Avlo")' - query: + - Iryo + - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' + - '[Avlo](/operator/renfe#langstrecke "Avlo")' --- ## FIP Nutzung diff --git a/content/country/spain/index.en.md b/content/country/spain/index.en.md index f090fbd32..0d851b678 100644 --- a/content/country/spain/index.en.md +++ b/content/country/spain/index.en.md @@ -5,12 +5,9 @@ country: "spain" params: iso_code: ES operators_without_fip: - - name: Iryo - query: - - name: OUIGO - query: - - name: '[Avlo](/operator/renfe#long-distance "Avlo")' - query: + - Iryo + - OUIGO + - '[Avlo](/operator/renfe#long-distance "Avlo")' --- ## FIP Information diff --git a/content/country/spain/index.fr.md b/content/country/spain/index.fr.md index cf5b34311..c891c9519 100644 --- a/content/country/spain/index.fr.md +++ b/content/country/spain/index.fr.md @@ -5,12 +5,9 @@ country: "spain" params: iso_code: ES operators_without_fip: - - name: Iryo - query: - - name: OUIGO - query: - - name: ’[Avlo](/operator/renfe#longue-distance "Avlo")’ - query: + - Iryo + - OUIGO + - ’[Avlo](/operator/renfe#longue-distance "Avlo")’ --- ## Informations FIP diff --git a/content/country/switzerland/index.de.md b/content/country/switzerland/index.de.md index aa277cc81..467ec4838 100644 --- a/content/country/switzerland/index.de.md +++ b/content/country/switzerland/index.de.md @@ -5,18 +5,12 @@ country: "switzerland" params: iso_code: CH operators_without_fip: - - name: European Sleeper - query: - - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) - query: - - name: Luftseilbahn Wengen – Männlichen - query: - - name: Gondelbahn Grindelwald – Männlichen (GGM) - query: - - name: Seilbahn Mürren – Allmendhubel (SMA) - query: - - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) - query: + - European Sleeper + - Heimwehfluhbahn (Interlaken – Heimwehfluh) + - Luftseilbahn Wengen – Männlichen + - Gondelbahn Grindelwald – Männlichen (GGM) + - Seilbahn Mürren – Allmendhubel (SMA) + - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) --- ## FIP Nutzung diff --git a/content/country/switzerland/index.en.md b/content/country/switzerland/index.en.md index fc0b81786..eee685140 100644 --- a/content/country/switzerland/index.en.md +++ b/content/country/switzerland/index.en.md @@ -5,18 +5,12 @@ country: "switzerland" params: iso_code: CH operators_without_fip: - - name: European Sleeper - query: - - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) - query: - - name: Luftseilbahn Wengen – Männlichen - query: - - name: Gondelbahn Grindelwald – Männlichen (GGM) - query: - - name: Seilbahn Mürren – Allmendhubel (SMA) - query: - - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) - query: + - European Sleeper + - Heimwehfluhbahn (Interlaken – Heimwehfluh) + - Luftseilbahn Wengen – Männlichen + - Gondelbahn Grindelwald – Männlichen (GGM) + - Seilbahn Mürren – Allmendhubel (SMA) + - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) --- ## FIP Information diff --git a/content/country/switzerland/index.fr.md b/content/country/switzerland/index.fr.md index 7b9e43d77..d2f4e505f 100644 --- a/content/country/switzerland/index.fr.md +++ b/content/country/switzerland/index.fr.md @@ -5,18 +5,12 @@ country: "switzerland" params: iso_code: CH operators_without_fip: - - name: European Sleeper - query: - - name: Heimwehfluhbahn (Interlaken – Heimwehfluh) - query: - - name: Luftseilbahn Wengen – Männlichen - query: - - name: Gondelbahn Grindelwald – Männlichen (GGM) - query: - - name: Seilbahn Mürren – Allmendhubel (SMA) - query: - - name: Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) - query: + - European Sleeper + - Heimwehfluhbahn (Interlaken – Heimwehfluh) + - Luftseilbahn Wengen – Männlichen + - Gondelbahn Grindelwald – Männlichen (GGM) + - Seilbahn Mürren – Allmendhubel (SMA) + - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) --- ## Informations FIP diff --git a/content/country/united-kingdom/index.de.md b/content/country/united-kingdom/index.de.md index f7ac22b5b..357c49fdf 100644 --- a/content/country/united-kingdom/index.de.md +++ b/content/country/united-kingdom/index.de.md @@ -5,36 +5,21 @@ country: "united-kingdom" params: iso_code: GB operators_without_fip: - - name: Blackpool Tramway - query: - - name: Caledonian MacBrayne Ferries - query: - - name: Docklands Light Railway - query: - - name: Edinburgh Tramway - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: Glasgow Subway - query: - - name: Hovertravel (Portsmouth nach Ryde auf der Isle of Wight) - query: - - name: '[London Underground](/operator/gb#verkehr-in-london "London Underground")' - query: - - name: Midland Metro (Birmingham nach Wolverhampton) - query: - - name: Nottingham Express Transit - query: - - name: Sheffield Supertram - query: - - name: London Trams (ehemals Croydon Tramlink) - query: - - name: Transport for Greater Manchester - query: - - name: Tyne and Wear Metro - query: - - name: Wightlink ferry (Portsmouth Harbour nach Ryde Pier Head station auf der Isle of Wight) - query: + - Blackpool Tramway + - Caledonian MacBrayne Ferries + - Docklands Light Railway + - Edinburgh Tramway + - Getlink (Eurotunnel LeShuttle) + - Glasgow Subway + - Hovertravel (Portsmouth nach Ryde auf der Isle of Wight) + - '[London Underground](/operator/gb#verkehr-in-london "London Underground")' + - Midland Metro (Birmingham nach Wolverhampton) + - Nottingham Express Transit + - Sheffield Supertram + - London Trams (ehemals Croydon Tramlink) + - Transport for Greater Manchester + - Tyne and Wear Metro + - Wightlink ferry (Portsmouth Harbour nach Ryde Pier Head station auf der Isle of Wight) --- diff --git a/content/country/united-kingdom/index.en.md b/content/country/united-kingdom/index.en.md index 31aa896c8..09d5bddde 100644 --- a/content/country/united-kingdom/index.en.md +++ b/content/country/united-kingdom/index.en.md @@ -5,36 +5,21 @@ country: "united-kingdom" params: iso_code: GB operators_without_fip: - - name: Blackpool Tramway - query: - - name: Caledonian MacBrayne Ferries - query: - - name: Docklands Light Railway - query: - - name: Edinburgh Tramway - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: Glasgow Subway - query: - - name: Hovertravel (Portsmouth to Ryde on the Isle of Wight) - query: - - name: '[London Underground](/operator/gb#verkehr-in-london "London Underground")' - query: - - name: Midland Metro (Birmingham to Wolverhampton) - query: - - name: Nottingham Express Transit - query: - - name: Sheffield Supertram - query: - - name: London Trams (formerly Croydon Tramlink) - query: - - name: Transport for Greater Manchester - query: - - name: Tyne and Wear Metro - query: - - name: Wightlink ferry (Portsmouth Harbour to Ryde Pier Head station on the Isle of Wight) - query: + - Blackpool Tramway + - Caledonian MacBrayne Ferries + - Docklands Light Railway + - Edinburgh Tramway + - Getlink (Eurotunnel LeShuttle) + - Glasgow Subway + - Hovertravel (Portsmouth to Ryde on the Isle of Wight) + - '[London Underground](/operator/gb#verkehr-in-london "London Underground")' + - Midland Metro (Birmingham to Wolverhampton) + - Nottingham Express Transit + - Sheffield Supertram + - London Trams (formerly Croydon Tramlink) + - Transport for Greater Manchester + - Tyne and Wear Metro + - Wightlink ferry (Portsmouth Harbour to Ryde Pier Head station on the Isle of Wight) --- diff --git a/content/country/united-kingdom/index.fr.md b/content/country/united-kingdom/index.fr.md index e4c8c8012..9e4fc6dcf 100644 --- a/content/country/united-kingdom/index.fr.md +++ b/content/country/united-kingdom/index.fr.md @@ -5,36 +5,21 @@ country: "united-kingdom" params: iso_code: GB operators_without_fip: - - name: Blackpool Tramway - query: - - name: Caledonian MacBrayne Ferries - query: - - name: Docklands Light Railway - query: - - name: Edinburgh Tramway - query: - - name: Getlink (Eurotunnel LeShuttle) - query: - - name: Glasgow Subway - query: - - name: Hovertravel (Portsmouth à Ryde sur l’île de Wight) - query: - - name: ’[London Underground](/operator/gb#verkehr-in-london "London Underground")’ - query: - - name: Midland Metro (Birmingham à Wolverhampton) - query: - - name: Nottingham Express Transit - query: - - name: Sheffield Supertram - query: - - name: London Trams (anciennement Croydon Tramlink) - query: - - name: Transport for Greater Manchester - query: - - name: Tyne and Wear Metro - query: - - name: Wightlink ferry (Portsmouth Harbour à Ryde Pier Head station sur l’île de Wight) - query: + - Blackpool Tramway + - Caledonian MacBrayne Ferries + - Docklands Light Railway + - Edinburgh Tramway + - Getlink (Eurotunnel LeShuttle) + - Glasgow Subway + - Hovertravel (Portsmouth à Ryde sur l’île de Wight) + - ’[London Underground](/operator/gb#verkehr-in-london "London Underground")’ + - Midland Metro (Birmingham à Wolverhampton) + - Nottingham Express Transit + - Sheffield Supertram + - London Trams (anciennement Croydon Tramlink) + - Transport for Greater Manchester + - Tyne and Wear Metro + - Wightlink ferry (Portsmouth Harbour à Ryde Pier Head station sur l’île de Wight) --- diff --git a/content/operator/bdz/index.de.md b/content/operator/bdz/index.de.md index 389aad322..69bfe09e4 100644 --- a/content/operator/bdz/index.de.md +++ b/content/operator/bdz/index.de.md @@ -7,9 +7,6 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office -params: - transitous_mapping: - - query: agencyName == "BDZ" --- Die Balgarski Darschawni Schelesnizi (BDŽ) ist die staatliche Eisenbahngesellschaft von [Bulgarien](/country/bulgaria "Bulgarien") und betreibt derzeit fast alle Verbindungen im Personenverkehr auf dem bulgarischen Schienennetz. diff --git a/content/operator/bdz/index.en.md b/content/operator/bdz/index.en.md index 07158bb56..0c71dc87e 100644 --- a/content/operator/bdz/index.en.md +++ b/content/operator/bdz/index.en.md @@ -7,9 +7,6 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office -params: - transitous_mapping: - - query: agencyName == "BDZ" --- Balgarski Darschawni Schelesnizi (BDŽ) is the state railway company of [Bulgaria](/country/bulgaria "Bulgaria") and currently operates almost all passenger services on the Bulgarian rail network. diff --git a/content/operator/bdz/index.fr.md b/content/operator/bdz/index.fr.md index 75e95f69a..5a9b41214 100644 --- a/content/operator/bdz/index.fr.md +++ b/content/operator/bdz/index.fr.md @@ -7,9 +7,6 @@ operator: "bdz" aliases: - /booking/bdz-ticket-office -params: - transitous_mapping: - - query: agencyName == "BDZ" --- Balgarski Darschawni Schelesnizi (BDŽ) est la compagnie ferroviaire nationale de [Bulgarie](/country/bulgaria "Bulgarie") et exploite actuellement presque tous les services voyageurs sur le réseau ferroviaire bulgare. diff --git a/content/operator/bdz/transitous.yaml b/content/operator/bdz/transitous.yaml new file mode 100644 index 000000000..c1c558f5f --- /dev/null +++ b/content/operator/bdz/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "BDZ" diff --git a/content/operator/bls/index.de.md b/content/operator/bls/index.de.md index 5942f9d1d..50c4688ba 100644 --- a/content/operator/bls/index.de.md +++ b/content/operator/bls/index.de.md @@ -6,10 +6,6 @@ country: aliases: - /booking/bls-ticket-office -params: - transitous_mapping: - - query: agencyName == "BLS AG" - - query: agencyName == "BLS" --- Die BLS (ehemals Bern-Lötschberg-Simplon-Bahn) ist eine öffentliche Eisenbahngesellschaft in der [Schweiz](/country/switzerland "Schweiz"). Sie betreibt viele Zug-, Bus- und Schiffsverbindungen und fährt primär im Kanton Bern. diff --git a/content/operator/bls/index.en.md b/content/operator/bls/index.en.md index 2c3182577..19524b9ef 100644 --- a/content/operator/bls/index.en.md +++ b/content/operator/bls/index.en.md @@ -6,10 +6,6 @@ country: aliases: - /booking/bls-ticket-office -params: - transitous_mapping: - - query: agencyName == "BLS AG" - - query: agencyName == "BLS" --- The BLS (formerly Bern-Lötschberg-Simplon-Bahn) is a public railway company in [Switzerland](/country/switzerland "Switzerland"). It operates many train, bus and ship connections and primarily runs in the Canton of Bern. diff --git a/content/operator/bls/index.fr.md b/content/operator/bls/index.fr.md index eeaeb1e71..cf454dfeb 100644 --- a/content/operator/bls/index.fr.md +++ b/content/operator/bls/index.fr.md @@ -6,10 +6,6 @@ country: aliases: - /booking/bls-ticket-office -params: - transitous_mapping: - - query: agencyName == "BLS AG" - - query: agencyName == "BLS" --- La BLS (anciennement Bern-Lötschberg-Simplon-Bahn) est une entreprise ferroviaire publique de la [Suisse](/country/switzerland "Suisse"). Elle exploite de nombreuses liaisons de trains, de bus et de bateaux et circule principalement dans le canton de Berne. diff --git a/content/operator/bls/transitous.yaml b/content/operator/bls/transitous.yaml new file mode 100644 index 000000000..f06a99e40 --- /dev/null +++ b/content/operator/bls/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "BLS AG" +- query: agencyName == "BLS" diff --git a/content/operator/cd/index.de.md b/content/operator/cd/index.de.md index aa1f68aaa..3d0fbe200 100644 --- a/content/operator/cd/index.de.md +++ b/content/operator/cd/index.de.md @@ -8,10 +8,6 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website -params: - transitous_mapping: - - query: agencyName == "České dráhy" - - query: agencyName == "ČD" --- Die České dráhy (ČD) ist die staatliche Eisenbahngesellschaft der [Tschechischen Republik](/country/czechia "Tschechischen Republik") und betreibt einen großen Teil der Verbindungen im Personenverkehr auf dem tschechischen Schienennetz. diff --git a/content/operator/cd/index.en.md b/content/operator/cd/index.en.md index 5954ab355..84969df93 100644 --- a/content/operator/cd/index.en.md +++ b/content/operator/cd/index.en.md @@ -8,10 +8,6 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website -params: - transitous_mapping: - - query: agencyName == "České dráhy" - - query: agencyName == "ČD" --- České dráhy (ČD) is the state railway company of the [Czech Republic](/country/czechia "Czech Republic") and operates a large part of passenger services on the Czech rail network. diff --git a/content/operator/cd/index.fr.md b/content/operator/cd/index.fr.md index 434572f23..a985750a0 100644 --- a/content/operator/cd/index.fr.md +++ b/content/operator/cd/index.fr.md @@ -8,10 +8,6 @@ operator: "cd" aliases: - /booking/cd-ticket-office - /booking/cd-website -params: - transitous_mapping: - - query: agencyName == "České dráhy" - - query: agencyName == "ČD" --- České dráhy (ČD) est la compagnie ferroviaire nationale de la [République tchèque](/country/czechia "République tchèque") et exploite une grande partie des services voyageurs sur le réseau ferroviaire tchèque. diff --git a/content/operator/cd/transitous.yaml b/content/operator/cd/transitous.yaml new file mode 100644 index 000000000..971bb8c36 --- /dev/null +++ b/content/operator/cd/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "České dráhy" +- query: agencyName == "ČD" diff --git a/content/operator/cfl/index.de.md b/content/operator/cfl/index.de.md index 1eac0a2b0..b64f300d4 100644 --- a/content/operator/cfl/index.de.md +++ b/content/operator/cfl/index.de.md @@ -8,9 +8,6 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFL" --- Die CFL (Société nationale des chemins de fer luxembourgeois) ist die luxemburgische Staatsbahn und die wichtigste Bahngesellschaft in [Luxemburg](/country/luxembourg "Luxemburg"). diff --git a/content/operator/cfl/index.en.md b/content/operator/cfl/index.en.md index 09fcba3c1..6a9550f2b 100644 --- a/content/operator/cfl/index.en.md +++ b/content/operator/cfl/index.en.md @@ -8,9 +8,6 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFL" --- CFL (Société nationale des chemins de fer luxembourgeois) is the Luxembourgish state railway and the main railway company in [Luxembourg](/country/luxembourg "Luxembourg"). diff --git a/content/operator/cfl/index.fr.md b/content/operator/cfl/index.fr.md index df31a2787..012aeb643 100644 --- a/content/operator/cfl/index.fr.md +++ b/content/operator/cfl/index.fr.md @@ -8,9 +8,6 @@ operator: "cfl" aliases: - /booking/cfl-phone - /booking/cfl-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFL" --- La CFL (Société nationale des chemins de fer luxembourgeois) est la compagnie ferroviaire nationale du [Luxembourg](/country/luxembourg "Luxembourg") et la principale société ferroviaire du pays. diff --git a/content/operator/cfl/transitous.yaml b/content/operator/cfl/transitous.yaml new file mode 100644 index 000000000..0973fb520 --- /dev/null +++ b/content/operator/cfl/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "CFL" diff --git a/content/operator/cfr/index.de.md b/content/operator/cfr/index.de.md index 005fe19ee..c323e5c80 100644 --- a/content/operator/cfr/index.de.md +++ b/content/operator/cfr/index.de.md @@ -7,9 +7,6 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFR Călători" --- Die Societatea Natională de Transport Feroviar de Călători “CFR Călători” S.A., kurz CFR Călători ist die staatliche Eisenbahngesellschaft von [Rumänien](/country/romania "Rumänien") und betreibt einen Großteil der Verbindungen im Personenverkehr auf dem rumänischen Schienennetz. diff --git a/content/operator/cfr/index.en.md b/content/operator/cfr/index.en.md index 2b8910d91..5cc2077e2 100644 --- a/content/operator/cfr/index.en.md +++ b/content/operator/cfr/index.en.md @@ -7,9 +7,6 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFR Călători" --- The Societatea Natională de Transport Feroviar de Călători "CFR Călători" S.A., or CFR Călători for short, is the state railway company of [Romania](/country/romania "Romania") and operates the majority of passenger services on the Romanian rail network. diff --git a/content/operator/cfr/index.fr.md b/content/operator/cfr/index.fr.md index 0fc028b1a..32407621e 100644 --- a/content/operator/cfr/index.fr.md +++ b/content/operator/cfr/index.fr.md @@ -7,9 +7,6 @@ operator: "cfr" aliases: - /booking/cfr-ticket-office -params: - transitous_mapping: - - query: agencyName == "CFR Călători" --- La Societatea Natională de Transport Feroviar de Călători « CFR Călători » S.A., en abrégé CFR Călători, est la compagnie ferroviaire nationale de [Roumanie](/country/romania "Roumanie") et exploite la majorité des services voyageurs sur le réseau ferroviaire roumain. diff --git a/content/operator/cfr/transitous.yaml b/content/operator/cfr/transitous.yaml new file mode 100644 index 000000000..f777ca83b --- /dev/null +++ b/content/operator/cfr/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "CFR Călători" diff --git a/content/operator/cie/index.de.md b/content/operator/cie/index.de.md index c66116748..d8f59e7cf 100644 --- a/content/operator/cie/index.de.md +++ b/content/operator/cie/index.de.md @@ -8,10 +8,6 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website -params: - transitous_mapping: - - query: agencyName == "Irish Rail" - - query: agencyName == "Iarnród Éireann" --- Córas lompair Éireann (CIE) ist die staatliche Bahngesellschaft [Irlands](/country/ireland) und das Mutterunternehmen von Irish Rail (Iarnród Éireann). Die Tochtergesellschaft betreibt den Großteil des Schienenverkehrs in der Republik Irland, einschließlich der Hauptstrecken zwischen Dublin, Cork, Galway und Limerick sowie regionaler Verbindungen in der Gegend von Dublin und Cork. diff --git a/content/operator/cie/index.en.md b/content/operator/cie/index.en.md index cb1dddee9..a60d2c466 100644 --- a/content/operator/cie/index.en.md +++ b/content/operator/cie/index.en.md @@ -8,10 +8,6 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website -params: - transitous_mapping: - - query: agencyName == "Irish Rail" - - query: agencyName == "Iarnród Éireann" --- Córas Iompair Éireann (CIE) is the state railway company of [Ireland](/country/ireland) and the parent company of Irish Rail (Iarnród Éireann). The subsidiary operates the majority of rail services in the Republic of Ireland, including the main routes between Dublin, Cork, Galway and Limerick, as well as regional connections in the Dublin and Cork areas. diff --git a/content/operator/cie/index.fr.md b/content/operator/cie/index.fr.md index e67d10a8f..7a7fe4409 100644 --- a/content/operator/cie/index.fr.md +++ b/content/operator/cie/index.fr.md @@ -8,10 +8,6 @@ operator: "cie" aliases: - /booking/irish-rail-ticket-office - /booking/irish-rail-website -params: - transitous_mapping: - - query: agencyName == "Irish Rail" - - query: agencyName == "Iarnród Éireann" --- Córas Iompair Éireann (CIE) est la compagnie ferroviaire nationale d’[Irlande](/country/ireland) et la société mère d’Irish Rail (Iarnród Éireann). La filiale exploite la majorité du trafic ferroviaire en République d’Irlande, notamment les lignes principales entre Dublin, Cork, Galway et Limerick, ainsi que des liaisons régionales dans les environs de Dublin et Cork. diff --git a/content/operator/cie/transitous.yaml b/content/operator/cie/transitous.yaml new file mode 100644 index 000000000..902fe5e63 --- /dev/null +++ b/content/operator/cie/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "Irish Rail" +- query: agencyName == "Iarnród Éireann" diff --git a/content/operator/cp/index.de.md b/content/operator/cp/index.de.md index ae59e4887..168863d2a 100644 --- a/content/operator/cp/index.de.md +++ b/content/operator/cp/index.de.md @@ -7,10 +7,6 @@ operator: "cp" aliases: - /booking/cp-ticket-office -params: - transitous_mapping: - - query: agencyName == "CP - Comboios de Portugal" - - query: agencyName == "Comboios de Portugal" --- Die CP (Comboios de Portugal) ist die portugiesische Staatsbahn und die wichtigste Bahngesellschaft in [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/cp/index.en.md b/content/operator/cp/index.en.md index aa6a57daf..49baae4f9 100644 --- a/content/operator/cp/index.en.md +++ b/content/operator/cp/index.en.md @@ -7,10 +7,6 @@ operator: "cp" aliases: - /booking/cp-ticket-office -params: - transitous_mapping: - - query: agencyName == "CP - Comboios de Portugal" - - query: agencyName == "Comboios de Portugal" --- CP (Comboios de Portugal) is the Portuguese state railway and the main railway company in [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/cp/index.fr.md b/content/operator/cp/index.fr.md index 153eb6d2b..97ccabade 100644 --- a/content/operator/cp/index.fr.md +++ b/content/operator/cp/index.fr.md @@ -7,10 +7,6 @@ operator: "cp" aliases: - /booking/cp-ticket-office -params: - transitous_mapping: - - query: agencyName == "CP - Comboios de Portugal" - - query: agencyName == "Comboios de Portugal" --- La CP (Comboios de Portugal) est la compagnie ferroviaire nationale portugaise et la principale société de chemins de fer au [Portugal](/country/portugal "Portugal"). diff --git a/content/operator/cp/transitous.yaml b/content/operator/cp/transitous.yaml new file mode 100644 index 000000000..fb2f8d3b7 --- /dev/null +++ b/content/operator/cp/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "CP - Comboios de Portugal" +- query: agencyName == "Comboios de Portugal" diff --git a/content/operator/db/index.de.md b/content/operator/db/index.de.md index 465c1816a..98ecfd760 100644 --- a/content/operator/db/index.de.md +++ b/content/operator/db/index.de.md @@ -10,26 +10,6 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international -params: - transitous_mapping: - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") - category: ice - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") - category: tgv - - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) - category: rj - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") - category: ece - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") - category: ec - - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") - category: ic - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") - category: re - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") - category: rb - - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" - category: s --- Die Deutsche Bahn (DB) ist das größte Eisenbahnverkehrsunternehmen in [Deutschland](/country/germany "Deutschland") und betreibt den Großteil des Fernverkehrs sowie viele Verbindungen im Regionalverkehr. diff --git a/content/operator/db/index.en.md b/content/operator/db/index.en.md index c552173d9..f61c83b83 100644 --- a/content/operator/db/index.en.md +++ b/content/operator/db/index.en.md @@ -10,26 +10,6 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international -params: - transitous_mapping: - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") - category: ice - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") - category: tgv - - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) - category: rj - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") - category: ece - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") - category: ec - - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") - category: ic - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") - category: re - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") - category: rb - - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" - category: s --- Deutsche Bahn (DB) is the largest railway company in [Germany](/country/germany "Germany"), operating most long-distance services as well as many regional connections. diff --git a/content/operator/db/index.fr.md b/content/operator/db/index.fr.md index aedfd8766..4d2109238 100644 --- a/content/operator/db/index.fr.md +++ b/content/operator/db/index.fr.md @@ -10,26 +10,6 @@ aliases: - /booking/db-website - /booking/db-website-fip-db - /booking/db-website-fip-international -params: - transitous_mapping: - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") - category: ice - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") - category: tgv - - query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) - category: rj - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") - category: ece - - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") - category: ec - - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") - category: ic - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") - category: re - - query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") - category: rb - - query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" - category: s --- La Deutsche Bahn (DB) est la plus grande entreprise ferroviaire d’[Allemagne](/country/germany "Allemagne") et exploite la majorité du trafic longue distance ainsi que de nombreuses liaisons régionales. diff --git a/content/operator/db/transitous.yaml b/content/operator/db/transitous.yaml new file mode 100644 index 000000000..199f949a2 --- /dev/null +++ b/content/operator/db/transitous.yaml @@ -0,0 +1,18 @@ +- query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") + category: ice +- query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") + category: tgv +- query: agencyName == "DB Fernverkehr AG" && (displayName.startsWith("RJ") || displayName.startsWith("RJX")) + category: rj +- query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ECE") + category: ece +- query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("EC") + category: ec +- query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") + category: ic +- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") + category: re +- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") + category: rb +- query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" + category: s diff --git a/content/operator/dsb/index.de.md b/content/operator/dsb/index.de.md index 436656aa4..39bc2e0d8 100644 --- a/content/operator/dsb/index.de.md +++ b/content/operator/dsb/index.de.md @@ -9,9 +9,6 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website -params: - transitous_mapping: - - query: agencyName == "DSB" --- Die DSB (Danske Statsbaner) ist die staatliche Eisenbahngesellschaft in [Dänemark](/country/denmark "Dänemark"). Sie betreibt den Großteil des Personenverkehrs auf dem dänischen Schienennetz. diff --git a/content/operator/dsb/index.en.md b/content/operator/dsb/index.en.md index 7b546a21b..4cd669f0e 100644 --- a/content/operator/dsb/index.en.md +++ b/content/operator/dsb/index.en.md @@ -9,9 +9,6 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website -params: - transitous_mapping: - - query: agencyName == "DSB" --- The DSB (Danske Statsbaner) is the state-owned railway company in [Denmark](/country/denmark "Denmark"). It operates the majority of passenger traffic on the Danish rail network. diff --git a/content/operator/dsb/index.fr.md b/content/operator/dsb/index.fr.md index b7b15a745..e4fd98956 100644 --- a/content/operator/dsb/index.fr.md +++ b/content/operator/dsb/index.fr.md @@ -9,9 +9,6 @@ aliases: - /booking/dsb-international-website - /booking/dsb-ticket-office - /booking/dsb-website -params: - transitous_mapping: - - query: agencyName == "DSB" --- La DSB (Danske Statsbaner) est la compagnie ferroviaire publique du [Danemark](/country/denmark "Danemark"). Elle exploite la majorité du trafic voyageurs sur le réseau ferroviaire danois. diff --git a/content/operator/dsb/transitous.yaml b/content/operator/dsb/transitous.yaml new file mode 100644 index 000000000..466e2beb9 --- /dev/null +++ b/content/operator/dsb/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "DSB" diff --git a/content/operator/eurostar/index.de.md b/content/operator/eurostar/index.de.md index 87a8522c1..83961ee0f 100644 --- a/content/operator/eurostar/index.de.md +++ b/content/operator/eurostar/index.de.md @@ -16,19 +16,6 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website - -params: - transitous_mapping: - - query: agencyId == "EUROSTAR_CHANNEL" - category: eurostar-blue - - query: agencyId == "EUROSTAR_CONTINENTAL" - category: eurostar-red - - query: agencyName == "NS Int" && routeShortName == "Eurostar" - category: eurostar-red - - query: agencyName == "SNCF" && routeShortName == "THA" - category: eurostar-red - - query: agencyId == "EUROSTAR_SNOW" - category: eurostar-snow --- Eurostar ist ein Betreiber von Hochgeschwindigkeitszügen in Westeuropa. Ursprünglich wurden nur die blauen Züge zwischen London und Paris/Brüssel/Amsterdam durch den Eurotunnel als Eurostar bezeichnet. Nach dem Zusammenschluss zwischen Thalys und Eurostar werden auch die roten Thalys-Züge als Eurostar (Red) bezeichnet. Eurostar verkehrt in [Deutschland](/country/germany "Deutschland"), [Frankreich](/country/france "Frankreich"), dem [Vereinigten Königreich](/country/united-kingdom "Vereinigtes Königreich"), [Belgien](/country/belgium "Belgien") und den [Niederlanden](/country/netherlands "Niederlande"). diff --git a/content/operator/eurostar/index.en.md b/content/operator/eurostar/index.en.md index 996fc7b91..e1a7fccff 100644 --- a/content/operator/eurostar/index.en.md +++ b/content/operator/eurostar/index.en.md @@ -16,19 +16,6 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website - -params: - transitous_mapping: - - query: agencyId == "EUROSTAR_CHANNEL" - category: eurostar-blue - - query: agencyId == "EUROSTAR_CONTINENTAL" - category: eurostar-red - - query: agencyName == "NS Int" && routeShortName == "Eurostar" - category: eurostar-red - - query: agencyName == "SNCF" && routeShortName == "THA" - category: eurostar-red - - query: agencyId == "EUROSTAR_SNOW" - category: eurostar-snow --- Eurostar is an operator of high-speed trains in Western Europe. Originally, only the blue trains between London and Paris/Brussels/Amsterdam through the Eurotunnel were referred to as Eurostar. After the merger between Thalys and Eurostar, the red Thalys trains are now also referred to as Eurostar (Red). Eurostar operates in [Germany](/country/germany "Germany"), [France](/country/france "France"), the [United Kingdom](/country/united-kingdom "United Kingdom"), [Belgium](/country/belgium "Belgium"), and the [Netherlands](/country/netherlands "Netherlands"). diff --git a/content/operator/eurostar/index.fr.md b/content/operator/eurostar/index.fr.md index d4f3c1326..52e55c9ab 100644 --- a/content/operator/eurostar/index.fr.md +++ b/content/operator/eurostar/index.fr.md @@ -16,18 +16,6 @@ aliases: - /booking/ffestiniogtravel-phone - /booking/internationalrail-email - /booking/railtourguide-website -params: - transitous_mapping: - - query: agencyId == "EUROSTAR_CHANNEL" - category: eurostar-blue - - query: agencyId == "EUROSTAR_CONTINENTAL" - category: eurostar-red - - query: agencyName == "NS Int" && routeShortName == "Eurostar" - category: eurostar-red - - query: agencyName == "SNCF" && routeShortName == "THA" - category: eurostar-red - - query: agencyId == "EUROSTAR_SNOW" - category: eurostar-snow --- Eurostar est un opérateur de trains à grande vitesse en Europe de l’Ouest. À l’origine, seuls les trains bleus entre Londres et Paris/Bruxelles/Amsterdam via l’Eurotunnel étaient désignés comme Eurostar. Depuis la fusion entre Thalys et Eurostar, les anciens trains rouges Thalys sont désormais appelés Eurostar (Rouge). Eurostar circule en [Allemagne](/country/germany "Allemagne"), [France](/country/france "France"), au [Royaume-Uni](/country/united-kingdom "Royaume-Uni"), en [Belgique](/country/belgium "Belgique") et aux [Pays-Bas](/country/netherlands "Pays-Bas"). diff --git a/content/operator/eurostar/transitous.yaml b/content/operator/eurostar/transitous.yaml new file mode 100644 index 000000000..8ea3118a3 --- /dev/null +++ b/content/operator/eurostar/transitous.yaml @@ -0,0 +1,12 @@ +- query: agencyId == "EUROSTAR_CHANNEL" + category: eurostar-blue + message: + en: "Global fare applies. Please check that this is not a Eurostar Snow service, as these are not covered by FIP." + de: "Globalpreis gilt. Bitte prüfe, dass es sich nicht um einen Eurostar Snow Service handelt, da diese nicht von FIP abgedeckt sind." + fr: "Le tarif global s'applique. Veuillez vérifier qu'il ne s'agit pas d'un service Eurostar Snow, car ceux-ci ne sont pas couverts par le FIP." +- query: agencyId == "EUROSTAR_CONTINENTAL" + category: eurostar-red +- query: agencyName == "NS Int" && routeShortName == "Eurostar" + category: eurostar-red +- query: agencyName == "SNCF" && routeShortName == "THA" + category: eurostar-red diff --git a/content/operator/fs/index.de.md b/content/operator/fs/index.de.md index 7a9ddd20b..b2e0acccd 100644 --- a/content/operator/fs/index.de.md +++ b/content/operator/fs/index.de.md @@ -9,9 +9,6 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website -params: - transitous_mapping: - - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) ist die italienische Staatsbahn. FIP Vergünstigungen gelten jedoch nur bei der Tochtergesellschaft Trenitalia in [Italien](/country/italy "Italien"). diff --git a/content/operator/fs/index.en.md b/content/operator/fs/index.en.md index d9216e824..62b161d22 100644 --- a/content/operator/fs/index.en.md +++ b/content/operator/fs/index.en.md @@ -9,9 +9,6 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website -params: - transitous_mapping: - - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) is the Italian state railway. FIP discounts only apply to its subsidiary Trenitalia in [Italy](/country/italy "Italy"). diff --git a/content/operator/fs/index.fr.md b/content/operator/fs/index.fr.md index 6f2363fe1..f96775cea 100644 --- a/content/operator/fs/index.fr.md +++ b/content/operator/fs/index.fr.md @@ -9,9 +9,6 @@ aliases: - /booking/fs-ticket-machine - /booking/fs-ticket-office - /booking/fs-website -params: - transitous_mapping: - - query: agencyName == "Trenitalia" --- Ferrovie dello Stato Italiane (FS) est la compagnie ferroviaire nationale italienne. Les rabais FIP ne s’appliquent qu’à sa filiale Trenitalia en [Italie](/country/italy "Italie"). diff --git a/content/operator/fs/transitous.yaml b/content/operator/fs/transitous.yaml new file mode 100644 index 000000000..d909126ae --- /dev/null +++ b/content/operator/fs/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Trenitalia" diff --git a/content/operator/gysev/index.de.md b/content/operator/gysev/index.de.md index 07eb04f39..615f1a890 100644 --- a/content/operator/gysev/index.de.md +++ b/content/operator/gysev/index.de.md @@ -9,10 +9,6 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website -params: - transitous_mapping: - - query: agencyName == "GYSEV" - - query: agencyName == "Raaberbahn" --- Die Raab-Oedenburg-Ebenfurter Eisenbahn AG (ungarisch Győr-Sopron-Ebenfurti Vasút Zrt.), kurz GySEV oder Raaberbahn ist ein privates ungarisches Eisenbahnunternehmen, welches Regionalzüge in Ungarn und [Österreich](/country/austria "Österreich") betreibt. Die Züge verkehren hauptsächlich südlich und östlich des Neusiedlersees (Westungarn), teilweise sind sie sogar auf eigener Infrastruktur unterwegs. diff --git a/content/operator/gysev/index.en.md b/content/operator/gysev/index.en.md index a8bfbed0d..60f342c76 100644 --- a/content/operator/gysev/index.en.md +++ b/content/operator/gysev/index.en.md @@ -9,10 +9,6 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website -params: - transitous_mapping: - - query: agencyName == "GYSEV" - - query: agencyName == "Raaberbahn" --- The Raab-Oedenburg-Ebenfurter Eisenbahn AG (Hungarian: Győr-Sopron-Ebenfurti Vasút Zrt.), short: GySEV or Raaberbahn, is a private Hungarian railway company that operates regional trains in Hungary and [Austria](/country/austria "Austria"). They primarily operate passenger services south and east of Lake Neusiedl (Western Hungary), partly even on their own infrastructure. diff --git a/content/operator/gysev/index.fr.md b/content/operator/gysev/index.fr.md index 2900b82ce..93d187b7f 100644 --- a/content/operator/gysev/index.fr.md +++ b/content/operator/gysev/index.fr.md @@ -9,10 +9,6 @@ aliases: - /booking/mav-ticket-machine - /booking/mav-ticket-office - /booking/mav-website -params: - transitous_mapping: - - query: agencyName == "GYSEV" - - query: agencyName == "Raaberbahn" --- La Raab-Oedenburg-Ebenfurter Eisenbahn AG (en hongrois Győr-Sopron-Ebenfurti Vasút Zrt.), abrégée GySEV ou Raaberbahn, est une compagnie ferroviaire privée hongroise qui exploite des trains régionaux en Hongrie et en [Autriche](/country/austria "Autriche"). Elle assure principalement le transport de voyageurs au sud et à l’est du lac de Neusiedl (ouest de la Hongrie), parfois même sur sa propre infrastructure. diff --git a/content/operator/gysev/transitous.yaml b/content/operator/gysev/transitous.yaml new file mode 100644 index 000000000..23cd5deb7 --- /dev/null +++ b/content/operator/gysev/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "GYSEV" +- query: agencyName == "Raaberbahn" diff --git a/content/operator/ht/index.de.md b/content/operator/ht/index.de.md index 771ae0679..44d40f654 100644 --- a/content/operator/ht/index.de.md +++ b/content/operator/ht/index.de.md @@ -8,10 +8,6 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website -params: - transitous_mapping: - - query: agencyName == "HŽ Putnički prijevoz" - - query: agencyName == "HŽ" --- Die Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) betreibt den gesamten staatlichen Personenverkehr auf dem griechischen Normalspurnetz. Das Unternehmen betreibt Fern-, Regional- und den Vorortverkehr („Proastiakos“). Seit 2017 ist es eine hundertprozentige Tochter der italienischen Staatsbahn Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/ht/index.en.md b/content/operator/ht/index.en.md index d495e5321..d73a16542 100644 --- a/content/operator/ht/index.en.md +++ b/content/operator/ht/index.en.md @@ -8,10 +8,6 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website -params: - transitous_mapping: - - query: agencyName == "HŽ Putnički prijevoz" - - query: agencyName == "HŽ" --- Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) operates all state passenger services on the Greek standard-gauge network. The company runs long-distance, regional and suburban services ("Proastiakos"). Since 2017, it has been a wholly owned subsidiary of the Italian state railway Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/ht/index.fr.md b/content/operator/ht/index.fr.md index 78f10129a..242b4b2a6 100644 --- a/content/operator/ht/index.fr.md +++ b/content/operator/ht/index.fr.md @@ -8,10 +8,6 @@ operator: "ht" aliases: - /booking/ht-ticket-office - /booking/ht-website -params: - transitous_mapping: - - query: agencyName == "HŽ Putnički prijevoz" - - query: agencyName == "HŽ" --- Hellenic Train S.A. (Ελληνικοί Σιδηρόδρομοι Α.Ε.) exploite l’ensemble du transport de voyageurs de l’État sur le réseau grec à voie normale. L’entreprise exploite des services grandes lignes, régionaux et de banlieue (« Proastiakos »). Depuis 2017, elle est une filiale à 100 % des chemins de fer italiens Ferrovie dello Stato Italiane (FS). diff --git a/content/operator/ht/transitous.yaml b/content/operator/ht/transitous.yaml new file mode 100644 index 000000000..2120b0447 --- /dev/null +++ b/content/operator/ht/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "HŽ Putnički prijevoz" +- query: agencyName == "HŽ" diff --git a/content/operator/kd/index.de.md b/content/operator/kd/index.de.md index a304c005f..430241bc1 100644 --- a/content/operator/kd/index.de.md +++ b/content/operator/kd/index.de.md @@ -9,9 +9,6 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website -params: - transitous_mapping: - - query: agencyName == "Koleje Dolnośląskie" --- Die Koleje Dolnośląskie, kurz KD, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Niederschlesien anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kd/index.en.md b/content/operator/kd/index.en.md index 7a704ce63..857bb8071 100644 --- a/content/operator/kd/index.en.md +++ b/content/operator/kd/index.en.md @@ -9,9 +9,6 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website -params: - transitous_mapping: - - query: agencyName == "Koleje Dolnośląskie" --- Koleje Dolnośląskie (KD) is a Polish railway company offering regional services in the Lower Silesia Province. It is one of five different operators in [Poland](/country/poland) which provide FIP benefits. diff --git a/content/operator/kd/index.fr.md b/content/operator/kd/index.fr.md index cc125ac39..899b93fa6 100644 --- a/content/operator/kd/index.fr.md +++ b/content/operator/kd/index.fr.md @@ -9,9 +9,6 @@ aliases: - /booking/kd-ticket-machine - /booking/kd-ticket-office - /booking/kd-website -params: - transitous_mapping: - - query: agencyName == "Koleje Dolnośląskie" --- Koleje Dolnośląskie (KD) est une compagnie ferroviaire polonaise assurant principalement des services régionaux dans la voïvodie de Basse-Silésie. C’est l’une des cinq compagnies différentes de [Pologne](/country/poland) qui proposent le FIP. diff --git a/content/operator/kd/transitous.yaml b/content/operator/kd/transitous.yaml new file mode 100644 index 000000000..2ab61b1bc --- /dev/null +++ b/content/operator/kd/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Koleje Dolnośląskie" diff --git a/content/operator/kml/index.de.md b/content/operator/kml/index.de.md index e71eeacb7..f3476f8e9 100644 --- a/content/operator/kml/index.de.md +++ b/content/operator/kml/index.de.md @@ -7,9 +7,6 @@ operator: "kml" aliases: - /booking/kml-ticket-office -params: - transitous_mapping: - - query: agencyName == "Koleje Małopolskie" --- Die Koleje Małopolskie, kurz KMŁ, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Kleinpolen anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kml/index.en.md b/content/operator/kml/index.en.md index f3313e7ac..5e5c52366 100644 --- a/content/operator/kml/index.en.md +++ b/content/operator/kml/index.en.md @@ -7,9 +7,6 @@ operator: "kml" aliases: - /booking/kml-ticket-office -params: - transitous_mapping: - - query: agencyName == "Koleje Małopolskie" --- Koleje Małopolskie, abbreviated KMŁ, is a Polish railway company that mainly provides regional services in the Lesser Poland Voivodeship. It is one of five different companies offering FIP in [Poland](/country/poland). diff --git a/content/operator/kml/index.fr.md b/content/operator/kml/index.fr.md index 0a26eca80..a9160ca61 100644 --- a/content/operator/kml/index.fr.md +++ b/content/operator/kml/index.fr.md @@ -7,9 +7,6 @@ operator: "kml" aliases: - /booking/kml-ticket-office -params: - transitous_mapping: - - query: agencyName == "Koleje Małopolskie" --- Les Koleje Małopolskie, abrégées KMŁ, sont une compagnie ferroviaire polonaise qui assure principalement des services régionaux dans la voïvodie de Petite-Pologne. C’est l’une des cinq compagnies différentes proposant la FIP en [Pologne](/country/poland). diff --git a/content/operator/kml/transitous.yaml b/content/operator/kml/transitous.yaml new file mode 100644 index 000000000..6713d29de --- /dev/null +++ b/content/operator/kml/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Koleje Małopolskie" diff --git a/content/operator/ks/index.de.md b/content/operator/ks/index.de.md index 4af5f9e15..6bceeaf09 100644 --- a/content/operator/ks/index.de.md +++ b/content/operator/ks/index.de.md @@ -9,9 +9,6 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website -params: - transitous_mapping: - - query: agencyName == "Koleje Śląskie" --- Die Koleje Śląskie, kurz KŚ, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Schlesien anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/ks/index.en.md b/content/operator/ks/index.en.md index 347de30a9..f71979eaa 100644 --- a/content/operator/ks/index.en.md +++ b/content/operator/ks/index.en.md @@ -9,9 +9,6 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website -params: - transitous_mapping: - - query: agencyName == "Koleje Śląskie" --- Koleje Śląskie, short KŚ, is a Polish railway operator that primarily offers regional transport in the Silesian Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/ks/index.fr.md b/content/operator/ks/index.fr.md index 9a6fea546..2b4a94b69 100644 --- a/content/operator/ks/index.fr.md +++ b/content/operator/ks/index.fr.md @@ -9,9 +9,6 @@ aliases: - /booking/ks-ticket-machine - /booking/ks-ticket-office - /booking/ks-website -params: - transitous_mapping: - - query: agencyName == "Koleje Śląskie" --- Koleje Śląskie, abrégées KŚ, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Silésie. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/ks/transitous.yaml b/content/operator/ks/transitous.yaml new file mode 100644 index 000000000..ac32e7cf7 --- /dev/null +++ b/content/operator/ks/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Koleje Śląskie" diff --git a/content/operator/kw/index.de.md b/content/operator/kw/index.de.md index aa9255520..47cefbdf3 100644 --- a/content/operator/kw/index.de.md +++ b/content/operator/kw/index.de.md @@ -9,9 +9,6 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website -params: - transitous_mapping: - - query: agencyName == "Koleje Wielkopolskie" --- Die Koleje Wielkopolskie, kurz KW, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Großpolen anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/kw/index.en.md b/content/operator/kw/index.en.md index 69e6bd59d..d7b2584be 100644 --- a/content/operator/kw/index.en.md +++ b/content/operator/kw/index.en.md @@ -9,9 +9,6 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website -params: - transitous_mapping: - - query: agencyName == "Koleje Wielkopolskie" --- Koleje Wielkopolskie, short KW, is a Polish railway operator that primarily offers regional transport in the Greater Poland Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/kw/index.fr.md b/content/operator/kw/index.fr.md index 4491a840a..d29e22472 100644 --- a/content/operator/kw/index.fr.md +++ b/content/operator/kw/index.fr.md @@ -9,9 +9,6 @@ aliases: - /booking/kw-ticket-machine - /booking/kw-ticket-office - /booking/kw-website -params: - transitous_mapping: - - query: agencyName == "Koleje Wielkopolskie" --- Koleje Wielkopolskie, abrégées KW, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Grande-Pologne. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/kw/transitous.yaml b/content/operator/kw/transitous.yaml new file mode 100644 index 000000000..2df27b5d4 --- /dev/null +++ b/content/operator/kw/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Koleje Wielkopolskie" diff --git a/content/operator/lka/index.de.md b/content/operator/lka/index.de.md index eddba007c..892dd7708 100644 --- a/content/operator/lka/index.de.md +++ b/content/operator/lka/index.de.md @@ -8,9 +8,6 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office -params: - transitous_mapping: - - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Die Łódzka Kolej Aglomeracyjna, kurz ŁKA, ist ein polnisches Eisenbahnverkehrsunternehmen, das hauptsächlich Regionalverkehr in der Woiwodschaft Łódz anbietet. Es ist eines der insgesamt fünf verschiedenen Unternehmen, das in [Polen](/country/poland) FIP anbietet. diff --git a/content/operator/lka/index.en.md b/content/operator/lka/index.en.md index b6517fc5d..6b137aae3 100644 --- a/content/operator/lka/index.en.md +++ b/content/operator/lka/index.en.md @@ -8,9 +8,6 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office -params: - transitous_mapping: - - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Łódzka Kolej Aglomeracyjna, short ŁKA, is a Polish railway operator that primarily offers regional transport in the Łódź Voivodeship. It is one of five different companies that offers FIP in [Poland](/country/poland). diff --git a/content/operator/lka/index.fr.md b/content/operator/lka/index.fr.md index 96f630002..988f53f26 100644 --- a/content/operator/lka/index.fr.md +++ b/content/operator/lka/index.fr.md @@ -8,9 +8,6 @@ operator: "lka" aliases: - /booking/lka-ticket-machine - /booking/lka-ticket-office -params: - transitous_mapping: - - query: agencyName == "Łódzka Kolej Aglomeracyjna" --- Łódzka Kolej Aglomeracyjna, abrégées ŁKA, est une entreprise de transport ferroviaire polonaise qui propose principalement des services régionaux dans la voïvodie de Łódź. C’est l’une des cinq entreprises différentes qui proposent le FIP en [Pologne](/country/poland). diff --git a/content/operator/lka/transitous.yaml b/content/operator/lka/transitous.yaml new file mode 100644 index 000000000..de1c9d5d6 --- /dev/null +++ b/content/operator/lka/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Łódzka Kolej Aglomeracyjna" diff --git a/content/operator/ltg/index.de.md b/content/operator/ltg/index.de.md index a278ccfac..d72be8cad 100644 --- a/content/operator/ltg/index.de.md +++ b/content/operator/ltg/index.de.md @@ -8,9 +8,6 @@ operator: "ltg" aliases: - /booking/ltg-website -params: - transitous_mapping: - - query: agencyName == "LTG Link" --- Die LTG ist die staatliche Eisenbahngesellschaft der Republik Litauen und betreibt mit ihrer Tochtergesellschaft LTG-Link alle Verbindungen im Personenverkehr auf dem litauischen Schienennetz sowie ins Ausland. diff --git a/content/operator/ltg/index.en.md b/content/operator/ltg/index.en.md index 8f947c4d8..5d726f660 100644 --- a/content/operator/ltg/index.en.md +++ b/content/operator/ltg/index.en.md @@ -8,9 +8,6 @@ operator: "ltg" aliases: - /booking/ltg-website -params: - transitous_mapping: - - query: agencyName == "LTG Link" --- LTG is the state railway company of the Republic of Lithuania and, through its subsidiary LTG-Link, operates all passenger services on the Lithuanian rail network as well as international connections. diff --git a/content/operator/ltg/index.fr.md b/content/operator/ltg/index.fr.md index 321e0d83f..2fce76d46 100644 --- a/content/operator/ltg/index.fr.md +++ b/content/operator/ltg/index.fr.md @@ -8,9 +8,6 @@ operator: "ltg" aliases: - /booking/ltg-website -params: - transitous_mapping: - - query: agencyName == "LTG Link" --- LTG est la compagnie ferroviaire nationale de la République de Lituanie et, avec sa filiale LTG-Link, exploite toutes les liaisons de transport de passagers sur le réseau ferroviaire lituanien ainsi qu’à l’étranger. diff --git a/content/operator/ltg/transitous.yaml b/content/operator/ltg/transitous.yaml new file mode 100644 index 000000000..b02f9965e --- /dev/null +++ b/content/operator/ltg/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "LTG Link" diff --git a/content/operator/nir/index.de.md b/content/operator/nir/index.de.md index 6f8a74741..80b21a6bf 100644 --- a/content/operator/nir/index.de.md +++ b/content/operator/nir/index.de.md @@ -8,10 +8,6 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp -params: - transitous_mapping: - - query: agencyName == "Translink NI Railways" - - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) ist die staatliche Bahngesellschaft in Nordirland und gehört zu Translink, einem staatlichen Verkehrsunternehmen. Das Zugnetz ist überschaubar und umfasst hauptsächlich Verbindungen von bzw. nach Belfast. diff --git a/content/operator/nir/index.en.md b/content/operator/nir/index.en.md index 6ee91f84d..a0091fb80 100644 --- a/content/operator/nir/index.en.md +++ b/content/operator/nir/index.en.md @@ -8,10 +8,6 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp -params: - transitous_mapping: - - query: agencyName == "Translink NI Railways" - - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) is the state railway company in Northern Ireland and is part of Translink, a state transport company. The rail network is compact and mainly consists of connections to and from Belfast. diff --git a/content/operator/nir/index.fr.md b/content/operator/nir/index.fr.md index fee9dc247..72c6f84ad 100644 --- a/content/operator/nir/index.fr.md +++ b/content/operator/nir/index.fr.md @@ -8,10 +8,6 @@ operator: "nir" aliases: - /booking/translink-ticket-office - /booking/translink-whatsapp -params: - transitous_mapping: - - query: agencyName == "Translink NI Railways" - - query: agencyName == "Northern Ireland Railways" --- Northern Ireland Railways (NIR) est la compagnie ferroviaire nationale d’Irlande du Nord et fait partie de Translink, une entreprise de transport public. Le réseau ferroviaire est compact et comprend principalement des liaisons à destination et en provenance de Belfast. diff --git a/content/operator/nir/transitous.yaml b/content/operator/nir/transitous.yaml new file mode 100644 index 000000000..4c681f457 --- /dev/null +++ b/content/operator/nir/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "Translink NI Railways" +- query: agencyName == "Northern Ireland Railways" diff --git a/content/operator/ns/index.de.md b/content/operator/ns/index.de.md index c8d57f406..a4ae074ad 100644 --- a/content/operator/ns/index.de.md +++ b/content/operator/ns/index.de.md @@ -8,11 +8,6 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office -params: - transitous_mapping: - - query: agencyName == "NS" - - query: agencyName == "NS Int" - - query: agencyName == "Nederlandse Spoorwegen" --- Die Nederlandse Spoorwegen (NS) ist die staatliche Eisenbahngesellschaft der [Niederlande](/country/netherlands "Niederlande") und betreibt den Großteil des Personenverkehrs auf dem niederländischen Schienennetz. diff --git a/content/operator/ns/index.en.md b/content/operator/ns/index.en.md index 1b2b383dd..bcb218833 100644 --- a/content/operator/ns/index.en.md +++ b/content/operator/ns/index.en.md @@ -8,11 +8,6 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office -params: - transitous_mapping: - - query: agencyName == "NS" - - query: agencyName == "NS Int" - - query: agencyName == "Nederlandse Spoorwegen" --- Nederlandse Spoorwegen (NS) is the state railway company of the [Netherlands](/country/netherlands "Netherlands") and operates the majority of passenger traffic on the Dutch rail network. diff --git a/content/operator/ns/index.fr.md b/content/operator/ns/index.fr.md index 12677214f..3de5a8ed3 100644 --- a/content/operator/ns/index.fr.md +++ b/content/operator/ns/index.fr.md @@ -8,11 +8,6 @@ operator: "ns" aliases: - /booking/ns-phone - /booking/ns-ticket-office -params: - transitous_mapping: - - query: agencyName == "NS" - - query: agencyName == "NS Int" - - query: agencyName == "Nederlandse Spoorwegen" --- Les Nederlandse Spoorwegen (NS) sont la compagnie ferroviaire nationale des [Pays-Bas](/country/netherlands "Pays-Bas") et assurent la majorité du trafic voyageurs dans le pays. diff --git a/content/operator/ns/transitous.yaml b/content/operator/ns/transitous.yaml new file mode 100644 index 000000000..e97e40a0e --- /dev/null +++ b/content/operator/ns/transitous.yaml @@ -0,0 +1,3 @@ +- query: agencyName == "NS" +- query: agencyName == "NS Int" +- query: agencyName == "Nederlandse Spoorwegen" diff --git a/content/operator/oebb/index.de.md b/content/operator/oebb/index.de.md index 501136dff..1a692e0e0 100644 --- a/content/operator/oebb/index.de.md +++ b/content/operator/oebb/index.de.md @@ -12,11 +12,6 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website -params: - transitous_mapping: - - query: agencyName == "OEBB Personenverkehr AG Kundenservice" - - query: agencyName == "ÖBB-Personenverkehr AG" - - query: agencyName == "ÖBB" --- Die ÖBB (Österreichische Bundesbahnen) ist die nationale Eisenbahngesellschaft [Österreich](/country/austria "Österreich") und die wichtigste Bahngesellschaft des Landes. Sie betreiben einen Großteil des Personenverkehrs in Österreich. diff --git a/content/operator/oebb/index.en.md b/content/operator/oebb/index.en.md index 3eba46db2..cda3f0097 100644 --- a/content/operator/oebb/index.en.md +++ b/content/operator/oebb/index.en.md @@ -12,11 +12,6 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website -params: - transitous_mapping: - - query: agencyName == "OEBB Personenverkehr AG Kundenservice" - - query: agencyName == "ÖBB-Personenverkehr AG" - - query: agencyName == "ÖBB" --- ÖBB (Austrian Federal Railways) is [Austria](/country/austria "Austria")’s national railway company and the country’s most important rail operator. It operates the majority of passenger services in Austria. diff --git a/content/operator/oebb/index.fr.md b/content/operator/oebb/index.fr.md index 29a72aa27..37a401d48 100644 --- a/content/operator/oebb/index.fr.md +++ b/content/operator/oebb/index.fr.md @@ -12,11 +12,6 @@ aliases: - /booking/oebb-ticket-machine - /booking/oebb-ticket-office - /booking/oebb-website -params: - transitous_mapping: - - query: agencyName == "OEBB Personenverkehr AG Kundenservice" - - query: agencyName == "ÖBB-Personenverkehr AG" - - query: agencyName == "ÖBB" --- Les ÖBB (Österreichische Bundesbahnen) sont la compagnie ferroviaire nationale d’[Autriche](/country/austria "Autriche") et l’opérateur ferroviaire le plus important du pays. Elle assure la majorité des services voyageurs. diff --git a/content/operator/oebb/transitous.yaml b/content/operator/oebb/transitous.yaml new file mode 100644 index 000000000..ac21f0f33 --- /dev/null +++ b/content/operator/oebb/transitous.yaml @@ -0,0 +1,3 @@ +- query: agencyName == "OEBB Personenverkehr AG Kundenservice" +- query: agencyName == "ÖBB-Personenverkehr AG" +- query: agencyName == "ÖBB" diff --git a/content/operator/pkp/index.de.md b/content/operator/pkp/index.de.md index b7caa164b..8f69a2b2f 100644 --- a/content/operator/pkp/index.de.md +++ b/content/operator/pkp/index.de.md @@ -10,10 +10,6 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website -params: - transitous_mapping: - - query: agencyName == "PKP Intercity" - - query: agencyName == "Polregio" --- Die polnische Staatsbahn PKP (Polskie Koleje Państwowe) betreibt mit ihren Tochtergesellschaften PKP Intercity und Polregio einen Großteil des Schienenpersonenverkehrs in [Polen](/country/poland "Polen"). diff --git a/content/operator/pkp/index.en.md b/content/operator/pkp/index.en.md index 143e00cbe..c70f87223 100644 --- a/content/operator/pkp/index.en.md +++ b/content/operator/pkp/index.en.md @@ -10,10 +10,6 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website -params: - transitous_mapping: - - query: agencyName == "PKP Intercity" - - query: agencyName == "Polregio" --- The Polish State Railways PKP (Polskie Koleje Państwowe) operates, together with its subsidiaries PKP Intercity and Polregio, a large part of passenger rail transport in [Poland](/country/poland "Poland"). diff --git a/content/operator/pkp/index.fr.md b/content/operator/pkp/index.fr.md index d7bd2a64a..5d9ca70ec 100644 --- a/content/operator/pkp/index.fr.md +++ b/content/operator/pkp/index.fr.md @@ -10,10 +10,6 @@ aliases: - /booking/pkp-ticket-office - /booking/pkp-website - /booking/koleo-website -params: - transitous_mapping: - - query: agencyName == "PKP Intercity" - - query: agencyName == "Polregio" --- Les chemins de fer polonais PKP (Polskie Koleje Państwowe) exploitent, avec leurs filiales PKP Intercity et Polregio, une grande partie du transport ferroviaire de voyageurs en [Pologne](/country/poland "Pologne"). diff --git a/content/operator/pkp/transitous.yaml b/content/operator/pkp/transitous.yaml new file mode 100644 index 000000000..66b6f555f --- /dev/null +++ b/content/operator/pkp/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "PKP Intercity" +- query: agencyName == "Polregio" diff --git a/content/operator/renfe/index.de.md b/content/operator/renfe/index.de.md index 4cb746d86..915db9db5 100644 --- a/content/operator/renfe/index.de.md +++ b/content/operator/renfe/index.de.md @@ -8,14 +8,6 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office -params: - transitous_mapping: - - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" - category: ave - - query: agencyName == "Renfe" - - query: agencyName == "Renfe Operadora" - - query: agencyName == "RENFE" - - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora ist das staatliche Eisenbahnunternehmen in [Spanien](/country/spain "Spanien"). Hierzu gehören komfortable Hochgeschwindkeitszüge, diverse Regionalzüge und S-Bahnen. diff --git a/content/operator/renfe/index.en.md b/content/operator/renfe/index.en.md index aaa5d0235..341657c95 100644 --- a/content/operator/renfe/index.en.md +++ b/content/operator/renfe/index.en.md @@ -8,14 +8,6 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office -params: - transitous_mapping: - - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" - category: ave - - query: agencyName == "Renfe" - - query: agencyName == "Renfe Operadora" - - query: agencyName == "RENFE" - - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora is the state-owned railroad company in [Spain](/country/spain "Spain"). It operates comfortable high-speed trains, various regional trains and suburban trains. diff --git a/content/operator/renfe/index.fr.md b/content/operator/renfe/index.fr.md index 6b35ba51c..52b1627ba 100644 --- a/content/operator/renfe/index.fr.md +++ b/content/operator/renfe/index.fr.md @@ -8,14 +8,6 @@ operator: "renfe" aliases: - /booking/renfe-ticket-office -params: - transitous_mapping: - - query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" - category: ave - - query: agencyName == "Renfe" - - query: agencyName == "Renfe Operadora" - - query: agencyName == "RENFE" - - query: agencyName == "RENFE OPERADORA" --- Renfe Operadora est la compagnie ferroviaire publique en [Espagne](/country/spain "Espagne"). Elle exploite des trains à grande vitesse confortables, divers trains régionaux et des trains de banlieue. diff --git a/content/operator/renfe/transitous.yaml b/content/operator/renfe/transitous.yaml new file mode 100644 index 000000000..525e9cc68 --- /dev/null +++ b/content/operator/renfe/transitous.yaml @@ -0,0 +1,6 @@ +- query: agencyName == "RENFE OPERADORA" && routeShortName == "AVE" + category: ave +- query: agencyName == "Renfe" +- query: agencyName == "Renfe Operadora" +- query: agencyName == "RENFE" +- query: agencyName == "RENFE OPERADORA" diff --git a/content/operator/sbb/index.de.md b/content/operator/sbb/index.de.md index 14e525c24..d9c341ec0 100644 --- a/content/operator/sbb/index.de.md +++ b/content/operator/sbb/index.de.md @@ -8,12 +8,6 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website -params: - transitous_mapping: - - query: agencyName == "SBB" - - query: agencyName == "CFF" - - query: agencyName == "FFS" - - query: agencyName == "SBB CFF FFS" --- Die SBB (Schweizerische Bundesbahnen) – (Chemins de fer fédéraux suisses CFF, Ferrovie federali svizzere FFS) ist die nationale Eisenbahngesellschaft der [Schweiz](/country/switzerland "Schweiz"). Sie betreibt einen Großteil des schweizerischen Schienennetzes. Die SBB ist bekannt für ihre Pünktlichkeit und Zuverlässigkeit. diff --git a/content/operator/sbb/index.en.md b/content/operator/sbb/index.en.md index ae07c501a..4c8f6bf95 100644 --- a/content/operator/sbb/index.en.md +++ b/content/operator/sbb/index.en.md @@ -8,12 +8,6 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website -params: - transitous_mapping: - - query: agencyName == "SBB" - - query: agencyName == "CFF" - - query: agencyName == "FFS" - - query: agencyName == "SBB CFF FFS" --- SBB (Swiss Federal Railways) – (Chemins de fer fédéraux suisses CFF, Ferrovie federali svizzere FFS) is the national railway company of [Switzerland](/country/switzerland "Switzerland"). It operates most of the Swiss rail network and is known for its punctuality and reliability. diff --git a/content/operator/sbb/index.fr.md b/content/operator/sbb/index.fr.md index 61e9ee3a8..ee3fdd674 100644 --- a/content/operator/sbb/index.fr.md +++ b/content/operator/sbb/index.fr.md @@ -8,12 +8,6 @@ aliases: - /booking/sbb-ticket-machine - /booking/sbb-ticket-office - /booking/sbb-website -params: - transitous_mapping: - - query: agencyName == "SBB" - - query: agencyName == "CFF" - - query: agencyName == "FFS" - - query: agencyName == "SBB CFF FFS" --- Les CFF (Chemins de fer fédéraux suisses, SBB en allemand, FFS en italien) sont la compagnie ferroviaire nationale de la [Suisse](/country/switzerland "Suisse"). Ils exploitent la majeure partie du réseau ferroviaire suisse et sont réputés pour leur ponctualité et leur fiabilité. diff --git a/content/operator/sbb/transitous.yaml b/content/operator/sbb/transitous.yaml new file mode 100644 index 000000000..7e2fb931b --- /dev/null +++ b/content/operator/sbb/transitous.yaml @@ -0,0 +1,4 @@ +- query: agencyName == "SBB" +- query: agencyName == "CFF" +- query: agencyName == "FFS" +- query: agencyName == "SBB CFF FFS" diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index 097cdd2b3..c1ffbf573 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -9,10 +9,6 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website -params: - transitous_mapping: - - query: agencyName == "SNCB" - - query: agencyName == "NMBS" --- Die SNCB (Société nationale des chemins de fer belges) bzw. NMBS (Nationale Maatschappij der Belgische Spoorwegen) ist die belgische Staatsbahn und die wichtigste Bahngesellschaft in [Belgien](/country/belgium "Belgien"). diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index 0961c8e35..1b5d549b0 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -9,10 +9,6 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website -params: - transitous_mapping: - - query: agencyName == "SNCB" - - query: agencyName == "NMBS" --- The SNCB (Société nationale des chemins de fer belges) or NMBS (Nationale Maatschappij der Belgische Spoorwegen) is the Belgian national railway operator and the most important railway operator in [Belgium](/country/belgium "Belgium"). diff --git a/content/operator/sncb/index.fr.md b/content/operator/sncb/index.fr.md index 01035dbba..b25977786 100644 --- a/content/operator/sncb/index.fr.md +++ b/content/operator/sncb/index.fr.md @@ -9,10 +9,6 @@ aliases: - /booking/sncb-phone - /booking/sncb-ticket-office - /booking/sncb-website -params: - transitous_mapping: - - query: agencyName == "SNCB" - - query: agencyName == "NMBS" --- La SNCB (Société nationale des chemins de fer belges) ou NMBS (Nationale Maatschappij der Belgische Spoorwegen) est l’opérateur ferroviaire national belge et le plus important de [Belgique](/country/belgium "Belgique"). diff --git a/content/operator/sncb/transitous.yaml b/content/operator/sncb/transitous.yaml new file mode 100644 index 000000000..abd0a1944 --- /dev/null +++ b/content/operator/sncb/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "SNCB" +- query: agencyName == "NMBS" diff --git a/content/operator/sncf/index.de.md b/content/operator/sncf/index.de.md index 38dec5313..62e541649 100644 --- a/content/operator/sncf/index.de.md +++ b/content/operator/sncf/index.de.md @@ -15,10 +15,6 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office -params: - transitous_mapping: - - query: agencyName == "SNCF" - - query: agencyName == "SNCF Voyageurs" --- Die SNCF (Société Nationale des Chemins de fer Français) ist die französische Staatsbahn und die wichtigste Bahngesellschaft in [Frankreich](/country/france "Frankreich"). Sie betreibt fast alle Fern- und Regionalzüge in Frankreich. diff --git a/content/operator/sncf/index.en.md b/content/operator/sncf/index.en.md index b59607b66..e8f6bbcc0 100644 --- a/content/operator/sncf/index.en.md +++ b/content/operator/sncf/index.en.md @@ -15,10 +15,6 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office -params: - transitous_mapping: - - query: agencyName == "SNCF" - - query: agencyName == "SNCF Voyageurs" --- SNCF (Société Nationale des Chemins de fer Français) is the French national railway company and the main rail operator in [France](/country/france "France"). It operates almost all long-distance and regional trains in France. diff --git a/content/operator/sncf/index.fr.md b/content/operator/sncf/index.fr.md index f2ba818d0..dfdb0eff0 100644 --- a/content/operator/sncf/index.fr.md +++ b/content/operator/sncf/index.fr.md @@ -15,10 +15,6 @@ aliases: - /booking/sncf-phone - /booking/sncf-ticket-office - /booking/transilien-ticket-office -params: - transitous_mapping: - - query: agencyName == "SNCF" - - query: agencyName == "SNCF Voyageurs" --- La SNCF (Société Nationale des Chemins de fer Français) est la compagnie ferroviaire nationale française et le principal opérateur ferroviaire en [France](/country/france "France"). Elle exploite la quasi-totalité des trains grandes lignes et régionaux du pays. diff --git a/content/operator/sncf/transitous.yaml b/content/operator/sncf/transitous.yaml new file mode 100644 index 000000000..9e40d03be --- /dev/null +++ b/content/operator/sncf/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "SNCF" +- query: agencyName == "SNCF Voyageurs" diff --git a/content/operator/sv/index.de.md b/content/operator/sv/index.de.md index 46c584df6..29c36b2db 100644 --- a/content/operator/sv/index.de.md +++ b/content/operator/sv/index.de.md @@ -4,9 +4,6 @@ title: "SV" country: - "serbia" operator: "sv" -params: - transitous_mapping: - - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) ist die staatliche Eisenbahngesellschaft in Serbien und betreibt den Großteil des Personenverkehrs im Land. diff --git a/content/operator/sv/index.en.md b/content/operator/sv/index.en.md index b9edab00a..e33d8d4b4 100644 --- a/content/operator/sv/index.en.md +++ b/content/operator/sv/index.en.md @@ -4,9 +4,6 @@ title: "SV" country: - "serbia" operator: "sv" -params: - transitous_mapping: - - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) is the state railway company in Serbia and operates the majority of passenger traffic in the country. diff --git a/content/operator/sv/index.fr.md b/content/operator/sv/index.fr.md index d276a8bdb..9f4729804 100644 --- a/content/operator/sv/index.fr.md +++ b/content/operator/sv/index.fr.md @@ -4,9 +4,6 @@ title: "SV" country: - "serbia" operator: "sv" -params: - transitous_mapping: - - query: agencyName == "Srbija Voz" --- Srbija Voz (Србија Воз) est la compagnie ferroviaire nationale de Serbie et exploite la majeure partie du trafic voyageurs dans le pays. diff --git a/content/operator/sv/transitous.yaml b/content/operator/sv/transitous.yaml new file mode 100644 index 000000000..c5a297006 --- /dev/null +++ b/content/operator/sv/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "Srbija Voz" diff --git a/content/operator/sz/index.de.md b/content/operator/sz/index.de.md index d687f83e2..a41993c9f 100644 --- a/content/operator/sz/index.de.md +++ b/content/operator/sz/index.de.md @@ -4,10 +4,6 @@ title: "SŽ" country: - "slovenia" operator: "sz" -params: - transitous_mapping: - - query: agencyName == "Slovenske železnice" - - query: agencyName == "SŽ" --- Die Slovenske železnice (SŽ) ist die staatliche Eisenbahngesellschaft von [Slowenien](/country/slovenia "Slowenien") und betreibt einen Großteil der Verbindungen im Personenverkehr auf dem slowenischen Schienennetz. diff --git a/content/operator/sz/index.en.md b/content/operator/sz/index.en.md index eb263b65a..725b234a1 100644 --- a/content/operator/sz/index.en.md +++ b/content/operator/sz/index.en.md @@ -4,10 +4,6 @@ title: "SŽ" country: - "slovenia" operator: "sz" -params: - transitous_mapping: - - query: agencyName == "Slovenske železnice" - - query: agencyName == "SŽ" --- The Slovenske železnice (SŽ) is the state railway company of [Slovenia](/country/slovenia "Slovenia") and operates the majority of passenger services on the Slovenian rail network. diff --git a/content/operator/sz/index.fr.md b/content/operator/sz/index.fr.md index cd82d7294..6cf9c51b4 100644 --- a/content/operator/sz/index.fr.md +++ b/content/operator/sz/index.fr.md @@ -4,10 +4,6 @@ title: "SŽ" country: - "slovenia" operator: "sz" -params: - transitous_mapping: - - query: agencyName == "Slovenske železnice" - - query: agencyName == "SŽ" --- Les Slovenske železnice (SŽ) sont la compagnie ferroviaire nationale de [Slovénie](/country/slovenia "Slovénie") et exploitent la majorité des services de voyageurs sur le réseau ferroviaire slovène. diff --git a/content/operator/sz/transitous.yaml b/content/operator/sz/transitous.yaml new file mode 100644 index 000000000..74ad630ae --- /dev/null +++ b/content/operator/sz/transitous.yaml @@ -0,0 +1,2 @@ +- query: agencyName == "Slovenske železnice" +- query: agencyName == "SŽ" diff --git a/content/operator/vy/index.de.md b/content/operator/vy/index.de.md index a309dde27..17ff860e1 100644 --- a/content/operator/vy/index.de.md +++ b/content/operator/vy/index.de.md @@ -9,12 +9,6 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office -params: - transitous_mapping: - - query: agencyName == "Vy" - - query: agencyName == "Vy Tog" - - query: agencyName == "SJ Nord" - - query: agencyName == "Go-Ahead Nordic" --- Die Vy Group (ehemals Norges Statsbaner) ist die staatliche Bahngesellschaft in [Norwegen](/country/norway). Sie betreibt mit ihren Tochtergesellschaften den Großteil des Schienenpersonenverkehrs in Norwegen. diff --git a/content/operator/vy/index.en.md b/content/operator/vy/index.en.md index 6d9f5fbec..bbd09c772 100644 --- a/content/operator/vy/index.en.md +++ b/content/operator/vy/index.en.md @@ -9,12 +9,6 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office -params: - transitous_mapping: - - query: agencyName == "Vy" - - query: agencyName == "Vy Tog" - - query: agencyName == "SJ Nord" - - query: agencyName == "Go-Ahead Nordic" --- Vy Group (formerly Norges Statsbaner) is the state railway company in [Norway](/country/norway). Together with its subsidiaries, it operates most of the passenger rail transport in Norway. diff --git a/content/operator/vy/index.fr.md b/content/operator/vy/index.fr.md index 9022ab9bf..dfe3e37c2 100644 --- a/content/operator/vy/index.fr.md +++ b/content/operator/vy/index.fr.md @@ -9,12 +9,6 @@ aliases: - /booking/entur-chat - /booking/entur-phone - /booking/entur-ticket-office -params: - transitous_mapping: - - query: agencyName == "Vy" - - query: agencyName == "Vy Tog" - - query: agencyName == "SJ Nord" - - query: agencyName == "Go-Ahead Nordic" --- Vy Group (anciennement Norges Statsbaner) est la compagnie ferroviaire nationale de la [Norvège](/country/norway). Avec ses filiales, elle assure la majeure partie du transport ferroviaire de voyageurs en Norvège. diff --git a/content/operator/vy/transitous.yaml b/content/operator/vy/transitous.yaml new file mode 100644 index 000000000..91583170a --- /dev/null +++ b/content/operator/vy/transitous.yaml @@ -0,0 +1,4 @@ +- query: agencyName == "Vy" +- query: agencyName == "Vy Tog" +- query: agencyName == "SJ Nord" +- query: agencyName == "Go-Ahead Nordic" diff --git a/content/operator/zpcg/index.de.md b/content/operator/zpcg/index.de.md index 8831bf6c2..48ed51b0c 100644 --- a/content/operator/zpcg/index.de.md +++ b/content/operator/zpcg/index.de.md @@ -4,9 +4,6 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" -params: - transitous_mapping: - - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) ist der nationale Personenverkehrsbetreiber in Montenegro. diff --git a/content/operator/zpcg/index.en.md b/content/operator/zpcg/index.en.md index c4c6f7e1e..1c539e256 100644 --- a/content/operator/zpcg/index.en.md +++ b/content/operator/zpcg/index.en.md @@ -4,9 +4,6 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" -params: - transitous_mapping: - - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) is the national passenger transport operator in Montenegro. diff --git a/content/operator/zpcg/index.fr.md b/content/operator/zpcg/index.fr.md index db6331129..e23cd6578 100644 --- a/content/operator/zpcg/index.fr.md +++ b/content/operator/zpcg/index.fr.md @@ -4,9 +4,6 @@ title: "ŽPCG" country: - "montenegro" operator: "zpcg" -params: - transitous_mapping: - - query: agencyName == "ŽPCG" --- ŽPCG (Željeznički prevoz Crne Gore, Жељезнички превоз Црне Горе) est l’opérateur national de transport de voyageurs au Monténégro. diff --git a/content/operator/zpcg/transitous.yaml b/content/operator/zpcg/transitous.yaml new file mode 100644 index 000000000..9d169eb10 --- /dev/null +++ b/content/operator/zpcg/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "ŽPCG" diff --git a/content/operator/zssk/index.de.md b/content/operator/zssk/index.de.md index c4e88225f..e0727a9a4 100644 --- a/content/operator/zssk/index.de.md +++ b/content/operator/zssk/index.de.md @@ -9,9 +9,6 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website -params: - transitous_mapping: - - query: agencyName == "ZSSK" --- Die ŽSR (Železnice Slovenskej republiky) sowie der dazugehörige Zugbetreiber ZSSK (Železničná spoločnosť Slovensko) ist die slowakische Staatsbahn und die wichtigste Bahngesellschaft in der [Slowakei](/country/slovakia "Slowakei"). diff --git a/content/operator/zssk/index.en.md b/content/operator/zssk/index.en.md index b7a41971a..06aa42374 100644 --- a/content/operator/zssk/index.en.md +++ b/content/operator/zssk/index.en.md @@ -8,9 +8,6 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website -params: - transitous_mapping: - - query: agencyName == "ZSSK" --- The ŽSR (Železnice Slovenskej republiky) and its associated train operator ZSSK (Železničná spoločnosť Slovensko) are the Slovak state railways and the most important railway operator in [Slovaika](/country/slovakia "Slovakia"). diff --git a/content/operator/zssk/index.fr.md b/content/operator/zssk/index.fr.md index c7cecb8a2..65153ea00 100644 --- a/content/operator/zssk/index.fr.md +++ b/content/operator/zssk/index.fr.md @@ -8,9 +8,6 @@ aliases: - zsr - /booking/zssk-ticket-office - /booking/zssk-website -params: - transitous_mapping: - - query: agencyName == "ZSSK" --- La ŽSR (Železnice Slovenskej republiky) et son exploitant ferroviaire ZSSK (Železničná spoločnosť Slovensko) sont les chemins de fer nationaux slovaques et constituent l’opérateur ferroviaire principal du [Slovaquie](/country/slovakia "Slovaquie"). diff --git a/content/operator/zssk/transitous.yaml b/content/operator/zssk/transitous.yaml new file mode 100644 index 000000000..bc933fb8f --- /dev/null +++ b/content/operator/zssk/transitous.yaml @@ -0,0 +1 @@ +- query: agencyName == "ZSSK" diff --git a/i18n/de.yaml b/i18n/de.yaml index d64703a05..360e2d74d 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -230,6 +230,13 @@ routePlanner: departureTime: Abfahrtszeit duration: Dauer errorGeneric: Ein Fehler ist aufgetreten. Bitte versuche es erneut. + experimental: >- + Der Routenplaner ist noch experimentell. Er enthält noch Fehler, daher + brauchen wir eure Hilfe. Wenn ihr fehlerhafte Informationen findet, meldet + diese bitte über das ICON_BUG_REPORT-Symbol für jeden Abschnitt im + Routenergebnis. Die Routenauskunft basiert auf der [Transitous + API](https://transitous.org/). Bitte prüfe die Informationen vor einer Fahrt + unbedingt auf den entsprechenden Betreiberseiten im FIP Guide. fipAccepted: FIP akzeptiert fipNotAccepted: FIP nicht akzeptiert fipPartial: FIP teilweise akzeptiert diff --git a/i18n/en.yaml b/i18n/en.yaml index ed60a118c..c4dfaf0bd 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -223,6 +223,13 @@ routePlanner: departureTime: Departure time duration: Duration errorGeneric: An error occurred. Please try again. + experimental: >- + The route planner is still experimental. It still contains errors, so we + need your help. If you find incorrect information, please report it using + the ICON_BUG_REPORT icon for each leg in the route result. The route + information is based on the [Transitous API](https://transitous.org/). + Please make sure to verify the information on the respective operator pages + in the FIP Guide before traveling. fipAccepted: FIP accepted fipNotAccepted: FIP not accepted fipPartial: FIP partially accepted diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 43583ad8a..1dddae564 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -232,6 +232,14 @@ routePlanner: departureTime: Heure de départ duration: Durée errorGeneric: Une erreur s'est produite. Veuillez réessayer. + experimental: >- + Le planificateur d'itinéraire est encore expérimental. Il contient encore + des erreurs, c'est pourquoi nous avons besoin de votre aide. Si vous trouvez + des informations erronées, veuillez les signaler via l'icône ICON_BUG_REPORT + pour chaque tronçon dans le résultat de l'itinéraire. Les informations + d'itinéraire sont basées sur l'[API Transitous](https://transitous.org/). + Veuillez vérifier les informations sur les pages des opérateurs + correspondants dans le FIP Guide avant de voyager. fipAccepted: FIP accepté fipNotAccepted: FIP non accepté fipPartial: FIP partiellement accepté diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json index 1bdde23c7..7723201ec 100644 --- a/layouts/_default/home.transitousmapping.json +++ b/layouts/_default/home.transitousmapping.json @@ -1,9 +1,10 @@ {{- $operators := where (where site.Pages "Type" "operator") "IsPage" true -}} {{- $result := slice -}} {{- range $operators -}} - {{- $mapping := .Params.transitous_mapping -}} - {{- if $mapping -}} - {{- $trainCategories := .Store.Get "train_categories" | default slice -}} + {{- $page := . -}} + {{- with .Resources.GetMatch "transitous.yaml" -}} + {{- $mapping := . | transform.Unmarshal -}} + {{- $trainCategories := $page.Store.Get "train_categories" | default slice -}} {{- $entries := slice -}} {{- range $mapping -}} {{- $entry := dict "query" .query -}} @@ -18,7 +19,7 @@ {{- end -}} {{- $entries = $entries | append $entry -}} {{- end -}} - {{- $op := dict "operator" .File.ContentBaseName "mapping" $entries -}} + {{- $op := dict "operator" $page.File.ContentBaseName "mapping" $entries -}} {{- $result = $result | append $op -}} {{- end -}} {{- end -}} @@ -26,9 +27,12 @@ {{- $countries := where (where site.Pages "Type" "country") "IsPage" true -}} {{- range $countries -}} {{- $countrySlug := .File.ContentBaseName -}} - {{- range .Params.operators_without_fip -}} - {{- if .query -}} - {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug) -}} + {{- with .Resources.GetMatch "transitous.yaml" -}} + {{- $entries := . | transform.Unmarshal -}} + {{- range $entries -}} + {{- if .query -}} + {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug) -}} + {{- end -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/layouts/country/single.html b/layouts/country/single.html index 4782318ec..dd42afd59 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -36,7 +36,7 @@

      {{ range . }} -
    • {{ .name | markdownify }}
      • +
    • {{ . | markdownify }}
      • {{ end }}
    {{ end }} diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html index 795b20125..a33ff32fe 100644 --- a/layouts/general/route-planner/single.html +++ b/layouts/general/route-planner/single.html @@ -8,6 +8,12 @@

    {{ .Title }}

    + {{ $icon := partial "icon" "bug_report" }} + {{ $rendered := T "routePlanner.experimental" | .RenderString }} + {{ $text := replace $rendered "ICON_BUG_REPORT" $icon | safeHTML }} + {{ partial "highlight" (dict "Type" "important" "Content" $text) }} + +
    From 8db20a45df7506b28b033a9cfa0703bf477e4b94 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 09:11:29 +0200 Subject: [PATCH 07/18] Remove Regionalverkehre Start Deutschland entries from transitous.yaml --- content/country/germany/transitous.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/country/germany/transitous.yaml b/content/country/germany/transitous.yaml index daf12b6f8..8c2ca7986 100644 --- a/content/country/germany/transitous.yaml +++ b/content/country/germany/transitous.yaml @@ -42,10 +42,6 @@ - query: agencyId == "7882" || agencyId == "731" # agencyName: "Ostdeutsche Eisenbahn GmbH" / "ODEG Ostdeutsche Eisenbahn GmbH" - query: agencyId == "10937" # agencyName: "Pressnitztalbahn" - query: agencyId == "10894" # agencyName: "REGIOBAHN" -- query: agencyId == "12521" # agencyName: "Regionalverkehre Start Deutschland GmbH Mitteldeutschland" -- query: agencyId == "14872" || agencyId == "2505" # agencyName: "Regionalverkehre Start Deutschland GmbH Niedersachsen-Mitte" -- query: agencyId == "14174" # agencyName: "Regionalverkehre Start Deutschland GmbH Taunus" -- query: agencyId == "12683" # agencyName: "Regionalverkehre Start Deutschland GmbH Unterelbe" - query: agencyId == "14173" # agencyName: "RheinRuhrBahn" - query: agencyId == "10858" # agencyName: "Rurtalbahn" - query: agencyId == "8931" # agencyName: "Saarbahn GmbH" From 8d351e5841222c0d360439804a9650c9ede08b64 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 09:33:33 +0200 Subject: [PATCH 08/18] Add priority field to transitous entries for match ordering --- assets/js/routePlanner.js | 25 ++++++++++++-------- content/country/germany/transitous.yaml | 2 +- layouts/_default/home.transitousmapping.json | 8 +++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index d4bed6a0f..39b68d164 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -87,18 +87,23 @@ function evalQuery(query, leg) { function matchLeg(leg) { if (!transitousMapping) return null; + const allEntries = []; for (const op of transitousMapping) { for (const entry of op.mapping) { - if (evalQuery(entry.query, leg)) { - return { - operatorSlug: op.operator, - categoryId: entry.category || null, - fipAccepted: entry.fipAccepted ?? null, - reservationRequired: entry.reservationRequired ?? null, - matchedQuery: entry.query, - country: entry.country || null, - }; - } + allEntries.push({ ...entry, operatorSlug: op.operator }); + } + } + allEntries.sort((a, b) => (b.priority || 0) - (a.priority || 0)); + for (const entry of allEntries) { + if (evalQuery(entry.query, leg)) { + return { + operatorSlug: entry.operatorSlug, + categoryId: entry.category || null, + fipAccepted: entry.fipAccepted ?? null, + reservationRequired: entry.reservationRequired ?? null, + matchedQuery: entry.query, + country: entry.country || null, + }; } } return null; diff --git a/content/country/germany/transitous.yaml b/content/country/germany/transitous.yaml index 8c2ca7986..224420e3c 100644 --- a/content/country/germany/transitous.yaml +++ b/content/country/germany/transitous.yaml @@ -3,7 +3,7 @@ - query: agencyId == "10833" # agencyName: "AKN Eisenbahn AG" - query: agencyId == "10836" # agencyName: "Albtal-Verkehrs-Gesellschaft" - query: agencyId == "10837" # agencyName: "alex - Die Länderbahn GmbH DLB" -- query: agencyId == "IFF:ARRIVA" # agencyName: "Arriva" (NL cross-border trains) +- query: agencyId == "IFF:ARRIVA" || agencyId == "ARR" # agencyName: "Arriva" (NL cross-border trains + Buses) - query: agencyId == "15251" # agencyName: "Arverio Baden-Württemberg GmbH" - query: agencyId == "15250" # agencyName: "Arverio Bayern GmbH" - query: agencyId == "10969" # agencyName: "Bayerische Regiobahn" diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json index 7723201ec..3a9566dea 100644 --- a/layouts/_default/home.transitousmapping.json +++ b/layouts/_default/home.transitousmapping.json @@ -7,7 +7,8 @@ {{- $trainCategories := $page.Store.Get "train_categories" | default slice -}} {{- $entries := slice -}} {{- range $mapping -}} - {{- $entry := dict "query" .query -}} + {{- $priority := .priority | default 0 -}} + {{- $entry := dict "query" .query "priority" $priority -}} {{- if .category -}} {{- $entry = merge $entry (dict "category" .category) -}} {{- $catId := .category -}} @@ -19,6 +20,7 @@ {{- end -}} {{- $entries = $entries | append $entry -}} {{- end -}} + {{- $entries = sort $entries "priority" "desc" -}} {{- $op := dict "operator" $page.File.ContentBaseName "mapping" $entries -}} {{- $result = $result | append $op -}} {{- end -}} @@ -31,12 +33,14 @@ {{- $entries := . | transform.Unmarshal -}} {{- range $entries -}} {{- if .query -}} - {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug) -}} + {{- $priority := .priority | default 0 -}} + {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug "priority" $priority) -}} {{- end -}} {{- end -}} {{- end -}} {{- end -}} {{- if $noFipEntries -}} + {{- $noFipEntries = sort $noFipEntries "priority" "desc" -}} {{- $result = $result | append (dict "operator" "no-fip" "mapping" $noFipEntries) -}} {{- end -}} {{- $result | jsonify (dict "indent" " ") -}} From 94a42cfda54290c0b742a402d14979f13fe8b5aa Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 09:39:40 +0200 Subject: [PATCH 09/18] Add message and fipAccepted/reservationRequired overwrite support to transitous entries --- assets/js/routePlanner.js | 7 +++++++ layouts/_default/home.transitousmapping.json | 22 +++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index 39b68d164..f0a1d183a 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -103,6 +103,7 @@ function matchLeg(leg) { reservationRequired: entry.reservationRequired ?? null, matchedQuery: entry.query, country: entry.country || null, + message: entry.message || null, }; } } @@ -148,6 +149,7 @@ function getFipStatus(leg) { fipAccepted: matchedFipAccepted, reservationRequired, country, + message, } = match; const isNoFip = operatorSlug === "no-fip"; const operatorUrl = isNoFip ? null : `/${cfg.lang}/operator/${operatorSlug}/`; @@ -166,6 +168,7 @@ function getFipStatus(leg) { categoryUrl, operatorSlug, reservationRequired, + message, debug, }; } @@ -176,6 +179,7 @@ function getFipStatus(leg) { categoryUrl, operatorSlug, reservationRequired, + message, debug, }; } @@ -186,6 +190,7 @@ function getFipStatus(leg) { categoryUrl, operatorSlug, reservationRequired, + message, debug, }; } @@ -195,6 +200,7 @@ function getFipStatus(leg) { categoryUrl, operatorSlug, reservationRequired, + message, debug, }; } @@ -330,6 +336,7 @@ function renderLeg(leg) { ${arrTime} ${leg.to?.name || ""}${toPlatform}
    + ${fipStatus.message ? `
    ${fipStatus.message}
    ` : ""}
    ${renderFipBadge(fipStatus, popoverId)}
    diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json index 3a9566dea..af47408b1 100644 --- a/layouts/_default/home.transitousmapping.json +++ b/layouts/_default/home.transitousmapping.json @@ -9,6 +9,12 @@ {{- range $mapping -}} {{- $priority := .priority | default 0 -}} {{- $entry := dict "query" .query "priority" $priority -}} + {{- with .message -}} + {{- $msg := index . $page.Language.Lang -}} + {{- if $msg -}} + {{- $entry = merge $entry (dict "message" $msg) -}} + {{- end -}} + {{- end -}} {{- if .category -}} {{- $entry = merge $entry (dict "category" .category) -}} {{- $catId := .category -}} @@ -18,6 +24,12 @@ {{- end -}} {{- end -}} {{- end -}} + {{- if isset . "fip_accepted" -}} + {{- $entry = merge $entry (dict "fipAccepted" .fip_accepted) -}} + {{- end -}} + {{- if isset . "reservation_required" -}} + {{- $entry = merge $entry (dict "reservationRequired" .reservation_required) -}} + {{- end -}} {{- $entries = $entries | append $entry -}} {{- end -}} {{- $entries = sort $entries "priority" "desc" -}} @@ -28,13 +40,21 @@ {{- $noFipEntries := slice -}} {{- $countries := where (where site.Pages "Type" "country") "IsPage" true -}} {{- range $countries -}} + {{- $countryPage := . -}} {{- $countrySlug := .File.ContentBaseName -}} {{- with .Resources.GetMatch "transitous.yaml" -}} {{- $entries := . | transform.Unmarshal -}} {{- range $entries -}} {{- if .query -}} {{- $priority := .priority | default 0 -}} - {{- $noFipEntries = $noFipEntries | append (dict "query" .query "fipAccepted" false "country" $countrySlug "priority" $priority) -}} + {{- $noFipEntry := dict "query" .query "fipAccepted" false "country" $countrySlug "priority" $priority -}} + {{- with .message -}} + {{- $msg := index . $countryPage.Language.Lang -}} + {{- if $msg -}} + {{- $noFipEntry = merge $noFipEntry (dict "message" $msg) -}} + {{- end -}} + {{- end -}} + {{- $noFipEntries = $noFipEntries | append $noFipEntry -}} {{- end -}} {{- end -}} {{- end -}} From 035c5c044d3817591b8198517874584979dfd41c Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 27 Jul 2026 22:40:14 +0200 Subject: [PATCH 10/18] feat: Add information about three-country-train (DE/BE/NL) --- content/country/belgium/index.de.md | 10 ++++++++++ content/country/belgium/index.en.md | 10 ++++++++++ content/country/belgium/index.fr.md | 10 ++++++++++ content/country/netherlands/index.de.md | 10 +++++++++- content/country/netherlands/index.en.md | 10 +++++++++- content/country/netherlands/index.fr.md | 10 +++++++++- content/operator/ns/index.de.md | 4 +++- content/operator/ns/index.en.md | 4 +++- content/operator/ns/index.fr.md | 4 +++- content/operator/sncb/index.de.md | 10 ++++++++++ content/operator/sncb/index.en.md | 10 ++++++++++ content/operator/sncb/index.fr.md | 10 ++++++++++ 12 files changed, 96 insertions(+), 6 deletions(-) diff --git a/content/country/belgium/index.de.md b/content/country/belgium/index.de.md index 909473288..49e343187 100644 --- a/content/country/belgium/index.de.md +++ b/content/country/belgium/index.de.md @@ -48,6 +48,14 @@ Von den Niederlanden aus können grenzüberschreitende Regionalzüge (dazu gehö Mit dem Eurostar (ehemals Thalys) kann ebenfalls von den Niederlanden aus das Netz der SNCB erreicht werden. Hier wird ein spezielles FIP Ticket von Eurostar auf dem kompletten Abschnitt (auch innerhalb von Belgien) benötigt. ([siehe Eurostar](/operator/eurostar "Eurostar")) +#### Dreiländerzug (Liège – Maastricht – Heerlen – Aachen) + +Seit Juni 2024 betreibt Arriva den Dreiländerzug zwischen Aachen (Deutschland), Heerlen (Niederlande), Maastricht (Niederlande) und Liège-Guillemins (Belgien). Auf dem Abschnitt zwischen Liège-Guillemins und Maastricht wird der Zug im Auftrag der SNCB (belgischer Abschnitt) und der NS (niederländischer Abschnitt bis Maastricht) betrieben. SNCB- und NS-Tickets, einschließlich FIP, bleiben auf diesem Abschnitt gültig.[^4] + +{{% highlight important %}} +FIP ist zwischen Liège-Guillemins und Maastricht gültig. Jenseits von Maastricht in Richtung Heerlen und Aachen wird der Zug von Arriva betrieben und FIP ist auf diesem Abschnitt nicht gültig. +{{% /highlight %}} + ### Deutschland #### Fernverkehr @@ -89,3 +97,5 @@ Außerdem gibt es verschiedene `TER` Regionalzugverbindungen von Frankreich nach [^2]: [DB Presse: ICE zum Flughafen Brüssel](https://www.deutschebahn.com/de/presse/pressestart_zentrales_uebersicht/Der-ICE-faehrt-zum-Flughafen-Bruessel-neue-Kooperation-von-DB-und-Brussels-Airlines-13703430) [^3]: [FIP Guide Community - Feedback](https://discord.com/channels/1250522473188032512/1480609147828441108/1480609147828441108) + +[^4]: [Arriva Dreiländerzug](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) diff --git a/content/country/belgium/index.en.md b/content/country/belgium/index.en.md index 5845498f6..b47f6c6e9 100644 --- a/content/country/belgium/index.en.md +++ b/content/country/belgium/index.en.md @@ -48,6 +48,14 @@ From the Netherlands, cross-border regional trains (including the `IC`) can be u The Eurostar (formerly Thalys) can also be used from the Netherlands to reach the SNCB network. Here, a special FIP Ticket from Eurostar is required for the entire section, including within Belgium. ([see Eurostar](/operator/eurostar "Eurostar")) +#### Three-Country Train (Liège – Maastricht – Heerlen – Aachen) + +Since June 2024, Arriva operates the Three-Country Train between Aachen (Germany), Heerlen (Netherlands), Maastricht (Netherlands), and Liège-Guillemins (Belgium). On the section between Liège-Guillemins and Maastricht, the train is operated on behalf of SNCB (Belgian section) and NS (Dutch section up to Maastricht). SNCB and NS tickets, including FIP, remain valid on this section.[^4] + +{{% highlight important %}} +FIP is valid between Liège-Guillemins and Maastricht. Beyond Maastricht towards Heerlen and Aachen, the train is operated by Arriva and FIP is not valid on this section. +{{% /highlight %}} + ### Germany #### Long-distance @@ -89,3 +97,5 @@ There are also various `TER` regional train connections from France to Belgium t [^2]: [DB Press: ICE to Brussels Airport](https://www.deutschebahn.com/de/presse/pressestart_zentrales_uebersicht/Der-ICE-faehrt-zum-Flughafen-Bruessel-neue-Kooperation-von-DB-und-Brussels-Airlines-13703430) [^3]: [FIP Guide Community - Feedback](https://discord.com/channels/1250522473188032512/1480609147828441108/1480609147828441108) + +[^4]: [Arriva Three-Country Train](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) diff --git a/content/country/belgium/index.fr.md b/content/country/belgium/index.fr.md index 9748ccb5b..83816da72 100644 --- a/content/country/belgium/index.fr.md +++ b/content/country/belgium/index.fr.md @@ -48,6 +48,14 @@ Depuis les Pays-Bas, il est possible d’utiliser les trains régionaux transfro L’Eurostar (anciennement Thalys) peut également être utilisé depuis les Pays-Bas pour rejoindre le réseau SNCB. Dans ce cas, un Billet FIP spécial Eurostar est nécessaire pour l’ensemble du trajet, y compris en Belgique. ([voir Eurostar](/operator/eurostar "Eurostar")) +#### Train des Trois Pays (Liège – Maastricht – Heerlen – Aix-la-Chapelle) + +Depuis juin 2024, Arriva exploite le Train des Trois Pays entre Aix-la-Chapelle (Allemagne), Heerlen (Pays-Bas), Maastricht (Pays-Bas) et Liège-Guillemins (Belgique). Sur la section entre Liège-Guillemins et Maastricht, le train est exploité pour le compte de la SNCB (section belge) et de la NS (section néerlandaise jusqu’à Maastricht). Les billets SNCB et NS, y compris les titres FIP, restent valables sur cette section.[^4] + +{{% highlight important %}} +Le FIP est valable entre Liège-Guillemins et Maastricht. Au-delà de Maastricht en direction de Heerlen et Aix-la-Chapelle, le train est exploité par Arriva et le FIP n’est pas valable sur cette section. +{{% /highlight %}} + ### Allemagne #### Grande vitesse @@ -89,3 +97,5 @@ Par ailleurs, plusieurs liaisons régionales `TER` existent entre la France et l [^2]: [DB Presse : ICE vers l’aéroport de Bruxelles](https://www.deutschebahn.com/de/presse/pressestart_zentrales_uebersicht/Der-ICE-faehrt-zum-Flughafen-Bruessel-neue-Kooperation-von-DB-und-Brussels-Airlines-13703430) [^3]: [Communauté FIP Guide - Retour d’information](https://discord.com/channels/1250522473188032512/1480609147828441108/1480609147828441108) + +[^4]: [Arriva Train des Trois Pays](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) diff --git a/content/country/netherlands/index.de.md b/content/country/netherlands/index.de.md index 8bb8a4a5b..b4d790cdc 100644 --- a/content/country/netherlands/index.de.md +++ b/content/country/netherlands/index.de.md @@ -21,7 +21,7 @@ In den Niederlanden können FIP 50 Tickets und FIP Freifahrtscheine auf einem gr Zusätzlich verkehren internationale [Eurostar](/operator/eurostar "Eurostar") Züge, welche vergünstigt mit speziellen FIP Globalpreisen genutzt werden können. Die Züge sind in der Verbindungsauskunft als Zugkategorie `EST` ausgewiesen. -Andere Betreiber wie Arriva Nederland oder die grenzüberschreitenden `RE` Züge Arnhem - Düsseldorf, Venlo - Hamm und Maastricht - Aachen sind dagegen leider nicht mit FIP nutzbar. Auch sämtliche Busse (außer im Schienenersatzverkehr), Straßenbahnen und U-Bahnen sind nicht enthalten. +Andere Betreiber wie Arriva Nederland oder die grenzüberschreitenden `RE` Züge Arnhem - Düsseldorf und Venlo - Hamm sind dagegen leider nicht mit FIP nutzbar. Beim Dreiländerzug (Maastricht – Heerlen – Aachen) ist FIP nur auf dem Abschnitt zwischen Maastricht und Liège-Guillemins gültig (betrieben im Auftrag von NS und SNCB), nicht jedoch zwischen Maastricht und Aachen. Auch sämtliche Busse (außer im Schienenersatzverkehr), Straßenbahnen und U-Bahnen sind nicht enthalten. {{< identify-operator sources="ns-website,db-website" />}} @@ -66,6 +66,14 @@ Von Belgien aus können grenzüberschreitende Regionalzüge (dazu gehört hier a Mit dem Eurostar (ehemals Thalys) kann ebenfalls von den Niederlanden aus das Netz der SNCB erreicht werden. Hier wird ein spezielles FIP Ticket von Eurostar auf dem kompletten Abschnitt (auch innerhalb der Niederlande) benötigt. ([siehe Eurostar](/operator/eurostar "Eurostar")) +#### Dreiländerzug (Liège – Maastricht – Heerlen – Aachen) + +Seit Juni 2024 betreibt Arriva den Dreiländerzug zwischen Aachen (Deutschland), Heerlen (Niederlande), Maastricht (Niederlande) und Liège-Guillemins (Belgien). Auf dem Abschnitt zwischen Maastricht und Liège-Guillemins wird der Zug im Auftrag der NS (niederländischer Abschnitt) und der SNCB (belgischer Abschnitt) betrieben. NS- und SNCB-Tickets, einschließlich FIP, bleiben auf diesem Abschnitt gültig. + +{{% highlight important %}} +FIP ist zwischen Maastricht und Liège-Guillemins gültig. Zwischen Maastricht und Aachen (über Heerlen) wird der Zug von Arriva betrieben und FIP ist nicht gültig. +{{% /highlight %}} + ### Vereinigtes Königreich Von London St. Pancras verkehren durchgängige [Eurostar](/operator/eurostar "Eurostar") Züge nach Amsterdam und Rotterdam. Die Eurostar Züge sind immer reservierungspflichtig und es müssen FIP Globalpreis-Tickets erworben werden. diff --git a/content/country/netherlands/index.en.md b/content/country/netherlands/index.en.md index cb64ab56b..9db744678 100644 --- a/content/country/netherlands/index.en.md +++ b/content/country/netherlands/index.en.md @@ -21,7 +21,7 @@ In the Netherlands, FIP 50 Tickets and FIP Coupons can be used on a large part o Additionally, international [Eurostar](/operator/eurostar "Eurostar") trains operate, which can be used at a discount with special FIP Global Fares. These trains are listed as train category `EST` in journey planners. -Other operators such as Arriva Nederland or the cross-border `RE` trains Arnhem - Düsseldorf, Venlo - Hamm, and Maastricht - Aachen unfortunately do not accept FIP. All buses (except rail replacement services), trams, and metros are also excluded. +Other operators such as Arriva Nederland or the cross-border `RE` trains Arnhem - Düsseldorf and Venlo - Hamm unfortunately do not accept FIP. On the Three-Country Train (Maastricht – Heerlen – Aachen), FIP is only valid on the section between Maastricht and Liège-Guillemins (operated on behalf of NS and SNCB), but not between Maastricht and Aachen. All buses (except rail replacement services), trams, and metros are also excluded. {{< identify-operator sources="ns-website,db-website" />}} @@ -66,6 +66,14 @@ From Belgium, cross-border regional trains (including the `IC` here) can be used With the Eurostar (formerly Thalys), you can also reach the SNCB network from the Netherlands. Here, a special FIP Ticket from Eurostar is required for the entire route (including within the Netherlands). ([see Eurostar](/operator/eurostar "Eurostar")) +#### Three-Country Train (Liège – Maastricht – Heerlen – Aachen) + +Since June 2024, Arriva operates the Three-Country Train between Aachen (Germany), Heerlen (Netherlands), Maastricht (Netherlands), and Liège-Guillemins (Belgium). On the section between Maastricht and Liège-Guillemins, the train is operated on behalf of NS (Dutch section) and SNCB (Belgian section). NS and SNCB tickets, including FIP, remain valid on this section. + +{{% highlight important %}} +FIP is valid between Maastricht and Liège-Guillemins. Between Maastricht and Aachen (via Heerlen), the train is operated by Arriva and FIP is not valid. +{{% /highlight %}} + ### United Kingdom Direct [Eurostar](/operator/eurostar "Eurostar") trains run from London St. Pancras to Amsterdam and Rotterdam. Reservations are always required for Eurostar trains, and FIP Global Fare tickets must be purchased. diff --git a/content/country/netherlands/index.fr.md b/content/country/netherlands/index.fr.md index e872ac187..5fa7b824d 100644 --- a/content/country/netherlands/index.fr.md +++ b/content/country/netherlands/index.fr.md @@ -21,7 +21,7 @@ Aux Pays-Bas, les Billets FIP 50 et les Coupons FIP peuvent être utilisés sur Des trains internationaux [Eurostar](/operator/eurostar "Eurostar") circulent également, accessibles avec des billets spéciaux FIP à tarif global. Ces trains apparaissent sous la catégorie `EST` dans les horaires. -D’autres opérateurs, comme Arriva Nederland, ou les trains régionaux transfrontaliers `RE` (Arnhem – Düsseldorf, Venlo – Hamm, Maastricht – Aix-la-Chapelle) n’acceptent pas les Billets FIP. Tous les bus (sauf remplacement rail), trams et métros sont également exclus. +D’autres opérateurs, comme Arriva Nederland, ou les trains régionaux transfrontaliers `RE` (Arnhem – Düsseldorf, Venlo – Hamm) n’acceptent pas les Billets FIP. Sur le Train des Trois Pays (Maastricht – Heerlen – Aix-la-Chapelle), le FIP est uniquement valable sur la section entre Maastricht et Liège-Guillemins (exploitée pour le compte de la NS et de la SNCB), mais pas entre Maastricht et Aix-la-Chapelle. Tous les bus (sauf remplacement rail), trams et métros sont également exclus. {{< identify-operator sources="ns-website,db-website" />}} @@ -66,6 +66,14 @@ Depuis la Belgique, les trains régionaux transfrontaliers (y compris les `IC`) L’Eurostar (anciennement Thalys) permet aussi de rejoindre la Belgique depuis les Pays-Bas. Un Billet FIP spécial Eurostar est alors requis pour tout le trajet, y compris la partie néerlandaise. ([voir Eurostar](/operator/eurostar "Eurostar")) +#### Train des Trois Pays (Liège – Maastricht – Heerlen – Aix-la-Chapelle) + +Depuis juin 2024, Arriva exploite le Train des Trois Pays entre Aix-la-Chapelle (Allemagne), Heerlen (Pays-Bas), Maastricht (Pays-Bas) et Liège-Guillemins (Belgique). Sur la section entre Maastricht et Liège-Guillemins, le train est exploité pour le compte de la NS (section néerlandaise) et de la SNCB (section belge). Les billets NS et SNCB, y compris les titres FIP, restent valables sur cette section. + +{{% highlight important %}} +Le FIP est valable entre Maastricht et Liège-Guillemins. Entre Maastricht et Aix-la-Chapelle (via Heerlen), le train est exploité par Arriva et le FIP n'est pas valable. +{{% /highlight %}} + ### Royaume-Uni Depuis London St. Pancras, des trains [Eurostar](/operator/eurostar "Eurostar") directs relient Amsterdam et Rotterdam. Les trains Eurostar sont toujours soumis à réservation et des billets au tarif global FIP doivent être achetés. diff --git a/content/operator/ns/index.de.md b/content/operator/ns/index.de.md index a4ae074ad..fdce27c8c 100644 --- a/content/operator/ns/index.de.md +++ b/content/operator/ns/index.de.md @@ -148,7 +148,9 @@ Anders als in anderen Ländern keine wirklichen Fernzüge, sondern eher schnelle Regionalzüge mit mehr Halten als beim Intercity, aber trotzdem nur an wichtigeren Stationen. {{% highlight confusion %}} -Die Züge der Kategorie Sneltrein / Regional-Express `RE`, unter anderem die Verbindungen Venlo – Hamm (Deutschland), Maastricht – Aachen (Deutschland) und Arnhem – Düsseldorf (Deutschland) sowie andere RE-Verbindungen werden nicht von der NS betrieben und sind mit FIP nicht nutzbar. +Die Züge der Kategorie Sneltrein / Regional-Express `RE`, unter anderem die Verbindungen Venlo – Hamm (Deutschland) und Arnhem – Düsseldorf (Deutschland) sowie andere RE-Verbindungen werden nicht von der NS betrieben und sind mit FIP nicht nutzbar. + +Eine Ausnahme gilt für den Dreiländerzug (Liège-Guillemins – Maastricht – Heerlen – Aachen): Zwischen Maastricht und Liège-Guillemins wird der Zug im Auftrag der NS und SNCB betrieben, NS/SNCB-Tickets einschließlich FIP bleiben gültig. Zwischen Maastricht und Aachen (über Heerlen) wird der Zug von Arriva betrieben und FIP ist nicht gültig. {{% /highlight %}} {{% /train-category %}} diff --git a/content/operator/ns/index.en.md b/content/operator/ns/index.en.md index bcb218833..0778cafaf 100644 --- a/content/operator/ns/index.en.md +++ b/content/operator/ns/index.en.md @@ -149,7 +149,9 @@ Unlike in other countries, these are not true long-distance trains, but rather f Regional trains with more stops than Intercity, but still only at important stations. {{% highlight confusion %}} -Trains of the Sneltrein / Regional-Express `RE` category, including the connections Venlo – Hamm (Germany), Maastricht – Aachen (Germany), and Arnhem – Düsseldorf (Germany), as well as other RE connections, are not operated by NS and cannot be used with FIP. +Trains of the Sneltrein / Regional-Express `RE` category, including the connections Venlo – Hamm (Germany) and Arnhem – Düsseldorf (Germany), as well as other RE connections, are not operated by NS and cannot be used with FIP. + +An exception applies to the Three-Country Train (Liège-Guillemins – Maastricht – Heerlen – Aachen): between Maastricht and Liège-Guillemins, the train is operated on behalf of NS and SNCB, and NS/SNCB tickets including FIP remain valid. Between Maastricht and Aachen (via Heerlen), the train is operated by Arriva and FIP is not valid. {{% /highlight %}} {{% /train-category %}} diff --git a/content/operator/ns/index.fr.md b/content/operator/ns/index.fr.md index 3de5a8ed3..de7610a26 100644 --- a/content/operator/ns/index.fr.md +++ b/content/operator/ns/index.fr.md @@ -149,7 +149,9 @@ Contrairement à d’autres pays, il ne s’agit pas de véritables trains longu Trains régionaux avec plus d’arrêts que les Intercity, mais uniquement dans les gares principales. {{% highlight confusion %}} -Les trains de la catégorie Sneltrein / Regional-Express `RE`, notamment les liaisons Venlo – Hamm (Allemagne), Maastricht – Aix-la-Chapelle (Allemagne) et Arnhem – Düsseldorf (Allemagne), ainsi que d’autres liaisons RE, ne sont pas exploités par NS et ne sont pas accessibles avec FIP. +Les trains de la catégorie Sneltrein / Regional-Express `RE`, notamment les liaisons Venlo – Hamm (Allemagne) et Arnhem – Düsseldorf (Allemagne), ainsi que d’autres liaisons RE, ne sont pas exploités par NS et ne sont pas accessibles avec FIP. + +Une exception s’applique au Train des Trois Pays (Liège-Guillemins – Maastricht – Heerlen – Aix-la-Chapelle) : entre Maastricht et Liège-Guillemins, le train est exploité pour le compte de la NS et de la SNCB, et les billets NS/SNCB incluant le FIP restent valables. Entre Maastricht et Aix-la-Chapelle (via Heerlen), le train est exploité par Arriva et le FIP n’est pas valable. {{% /highlight %}} {{% /train-category %}} diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index c1ffbf573..2dae8dc0d 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -209,6 +209,14 @@ Bis zu vier Kinder unter 12 Jahren reisen in Begleitung eines Erwachsenen (Perso ## Tarifliche Besonderheiten +### Dreiländerzug (Liège – Maastricht – Heerlen – Aachen) + +Seit Juni 2024 betreibt Arriva den Dreiländerzug zwischen Aachen (Deutschland), Heerlen (Niederlande), Maastricht (Niederlande) und Liège-Guillemins (Belgien). Auf dem Abschnitt zwischen Liège-Guillemins und Maastricht wird der Zug im Auftrag der SNCB (belgischer Abschnitt) und der NS (niederländischer Abschnitt bis Maastricht) betrieben. SNCB- und NS-Tickets, einschließlich FIP, bleiben auf diesem Abschnitt gültig.[^8] + +{{% highlight important %}} +FIP ist zwischen Liège-Guillemins und Maastricht gültig. Jenseits von Maastricht in Richtung Heerlen und Aachen wird der Zug von Arriva betrieben und FIP ist auf diesem Abschnitt nicht gültig. +{{% /highlight %}} + ### Flughafen Brüssel Zaventem Auf Verbindungen von und zum Flughafen Brüssel Zaventem muss für den FIP Freifahrtschein ein Zuschlag gezahlt werden. Dieser beträgt aktuell 7,10 Euro (vgl. [Info der SNCB](https://www.belgiantrain.be/de/tickets-and-railcards/airports/brussels-airport)) und muss auch gezahlt werden, wenn der Hinweise _No Supplement Necessary_ angegeben ist. [^1] Bei FIP 50 / FIP 75 Tickets ist dieser bereits im Preis inbegriffen, sofern das Ticket nicht am Fahrkartenautomaten erworben wurde. [^2] @@ -238,3 +246,5 @@ Dieser Betreiber ist Teil des AJC (Agreement on Journey Continuation). [Weitere [^6]: [Rail Delivery Group -- Changes to buying tickets on SNCB trains in Belgium](https://www.raildeliverygroup.com/rst/stop-press/469782370-changes-to-buying-tickets-on-sncb-trains-in-belgium.html) [^7]: [FIP Guide Community: SNCB Unlimited Pass](https://discord.com/channels/1250522473188032512/1433782574806728804/1470491831987998771) + +[^8]: [Arriva Dreiländerzug](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index 1b5d549b0..de6c8ae5e 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -211,6 +211,14 @@ Up to four children under the age of 12 travel for free when accompanied by an a ## Special Tariff Conditions +### Three-Country Train (Liège – Maastricht – Heerlen – Aachen) + +Since June 2024, Arriva operates the Three-Country Train between Aachen (Germany), Heerlen (Netherlands), Maastricht (Netherlands), and Liège-Guillemins (Belgium). On the section between Liège-Guillemins and Maastricht, the train is operated on behalf of SNCB (Belgian section) and NS (Dutch section up to Maastricht). SNCB and NS tickets, including FIP, remain valid on this section.[^8] + +{{% highlight important %}} +FIP is valid between Liège-Guillemins and Maastricht. Beyond Maastricht towards Heerlen and Aachen, the train is operated by Arriva and FIP is not valid on this section. +{{% /highlight %}} + ### Brussels Zaventem Airport For connections to and from Brussels Zaventem Airport, a surcharge must be paid for the FIP Coupon. This currently amounts to € 7.10 (see [SNCB info](https://www.belgiantrain.be/en/tickets-and-railcards/airports/brussels-airport)) and must also be paid if the note _No Supplement Necessary_ is indicated. [^1] For FIP 50 / FIP 75 Tickets, this is already included in the price, unless the ticket was purchased at a ticket machine. [^2] @@ -240,3 +248,5 @@ This operator is part of AJC (Agreement on Journey Continuation). [More informat [^6]: [Rail Delivery Group -- Changes to buying tickets on SNCB trains in Belgium](https://www.raildeliverygroup.com/rst/stop-press/469782370-changes-to-buying-tickets-on-sncb-trains-in-belgium.html) [^7]: [FIP Guide Community: SNCB Unlimited Pass](https://discord.com/channels/1250522473188032512/1433782574806728804/1470491831987998771) + +[^8]: [Arriva Three-Country Train](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) diff --git a/content/operator/sncb/index.fr.md b/content/operator/sncb/index.fr.md index b25977786..abab0eabe 100644 --- a/content/operator/sncb/index.fr.md +++ b/content/operator/sncb/index.fr.md @@ -210,6 +210,14 @@ Jusqu’à quatre enfants de moins de 12 ans voyagent gratuitement lorsqu’ils ## Conditions tarifaires spéciales +### Train des Trois Pays (Liège – Maastricht – Heerlen – Aix-la-Chapelle) + +Depuis juin 2024, Arriva exploite le Train des Trois Pays entre Aix-la-Chapelle (Allemagne), Heerlen (Pays-Bas), Maastricht (Pays-Bas) et Liège-Guillemins (Belgique). Sur la section entre Liège-Guillemins et Maastricht, le train est exploité pour le compte de la SNCB (section belge) et de la NS (section néerlandaise jusqu'à Maastricht). Les billets SNCB et NS, y compris les titres FIP, restent valables sur cette section.[^8] + +{{% highlight important %}} +Le FIP est valable entre Liège-Guillemins et Maastricht. Au-delà de Maastricht en direction de Heerlen et Aix-la-Chapelle, le train est exploité par Arriva et le FIP n'est pas valable sur cette section. +{{% /highlight %}} + ### Aéroport de Bruxelles-Zaventem Un supplément de 7,10 € est requis pour les trajets à destination ou en provenance de l’aéroport, même avec un Coupon FIP, même si le message _"Pas de supplément requis"_ figure sur le billet. [^1] Ce supplément est inclus dans le prix d’un Billet FIP 50 / FIP 75, sauf si le billet a été acheté à un distributeur automatique. [^2] [Plus d’infos sur le supplément SNCB](https://www.belgiantrain.be/fr/tickets-and-railcards/airports/brussels-airport) @@ -239,3 +247,5 @@ Cet opérateur fait partie de l’AJC (Agreement on Journey Continuation). [Plus [^6]: [Rail Delivery Group -- Changes to buying tickets on SNCB trains in Belgium](https://www.raildeliverygroup.com/rst/stop-press/469782370-changes-to-buying-tickets-on-sncb-trains-in-belgium.html) [^7]: [FIP Guide Community: SNCB Unlimited Pass](https://discord.com/channels/1250522473188032512/1433782574806728804/1470491831987998771) + +[^8]: [Arriva Train des Trois Pays](https://www.arriva.nl/over-je-reis/met-de-trein/de-drielandentrein/) From 305eda73eecf2d844ebe91c51196eb2e27b204a6 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 11:27:09 +0200 Subject: [PATCH 11/18] Add Arriva three-country train (RE18) rules to NS transitous mapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add fromName/toName/fromStopId/toStopId to query evaluation context - Detect Liège–Maastricht section (FIP accepted) - Detect Maastricht–Aachen section (FIP not accepted) - Fallback for mixed legs (FIP partially accepted) - Match both Arriva (Sneltrein RE18) and DB Regio (de-DELFI_de:nrw:re18) variants --- assets/js/routePlanner.js | 12 ++++++++ content/operator/ns/transitous.yaml | 46 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index f0a1d183a..11d106ced 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -62,6 +62,10 @@ function evalQuery(query, leg) { routeId, tripShortName, } = leg; + const fromStopId = leg.from?.stopId || leg.from?.id || ""; + const toStopId = leg.to?.stopId || leg.to?.id || ""; + const fromName = leg.from?.name || ""; + const toName = leg.to?.name || ""; return Function( "agencyId", "agencyName", @@ -70,6 +74,10 @@ function evalQuery(query, leg) { "mode", "routeId", "tripShortName", + "fromStopId", + "toStopId", + "fromName", + "toName", `"use strict"; return (${query});`, )( agencyId, @@ -79,6 +87,10 @@ function evalQuery(query, leg) { mode, routeId, tripShortName, + fromStopId, + toStopId, + fromName, + toName, ); } catch { return false; diff --git a/content/operator/ns/transitous.yaml b/content/operator/ns/transitous.yaml index e97e40a0e..c449f3588 100644 --- a/content/operator/ns/transitous.yaml +++ b/content/operator/ns/transitous.yaml @@ -1,3 +1,49 @@ +- query: (agencyId == "IFF:ARRIVA" && routeShortName == "Sneltrein RE18" || routeId.startsWith("de-DELFI_de:nrw:re18")) && !fromName.includes("Heerlen") && !fromName.includes("Aachen") && !fromName.includes("Herzogenrath") && !fromName.includes("Eygelshoven") && !fromName.includes("Landgraaf") && !toName.includes("Heerlen") && !toName.includes("Aachen") && !toName.includes("Herzogenrath") && !toName.includes("Eygelshoven") && !toName.includes("Landgraaf") + fip_accepted: true + priority: 3 + message: + de: >- + FIP ist auf dem Abschnitt Liège-Guillemins – Maastricht des + Dreiländerzugs (RE18) gültig. Der Zug wird hier im Auftrag von NS und + SNCB betrieben. + en: >- + FIP is valid on the Liège-Guillemins – Maastricht section of the + Three-Country Train (RE18). The train is operated on behalf of NS and SNCB + on this section. + fr: >- + Le FIP est valable sur le tronçon Liège-Guillemins – Maastricht du Train + des Trois Pays (RE18). Le train est exploité pour le compte de la NS et de + la SNCB sur ce tronçon. +- query: (agencyId == "IFF:ARRIVA" && routeShortName == "Sneltrein RE18" || routeId.startsWith("de-DELFI_de:nrw:re18")) && !fromName.includes("Liège") && !fromName.includes("Bressoux") && !fromName.includes("Visé") && !fromName.includes("Eijsden") && !fromName.includes("Maastricht Randwyck") && !toName.includes("Liège") && !toName.includes("Bressoux") && !toName.includes("Visé") && !toName.includes("Eijsden") && !toName.includes("Maastricht Randwyck") + fip_accepted: false + priority: 3 + message: + de: >- + FIP ist auf dem Abschnitt Maastricht – Aachen des Dreiländerzugs (RE18) + nicht gültig. Der Zug wird hier von Arriva betrieben. + en: >- + FIP is not valid on the Maastricht – Aachen section of the Three-Country + Train (RE18). The train is operated by Arriva on this section. + fr: >- + Le FIP n'est pas valable sur le tronçon Maastricht – Aix-la-Chapelle du + Train des Trois Pays (RE18). Le train est exploité par Arriva sur ce + tronçon. +- query: agencyId == "IFF:ARRIVA" && routeShortName == "Sneltrein RE18" || routeId.startsWith("de-DELFI_de:nrw:re18") + fip_accepted: "partially" + priority: 2 + message: + de: >- + FIP ist zwischen Liège-Guillemins und Maastricht gültig. Über Maastricht + hinaus Richtung Heerlen und Aachen wird der Zug von Arriva betrieben und + FIP ist auf diesem Abschnitt nicht gültig. + en: >- + FIP is valid between Liège-Guillemins and Maastricht. Beyond Maastricht + towards Heerlen and Aachen, the train is operated by Arriva and FIP is not + valid on this section. + fr: >- + Le FIP est valable entre Liège-Guillemins et Maastricht. Au-delà de + Maastricht vers Heerlen et Aix-la-Chapelle, le train est exploité par + Arriva et le FIP n'est pas valable sur ce tronçon. - query: agencyName == "NS" - query: agencyName == "NS Int" - query: agencyName == "Nederlandse Spoorwegen" From e2dab81f8a314e56587ee15d7492e6afb66a1e88 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 12:04:33 +0200 Subject: [PATCH 12/18] Add fromCountry/toCountry to query context and NS International ICE rule - Pre-resolve countries for all legs before rendering - Add fromCountry/toCountry to evalQuery for country-based matching - Add NS International ICE as FIP accepted on DB page for domestic journeys - Set reservation_required false for national ICE trains --- assets/js/routePlanner.js | 20 ++++++++++++++++++++ content/operator/db/transitous.yaml | 4 ++++ content/operator/ns/transitous.yaml | 3 --- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index 11d106ced..c38b14fe5 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -66,6 +66,16 @@ function evalQuery(query, leg) { const toStopId = leg.to?.stopId || leg.to?.id || ""; const fromName = leg.from?.name || ""; const toName = leg.to?.name || ""; + const fromCountry = + (leg.from?.lat && + leg.from?.lon && + countryCache.get(`${leg.from.lat},${leg.from.lon}`)) || + ""; + const toCountry = + (leg.to?.lat && + leg.to?.lon && + countryCache.get(`${leg.to.lat},${leg.to.lon}`)) || + ""; return Function( "agencyId", "agencyName", @@ -78,6 +88,8 @@ function evalQuery(query, leg) { "toStopId", "fromName", "toName", + "fromCountry", + "toCountry", `"use strict"; return (${query});`, )( agencyId, @@ -91,6 +103,8 @@ function evalQuery(query, leg) { toStopId, fromName, toName, + fromCountry, + toCountry, ); } catch { return false; @@ -443,6 +457,12 @@ async function search() { return; } + const allPlaces = itineraries.flatMap( + (it) => + it.legs?.flatMap((leg) => [leg.from, leg.to].filter(Boolean)) || [], + ); + await Promise.all(allPlaces.map((p) => getCountryForPlace(p))); + itinerariesEl.innerHTML = itineraries .map((it, i) => renderItinerary(it, i)) .join(""); diff --git a/content/operator/db/transitous.yaml b/content/operator/db/transitous.yaml index 199f949a2..29ab4e4f5 100644 --- a/content/operator/db/transitous.yaml +++ b/content/operator/db/transitous.yaml @@ -1,3 +1,7 @@ +- query: (agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") || agencyId == "IFF:NS_INT" && routeShortName == "ICE") && fromCountry == "DE" && toCountry == "DE" + category: ice + reservation_required: false + priority: 1 - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("ICE") category: ice - query: agencyName == "DB Fernverkehr AG" && displayName.startsWith("TGV") diff --git a/content/operator/ns/transitous.yaml b/content/operator/ns/transitous.yaml index c449f3588..870f076bc 100644 --- a/content/operator/ns/transitous.yaml +++ b/content/operator/ns/transitous.yaml @@ -44,6 +44,3 @@ Le FIP est valable entre Liège-Guillemins et Maastricht. Au-delà de Maastricht vers Heerlen et Aix-la-Chapelle, le train est exploité par Arriva et le FIP n'est pas valable sur ce tronçon. -- query: agencyName == "NS" -- query: agencyName == "NS Int" -- query: agencyName == "Nederlandse Spoorwegen" From 9279468bb5218f818ea00a79176f72ecdfa1b44c Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 12:15:29 +0200 Subject: [PATCH 13/18] Add markdown link support in transitous messages and link to country pages --- content/operator/ns/transitous.yaml | 30 ++++++++++++-------- layouts/_default/home.transitousmapping.json | 4 +-- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/content/operator/ns/transitous.yaml b/content/operator/ns/transitous.yaml index 870f076bc..d4bc3c7a5 100644 --- a/content/operator/ns/transitous.yaml +++ b/content/operator/ns/transitous.yaml @@ -4,30 +4,33 @@ message: de: >- FIP ist auf dem Abschnitt Liège-Guillemins – Maastricht des - Dreiländerzugs (RE18) gültig. Der Zug wird hier im Auftrag von NS und - SNCB betrieben. + [Dreiländerzugs (RE18)](/country/belgium/#dreiländerzug-liège--maastricht--heerlen--aachen) + gültig. Der Zug wird hier im Auftrag von NS und SNCB betrieben. en: >- FIP is valid on the Liège-Guillemins – Maastricht section of the - Three-Country Train (RE18). The train is operated on behalf of NS and SNCB - on this section. + [Three-Country Train (RE18)](/country/belgium/#three-country-train-liège--maastricht--heerlen--aachen). + The train is operated on behalf of NS and SNCB on this section. fr: >- - Le FIP est valable sur le tronçon Liège-Guillemins – Maastricht du Train - des Trois Pays (RE18). Le train est exploité pour le compte de la NS et de - la SNCB sur ce tronçon. + Le FIP est valable sur le tronçon Liège-Guillemins – Maastricht du + [Train des Trois Pays (RE18)](/country/belgium/#train-des-trois-pays-liège--maastricht--heerlen--aix-la-chapelle). + Le train est exploité pour le compte de la NS et de la SNCB sur ce + tronçon. - query: (agencyId == "IFF:ARRIVA" && routeShortName == "Sneltrein RE18" || routeId.startsWith("de-DELFI_de:nrw:re18")) && !fromName.includes("Liège") && !fromName.includes("Bressoux") && !fromName.includes("Visé") && !fromName.includes("Eijsden") && !fromName.includes("Maastricht Randwyck") && !toName.includes("Liège") && !toName.includes("Bressoux") && !toName.includes("Visé") && !toName.includes("Eijsden") && !toName.includes("Maastricht Randwyck") fip_accepted: false priority: 3 message: de: >- - FIP ist auf dem Abschnitt Maastricht – Aachen des Dreiländerzugs (RE18) + FIP ist auf dem Abschnitt Maastricht – Aachen des + [Dreiländerzugs (RE18)](/country/netherlands/#dreiländerzug-liège--maastricht--heerlen--aachen) nicht gültig. Der Zug wird hier von Arriva betrieben. en: >- - FIP is not valid on the Maastricht – Aachen section of the Three-Country - Train (RE18). The train is operated by Arriva on this section. + FIP is not valid on the Maastricht – Aachen section of the + [Three-Country Train (RE18)](/country/netherlands/#three-country-train-liège--maastricht--heerlen--aachen). + The train is operated by Arriva on this section. fr: >- Le FIP n'est pas valable sur le tronçon Maastricht – Aix-la-Chapelle du - Train des Trois Pays (RE18). Le train est exploité par Arriva sur ce - tronçon. + [Train des Trois Pays (RE18)](/country/netherlands/#train-des-trois-pays-liège--maastricht--heerlen--aix-la-chapelle). + Le train est exploité par Arriva sur ce tronçon. - query: agencyId == "IFF:ARRIVA" && routeShortName == "Sneltrein RE18" || routeId.startsWith("de-DELFI_de:nrw:re18") fip_accepted: "partially" priority: 2 @@ -36,11 +39,14 @@ FIP ist zwischen Liège-Guillemins und Maastricht gültig. Über Maastricht hinaus Richtung Heerlen und Aachen wird der Zug von Arriva betrieben und FIP ist auf diesem Abschnitt nicht gültig. + [Mehr Informationen](/country/netherlands/#dreiländerzug-liège--maastricht--heerlen--aachen) en: >- FIP is valid between Liège-Guillemins and Maastricht. Beyond Maastricht towards Heerlen and Aachen, the train is operated by Arriva and FIP is not valid on this section. + [More information](/country/netherlands/#three-country-train-liège--maastricht--heerlen--aachen) fr: >- Le FIP est valable entre Liège-Guillemins et Maastricht. Au-delà de Maastricht vers Heerlen et Aix-la-Chapelle, le train est exploité par Arriva et le FIP n'est pas valable sur ce tronçon. + [Plus d'informations](/country/netherlands/#train-des-trois-pays-liège--maastricht--heerlen--aix-la-chapelle) diff --git a/layouts/_default/home.transitousmapping.json b/layouts/_default/home.transitousmapping.json index af47408b1..821946ca6 100644 --- a/layouts/_default/home.transitousmapping.json +++ b/layouts/_default/home.transitousmapping.json @@ -12,7 +12,7 @@ {{- with .message -}} {{- $msg := index . $page.Language.Lang -}} {{- if $msg -}} - {{- $entry = merge $entry (dict "message" $msg) -}} + {{- $entry = merge $entry (dict "message" ($msg | $page.RenderString)) -}} {{- end -}} {{- end -}} {{- if .category -}} @@ -51,7 +51,7 @@ {{- with .message -}} {{- $msg := index . $countryPage.Language.Lang -}} {{- if $msg -}} - {{- $noFipEntry = merge $noFipEntry (dict "message" $msg) -}} + {{- $noFipEntry = merge $noFipEntry (dict "message" ($msg | $countryPage.RenderString)) -}} {{- end -}} {{- end -}} {{- $noFipEntries = $noFipEntries | append $noFipEntry -}} From 5742be8d35e3ba844793be1315064ed1cb6b3168 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 13:17:46 +0200 Subject: [PATCH 14/18] Restrict DB Regio rules to domestic German journeys --- content/operator/db/transitous.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/operator/db/transitous.yaml b/content/operator/db/transitous.yaml index 29ab4e4f5..5602d12d9 100644 --- a/content/operator/db/transitous.yaml +++ b/content/operator/db/transitous.yaml @@ -14,9 +14,9 @@ category: ec - query: (agencyName == "DB Fernverkehr AG" || agencyId == "10918") && displayName.startsWith("IC") category: ic -- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") +- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RE") && fromCountry == "DE" && toCountry == "DE" category: re -- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") +- query: agencyName.startsWith("DB Regio") && routeShortName.startsWith("RB") && fromCountry == "DE" && toCountry == "DE" category: rb -- query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" +- query: agencyName.startsWith("DB Regio") && mode == "SUBURBAN" && fromCountry == "DE" && toCountry == "DE" category: s From fad981872a55cde1e8500322c1d8be7887525987 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 22:47:02 +0200 Subject: [PATCH 15/18] feat: Use proper dialog for debug menu --- assets/js/dialog.js | 54 +++++++++++++---------- assets/js/routePlanner.js | 41 ++++++++++++----- assets/sass/routePlanner.scss | 28 ------------ i18n/de.yaml | 1 + i18n/en.yaml | 1 + i18n/fr.yaml | 1 + layouts/general/route-planner/single.html | 2 + 7 files changed, 64 insertions(+), 64 deletions(-) diff --git a/assets/js/dialog.js b/assets/js/dialog.js index 76932ae97..4081ea9cf 100644 --- a/assets/js/dialog.js +++ b/assets/js/dialog.js @@ -24,34 +24,40 @@ function openDialogOnHash() { } } -function initDialogs() { - document.querySelectorAll("dialog").forEach((dialog) => { - dialog.addEventListener("click", (e) => { - if (e.target === dialog) { - dialog.close(); - } - }); - - const closeButton = getCloseButton(dialog); - if (closeButton) { - closeButton.addEventListener("click", () => dialog.close()); +export function bindDialog(dialog) { + dialog.addEventListener("click", (e) => { + if (e.target === dialog) { + dialog.close(); } }); - document.querySelectorAll("[data-dialog-trigger]").forEach((trigger) => { - const handler = (e) => { - if (e.type === "click" || (e.type === "keydown" && e.key === "Enter")) { - e.preventDefault(); - const dialogId = trigger.getAttribute("data-dialog-trigger"); - openDialog(dialogId); - } - }; - - trigger.addEventListener("click", handler); - trigger.addEventListener("keydown", handler); - }); + const closeButton = getCloseButton(dialog); + if (closeButton) { + closeButton.addEventListener("click", () => dialog.close()); + } +} + +export function bindDialogTrigger(trigger) { + const handler = (e) => { + if (e.type === "click" || (e.type === "keydown" && e.key === "Enter")) { + e.preventDefault(); + const dialogId = trigger.getAttribute("data-dialog-trigger"); + openDialog(dialogId); + } + }; + + trigger.addEventListener("click", handler); + trigger.addEventListener("keydown", handler); +} + +export function initDialogsIn(root) { + root.querySelectorAll("dialog").forEach(bindDialog); + root.querySelectorAll("[data-dialog-trigger]").forEach(bindDialogTrigger); +} + +function initDialogs() { + initDialogsIn(document); - // Initialize hash check openDialogOnHash(); window.addEventListener("hashchange", openDialogOnHash); } diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index c38b14fe5..5eaa34953 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -4,6 +4,7 @@ import { plan, reverseGeocode, } from "@motis-project/motis-client"; +import { bindDialog, bindDialogTrigger } from "./dialog.js"; const countryCache = new Map(); @@ -263,9 +264,9 @@ function renderInternationalWarning(fromCode, toCode) { return `
    ${cfg.labels.internationalJourney} ${countries.join(", ")}
    `; } -function renderFipBadge(fipStatus, popoverId) { +function renderFipBadge(fipStatus, dialogId) { const cfg = window.routePlannerConfig; - if (!popoverId) popoverId = `fip-debug-${++fipDebugCounter}`; + if (!dialogId) dialogId = `fip-debug-${++fipDebugCounter}`; const rows = Object.entries(fipStatus.debug) .map( @@ -273,10 +274,20 @@ function renderFipBadge(fipStatus, popoverId) { `${k}${v !== null ? v : "—"}`, ) .join(""); - const popoverHtml = ` -
    - ${rows}
    -
    `; + const dialogHtml = ` + +
    +
    +

    ${cfg.labels.debugTitle}

    + +
    +
    + ${rows}
    +
    +
    +     `; let reservationBadge = ""; if ( @@ -288,7 +299,7 @@ function renderFipBadge(fipStatus, popoverId) { reservationBadge = ` ${cfg.labels.reservationPartiallyRequired}`; } let badgeHtml = `${fipStatus.label}${reservationBadge}`; - badgeHtml += ` ${popoverHtml}`; + badgeHtml += ` ${dialogHtml}`; if (fipStatus.categoryUrl) { badgeHtml += ` ${cfg.labels.viewInFipGuide}`; } @@ -327,16 +338,16 @@ function renderLeg(leg) { : ""; const warningId = ++legWarningCounter; - const popoverId = `fip-debug-${++fipDebugCounter}`; + const dialogId = `fip-debug-${++fipDebugCounter}`; Promise.all([getCountryForPlace(leg.from), getCountryForPlace(leg.to)]).then( ([fromCode, toCode]) => { setTimeout(() => { const el = document.getElementById(`leg-warning-${warningId}`); if (el) el.outerHTML = renderInternationalWarning(fromCode, toCode); - const popover = document.getElementById(popoverId); - if (popover) { + const dialog = document.getElementById(dialogId); + if (dialog) { const update = (key, val) => { - const cell = popover.querySelector(`[data-debug-key="${key}"]`); + const cell = dialog.querySelector(`[data-debug-key="${key}"]`); if (cell) cell.textContent = val !== null ? val : "—"; }; update("fromCountry", fromCode); @@ -364,7 +375,7 @@ function renderLeg(leg) {
    ${fipStatus.message ? `
    ${fipStatus.message}
    ` : ""}
    - ${renderFipBadge(fipStatus, popoverId)} + ${renderFipBadge(fipStatus, dialogId)}
    `; @@ -466,6 +477,12 @@ async function search() { itinerariesEl.innerHTML = itineraries .map((it, i) => renderItinerary(it, i)) .join(""); + itinerariesEl + .querySelectorAll("dialog") + .forEach((dialog) => bindDialog(dialog)); + itinerariesEl + .querySelectorAll("[data-dialog-trigger]") + .forEach((trigger) => bindDialogTrigger(trigger)); } catch (err) { errorEl.textContent = cfg.labels.errorGeneric; errorEl.hidden = false; diff --git a/assets/sass/routePlanner.scss b/assets/sass/routePlanner.scss index c965124ea..0a845fc3b 100644 --- a/assets/sass/routePlanner.scss +++ b/assets/sass/routePlanner.scss @@ -398,34 +398,6 @@ } } - &__fip-debug-popover { - position: fixed; - margin: auto; - padding: 0.75rem 1rem; - border: 1px solid var(--border-default, #ccc); - border-radius: 0.5rem; - background: var(--bg-default, #fff); - color: var(--text-default, #000); - font-size: 1.3rem; - max-width: 480px; - width: 90vw; - box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15); - - [data-theme="dark"] & { - box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5); - } - } - - &__fip-debug-table { - border-collapse: collapse; - width: 100%; - - td { - padding: 0.2rem 0.4rem; - vertical-align: top; - } - } - &__fip-debug-key { font-weight: 600; white-space: nowrap; diff --git a/i18n/de.yaml b/i18n/de.yaml index 360e2d74d..7cfcbea27 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -226,6 +226,7 @@ related-operators: Verwandte Betreiber reportError: Melde ein Fehler routePlanner: arrival: Ankunft + debugTitle: Debug-Informationen departure: Abfahrt departureTime: Abfahrtszeit duration: Dauer diff --git a/i18n/en.yaml b/i18n/en.yaml index c4dfaf0bd..4fe8c7f06 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -219,6 +219,7 @@ related: reportError: Report an error routePlanner: arrival: Arrival + debugTitle: Debug Information departure: Departure departureTime: Departure time duration: Duration diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 1dddae564..66d08ad7a 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -228,6 +228,7 @@ related: reportError: Signaler une erreur routePlanner: arrival: Arrivée + debugTitle: Informations de débogage departure: Départ departureTime: Heure de départ duration: Durée diff --git a/layouts/general/route-planner/single.html b/layouts/general/route-planner/single.html index a33ff32fe..24b571240 100644 --- a/layouts/general/route-planner/single.html +++ b/layouts/general/route-planner/single.html @@ -131,6 +131,8 @@

    {{ .Title }}

    platform: "{{ T "routePlanner.platform" }}", noResults: "{{ T "routePlanner.noResults" }}", errorGeneric: "{{ T "routePlanner.errorGeneric" }}", + debugTitle: "{{ T "routePlanner.debugTitle" }}", + close: "{{ T "dialog.close" }}", internationalJourney: "{{ T "routePlanner.internationalJourney" }}" } }; From b04ceed31b4c5e9a124caec9d7fae214be2d59fc Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 22:51:20 +0200 Subject: [PATCH 16/18] Remove transitous.yaml files with only agencyName matching --- content/operator/bdz/transitous.yaml | 1 - content/operator/cfl/transitous.yaml | 1 - content/operator/cfr/transitous.yaml | 1 - content/operator/dsb/transitous.yaml | 1 - content/operator/fs/transitous.yaml | 1 - content/operator/kd/transitous.yaml | 1 - content/operator/kml/transitous.yaml | 1 - content/operator/ks/transitous.yaml | 1 - content/operator/kw/transitous.yaml | 1 - content/operator/lka/transitous.yaml | 1 - content/operator/ltg/transitous.yaml | 1 - content/operator/sv/transitous.yaml | 1 - content/operator/zpcg/transitous.yaml | 1 - content/operator/zssk/transitous.yaml | 1 - 14 files changed, 14 deletions(-) delete mode 100644 content/operator/bdz/transitous.yaml delete mode 100644 content/operator/cfl/transitous.yaml delete mode 100644 content/operator/cfr/transitous.yaml delete mode 100644 content/operator/dsb/transitous.yaml delete mode 100644 content/operator/fs/transitous.yaml delete mode 100644 content/operator/kd/transitous.yaml delete mode 100644 content/operator/kml/transitous.yaml delete mode 100644 content/operator/ks/transitous.yaml delete mode 100644 content/operator/kw/transitous.yaml delete mode 100644 content/operator/lka/transitous.yaml delete mode 100644 content/operator/ltg/transitous.yaml delete mode 100644 content/operator/sv/transitous.yaml delete mode 100644 content/operator/zpcg/transitous.yaml delete mode 100644 content/operator/zssk/transitous.yaml diff --git a/content/operator/bdz/transitous.yaml b/content/operator/bdz/transitous.yaml deleted file mode 100644 index c1c558f5f..000000000 --- a/content/operator/bdz/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "BDZ" diff --git a/content/operator/cfl/transitous.yaml b/content/operator/cfl/transitous.yaml deleted file mode 100644 index 0973fb520..000000000 --- a/content/operator/cfl/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "CFL" diff --git a/content/operator/cfr/transitous.yaml b/content/operator/cfr/transitous.yaml deleted file mode 100644 index f777ca83b..000000000 --- a/content/operator/cfr/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "CFR Călători" diff --git a/content/operator/dsb/transitous.yaml b/content/operator/dsb/transitous.yaml deleted file mode 100644 index 466e2beb9..000000000 --- a/content/operator/dsb/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "DSB" diff --git a/content/operator/fs/transitous.yaml b/content/operator/fs/transitous.yaml deleted file mode 100644 index d909126ae..000000000 --- a/content/operator/fs/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Trenitalia" diff --git a/content/operator/kd/transitous.yaml b/content/operator/kd/transitous.yaml deleted file mode 100644 index 2ab61b1bc..000000000 --- a/content/operator/kd/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Koleje Dolnośląskie" diff --git a/content/operator/kml/transitous.yaml b/content/operator/kml/transitous.yaml deleted file mode 100644 index 6713d29de..000000000 --- a/content/operator/kml/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Koleje Małopolskie" diff --git a/content/operator/ks/transitous.yaml b/content/operator/ks/transitous.yaml deleted file mode 100644 index ac32e7cf7..000000000 --- a/content/operator/ks/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Koleje Śląskie" diff --git a/content/operator/kw/transitous.yaml b/content/operator/kw/transitous.yaml deleted file mode 100644 index 2df27b5d4..000000000 --- a/content/operator/kw/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Koleje Wielkopolskie" diff --git a/content/operator/lka/transitous.yaml b/content/operator/lka/transitous.yaml deleted file mode 100644 index de1c9d5d6..000000000 --- a/content/operator/lka/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Łódzka Kolej Aglomeracyjna" diff --git a/content/operator/ltg/transitous.yaml b/content/operator/ltg/transitous.yaml deleted file mode 100644 index b02f9965e..000000000 --- a/content/operator/ltg/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "LTG Link" diff --git a/content/operator/sv/transitous.yaml b/content/operator/sv/transitous.yaml deleted file mode 100644 index c5a297006..000000000 --- a/content/operator/sv/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "Srbija Voz" diff --git a/content/operator/zpcg/transitous.yaml b/content/operator/zpcg/transitous.yaml deleted file mode 100644 index 9d169eb10..000000000 --- a/content/operator/zpcg/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "ŽPCG" diff --git a/content/operator/zssk/transitous.yaml b/content/operator/zssk/transitous.yaml deleted file mode 100644 index bc933fb8f..000000000 --- a/content/operator/zssk/transitous.yaml +++ /dev/null @@ -1 +0,0 @@ -- query: agencyName == "ZSSK" From b5be98ca287e395065a0f82eba90385f0f9dae4f Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 23:13:06 +0200 Subject: [PATCH 17/18] Add debug dialog actions and fix snackbar in modal dialogs --- assets/js/anchorlinks.js | 31 +++++++++++-- assets/js/routePlanner.js | 56 +++++++++++++++++++++-- assets/sass/anchorlink.scss | 2 + assets/sass/routePlanner.scss | 15 ++++++ i18n/de.yaml | 5 ++ i18n/en.yaml | 5 ++ i18n/fr.yaml | 5 ++ layouts/_partials/snackbar.html | 1 + layouts/general/route-planner/single.html | 4 ++ 9 files changed, 117 insertions(+), 7 deletions(-) diff --git a/assets/js/anchorlinks.js b/assets/js/anchorlinks.js index 6cce91868..3bc3f2b4a 100644 --- a/assets/js/anchorlinks.js +++ b/assets/js/anchorlinks.js @@ -1,7 +1,9 @@ +const snackbar = document.getElementById("snackbar"); +const snackbarHome = snackbar.parentNode; +const snackbarNextSibling = snackbar.nextSibling; + function initAnchorlinkEventListener() { const anchorLinks = document.querySelectorAll(".a-anchorlink__link"); - const snackbar = document.getElementById("snackbar"); - const snackbarButton = document.getElementById("snackbar-button"); anchorLinks.forEach((element) => { element.addEventListener("click", () => { @@ -19,32 +21,53 @@ function initAnchorlinkEventListener() { }); }); }); +} + +function initSnackbarCloseListener() { + const snackbarButton = document.getElementById("snackbar-button"); + if (!snackbarButton) return; snackbarButton.addEventListener("click", () => { closeSnackbar(); }); } -function showSnackbar() { +export function showSnackbar() { + const openDialog = document.querySelector("dialog[open]"); + if (openDialog && snackbar.parentNode !== openDialog) { + openDialog.append(snackbar); + } else if (!openDialog && snackbar.parentNode !== snackbarHome) { + snackbarHome.insertBefore(snackbar, snackbarNextSibling); + } + snackbar.setAttribute("aria-hidden", "false"); snackbar.classList.add("a-snackbar--show"); + if (snackbar.showPopover) snackbar.showPopover(); setTimeout(closeSnackbar, 5000); } -function closeSnackbar() { +export function closeSnackbar() { snackbar.setAttribute("aria-hidden", "true"); snackbar.classList.remove("a-snackbar--show"); + if (snackbar.hidePopover && snackbar.matches(":popover-open")) { + snackbar.hidePopover(); + } + if (snackbar.parentNode !== snackbarHome) { + snackbarHome.insertBefore(snackbar, snackbarNextSibling); + } } if (document.readyState === "interactive") { if (document.querySelectorAll(".a-anchorlink__link").length) { initAnchorlinkEventListener(); } + initSnackbarCloseListener(); } else { window.addEventListener("DOMContentLoaded", () => { if (document.querySelectorAll(".a-anchorlink__link").length) { initAnchorlinkEventListener(); } + initSnackbarCloseListener(); }); } diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index 5eaa34953..bde4c5aa0 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -5,6 +5,7 @@ import { reverseGeocode, } from "@motis-project/motis-client"; import { bindDialog, bindDialogTrigger } from "./dialog.js"; +import { showSnackbar } from "./anchorlinks.js"; const countryCache = new Map(); @@ -284,7 +285,18 @@ function renderFipBadge(fipStatus, dialogId) {
    +

    ${cfg.labels.debugHint}

    ${rows}
    +
    + + +
    `; @@ -306,6 +318,43 @@ function renderFipBadge(fipStatus, dialogId) { return badgeHtml; } +function buildDebugText(dialog) { + const rows = dialog.querySelectorAll(".o-route-planner__fip-debug-key"); + return Array.from(rows) + .map((keyCell) => { + const key = keyCell.textContent; + const valCell = keyCell.nextElementSibling; + return `${key}: ${valCell ? valCell.textContent : "—"}`; + }) + .join("\n"); +} + +function buildGitHubIssueUrl(dialog) { + const cfg = window.routePlannerConfig; + const body = buildDebugText(dialog); + return `${cfg.gitHubUrl}/issues/new?title=Route+planner+issue&labels=content,route-planner&body=${encodeURIComponent("```yaml\n" + body + "\n```")}`; +} + +function bindDebugActions(dialog) { + const copyButton = dialog.querySelector('[data-debug-action="copy"]'); + const githubButton = dialog.querySelector('[data-debug-action="github"]'); + + if (copyButton) { + copyButton.addEventListener("click", () => { + const text = buildDebugText(dialog); + navigator.clipboard.writeText(text).then(() => { + showSnackbar(); + }); + }); + } + + if (githubButton) { + githubButton.addEventListener("click", () => { + window.open(buildGitHubIssueUrl(dialog), "_blank", "noopener,noreferrer"); + }); + } +} + function renderLeg(leg) { const cfg = window.routePlannerConfig; @@ -477,9 +526,10 @@ async function search() { itinerariesEl.innerHTML = itineraries .map((it, i) => renderItinerary(it, i)) .join(""); - itinerariesEl - .querySelectorAll("dialog") - .forEach((dialog) => bindDialog(dialog)); + itinerariesEl.querySelectorAll("dialog").forEach((dialog) => { + bindDialog(dialog); + bindDebugActions(dialog); + }); itinerariesEl .querySelectorAll("[data-dialog-trigger]") .forEach((trigger) => bindDialogTrigger(trigger)); diff --git a/assets/sass/anchorlink.scss b/assets/sass/anchorlink.scss index c9a22e6d3..372589121 100644 --- a/assets/sass/anchorlink.scss +++ b/assets/sass/anchorlink.scss @@ -76,11 +76,13 @@ .a-snackbar { position: fixed; + inset: auto auto 0 auto; bottom: 0; background-color: var(--bg-accent); color: var(--color-onLight); padding: 1.6rem; border-radius: var(--border-radius-s); + border: none; opacity: 0; visibility: hidden; transform: translateY(2rem); diff --git a/assets/sass/routePlanner.scss b/assets/sass/routePlanner.scss index 0a845fc3b..d6feba862 100644 --- a/assets/sass/routePlanner.scss +++ b/assets/sass/routePlanner.scss @@ -398,6 +398,10 @@ } } + &__fip-debug-hint { + margin-bottom: 1.5rem; + } + &__fip-debug-key { font-weight: 600; white-space: nowrap; @@ -408,6 +412,17 @@ font-family: monospace; word-break: break-all; } + + &__fip-debug-actions { + display: flex; + flex-wrap: wrap; + gap: 1rem; + margin-top: 1.5rem; + + .a-icon { + font-size: 1.6rem; + } + } } @keyframes route-planner-spin { diff --git a/i18n/de.yaml b/i18n/de.yaml index 7cfcbea27..f2a334394 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -226,6 +226,10 @@ related-operators: Verwandte Betreiber reportError: Melde ein Fehler routePlanner: arrival: Ankunft + copyToClipboard: In die Zwischenablage kopieren + debugHint: >- + Die Information ist nicht korrekt oder es fehlen Informationen? Bitte melde + uns den Fehler und hänge die folgenden Informationen an: debugTitle: Debug-Informationen departure: Abfahrt departureTime: Abfahrtszeit @@ -247,6 +251,7 @@ routePlanner: internationalJourney: 'Internationale Fahrt! Bitte prüfe die Grenzpunkte auf den Länderseiten:' loading: Verbindungen werden gesucht… noResults: Keine Verbindungen gefunden. + openGitHubIssue: GitHub-Issue öffnen operatorBaseUrl: /de operatorNotInFipGuide: Betreiber nicht im FIP Guide platform: Gleis diff --git a/i18n/en.yaml b/i18n/en.yaml index 4fe8c7f06..55c9e7f3d 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -219,6 +219,10 @@ related: reportError: Report an error routePlanner: arrival: Arrival + copyToClipboard: Copy to clipboard + debugHint: >- + Is this information incorrect or missing? Please report the error to us and + attach the following information: debugTitle: Debug Information departure: Departure departureTime: Departure time @@ -240,6 +244,7 @@ routePlanner: internationalJourney: 'International journey! Please check the border points on the country pages:' loading: Searching for connections… noResults: No connections found. + openGitHubIssue: Open GitHub issue operatorBaseUrl: /en operatorNotInFipGuide: Operator not in FIP Guide platform: Platform diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 66d08ad7a..f6f0f32ac 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -228,6 +228,10 @@ related: reportError: Signaler une erreur routePlanner: arrival: Arrivée + copyToClipboard: Copier dans le presse-papiers + debugHint: >- + Cette information est incorrecte ou incomplète ? Merci de nous signaler + l’erreur et de joindre les informations suivantes : debugTitle: Informations de débogage departure: Départ departureTime: Heure de départ @@ -252,6 +256,7 @@ routePlanner: des pays : loading: Recherche de connexions… noResults: Aucune connexion trouvée. + openGitHubIssue: Ouvrir un ticket GitHub operatorBaseUrl: /fr operatorNotInFipGuide: Opérateur absent du FIP Guide platform: Voie diff --git a/layouts/_partials/snackbar.html b/layouts/_partials/snackbar.html index 9659eb04a..c35639f3f 100644 --- a/layouts/_partials/snackbar.html +++ b/layouts/_partials/snackbar.html @@ -1,5 +1,6 @@
    {{ .Title }} window.routePlannerConfig = { lang: "{{ .Language.Lang }}", baseUrl: "{{ T "routePlanner.operatorBaseUrl" }}", + gitHubUrl: "{{ .Site.Params.gitHubUrl }}", countryCodeMap: JSON.parse('{{ $map := dict }}{{ range where (where site.Pages "Type" "country") "IsPage" true }}{{ $slug := .File.ContentBaseName }}{{ $name := .Title }}{{ with .Params.iso_code }}{{ $map = merge $map (dict . (dict "slug" $slug "name" $name)) }}{{ end }}{{ end }}{{ $map | jsonify }}'), labels: { walk: "{{ T "routePlanner.walk" }}", @@ -132,6 +133,9 @@

    {{ .Title }}

    noResults: "{{ T "routePlanner.noResults" }}", errorGeneric: "{{ T "routePlanner.errorGeneric" }}", debugTitle: "{{ T "routePlanner.debugTitle" }}", + debugHint: "{{ T "routePlanner.debugHint" }}", + copyToClipboard: "{{ T "routePlanner.copyToClipboard" }}", + openGitHubIssue: "{{ T "routePlanner.openGitHubIssue" }}", close: "{{ T "dialog.close" }}", internationalJourney: "{{ T "routePlanner.internationalJourney" }}" } From e11201c4fa0bf9d7a718df0ec2a4101a310e90ef Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Mon, 3 Aug 2026 23:20:56 +0200 Subject: [PATCH 18/18] Use scheduled times and drop OTHER transit mode in route planner --- assets/js/routePlanner.js | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/assets/js/routePlanner.js b/assets/js/routePlanner.js index bde4c5aa0..a58055514 100644 --- a/assets/js/routePlanner.js +++ b/assets/js/routePlanner.js @@ -147,8 +147,12 @@ function getFipStatus(leg) { to: leg.to?.name || null, toId: leg.to?.stopId || leg.to?.id || null, toCountry: null, - startTime: leg.startTime ? new Date(leg.startTime).toLocaleString() : null, - endTime: leg.endTime ? new Date(leg.endTime).toLocaleString() : null, + startTime: leg.scheduledStartTime + ? new Date(leg.scheduledStartTime).toLocaleString() + : null, + endTime: leg.scheduledEndTime + ? new Date(leg.scheduledEndTime).toLocaleString() + : null, agencyId: leg.agencyId || null, agencyName: leg.agencyName || null, routeShortName: leg.routeShortName || null, @@ -372,8 +376,8 @@ function renderLeg(leg) { const agencyName = leg.agencyName || ""; const fipStatus = getFipStatus(leg); const legLabel = leg.displayName || leg.routeShortName || ""; - const depTime = formatTime(leg.startTime); - const arrTime = formatTime(leg.endTime); + const depTime = formatTime(leg.scheduledStartTime); + const arrTime = formatTime(leg.scheduledEndTime); const headsign = leg.headsign ? ` → ${leg.headsign}` : ""; const routeColor = leg.routeColor ? `#${leg.routeColor}` @@ -432,13 +436,19 @@ function renderLeg(leg) { function renderItinerary(itinerary, index) { const cfg = window.routePlannerConfig; - const depTime = formatTime( - itinerary.startTime || itinerary.legs?.[0]?.startTime, - ); - const arrTime = formatTime( - itinerary.endTime || itinerary.legs?.[itinerary.legs.length - 1]?.endTime, - ); - const duration = formatDuration(itinerary.duration); + const scheduledStart = itinerary.legs?.[0]?.scheduledStartTime; + const scheduledEnd = + itinerary.legs?.[itinerary.legs.length - 1]?.scheduledEndTime; + const depTime = formatTime(scheduledStart); + const arrTime = formatTime(scheduledEnd); + const duration = + scheduledStart && scheduledEnd + ? formatDuration( + (new Date(scheduledEnd).getTime() - + new Date(scheduledStart).getTime()) / + 1000, + ) + : formatDuration(itinerary.duration); const transitLegs = itinerary.legs?.filter((l) => l.mode !== "WALK" && l.mode !== "FOOT") || []; @@ -500,7 +510,6 @@ async function search() { "RAIL", "FUNICULAR", "AERIAL_LIFT", - "OTHER", ], }, });